设备运行图片

src/api/jixiaoguanli/baogong.js

@@ -57,4 +57,11 @@ export const  ComplaintRecord= (params) => {
     method: 'get',
 	params
   })
-}
+}
+export const MachineTeamAdd = (data) => {
+  return service({
+    url:'/mes_server/facility/MachineTeamAdd',
+    method: 'post',
+    data
+  })
+}

src/view/performance/chejianbaogong.vue

@@ -309,22 +309,23 @@
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                         :header-cell-style="{ padding: '0px' }"
                         :show-overflow-tooltip="true"
-                        highlight-current-row="true" @row-click="BZhandle"
+                        :cell-class-name="bzryplanUsageCellClass"
+                        @row-click="BZhandle"
                         style="width: 100%;height: 250px;margin-top: 0px;" border tooltip-effect="dark"
 						:data="bzData" row-key="ID" @selection-change="BZSelectionChange">
               <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column align="left" label="机台" prop="JTMC" width="70"/>
+              <el-table-column align="left" label="机台" prop="JTMC" width="80"/>
               <el-table-column align="left" label="班组" prop="班组号" width="60"/>
-              <el-table-column align="left" label="组员1" prop="0" width="195"/>
-              <el-table-column align="left" label="组员2" prop="1" width="195"/>
-			  <el-table-column align="left" label="组员3" prop="2" width="195"/>
+              <el-table-column align="left" label="组员1" prop="0" width="200"/>
+              <el-table-column align="left" label="组员2" prop="1" width="200"/>
+			        <el-table-column align="left" label="组员3" prop="2" width="200"/>
               <el-table-column align="left" label="组员4" prop="3" width="195"/>
               <el-table-column align="left" label="组员5" prop="4" width="70"/>
               <el-table-column align="left" label="组员6" prop="5" width="70"/>
               <el-table-column align="left" label="组员7" prop="6" width="70"/>
               <el-table-column align="left" label="组员8" prop="7" width="70"/>
               <el-table-column align="left" label="组员9" prop="8" width="70"/>
-              <el-table-column align="left" label="特殊组员" prop="9" width="85"/>
+              <el-table-column align="left" label="特殊组员" prop="9" width="200"/>
               <el-table-column align="left" label="UNIQID" prop="ID" width="75"/>
             </el-table>
 
@@ -402,28 +403,28 @@
 
 
 				<el-col :span="3">
-				  <el-input v-model="formDatas.code1"  placeholder="" />
+				  <el-input v-model="formDatas.code1" @keyup.enter.native="getbzyg($event, '1')" placeholder="" />
 				</el-col>
 				<el-col :span="3">
-				  <el-input v-model="formDatas.code2"  placeholder="" />
+				  <el-input v-model="formDatas.code2" @keyup.enter.native="getbzyg($event, '2')"  placeholder="" />
 				</el-col>
 				<el-col :span="3">
-				  <el-input v-model="formDatas.code3"  placeholder="" />
+				  <el-input v-model="formDatas.code3" @keyup.enter.native="getbzyg($event, '3')" placeholder="" />
 				</el-col>
 				<el-col :span="3">
-				  <el-input v-model="formDatas.code4"  placeholder="" />
+				  <el-input v-model="formDatas.code4" @keyup.enter.native="getbzyg($event, '4')" placeholder="" />
 				</el-col>
 				<el-col :span="3">
-				  <el-input v-model="formDatas.code5"  placeholder="" />
+				  <el-input v-model="formDatas.code5" @keyup.enter.native="getbzyg($event, '5')" placeholder="" />
 				</el-col>
 				<el-col :span="3">
-				  <el-input v-model="formDatas.code6"  placeholder="" />
+				  <el-input v-model="formDatas.code6" @keyup.enter.native="getbzyg($event, '6')" placeholder="" />
 				</el-col>
 				<el-col :span="3">
-				  <el-input v-model="formDatas.code7"  placeholder="" />
+				  <el-input v-model="formDatas.code7" @keyup.enter.native="getbzyg($event, '7')" placeholder="" />
 				</el-col>
 				<el-col :span="3">
-				  <el-input v-model="formDatas.code8"  placeholder="" />
+				  <el-input v-model="formDatas.code8" @keyup.enter.native="getbzyg($event, '8')" placeholder="" />
 				</el-col>
 				<!-- <el-col :span="2">
 				  <el-input v-model="formData.name"  placeholder="瞿春生" />
@@ -523,10 +524,10 @@
 							  <el-input v-model="formDatas.percentage6"  placeholder="" />
 							</el-col>
 							<el-col :span="3">
-							  <el-input v-model="formDatas.percentage5"  placeholder="" />
+							  <el-input v-model="formDatas.percentage7"  placeholder="" />
 							</el-col>
 							<el-col :span="3">
-							  <el-input v-model="formDatas.percentage6"  placeholder="" />
+							  <el-input v-model="formDatas.percentage8"  placeholder="" />
 							</el-col>
 			  			<!-- 	<el-col :span="2">
 			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="是" />
@@ -550,9 +551,9 @@
 			</div>
 			<div style="height: 17vh; width: 15vh;margin-top: 5vh;">
 				<el-button type="text"></el-button>
-				<!-- <el-button style="margin-bottom: 5px;" @click="" >新增</el-button> -->
-				<el-button  style="margin-bottom: 1vh;margin: 0 auto" @click="selectBz" >更新当前班组</el-button>
-				<!-- <el-button @click="delBz" >删除当前班组</el-button> -->
+				 <el-button style="margin-bottom: 5px;" @click="addBz" >新增</el-button>
+				 <el-button  style="margin-bottom: 1vh;" @click="selectBz" >更新当前班组</el-button>
+<!--				 <el-button style="margin-bottom: 1vh;" @click="delBz" >删除当前班组</el-button>-->
 			</div>
 			</div>
           </el-dialog>
@@ -1870,7 +1871,8 @@ import {
   setMachineTeam,
   ModelChangeRecord,
   ComplaintRecord,
-  RemodelDetail
+  RemodelDetail,
+  MachineTeamAdd
 } from '@/api/jixiaoguanli/baogong'
 
 import {
@@ -2069,7 +2071,7 @@ const handleNodeClick = (nodeData,node) => {
 
 // });
 const classbz=ref([])
-const FacilityProduction = async () => {
+const FacilityProduction = async (addr) => {
   const response = await facilityProduction({machine:JTMC});
   if (response.code === 0) {
 	    formData.value.工单编号 = response.data.工单编号;
@@ -2081,7 +2083,8 @@ const FacilityProduction = async () => {
 		formData.value.machine=JTMC
 		formData.value.状态=response.data.状态
     formData.value.定额代号=response.data.定额代号
-		BZMC.value=response.data.班组编号
+    formData.value.addr=addr
+    BZMC.value=response.data.班组编号
 	       // 填充sczl_bh和sczl_name字段
 		   let sczl_bhkey=''
 		   let sczl_namekey=''
@@ -2218,6 +2221,17 @@ const getygsubmit = (event, inputName) => {
 		   GetYg(variableValue,inputName)
 }
 
+const getbzyg = async (value,key) => {
+  let bzyg=''
+  bzyg=`code${key}`
+  let bzxm=''
+  bzxm=`name${key}`
+  const response = await getYg({sczl_bh:formDatas.value[bzyg]});
+  if (response.code === 0) {
+    formDatas.value[bzxm]=response.data.ygxm
+  }
+}
+
 const getxunchayg = async (value) => {
   const response = await getYg({sczl_bh:xunchaData.value.sczl_bh});
   if (response.code === 0) {
@@ -2728,21 +2742,26 @@ const GetMachineMac = async (addr) => {
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5E-4E' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-60-D1' });
   if (response.code === 0) {
-    // 将接口返回的数据添加到树型结构中
-    let newNode = {
-      label: response.data["使用部门"],
-      level: 1,
-      children: [
-        {
-          label: response.data["设备编号"],
-          level: 2,
-        }
-      ]
-    };
-    treeData.value.push(newNode);
-	CJMC=newNode.label
-    JTMC = newNode.children[0].label;
-    FacilityProduction();
+    if(response.data===null){
+      JTMC = 'MQ07#';
+      FacilityProduction(addr);
+    }else{
+      // 将接口返回的数据添加到树型结构中
+      let newNode = {
+        label: response.data["使用部门"],
+        level: 1,
+        children: [
+          {
+            label: response.data["设备编号"],
+            level: 2,
+          }
+        ]
+      };
+      treeData.value.push(newNode);
+      CJMC=newNode.label
+      JTMC = newNode.children[0].label;
+      FacilityProduction(addr);
+    }
   }
 }
 const GetAddr =  () => {
@@ -3157,11 +3176,64 @@ const getSpotCheckItem = async (machineName) => {
 const FacilityTeam = async (value) => {
   const response = await facilityTeam({ machine: value });
   if (response.code === 0) {
-    console.log(response);
-
     // 清空 bzData 数组
     bzData.splice(0, bzData.length);
-
+    response.data.map(item=>{
+      if(formData.value['班组Id']==item.ID){
+        currentBz.value=item
+        formDatas.value = {};
+        let sczl_bhkey = ''
+        let sczl_namekey = ''
+        let percentagekey = ''
+        if (currentBz.value[9]) {
+          for (let i = 1; i <= 10; i++) {
+            sczl_bhkey = `code${i}`
+            sczl_namekey = `name${i}`
+            percentagekey = `percentage${i}`
+            formDatas.value[sczl_bhkey] = '';
+            formDatas.value[sczl_namekey] = '';
+            formDatas.value[percentagekey] = '';
+          }
+          formDatas.value.code8 = currentBz.value[9].split(' ')[0];
+          formDatas.value.name8 = currentBz.value[9].split(' ')[1]
+          formDatas.value.percentage8 = parseFloat(currentBz.value[9].split(' ')[2].split('(')[1].split(')')[0])/100
+          for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length - 4, 6); i++) {
+            sczl_bhkey = `code${i}`
+            sczl_namekey = `name${i}`
+            percentagekey = `percentage${i}`
+            formDatas.value[sczl_bhkey] = currentBz.value[i - 1].split(' ')[0];
+            formDatas.value[sczl_namekey] = currentBz.value[i - 1].split(' ')[1];
+            if(isNaN(parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0]))){
+              formDatas.value[percentagekey] = currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0];
+            }else{
+              formDatas.value[percentagekey] = parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0])/100;
+            }
+          }
+        } else {
+          for (let i = 1; i <= 10; i++) {
+            sczl_bhkey = `code${i}`
+            sczl_namekey = `name${i}`
+            percentagekey = `percentage${i}`
+            formDatas.value[sczl_bhkey] = '';
+            formDatas.value[sczl_namekey] = '';
+            formDatas.value[percentagekey] = '';
+          }
+          for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length - 3, 6); i++) {
+            sczl_bhkey = `code${i}`
+            sczl_namekey = `name${i}`
+            percentagekey = `percentage${i}`
+            formDatas.value[sczl_bhkey] = currentBz.value[i - 1].split(' ')[0];
+            formDatas.value[sczl_namekey] = currentBz.value[i - 1].split(' ')[1];
+            if(isNaN(parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0]))){
+              formDatas.value[percentagekey] = currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0];
+            }else{
+              formDatas.value[percentagekey] = parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0])/100;
+            }
+          }
+        }
+        console.log(formDatas)
+      }
+    })
     // 遍历接口返回的数据，并给每个对象添加 JTMC 属性
     const updatedData = response.data.map(item => {
       return { ...item, JTMC: value }; // 添加 JTMC 属性
@@ -3200,7 +3272,7 @@ const fetchData = async () => {
       dropdownOptions.value = options;
 
       // Default to selecting the first option
-       const defaultOption = options.find(option => option.value === JTMC);
+       const defaultOption = options.find(option => option.value.split('|')[0] === JTMC);
 		if (defaultOption) {
 		  selectedOption.value = defaultOption.value;
 		} else if (options.length > 0) {
@@ -3352,50 +3424,173 @@ const formDatas = ref({
 
 const currentBz ={}
 //班组单击
-const BZhandle = (val, row) => {
-	console.log(val.ID)
-	console.log(val)
-  currentBz.value=val
-  formDatas.value  = {};
-  for (const key in val) {
-    if (val[key] === 0) {
-      break;
+const BZhandle = (val) => {
+  currentBz.value = val
+  formDatas.value = {};
+  let sczl_bhkey = ''
+  let sczl_namekey = ''
+  let percentagekey = ''
+  if (currentBz.value[9]) {
+    for (let i = 1; i <= 9; i++) {
+      sczl_bhkey = `code${i}`
+      sczl_namekey = `name${i}`
+      percentagekey = `percentage${i}`
+      formDatas.value[sczl_bhkey] = '';
+      formDatas.value[sczl_namekey] = '';
+      formDatas.value[percentagekey] = '';
+    }
+    formDatas.value.code8 = currentBz.value[9].split(' ')[0];
+    formDatas.value.name8 = currentBz.value[9].split(' ')[1]
+    formDatas.value.percentage8 = parseFloat(currentBz.value[9].split(' ')[2].split('(')[1].split(')')[0])/100
+    for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length - 5, 6); i++) {
+      sczl_bhkey = `code${i}`
+      sczl_namekey = `name${i}`
+      percentagekey = `percentage${i}`
+      formDatas.value[sczl_bhkey] = currentBz.value[i - 1].split(' ')[0];
+      formDatas.value[sczl_namekey] = currentBz.value[i - 1].split(' ')[1];
+      if(isNaN(parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0]))){
+        formDatas.value[percentagekey] = currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0];
+      }else{
+        formDatas.value[percentagekey] = parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0])/100;
+      }
+    }
+  } else {
+    for (let i = 1; i <= 10; i++) {
+      sczl_bhkey = `code${i}`
+      sczl_namekey = `name${i}`
+      percentagekey = `percentage${i}`
+      formDatas.value[sczl_bhkey] = '';
+      formDatas.value[sczl_namekey] = '';
+      formDatas.value[percentagekey] = '';
+    }
+    for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length - 4, 6); i++) {
+      sczl_bhkey = `code${i}`
+      sczl_namekey = `name${i}`
+      percentagekey = `percentage${i}`
+      formDatas.value[sczl_bhkey] = currentBz.value[i - 1].split(' ')[0];
+      formDatas.value[sczl_namekey] = currentBz.value[i - 1].split(' ')[1];
+      if(isNaN(parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0]))){
+        formDatas.value[percentagekey] = currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0];
+      }else{
+        formDatas.value[percentagekey] = parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0])/100;
+      }
     }
-    const parts = val[key].split(/[\s()]+/);
-    const code = parts[0];
-    const name = parts[1];
-    const percentage = parts[2];
-
-    // 根据索引填充不同的字段
-    const index = parseInt(key) + 1; // 索引从1开始
-    formDatas.value['code' + index] = code;
-    formDatas.value['name' + index] = name;
-    formDatas.value['percentage' + index] = percentage;
-	BZMC.value=val.班组号
   }
+  console.log(formDatas)
+  // for (const key in val) {
+  //   if (val[key] === 0) {
+  //     break;
+  //   }
+  //   const parts = val[key].split(/[\s()]+/);
+  //   const code = parts[0];
+  //   const name = parts[1];
+  //   const percentage = parts[2];
+  //
+  //   // 根据索引填充不同的字段
+  //   const index = parseInt(key) + 1; // 索引从1开始
+  //   formDatas.value['code' + index] = code;
+  //   formDatas.value['name' + index] = name;
+  //   formDatas.value['percentage' + index] = percentage;
+	  BZMC.value=val.班组号
+  // }
 };
+const addBz = async() => {
+  console.log(selectedOption.value)
+  console.log(BZMC.value)
+  console.log(currentBz.value.ID)
+  const response = await MachineTeamAdd({
+    sczl_jtbh:  selectedOption.value.split('|')[0],
+    sczl_bzdh:  BZMC.value,
+    sczl_bh1:   formDatas.value.code1,
+    sczl_bh2:   formDatas.value.code2,
+    sczl_bh3:   formDatas.value.code3,
+    sczl_bh4:   formDatas.value.code4,
+    sczl_bh5:   formDatas.value.code5,
+    sczl_bh6:   formDatas.value.code6,
+    sczl_bh7:   formDatas.value.code7,
+    sczl_bh8:   formDatas.value.code10,
+    sczl_bh9:   formDatas.value.code9,
+    sczl_bh10:   formDatas.value.code8,
+    sczl_rate1: formDatas.value.percentage1,
+    sczl_rate2: formDatas.value.percentage2,
+    sczl_rate3: formDatas.value.percentage3,
+    sczl_rate4: formDatas.value.percentage4,
+    sczl_rate5: formDatas.value.percentage5,
+    sczl_rate6: formDatas.value.percentage6,
+    sczl_rate7: formDatas.value.percentage7,
+    sczl_rate8: formDatas.value.percentage10,
+    sczl_rate9: formDatas.value.percentage9,
+    sczl_rate10: formDatas.value.percentage8,
+    sys_id: `【${formData.value.addr} ${JTMC}】`
+  })
+  if (response.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '成功'
+    })
+    FacilityProduction()
+  }
+}
+
 const selectBz = async() => {
 	if(currentBz.value){
 		BZMC.value=currentBz.value.班组号
 		let sczl_bhkey=''
 		let sczl_namekey=''
-		if (currentBz.value) {
-		  for (let i = 1; i <= 6; i++) {
-		  	sczl_bhkey=`sczl_bh${i}`
-		    sczl_namekey=`sczl_name${i}`
-		    formData.value[sczl_bhkey] = '';
-		    formData.value[sczl_namekey] = '';
-		  }
-		  for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length-4, 6); i++) {
-			sczl_bhkey=`sczl_bh${i}`
-			sczl_namekey=`sczl_name${i}`
-			console.log(currentBz.value[i-1].split(' '))
-		    formData.value[sczl_bhkey] = currentBz.value[i-1].split(' ')[0];
-		    formData.value[sczl_namekey] = currentBz.value[i-1].split(' ')[1];
-		    classbz.value[i-1]=currentBz.value[i-1].split(' ')[0]
-		  }
-		  formData.value.class=classbz.value.join(',')
-		}
+		// if (currentBz.value) {
+		//   for (let i = 1; i <= 6; i++) {
+		//   	sczl_bhkey=`sczl_bh${i}`
+		//     sczl_namekey=`sczl_name${i}`
+		//     formData.value[sczl_bhkey] = '';
+		//     formData.value[sczl_namekey] = '';
+		//   }
+		//   for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length-4, 6); i++) {
+		// 	sczl_bhkey=`sczl_bh${i}`
+		// 	sczl_namekey=`sczl_name${i}`
+		// 	console.log(currentBz.value[i-1].split(' '))
+		//     formData.value[sczl_bhkey] = currentBz.value[i-1].split(' ')[0];
+		//     formData.value[sczl_namekey] = currentBz.value[i-1].split(' ')[1];
+		//     classbz.value[i-1]=currentBz.value[i-1].split(' ')[0]
+		//   }
+		//   formData.value.class=classbz.value.join(',')
+		// }
+    if (currentBz.value[9]) {
+      for (let i = 1; i <= 9; i++) {
+        sczl_bhkey=`sczl_bh${i}`
+        sczl_namekey=`sczl_name${i}`
+        formData.value[sczl_bhkey] = '';
+        formData.value[sczl_namekey] = '';
+      }
+      formData.value.sczl_bh10 = currentBz.value[9].split(' ')[0];
+      formData.value.sczl_name10=currentBz.value[9].split(' ')[1]
+      for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length-5, 6); i++) {
+        sczl_bhkey=`sczl_bh${i}`
+        sczl_namekey=`sczl_name${i}`
+        console.log(currentBz.value[i-1].split(' '))
+        formData.value[sczl_bhkey] = currentBz.value[i-1].split(' ')[0];
+        formData.value[sczl_namekey] = currentBz.value[i-1].split(' ')[1];
+        classbz.value[i-1]=currentBz.value[i-1].split(' ')[0]
+      }
+      classbz.value.push(currentBz.value[9].split(' ')[0])
+      formData.value.class=classbz.value.join(',')
+      console.log(formData.value)
+    }else{
+      for (let i = 1; i <= 10; i++) {
+        sczl_bhkey=`sczl_bh${i}`
+        sczl_namekey=`sczl_name${i}`
+        formData.value[sczl_bhkey] = '';
+        formData.value[sczl_namekey] = '';
+      }
+      for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length-4, 6); i++) {
+        sczl_bhkey=`sczl_bh${i}`
+        sczl_namekey=`sczl_name${i}`
+        console.log(currentBz.value[i-1].split(' '))
+        formData.value[sczl_bhkey] = currentBz.value[i-1].split(' ')[0];
+        formData.value[sczl_namekey] = currentBz.value[i-1].split(' ')[1];
+        classbz.value[i-1]=currentBz.value[i-1].split(' ')[0]
+      }
+      formData.value.class=classbz.value.join(',')
+    }
 		const response = await setMachineTeam({
 			machine: JTMC.split("#")[0],
 			order:formData.value.工单编号,
@@ -3413,7 +3608,7 @@ const selectBz = async() => {
 			  message: '成功'
 			})
 		}
-		currentBz.value={}
+		// currentBz.value={}
 	}
 }
 const delBz = async() => {
@@ -3423,9 +3618,16 @@ const delBz = async() => {
 		    cancelButtonText: '取消',
 		    type: 'warning'
 		}).then(() => {
-		        teamDel(currentBz.value.ID)
+      const response = teamDel(currentBz.value.ID)
+      if(response.code===0){
+        ElMessage({
+          type: 'success',
+          message: '成功'
+        })
+      }
 		    })
-	currentBz.value={}
+    FacilityProduction()
+    currentBz.value={}
 	}
 }
 

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -2896,7 +2896,6 @@ const addgyenterDialog = () => {
 	  	 // console.log(res)
 	  }
   });return
-  
 }
 
 //工艺新增取消

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

@@ -89,7 +89,7 @@ const cp_print_ProductValue = async (e) => {
   }
 }
 
-//打印作业通知单->工单印件及工序列表
+//打印作业通知单->工单印件及工序列表【印件号】【终止工序号】
 const _PrintCodeList = async () => {
   const workOrder = form['gdbh'];
   const PrintCodeList_list = await PrintCodeList({workOrder:workOrder});
@@ -99,8 +99,8 @@ const _PrintCodeList = async () => {
     yjlist.value = PrintCodeList_list.data
     form['yjno'] = PrintCodeList_list.data[0].印件号;
     form['yjmc'] = PrintCodeList_list.data[0].印件名称;
-
     const res = await ProcessCodeList({workOrder:workOrder, yjno: form['yjno']});
+    form['gxh'] = res.data[0]['工序号']
     gxlist.value = res.data
   }
 }
@@ -2606,9 +2606,12 @@ hiprint.init()
 const hiprintTemplate = new hiprint.PrintTemplate({ template: jsondata })
 const _gdlx = ref('')
 const cp_print_handleConfirm = async () => {
+  if(form['yjno'] === '' || form['yjno'] === undefined){
+    ElMessage({type: 'warning',message: '印件资料为空'})
+    return false;
+  }
   let params = {};
-  //2310707
-  //2012127
+  //2310707、2012127
   params.workOrder = form['gdbh'];
   params.PrepareDocument = form['zd'];
   params.examine = form['sh'];
@@ -2616,11 +2619,18 @@ const cp_print_handleConfirm = async () => {
   params.gxh = form['gxh'];
   //调用打印接口【打印作业通知单】
   const print_PrintJobOrder = await PrintJobOrder(params);
-  console.log(print_PrintJobOrder)
-  _gdlx.value =  '★' +print_PrintJobOrder.data['工单类型']
+  // console.log(print_PrintJobOrder)
+  if(print_PrintJobOrder.msg === '未找到物料资料信息'){
+    ElMessage({type: 'warning',message: '未找到物料资料信息'})
+    return false;
+  }
+  if(print_PrintJobOrder.data['工单类型']){
+    _gdlx.value =  '★' +print_PrintJobOrder.data['工单类型']
+  }
 
-  if(print_PrintJobOrder.data === null){
-    ElMessage({type: 'error',message: print_PrintJobOrder.msg})
+  if(print_PrintJobOrder.data === null || print_PrintJobOrder.data === undefined || print_PrintJobOrder.data === ''){
+    ElMessage({type: 'error',message: print_PrintJobOrder.msg});
+    return false;
   }
   // 获取当前日期
   const today = new Date();
@@ -2638,7 +2648,6 @@ const cp_print_handleConfirm = async () => {
     "printcode":print_PrintJobOrder.data['生产批次号'],
     "dysj":currentDate,
     "scpch":print_PrintJobOrder.data['生产批次号'],
-    // "xsddh":print_PrintJobOrder.data['生产批次号'],
     "xsddh":print_PrintJobOrder.data['销售订单号'],
     "khdh":  print_PrintJobOrder.data['客户代码'],
     "khmc":  print_PrintJobOrder.data['客户名称'],
@@ -2684,7 +2693,6 @@ const cp_print_handleConfirm = async () => {
     })),
     "shr":form['sh'],
     "zdr":form['zd']
-
   }
   hiprintTemplate.print(printdata);
   // cp_print_gdlist.value = false;

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -118,7 +118,7 @@
                 <el-input v-model="yycpzlformData['gdbh']" @keyup.enter="yycpzlProductValue" placeholder="" style="width: 23%;" />
               </el-form-item>
               <el-form-item label="客户代号" prop="processName" class="mab">
-                <el-input v-model="yycpzlformData['khdh']" disabled  placeholder="" />
+                <el-input v-model="yycpzlformData['khdh']" disabled  placeholder="" style="width: 23%;" />
                 <el-input v-model="yycpzlformData['khmc']" disabled  placeholder="" style="width: 320px;" />
               </el-form-item>
               <el-form-item label="产品代号" prop="processName" class="mab" >
@@ -934,173 +934,173 @@
 
 
 			<!-- 新增印件资料 -->
-			          <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog" :title="'新增印件资料'" height="500px" width="800px" destroy-on-close>
-			            <el-row>
-			              <el-scrollbar >
-			                <el-form :model="add_yjformDataTest" label-position="right" ref="elFormRef" :rules="rule">
-			                  <el-row>
-			                    <el-form-item label="印件号:" prop="address" class="mab" label-width="100px">
-			                      <el-input v-model="add_yjzlformdata.yjno" placeholder="" style="width: 140px;"  id="印件号"  @keydown="ent($event, '', '印件号', '印件代号')" />
-			                    </el-form-item>
-			                  </el-row>
-			                  <el-row>
-			                    <el-form-item label="印件代号:" prop="address" class="mab" label-width="100px">
-			                      <el-input  placeholder="" style="width: 140px;"  id="印件代号" @keydown="openSearchModal"   />
-			                    </el-form-item>
-			                  </el-row>
-			                  <el-row>
-			                    <el-col :span="18">
-			                      <el-form-item label="印件名称:" prop="address" class="mab" label-width="100px">
-			                        <el-input  placeholder="" style="width: 100%;" id="印件名称"  @keydown="ent($event, '印件代号', '印件名称', 'yj_zzdh')" />
-			                      </el-form-item>
-			                    </el-col>
-			                  </el-row>
-			                  <el-row>
-			                    <el-col :span="24">
-			                      <el-form-item label="纸张:" prop="address" class="mab" label-width="100px">
-			                        <el-row>
-			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh"  @keydown="ent($event, '印件名称', 'yj_zzdh', 'yj_zzmc')" />
-			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc"  @keydown="ent($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  placeholder="" style="width: 140px;"  id="yj_zzdh1"  @keydown="ent($event, 'yj_zzmc', 'yj_zzdh1', 'yj_zzmc1')" />
-			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="ent($event, 'yj_zzdh1', 'yj_zzmc', '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  placeholder="" style="width: 140px;"  id="yj_zzdh2"  @keydown="ent($event, 'yj_zzmc1', 'yj_zzdh', 'yj_zzmc2')" />
-			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc2"  @keydown="ent($event, 'yj_zzdh2', 'yj_zzmc', 'yj_zzdh3')"  />
-			                        </el-row>
-			                      </el-form-item>
-			                    </el-col>
-			                    <el-col :span="24">
-			                      <el-form-item label="备用纸张3:" prop="address" class="mab" label-width="100px">
-			                        <el-row>
-			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh3"  @keydown="ent($event, 'yj_zzmc2', 'yj_zzdh', 'yj_zzmc3')" />
-			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc3"  @keydown="ent($event, 'yj_zzdh3', 'yj_zzmc', 'yj_zzdh4')"  />
-			                        </el-row>
-			                      </el-form-item>
-			                    </el-col>
-			                    <el-col :span="24">
-			                      <el-form-item label="备用纸张4:" prop="address" class="mab" label-width="100px">
-			                        <el-row>
-			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh4"  @keydown="ent($event, 'yj_zzmc3', 'yj_zzdh', 'yj_zzmc4')" />
-			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc4"  @keydown="ent($event, 'yj_zzdh4', 'yj_zzmc', 'yj_tlgg')"  />
-			                        </el-row>
-			                      </el-form-item>
-			                    </el-col>
-
-			                  </el-row>
-			                  <el-row>
-			                    <el-col :span="8">
-			                      <el-form-item label="投料(mm*mm):" prop="address" class="mab">
-			                        <el-input  placeholder=""  style="width: 140px;"  id="yj_tlgg"  @keydown="ent($event, 'yj_zzmc', 'yj_tlgg', 'yj_klgg')"/>
-			                      </el-form-item>
-			                    </el-col>
-			                    <el-col :span="8">
-			                      <el-form-item label="开料(mm*mm):" prop="address" class="mab">
-			                        <el-input placeholder="" style="width: 140px;"  id="yj_klgg"  @keydown="ent($event, 'yj_tlgg', 'yj_klgg', 'yj_ks')"/>
-			                      </el-form-item>
-			                    </el-col>
-			                  </el-row>
-			                  <el-row>
-			                    <el-col :span="10">
-			                      <el-form-item label="开数:" prop="address" class="mab" label-width="100px">
-			                        <el-input  placeholder="" style="width: 140px;" id="yj_ks"  @keydown="ent($event, 'yj_tlgg', 'yj_ks', 'yj_ls')"/>
-			                      </el-form-item>
-			                    </el-col>
-			                    <el-col :span="10">
-			                      <el-form-item label="联数:" prop="address" class="mab">
-			                        <el-input  placeholder=""  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>
-			                      </el-form-item>
-			                    </el-col>
-			                  </el-row>
-			                  <el-row>
-			                    <el-col :span="24">
-			                      <el-form-item label="备注说明:" prop="remark" class="mab">
-			                        <el-input type="textarea" rows="4" clearable placeholder="请输入备注说明"  id="yj_desc"  @keydown="ent($event, 'yj_ls', 'yj_desc', '印件号')"/>
-			                      </el-form-item>
-			                    </el-col>
-			                  </el-row>
-			                </el-form>
-			              </el-scrollbar>
-			            </el-row>
-			            <template #footer>
-			              <div class="dialog-footer">
-			                <el-button @click="add_yjcloseDialog">取 消</el-button>
-			                <el-button type="primary" disabled @click="add_yjenterDialog">确 定</el-button>
-			              </div>
-			            </template>
-			          </el-dialog>
+<!--          <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog" :title="'新增印件资料'" height="500px" width="800px" destroy-on-close>-->
+<!--			            <el-row>-->
+<!--			              <el-scrollbar >-->
+<!--			                <el-form :model="add_yjformDataTest" label-position="right" ref="elFormRef" :rules="rule">-->
+<!--			                  <el-row>-->
+<!--			                    <el-form-item label="印件号:" prop="address" class="mab" label-width="100px">-->
+<!--			                      <el-input v-model="add_yjzlformdata.yjno" placeholder="" style="width: 140px;"  id="印件号"  @keydown="ent($event, '', '印件号', '印件代号')" />-->
+<!--			                    </el-form-item>-->
+<!--			                  </el-row>-->
+<!--			                  <el-row>-->
+<!--			                    <el-form-item label="印件代号:" prop="address" class="mab" label-width="100px">-->
+<!--			                      <el-input  placeholder="" style="width: 140px;"  id="印件代号" @keydown="openSearchModal"   />-->
+<!--			                    </el-form-item>-->
+<!--			                  </el-row>-->
+<!--			                  <el-row>-->
+<!--			                    <el-col :span="18">-->
+<!--			                      <el-form-item label="印件名称:" prop="address" class="mab" label-width="100px">-->
+<!--			                        <el-input  placeholder="" style="width: 100%;" id="印件名称"  @keydown="ent($event, '印件代号', '印件名称', 'yj_zzdh')" />-->
+<!--			                      </el-form-item>-->
+<!--			                    </el-col>-->
+<!--			                  </el-row>-->
+<!--			                  <el-row>-->
+<!--			                    <el-col :span="24">-->
+<!--			                      <el-form-item label="纸张:" prop="address" class="mab" label-width="100px">-->
+<!--			                        <el-row>-->
+<!--			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh"  @keydown="ent($event, '印件名称', 'yj_zzdh', 'yj_zzmc')" />-->
+<!--			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc"  @keydown="ent($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  placeholder="" style="width: 140px;"  id="yj_zzdh1"  @keydown="ent($event, 'yj_zzmc', 'yj_zzdh1', 'yj_zzmc1')" />-->
+<!--			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="ent($event, 'yj_zzdh1', 'yj_zzmc', '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  placeholder="" style="width: 140px;"  id="yj_zzdh2"  @keydown="ent($event, 'yj_zzmc1', 'yj_zzdh', 'yj_zzmc2')" />-->
+<!--			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc2"  @keydown="ent($event, 'yj_zzdh2', 'yj_zzmc', 'yj_zzdh3')"  />-->
+<!--			                        </el-row>-->
+<!--			                      </el-form-item>-->
+<!--			                    </el-col>-->
+<!--			                    <el-col :span="24">-->
+<!--			                      <el-form-item label="备用纸张3:" prop="address" class="mab" label-width="100px">-->
+<!--			                        <el-row>-->
+<!--			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh3"  @keydown="ent($event, 'yj_zzmc2', 'yj_zzdh', 'yj_zzmc3')" />-->
+<!--			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc3"  @keydown="ent($event, 'yj_zzdh3', 'yj_zzmc', 'yj_zzdh4')"  />-->
+<!--			                        </el-row>-->
+<!--			                      </el-form-item>-->
+<!--			                    </el-col>-->
+<!--			                    <el-col :span="24">-->
+<!--			                      <el-form-item label="备用纸张4:" prop="address" class="mab" label-width="100px">-->
+<!--			                        <el-row>-->
+<!--			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh4"  @keydown="ent($event, 'yj_zzmc3', 'yj_zzdh', 'yj_zzmc4')" />-->
+<!--			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc4"  @keydown="ent($event, 'yj_zzdh4', 'yj_zzmc', 'yj_tlgg')"  />-->
+<!--			                        </el-row>-->
+<!--			                      </el-form-item>-->
+<!--			                    </el-col>-->
+
+<!--			                  </el-row>-->
+<!--			                  <el-row>-->
+<!--			                    <el-col :span="8">-->
+<!--			                      <el-form-item label="投料(mm*mm):" prop="address" class="mab">-->
+<!--			                        <el-input  placeholder=""  style="width: 140px;"  id="yj_tlgg"  @keydown="ent($event, 'yj_zzmc', 'yj_tlgg', 'yj_klgg')"/>-->
+<!--			                      </el-form-item>-->
+<!--			                    </el-col>-->
+<!--			                    <el-col :span="8">-->
+<!--			                      <el-form-item label="开料(mm*mm):" prop="address" class="mab">-->
+<!--			                        <el-input placeholder="" style="width: 140px;"  id="yj_klgg"  @keydown="ent($event, 'yj_tlgg', 'yj_klgg', 'yj_ks')"/>-->
+<!--			                      </el-form-item>-->
+<!--			                    </el-col>-->
+<!--			                  </el-row>-->
+<!--			                  <el-row>-->
+<!--			                    <el-col :span="10">-->
+<!--			                      <el-form-item label="开数:" prop="address" class="mab" label-width="100px">-->
+<!--			                        <el-input  placeholder="" style="width: 140px;" id="yj_ks"  @keydown="ent($event, 'yj_tlgg', 'yj_ks', 'yj_ls')"/>-->
+<!--			                      </el-form-item>-->
+<!--			                    </el-col>-->
+<!--			                    <el-col :span="10">-->
+<!--			                      <el-form-item label="联数:" prop="address" class="mab">-->
+<!--			                        <el-input  placeholder=""  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>-->
+<!--			                      </el-form-item>-->
+<!--			                    </el-col>-->
+<!--			                  </el-row>-->
+<!--			                  <el-row>-->
+<!--			                    <el-col :span="24">-->
+<!--			                      <el-form-item label="备注说明:" prop="remark" class="mab">-->
+<!--			                        <el-input type="textarea" rows="4" clearable placeholder="请输入备注说明"  id="yj_desc"  @keydown="ent($event, 'yj_ls', 'yj_desc', '印件号')"/>-->
+<!--			                      </el-form-item>-->
+<!--			                    </el-col>-->
+<!--			                  </el-row>-->
+<!--			                </el-form>-->
+<!--			              </el-scrollbar>-->
+<!--			            </el-row>-->
+<!--			            <template #footer>-->
+<!--			              <div class="dialog-footer">-->
+<!--			                <el-button @click="add_yjcloseDialog">取 消</el-button>-->
+<!--			                <el-button type="primary" disabled @click="add_yjenterDialog">确 定</el-button>-->
+<!--			              </div>-->
+<!--			            </template>-->
+<!--			          </el-dialog>-->
 
             <!-- 新增印件资料弹窗 -->
             <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog"
                        style="width: 60%;" :title="'新增印件资料'" destroy-on-close>
               <el-form label-width="100px" :model="add_yjzlformdata">
                 <el-form-item label="印件号:" class="mab" prop="yjno" >
-                  <el-input v-model="add_yjzlformdata.yjno" placeholder="" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.yjno" placeholder="" style="width: 140px;" id="yjno"  @keydown="add_gdzlyjent($event, 'desc', 'yjno', 'yjdh')"/>
                 </el-form-item>
                 <el-form-item label="印件代码:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.yjdh" id="yjdhId" @keydown="openSearchModal" placeholder="" style="width: 140px;"/>
-                  <el-input v-model="add_yjzlformdata.yjmc"  placeholder="" style="width: 80%; margin-left: 10px"/>
+                  <el-input v-model="add_yjzlformdata.yjdh" id="yjdh"  @keydown="add_gdzlyjent($event, 'yjno', 'yjdh', 'yjmc')" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.yjmc" id="yjmc" @keydown="add_gdzlyjent($event, 'yjdh', 'yjmc', 'zzdh')" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <el-form-item label="纸张编号:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.zzdh"  class="zhi" @keydown="openSearchZhiModal($event, 0)" placeholder="" style="width: 140px;"/>
-                  <el-input v-model="add_yjzlformdata.zzmc"  placeholder="" style="width: 80%; margin-left: 10px"/>
+                  <el-input v-model="add_yjzlformdata.zzdh"  class="zhi" id="zzdh" @keydown="add_gdzlyjent($event, 'yjmc', 'zzdh', 'zzmc',0)"  placeholder="" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.zzmc"  id="zzmc" @keydown="add_gdzlyjent($event, 'zzdh', 'zzmc', 'zzdh1')" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <el-form-item label="备用纸张1:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.zzdh1" class="zhi" @keydown="openSearchZhiModal($event, 1)"  placeholder="" style="width: 140px;"/>
-                  <el-input v-model="add_yjzlformdata.zzmc1"  placeholder="" style="width: 80%; margin-left: 10px"/>
+                  <el-input v-model="add_yjzlformdata.zzdh1" class="zhi" id="zzdh1" @keydown="add_gdzlyjent($event, 'zzmc', 'zzdh1', 'zzmc1',1)" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.zzmc1"  id="zzmc1" @keydown="add_gdzlyjent($event, 'zzdh1', 'zzmc1', 'zzdh2')"  style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <el-form-item label="备用纸张2:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.zzdh2" class="zhi" @keydown="openSearchZhiModal($event, 2)"  placeholder="" style="width: 140px;"/>
-                  <el-input v-model="add_yjzlformdata.zzmc2"  placeholder="" style="width: 80%; margin-left: 10px"/>
+                  <el-input v-model="add_yjzlformdata.zzdh2" class="zhi" id="zzdh2" @keydown="add_gdzlyjent($event, 'zzmc1', 'zzdh2', 'zzmc2',2)" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.zzmc2"  id="zzmc2" @keydown="add_gdzlyjent($event, 'zzdh2', 'zzmc2', 'zzdh3')" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <el-form-item label="备用纸张3:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.zzdh3" class="zhi" @keydown="openSearchZhiModal($event, 3)"  placeholder="" style="width: 140px;"/>
-                  <el-input v-model="add_yjzlformdata.zzmc3"  placeholder="" style="width: 80%; margin-left: 10px"/>
+                  <el-input v-model="add_yjzlformdata.zzdh3" class="zhi" id="zzdh3" @keydown="add_gdzlyjent($event, 'zzmc2', 'zzdh3', 'zzmc3',3)" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.zzmc3" id="zzmc3" @keydown="add_gdzlyjent($event, 'zzdh3', 'zzmc3', 'zzdh4')" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <el-form-item label="备用纸张4:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.zzdh4"  class="zhi" @keydown="openSearchZhiModal($event, 4)" placeholder="" style="width: 140px;"/>
-                  <el-input v-model="add_yjzlformdata.zzmc4" placeholder="" style="width: 80%; margin-left: 10px"/>
+                  <el-input v-model="add_yjzlformdata.zzdh4"  class="zhi" id="zzdh4" @keydown="add_gdzlyjent($event, 'zzmc3', 'zzdh4', 'zzmc4',4)" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.zzmc4" id="zzmc4" @keydown="add_gdzlyjent($event, 'zzdh4', 'zzmc4', 'cpsl')" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <div style="display: flex; gap: 0px;">
                   <el-form-item label="订单数量:" class="mab" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.cpsl" placeholder="" style="width: 80px;"/>
+                    <el-input v-model="add_yjzlformdata.cpsl" style="width: 80px;" id="cpsl" @keydown="add_gdzlyjent($event, 'zzmc4', 'cpsl', 'pztl')"/>
                   </el-form-item>
                   <el-form-item label="平张投料:" class="mab" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.pztl"  placeholder="" style="width: 80px;"/>
+                    <el-input v-model="add_yjzlformdata.pztl" style="width: 80px;" id="pztl" @keydown="add_gdzlyjent($event, 'cpsl', 'pztl', 'klgg')"/>
                   </el-form-item>
                   <el-form-item label="万小张:" class="mab" prop="keyOrder">
-                    <el-input disabled v-model="add_yjzlformdata.万小张"  placeholder="" style="width: 80px;"/>
+                    <el-input disabled v-model="add_yjzlformdata.万小张" style="width: 80px;"/>
                   </el-form-item>
                   <el-form-item label="纸张规格:" class="mab" prop="keyOrder">
-                    <el-input disabled v-model="add_yjzlformdata.tlgg"  placeholder="" style="width: 240px;"/>
+                    <el-input disabled v-model="add_yjzlformdata.tlgg" style="width: 240px;"/>
                   </el-form-item>
                 </div>
                 <div style="display: flex; gap: 0px;">
                   <el-form-item label="投料规格:" class="mab" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.klgg"  placeholder="" style="width: 80px;"/>
+                    <el-input v-model="add_yjzlformdata.klgg" style="width: 80px;" id="klgg"  @keydown="add_gdzlyjent($event, 'pztl', 'klgg', 'ks')"/>
                   </el-form-item>
                   <el-form-item label="开料开数:" class="mab" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.ks"  placeholder="" style="width: 80px;"/>
+                    <el-input v-model="add_yjzlformdata.ks" style="width: 80px;" id="ks"  @keydown="add_gdzlyjent($event, 'klgg', 'yjdh', 'ls')"/>
                   </el-form-item>
                   <el-form-item label="开料联数:" class="mab" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.ls"  placeholder="" style="width: 80px;"/>
+                    <el-input v-model="add_yjzlformdata.ls" style="width: 80px;" id="ls"  @keydown="add_gdzlyjent($event, 'ks', 'ls', 'hsgg')"/>
                   </el-form-item>
                   <el-form-item label="核算规格:" class="mab" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.hsgg"  placeholder="" style="width: 240px;"/>
+                    <el-input v-model="add_yjzlformdata.hsgg" style="width: 240px;" id="hsgg"  @keydown="add_gdzlyjent($event, 'ls', 'hsgg', 'desc')"/>
                   </el-form-item>
                 </div>
                 <el-form-item label="备注说明:" class="mab" prop="remark">
-                  <el-input v-model="add_yjzlformdata.desc" type="textarea" resize="none" rows="2" clearable placeholder=""  />
+                  <el-input v-model="add_yjzlformdata.desc" type="textarea" resize="none" rows="2" clearable id="desc" @keydown="add_gdzlyjent($event, 'hsgg', 'desc', 'yjno')" />
                 </el-form-item>
               </el-form>
 
@@ -1965,6 +1965,15 @@ const add_gdzlent = async (event,id1,id2,id3) => {
 //默认弹窗关闭
 const yjzuidahaoma = ref(0)
 const add_gdyjdialogFormVisible = ref(false)
+const searchModel = ref(false)
+const searchZhiModel = ref(false)
+const zzdhIndex = ref(null)
+const getProductYjListdata = ref()
+const getProductZhiListdata = ref()
+const yjdh_keyword = ref('')
+const zhi_keyword = ref('')
+
+// 新增印件资料表单
 const add_yjzlformdata = reactive({
   yjno: '',
   yjdh: '',
@@ -1990,6 +1999,7 @@ const add_yjzlformdata = reactive({
   desc: '',
   万小张: '',
 });
+
 //清空对象的属性值
 const gdyj_clearFormData = () => {
   Object.keys(add_yjzlformdata).forEach(key => {
@@ -2008,29 +2018,7 @@ const gdyj_clearFormData = () => {
 
 };
 
-const searchModel = ref(false)
-const searchZhiModel = ref(false)
-
-const openSearchModal = (code) => {
-  if (code.key==='Tab' || code.key=== 'Enter') {
-    setTimeout(() =>document.querySelector('#yjdhId').focus(), 50)
-    _getProductYjList();
-    searchModel.value = true
-  }
-}
-
-const zzdhIndex = ref(null)
-const openSearchZhiModal = (code, idx) => {
-  if (code.key==='Tab'  || code.key=== 'Enter') {
-    setTimeout(() => document.querySelector('.zhi').focus(), 50)
-    _getProductZzList()
-    searchZhiModel.value = true
-    zzdhIndex.value = idx
-
-  }
-}
-
-//新增印件资料弹窗
+//点击新增印件资料按钮
 const addgdyj_onclick = () => {
   if(_Gd_gdbh.value == null){
     cgugdlist.value = false;
@@ -2089,9 +2077,8 @@ const add_gdyjenterDialog =  async  () => {
   }
 }
 //印件新增取消
-const add_dyjcloseDialog = () => {
-  add_gdyjdialogFormVisible.value = false
-}
+const add_dyjcloseDialog = () => {add_gdyjdialogFormVisible.value = false}
+
 //印件新增【印件代码】树状图
 const handleTreeData = (treeData) => {
  const data = Object.keys(treeData).map((key)=>({
@@ -2110,7 +2097,6 @@ const handleTreeData = (treeData) => {
 
 //印件新增【纸张】树状图
 const handleTreeDatas = (treeData) => {
-  // console.log(treeData)
   const data = Object.keys(treeData).map((key)=>({
     label:key,
     children: Object.keys(treeData[key]).map((keys)=>({
@@ -2129,11 +2115,6 @@ const handleTreeDatas = (treeData) => {
   return data
 }
 
-//3.4获取印件代码及名称
-const getProductYjListdata = ref()
-const getProductZhiListdata = ref()
-const yjdh_keyword = ref('')
-const zhi_keyword = ref('')
 //3.4获取印件代码及名称
 const _getProductYjList = async ()=>{
   try {
@@ -2184,6 +2165,63 @@ const selectZhiNode = (v) => {
     searchZhiModel.value = false
   }
 }
+//新增印件资料弹窗 键盘 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()
+    }
+  }
+}
 
 
 // =========== 新增工艺资料 ===========
@@ -2407,7 +2445,7 @@ const addGongyiAttach = () => {
 }
 const gdzlfjxxtableColumns = ref(
     [
-      { label: '方案', prop: '方案', width: '70' },
+      { label: '方案', prop: '方案', width: '60' },
       { label: '印件号', prop: '印件号', width: '70' },
       { label: '工序号', prop: '工序号', width: '70' },
       { label: '工序名称', prop: '工序名称', width: '370' },

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1448,7 +1448,7 @@
 		  destroy-on-close width="80%" style="height: 100%;">
 		  <div class="button-container">
 		    <button v-for="(item, index) in machineData" :key="index" class="custom-button" @click="handleButtonClick(item.设备编号)">
-		      <img :src="`https://10.10.4.58/src/${item.状态}.png`" :alt="altText" style="max-width: 100%; height: auto;"/>
+		      <img :src="`/src/assets/${item.状态}.png`" :alt="altText" style="max-width: 100%; height: auto;"/>
 		      <span style="margin-top: 8px;">{{ item.设备编号 + ' - ' + item.设备名称 }}</span>
 		    </button>
 		  </div>