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

src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -166,16 +166,29 @@ _username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickNam
 //新增工艺资料弹窗 键盘 input框跳转
 const add_gyzlent = async (event,id1,id2,id3) => {
   if (id2==='印件编号' && event.key==='Tab' || id2 === '印件编号' && event.key=== 'Enter') {
-    const node = yjList.value.find(item => item.no ===form['yjno'])
-    if (! node) {
-      yjdisplay.value = true
+    if(yjList.value !== undefined){
+      const node = yjList.value.find(item => item.no ===form['yjno'])
+      if (! node) {
+        yjdisplay.value = true
+      }
+      document.getElementById(id3).focus()
     }
-    document.getElementById(id3).focus()
+
   }
-  if (id2 === '车间名称' && event.key==='Tab' || id2 === '车间名称' && event.key=== 'Enter') {
+  if (id2 === '车间名称' && event.key==='Tab') {
     document.getElementById(id3).focus()
     cjdisplay.value = true
   }
+
+  if (id2 === '车间名称' &&  event.key=== 'Enter') {
+    form['工艺名称'] = form['车间名称']
+    form['设备编号'] = []
+    //通过车间名称查询机台
+    const MachineList_jitai = await gdzl_MachineList({address:form['车间名称']});
+    gdzl_MachineList_address.value = MachineList_jitai.data;
+    form['shdh'] = ''
+    form['工序损耗名称'] = ''
+  }
   if (id2 === '工序损耗' &&  event.key==='Tab' || id2 === '工序损耗' && event.key=== 'Enter') {
     if(form['车间名称']){
       await getGxshList();
@@ -209,27 +222,31 @@ const add_gyzlent = async (event,id1,id2,id3) => {
 }
 
 const open = async (gdbh, gxlist) => {
+  visible.value = true
+
   id.value = gdbh
   const res = await PrintDetailList({workOrder: id.value})
   const chejian = await getDepartName()
-  cjList.value = [
-    {
-      label: '标准工艺',
-      value: '标准工艺',
-      children: []
-    }
-  ]
-  initChejian(chejian.data['标准工艺'])
+  if (chejian && Array.isArray(chejian.data) && chejian.data.length === 0) {
+  } else {
+    cjList.value = [
+      {
+        label: '标准工艺',
+        value: '标准工艺',
+        children: []
+      }
+    ]
+    initChejian(chejian.data['标准工艺'])
+  }
   yjList.value = res.data
   gxList.value = gxlist
-  console.log("打开了弹窗")
-  visible.value = true
 }
 
 //工序损耗列表
 const gxshList = ref([])
 const getGxshList = async ()=>{
   const WastageList_data = await WastageList({search: form['车间名称']})
+  console.log(WastageList_data)
   gxshList.value = [{
     label: form['车间名称'],
     value: form['车间名称'],
@@ -319,6 +336,7 @@ const sbbhclick = () => {
 
 
 const _capacityList = async () => {
+  console.log(111)
   if(form['设备编号'] === ''){
     return false;
   }else{

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -617,7 +617,6 @@ const treeData = ref([]);
 const workbenchdata = async () => {
   try {
     const data = await workbench();
-    console.log(data)
     const rawData = data.data;
     const dataArray =Object.keys(rawData).map(key => ({
       label: key,
@@ -705,12 +704,13 @@ const handleNodeClick = async (node) => {
   } else if (!node.children) {
     treeType.value = 'dataTree'
     // 使用字符串分割获取#前面的数据
-    _machine.value = node.label.split('#')[0].trim() + '#';
-    console.log('点击了机台-------' + _machine.value)
+
+    _machine.value = node.label.split('-->')[0].trim();
+    console.log(_machine.value)
+
     const zhubiao = await MachineWorkOrderList({ machine:_machine.value})
-    console.log("获取出来的数据【排程↑】【制程↓】↓↓↓↓↓↓↓↓↓↓↓↓↓")
-    console.log(zhubiao)
     chejianData.value = zhubiao.data['排程'];
+    console.log("获取出来的数据【排程↑】【制程↓】↓↓↓↓↓↓↓↓↓↓↓↓↓")
     chejianfuData.value = zhubiao.data['制程'];
   }
 };

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2366,7 +2366,6 @@ const add_gdgyformData = reactive({});
 // };
 //新增工艺资料弹窗//
 const addgdgy_onclick = () => {
-  console.log("点击了新增工艺资料按钮")
   if(_Gd_gdbh.value == null){
     cgugdlist.value = false;
     ElMessage({
@@ -2981,7 +2980,18 @@ const handleNodeClick = async (node) => {
   yjtableData.value = [];
   bomtableData.value = [];
   jstableData.value = [];
-  _Gd_khdh.value = node.label.substring(0, 4);
+  // console.log(node.label)
+  if (node.label) {
+    var parts = node.label.split('【');
+    if (parts.length > 1) {
+      // console.log(parts[0]); // 输出“【”左侧的数据
+      _Gd_khdh.value = parts[0]
+    } else {
+      // console.log(node.label); // 如果没有“【”，直接输出原字符串
+      // _Gd_khdh.value = node.label
+    }
+  }
+  // _Gd_khdh.value = node.label.substring(0, 4);
   _WorkList_page();
 };
 //工单资料