Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -700,11 +700,11 @@ const handleNodeClick = async (node) => {
     // 使用字符串分割获取#前面的数据
     const dataBeforeHash = custom_code.split('#')[0].trim();
     _machine.value = dataBeforeHash + '#';
-    if(_machine.value && node['$treeNodeId']){
-      console.log(_machine.value)
-      console.log(node['$treeNodeId'])
-      return 'el-background-color';
-    }
+    // if(_machine.value && node['$treeNodeId']){
+    //   console.log(_machine.value)
+    //   console.log(node['$treeNodeId'])
+    //   return 'el-background-color';
+    // }
     console.log('机台' + _machine.value)
     const zhubiao = await MachineWorkOrderList({ machine:_machine.value})
     chejianData.value = zhubiao.data['排程'];

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2873,7 +2873,7 @@ const type = ref('')
 let scgdformData = ref({})
 //双击修改
 const updateCompanyFunc = async(row) => {
-  console.log(row['工单编号'])
+  console.log(row)
   // if(row['status'] === '*'){
   //   ElMessage({ type: 'warning', message: '未找到该工单印件资料' });
   //   return false;