功能优化

.env.development

@@ -5,7 +5,7 @@ VITE_BASE_API = /api
 VITE_FILE_API = /api
 VITE_BASE_PATH = http://10.10.4.58
 //VITE_BASE_PATH = http://20.0.16.174
-VITE_EDITOR = vscode
+//VITE_EDITOR = vscode
 // VITE_EDITOR = webstorm 如果使用webstorm开发且要使用dom定位到代码行功能 请先自定添加 webstorm到环境变量 再将VITE_EDITOR值修改为webstorm
 // 如果使用docker-compose开发模式，设置为下面的地址或本机主机IP
 //VITE_BASE_PATH = http://177.7.0.12

src/api/yunyin/yunying.js

@@ -180,7 +180,7 @@ export const getProductYjList = (params) => {
         params
     })
 }
-/3.5获取纸张代号及名称/
+//3.5获取纸张代号及名称
 export const getProductZzList = (params) => {
     return service({
         url: '/mes_server/Product/getProductZzList',

src/view/performance/Dayreports.vue

@@ -1547,6 +1547,7 @@ function onAdd() {
 		  // GetInfo(table.value)
 		  console.log(['table_type'])
 		  console.log('此数据无法新增')
+		  dialogFormVisible.value = true
 	}  
 	
 	// Productionadd()

src/view/performance/chejianbaogong.vue

@@ -3338,6 +3338,7 @@ const SetMachineStatus = async (row) => {
 	 class:classString
   });
   if (response.code === 0) {
+	 FacilityProduction(JTMC)
   }
 }
 //提交巡查记录
@@ -3543,10 +3544,12 @@ const GetMachineMac = async (addr) => {
       CJMC=newNode.label
       JTMC = newNode.children[0].label;
 	  formData.value.机台号=JTMC
+	  // console.log('【'+MAC.value+'/'+JTMC+'】')
       FacilityProduction(addr);
     }
   }
 }
+const MAC=ref()
 const GetAddr =  () => {
   var xmlhttp = null;
   var res;
@@ -3566,6 +3569,7 @@ const GetAddr =  () => {
         }
         result += res.macAddress[i]
       }
+	  MAC.value=result
       GetMachineMac(result)
     }
   }
@@ -4317,7 +4321,7 @@ const addBz = async() => {
     sczl_rate8: formDatas.value.percentage10,
     sczl_rate9: formDatas.value.percentage9,
     sczl_rate10: formDatas.value.percentage8,
-    sys_id: `【${formData.value.addr} ${JTMC}】`
+    sys_id: '【'+MAC.value+'/'+JTMC+'】'
   })
   // console.log()
   if (response.code === 0) {

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -968,23 +968,23 @@
                               <el-col :span="24">
                                 <el-form-item label="纸张:" prop="address" class="mab" label-width="100px">
                                   <el-row>
-                                    <el-input v-model="add_yjzlformdata.zzdh"  placeholder="" style="width: 140px;"  id="yj_zzdh" @keydown="add_yinjian_ent($event, '印件代号', 'yj_zzdh', 'yj_zzmc')"   />
-                                    <el-input v-model="add_yjzlformdata.zzmc" placeholder=""  style="width: 460px;" id="yj_zzmc"   @keydown="add_yinjian_ent($event, 'yj_zzdh', 'yj_zzmc', 'yj_zzdh1')"  />
+                                    <el-input v-model="add_yjzlformdata.zzdh"  placeholder="" style="width: 140px;"  id="yj_zzdh" @keydown="add_gdzlyjent($event, '印件代号', 'yj_zzdh', 'yj_zzmc')"   />
+                                    <el-input v-model="add_yjzlformdata.zzmc" placeholder=""  style="width: 460px;" id="yj_zzmc"   @keydown="add_gdzlyjent($event, 'yj_zzdh', 'yj_zzmc', 'yj_zzdh1')"  />
                                   </el-row>
                                 </el-form-item>
                               </el-col>
                               <el-col :span="24">
                                 <el-form-item label="备用纸张1:" prop="address" class="mab" label-width="100px">
                                   <el-row>
-                                    <el-input v-model="add_yjzlformdata.zzdh1"  placeholder="" style="width: 140px;"  id="yj_zzdh1" @keydown="add_yinjian_ent($event, 'yj_zzmc', 'yj_zzdh1', 'yj_zzmc1')"  />
-                                    <el-input v-model="add_yjzlformdata.zzmc1" placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="add_yinjian_ent($event, 'yj_zzdh1', 'yj_zzmc1', 'yj_zzdh2')" />
+                                    <el-input v-model="add_yjzlformdata.zzdh1"  placeholder="" style="width: 140px;"  id="yj_zzdh1" @keydown="add_gdzlyjent($event, 'yj_zzmc', 'yj_zzdh1', 'yj_zzmc1')"  />
+                                    <el-input v-model="add_yjzlformdata.zzmc1" placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="add_gdzlyjent($event, 'yj_zzdh1', 'yj_zzmc1', 'yj_zzdh2')" />
                                   </el-row>
                                 </el-form-item>
                               </el-col>
                               <el-col :span="24">
                                 <el-form-item label="备用纸张2:" prop="address" class="mab" label-width="100px">
                                   <el-row>
-                                    <el-input v-model="add_yjzlformdata.zzdh2" placeholder="" style="width: 140px;"  id="yj_zzdh2"  @keydown="add_yinjian_ent($event, 'yj_zzmc1', 'yj_zzdh2', 'yj_zzmc2')" />
+                                    <el-input v-model="add_yjzlformdata.zzdh2" placeholder="" style="width: 140px;"  id="yj_zzdh2"  @keydown="add_gdzlyjent($event, 'yj_zzmc1', 'yj_zzdh2', 'yj_zzmc2')" />
                                     <el-input v-model="add_yjzlformdata.zzmc2" placeholder=""  style="width: 460px;" id="yj_zzmc2"  @keydown="ent($event, 'yj_zzdh2', 'yj_zzmc2', 'yj_zzdh3')"  />
                                   </el-row>
                                 </el-form-item>
@@ -992,7 +992,7 @@
                               <el-col :span="24">
                                 <el-form-item label="备用纸张3:" prop="address" class="mab" label-width="100px">
                                   <el-row>
-                                    <el-input  v-model="add_yjzlformdata.zzdh3" placeholder="" style="width: 140px;"  id="yj_zzdh3"  @keydown="add_yinjian_ent($event, 'yj_zzmc2', 'yj_zzdh3', 'yj_zzmc3')"  />
+                                    <el-input  v-model="add_yjzlformdata.zzdh3" placeholder="" style="width: 140px;"  id="yj_zzdh3"  @keydown="add_gdzlyjent($event, 'yj_zzmc2', 'yj_zzdh3', 'yj_zzmc3')"  />
                                     <el-input v-model="add_yjzlformdata.zzmc3" placeholder=""  style="width: 460px;" id="yj_zzmc3"  @keydown="ent($event, 'yj_zzdh3', 'yj_zzmc3', 'yj_zzdh4')"  />
                                   </el-row>
                                 </el-form-item>
@@ -1000,7 +1000,7 @@
                               <el-col :span="24">
                                 <el-form-item label="备用纸张4:" prop="address" class="mab" label-width="100px">
                                   <el-row>
-                                    <el-input v-model="add_yjzlformdata.zzdh4"  placeholder="" style="width: 140px;"  id="yj_zzdh4" @keydown="add_yinjian_ent($event, 'yj_zzmc3', 'yj_zzdh4', 'yj_zzmc4')" />
+                                    <el-input v-model="add_yjzlformdata.zzdh4"  placeholder="" style="width: 140px;"  id="yj_zzdh4" @keydown="add_gdzlyjent($event, 'yj_zzmc3', 'yj_zzdh4', 'yj_zzmc4')" />
                                     <el-input v-model="add_yjzlformdata.zzmc4" placeholder=""  style="width: 460px;" id="yj_zzmc4"  @keydown="ent($event, 'yj_zzdh4', 'yj_zzmc4', 'yj_tlgg')"  />
                                   </el-row>
                                 </el-form-item>
@@ -2740,6 +2740,27 @@ const handleTreeData = (treeData) => {
   }))
   return data
 }
+
+//印件新增【纸张】树状图
+const handleTreeDatas = (treeData) => {
+  const data = Object.keys(treeData).map((key)=>({
+    label:key,
+    children: Object.keys(treeData[key]).map((keys)=>({
+      label:keys,
+      children:Object.keys(treeData[key][keys]).map((keyss)=>({
+        label:keyss,
+        children:treeData[key][keys][keyss].map(item=>({
+          label:`${item.物料代码} ${item.物料名称}`,
+          规格:item.规格,
+          物料代码:item.物料代码,
+          物料名称:item.物料名称
+        }))
+      }))
+    }))
+  }))
+  return data
+}
+
 const selectZhiNode = (v) => {
   if (v.children.length === 0) {
     if (zzdhIndex.value == 0) {
@@ -2833,7 +2854,63 @@ const add_yinjian_ent = (event,id1,id2,id3) => {
     }
   }
 }
-
+//新增印件表格input
+const add_gdzlyjent = async (event,id1,id2,id3,idx) => {
+  if (id2 === 'yjdh' && event.key==='Tab' || id2 === 'yjdh' && event.key=== 'Enter') {
+    _getProductYjList();
+    searchModel.value = true
+  }
+  if (id2 === 'zzdh' && event.key==='Tab' || id2 === 'zzdh' && event.key=== 'Enter') {
+    _getProductZzList()
+    searchZhiModel.value = true
+    zzdhIndex.value = idx
+  }
+  if (id2 === 'zzdh1' && event.key==='Tab' || id2 === 'zzdh1' && event.key=== 'Enter') {
+    _getProductZzList()
+    searchZhiModel.value = true
+    zzdhIndex.value = idx
+  }
+  if (id2 === 'zzdh2' && event.key==='Tab' || id2 === 'zzdh2' && event.key=== 'Enter') {
+    _getProductZzList()
+    searchZhiModel.value = true
+    zzdhIndex.value = idx
+  }
+  if (id2 === 'zzdh3' && event.key==='Tab' || id2 === 'zzdh3' && event.key=== 'Enter') {
+    _getProductZzList()
+    searchZhiModel.value = true
+    zzdhIndex.value = idx
+  }
+  if (id2 === 'zzdh4' && event.key==='Tab' || id2 === 'zzdh4' && event.key=== 'Enter') {
+    _getProductZzList()
+    searchZhiModel.value = true
+    zzdhIndex.value = idx
+  }
+  if(event.keyCode === 40){
+    if(id3!=''){
+      document.getElementById(id3).focus()
+    }
+  }else if (event.keyCode === 13) { // Enter 或向下箭头
+    if(id3!=''){
+      document.getElementById(id3).focus()
+    }
+  } else if (event.keyCode === 38) { // 向上箭头
+    if(id1!=''){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 8) { // 删除箭头
+    if(id1!='' && document.getElementById(id2).value==''){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 37) { // 向左箭头
+    if(id1!='' && document.getElementById(id2).selectionStart==0){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 39) { // 向右箭头
+    if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
+      document.getElementById(id3).focus()
+    }
+  }
+}
 //===============新增工艺资料=======================
 const addgydialogFormVisible = ref(false)
 const searchCJModel = ref(false)