机台修改优化/备选工序选中优化

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -3524,9 +3524,10 @@ const _cjmc = ref(null);
 //双击修改
 const gdgyupdateCompanyFunc = async(row) => {
   gdgydialogFormVisible.value = true
-
+
+  Object.assign(gdgyformData,row);
+  
 const apiData = await getDepartName()
-  console.log(apiData)
   function transformDataToTreeFormat(data) {
     return Object.entries(data).map(([key, value]) => {
       // key是车间名称，value是车间内的操作列表
@@ -3545,7 +3546,6 @@ const apiData = await getDepartName()
   const res = await PrintDetailList({workOrder: _Gd_gdbh.value})
   yjList.value = res.data
   
-  console.log(row)
   if(row['车间名称']){
     _cjmc.value = row['车间名称']
   }else{
@@ -3553,15 +3553,12 @@ const apiData = await getDepartName()
   }
   gdgyformData['设备编号'] = []
   //通过车间名称查询机台
-  console.log(_cjmc.value)
   const MachineList_jitai = await gdzl_MachineList({address:_cjmc.value});
-  console.log(MachineList_jitai)
   if(MachineList_jitai.data === null || MachineList_jitai.data === ''){
     ElMessage({type: 'warning', message: '未找到该车间机台'})
     return false;
   }
   const jitai = row['机台编号'].split(' ')
-  console.log(jitai)
   jitai.map(item => {
     MachineList_jitai.data.map(jt => {
       if (jt.indexOf(item) > -1 && item !== '') {
@@ -3600,14 +3597,15 @@ const apiData = await getDepartName()
   } else {
     // 如果没有 "-"，则整个字符串是印件，工序为空
     yinjian = printProcess.trim();
-  }
-  // console.log(row)
+  }
+  
   gdgyformData['印件'] = yinjian;
   gdgyformData['工序'] = gongxu;
   gdgyformData['工艺名称'] = technologyName;
-  gdgyformData['工序名称'] = operationName;
-
-  Object.assign(gdgyformData,row);
+  gdgyformData['工序名称'] = operationName;
+  if(row.备选工序==1){
+	  gdgyformData.备选工序 = true
+  }
 }
 
 //工艺列表修改【确定】
@@ -3626,7 +3624,8 @@ const gdgyenterDialog = async () => {
     // if(gdgyformData['设备编号'] === '' || gdgyformData['设备编号'] === "0"){
     //   ElMessage({type: 'warning', message: '设备编号 不能为空'})
     //   return false;
-    // }
+    // }
+	let sbbh = gdgyformData['设备编号'].join(' ');
     const formattedData = {
       UniqId: gdgyformData['UniqId'],
 	  
@@ -3638,7 +3637,7 @@ const gdgyenterDialog = async () => {
 	  Add_gxmc:gdgyformData['工序名称'] ? gdgyformData['工序名称'] : "",
 	  备选工序: gdgyformData['备选工序'] ? "1" : "0",
 	  重点工序: gdgyformData['重点工序'] ? gdgyformData['重点工序'] : "",
-	  Gy0_sbbh: gdgyformData['设备编号'] ? gdgyformData['设备编号'] : "",
+	  Gy0_sbbh: sbbh ? sbbh : "",
 	  Gy0_sbmc: "",
 	  Gy0_SITE: gdgyformData['车间名称'] ? gdgyformData['车间名称'] : "",
 	  Gy0_ks: gdgyformData['开数'] ? gdgyformData['开数'] : "",
@@ -3777,7 +3776,7 @@ const selectHandle = async (node)=>{
     return false;
   }
   gdgyformData['设备编号'] = []
-
+console.log(gdgyformData['车间名称'])
   //通过车间名称查询机台
   const MachineList_jitai = await gdzl_MachineList({address:gdgyformData['车间名称']});
   gdzl_MachineList_address.value = MachineList_jitai.data;