优化

src/view/performance/chejianbaogong.vue

@@ -6079,7 +6079,7 @@ const warningres = (arr) => {
   // 树形节点属性映射
   const treeDatalcd = reactive([]);
   const defaultProps = {
-	label: '流程单',
+	label: 'label',
 	children: 'children',
   };
   //全局调用工单编号、印件号
@@ -6132,18 +6132,23 @@ const warningres = (arr) => {
 	_StaProcessAnomaly()
   };
   
-  //获取左侧菜单栏
-  const _StaGetList = async (row) => {
-	const StaGetListdata = await StaGetList({gdbh:row['Gd_gdbh'],yjno:row['行号']});
-	console.log(StaGetListdata.msg)
-	if(StaGetListdata.msg === '成功'){
-		treeDatalcd.splice(0, treeDatalcd.length, ...StaGetListdata.data);
-		popdialog.value = true
-	}else{
-		console.log(StaGetListdata.msg)
-		warningres(StaGetListdata.msg)
-	}
-  };
+//获取左侧菜单栏
+const _StaGetList = async (row) => {
+  const StaGetListdata = await StaGetList({ gdbh: row['Gd_gdbh'], yjno: row['行号'] });
+  
+  if (StaGetListdata.msg === '成功') {
+    // 转换数据：确保每个节点有 label 属性
+    const formattedData = StaGetListdata.data.map(item => ({
+      ...item,
+      label: item.流程单 || `流程单-${item.num}`, 
+    }));
+    
+    treeDatalcd.splice(0, treeDatalcd.length, ...formattedData);
+    popdialog.value = true;
+  } else {
+    ElMessage({ type: 'warning', message: StaGetListdata.msg });
+  }
+};
   
   //工艺及生产班组
   const lcdtableData = reactive([])

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -74,6 +74,13 @@
             <el-form-item label="目标产品代号:" prop="process" class="mab">
               <el-input v-model="cpgyfzformData['mubprocess']" id="mubprocess" @keydown="add_cpgyfzent($event, 'gongyifa', 'mubprocess', 'mubprocessName')"   style="width: 160px;"/>
               <el-input disabled v-model="cpgyfzformData['mubprocessName']" id="mubprocessName" @keydown="add_cpgyfzent($event, 'mubprocess', 'mubprocessName', 'fzgyzl')"  style="width: 360px;"/>
+              <div v-if="yjOptions.length > 0" class="yj-checkbox-group">
+                <el-checkbox-group v-model="selectedYjList" @change="handleYjChange">
+                  <el-checkbox v-for="option in yjOptions" :key="option" :label="option">
+                    {{ option }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </div>
             </el-form-item>
 <!--            cpgyfzformData.fzgyzl === true-->
             <el-form-item label="" class="mab" >
@@ -1556,7 +1563,7 @@ export default {
 import { ElMessage, ElMessageBox } from 'element-plus'
 //拖拽 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
-import { ref, reactive, nextTick, } from 'vue'
+import { ref, reactive, nextTick,watch } from 'vue'
 import {
   DataList,
   ProductDetailData,
@@ -1603,8 +1610,8 @@ import {
   gdzl_MachineList,
   ProductYgSort
 } from '@/api/yunyin/yunying'
-defineOptions({   name: 'Company'})
 import { useUserStore } from '@/pinia/modules/user'
+defineOptions({   name: 'Company'})
 const userStore = useUserStore()
 const _username = ref('')
 _username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickName
@@ -1939,6 +1946,13 @@ const cpgyfzclick = async () => {
 };
 //取消
 const cpgyfzhandleCancel = async () => {
+  cpgyfzformData['fzgyzl'] = true;
+  cpgyfzformData['xzgyzl'] = false;
+  cpgyfzformData['fzybzl'] = false;
+  cpgyfzformData['fzyjzl'] = false;
+  cpgyfzformData['xzgyzl'] = false;
+  cpgyfzformData['to_pro'] = '';
+  selectedYjList.value = [yjOptions.value[0]];
   cpgyfzlist.value = false;
 };
 //确定
@@ -1978,12 +1992,19 @@ const cpgyfzhandleConfirm = async () => {
     clickedlist.value = true;
     return false;
   }
+    if (cpgyfzformData['fzgyzl'] === true && cpgyfzformData['fzybzl'] === false && cpgyfzformData['fzyjzl'] === false) {
+    if (cpgyfzformData['to_pro'] === '') {
+      ElMessage({ type: 'warning', message: '目标工艺方案不能为空' });
+      clickedlist.value = true;
+      return false;
+    }
+  }
 
   // 检查是否选择了复制印件资料
   if (cpgyfzformData['fzyjzl'] === true) {
     console.log('判断印件号是否重复')
     // 获取两个印件号的数组
-    const sourceYjNos = _yjno.value.split(',').filter(Boolean); 
+    const sourceYjNos = selectYJNO.value.split(',').filter(Boolean); 
     const targetYjNos = copy_yjno.value.split(',').filter(Boolean); 
     console.log('原印件号：', sourceYjNos);
     console.log('目标印件号：', targetYjNos);
@@ -2054,14 +2075,7 @@ const proceedWithCopy = async () => {
     is_copy_yj.value = 0;
   }
 
-  // 其他验证逻辑（如目标工艺方案是否为空等）
-  if (cpgyfzformData['fzgyzl'] === true && cpgyfzformData['fzybzl'] === false && cpgyfzformData['fzyjzl'] === false) {
-    if (cpgyfzformData['to_pro'] === '') {
-      ElMessage({ type: 'warning', message: '目标工艺方案不能为空' });
-      clickedlist.value = true;
-      return false;
-    }
-  }
+
 
   // 转换为大写
   toProUpperCase.value = cpgyfzformData['to_pro'].toUpperCase();
@@ -2089,7 +2103,9 @@ const proceedWithCopy = async () => {
   cpgyfzformData['xzgyzl'] = false;
   cpgyfzformData['fzybzl'] = false;
   cpgyfzformData['fzyjzl'] = false;
+  cpgyfzformData['xzgyzl'] = false;
   cpgyfzformData['to_pro'] = '';
+  selectedYjList.value = [yjOptions.value[0]];
   cpgyfzlist.value = false;
 };
 
@@ -2135,6 +2151,8 @@ const _ProductCodeList = async (v = '')=>{
   }
 }
 const copy_yjno = ref('')//保存目标印件号
+const yjOptions = ref([]); // 可选项 ["1", "2", "3", "4", "5"]
+const selectedYjList = ref([]); // 当前选中的值，如 ["1", "3"]
 const add_cpgyfzent = async (event,id1,id2,id3) => {
   if (id2 === 'mubprocess' &&  event.key==='Tab' || id2 === 'mubprocess' && event.key=== 'Enter') {
     // cpgyfz_keyword.value = '';
@@ -2179,6 +2197,10 @@ const add_cpgyfzent = async (event,id1,id2,id3) => {
   }
 }
 
+
+
+
+
 // =========== 工艺方案更名 ===========
 const gygmlist = ref(false);
 const _gygmstacode = ref(null);
@@ -2641,8 +2663,7 @@ const tableRowClick = async (row) => {
   console.log(_product_code.value + "--->下方表格获取数据")
   console.log(res)
   console.log(res.data.gyData)
-  const yjNos = res.data.yjData.map(item => item.yj_yjno).join(',');
-  _yjno.value = yjNos;
+  _yjno.value = res.data.yjData.map(item => item.yj_yjno).join(',');
   console.log(_yjno.value)
   const processedData = res.data.gyData.map(item => {
     return {
@@ -2670,6 +2691,30 @@ const tableRowClick = async (row) => {
   addyj.value=true
   delall.value=true
 };
+
+
+watch(_yjno, (newVal) => {
+  if (newVal) {
+    yjOptions.value = newVal.split(',').filter(item => item.trim());
+    // 默认选中第一个（可选）
+    if (yjOptions.value.length > 0) {
+      selectedYjList.value = [yjOptions.value[0]]; // 默认选中第一个
+      handleYjChange(selectedYjList.value);
+    }
+  } else {
+    yjOptions.value = [];
+    selectedYjList.value = [];
+  }
+});
+
+// 处理 Checkbox 选择变化
+const selectYJNO = ref('')
+const handleYjChange = (selectedValues) => {
+  // 拼接成字符串
+  selectYJNO.value = selectedValues.join(',');
+  console.log(selectYJNO.value)
+};
+
 const yjSelection = ref('')
 const gySelection = ref('')
 // 印件资料多选、工艺资料多选

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -698,10 +698,10 @@
 		  width="1300px"
 		  style="height: 75%;"
 		>
-		<div style="margin-top:-10px">
+		<!-- <div style="margin-top:-10px">
 			<el-button @click="selectSameWorkOrder" type="success">批量选择</el-button>
 			<el-button @click="invertSelection" type="info">反选</el-button>
-    </div>
+    </div> -->
 		  <el-row :gutter="24">
 		    <el-col :span="4">
 		      <el-form-item label="工单编号" prop="id">
@@ -5714,8 +5714,6 @@ const _StaGetOrderList = async (node) => {
 	  ElMessage({
 		type: 'warning',
 		message: '未搜索具体查询条件',
-		customClass: 'custom-message', // 添加自定义类名
-		duration: 3000 // 可选：设置消息显示的持续时间（单位：毫秒）
 	  });
 	}
   tableDatalcd.splice(0,tableDatalcd.length,...StaGetOrderListdata.data);//表格数据
@@ -5782,14 +5780,19 @@ const handleNodeClicklcd = (node) => {
 
 //获取左侧菜单栏
 const _StaGetList = async (row) => {
-  const StaGetListdata = await StaGetList({gdbh:row['Gd_gdbh'],yjno:row['行号']});
-  console.log(StaGetListdata.msg)
-  if(StaGetListdata.msg === '成功'){
-	  treeDatalcd.splice(0, treeDatalcd.length, ...StaGetListdata.data);
-	  popdialog.value = true
-  }else{
-	  console.log(StaGetListdata.msg)
-	  ElMessage({type: 'warning',message: StaGetListdata.msg})
+  const StaGetListdata = await StaGetList({ gdbh: row['Gd_gdbh'], yjno: row['行号'] });
+  
+  if (StaGetListdata.msg === '成功') {
+    // 转换数据：确保每个节点有 label 属性
+    const formattedData = StaGetListdata.data.map(item => ({
+      ...item,
+      label: item.流程单 || `流程单-${item.num}`, 
+    }));
+    
+    treeDatalcd.splice(0, treeDatalcd.length, ...formattedData);
+    popdialog.value = true;
+  } else {
+    ElMessage({ type: 'warning', message: StaGetListdata.msg });
   }
 };