优化

src/view/DecisionSupport/operation/operationPersonnel.vue

@@ -272,7 +272,6 @@ const exportToExcel = async () => {
     
     // 创建工作表
     const worksheet = XLSX.utils.json_to_sheet(processedData);
-    //从某列开始转化成数字
     //设置从C列开始为数字格式
     const range = XLSX.utils.decode_range(worksheet['!ref']);
     for (let col = 2; col <= range.e.c; col++) { // 从C列(索引2)开始
@@ -284,9 +283,9 @@ const exportToExcel = async () => {
           const numValue = Number(cellValue);
           
           if (!isNaN(numValue)) {
-            worksheet[cellAddress].t = 'n'; // 数字类型
-            worksheet[cellAddress].v = numValue; // 更新值
-            worksheet[cellAddress].z = '0.0'; // 数字格式
+            worksheet[cellAddress].t = 'n'; 
+            worksheet[cellAddress].v = numValue; 
+            worksheet[cellAddress].z = '0.0'; 
           }
         }
       }
@@ -346,9 +345,9 @@ const exportToExcel3 = async () => {
             const numValue = Number(cellValue);
             
             if (!isNaN(numValue)) {
-              ws[cellAddress].t = 'n';  // 设置为数字类型
-              ws[cellAddress].v = numValue;  // 更新值
-              ws[cellAddress].z = '0.0';  // 设置数字格式
+              ws[cellAddress].t = 'n'; 
+              ws[cellAddress].v = numValue;  
+              ws[cellAddress].z = '0.0'; 
             }
           }
         }

src/view/job/processSheet/BoxprocessSheet.vue

@@ -0,0 +1,1707 @@
+<template>
+	<el-container>
+	  <el-main>
+		  <form method="POST" :model="workData" action="{:U('NewBarCodeNew/add_bach')}" style="margin-bottom:50px;" id="form">
+		        <input name="userid" id="userid" value="{$session_config[uid]}" type="hidden">
+		        <fieldset class="newlabel">
+		            <legend style="width:auto;margin-left:20px;">标记参数</legend>
+		            <table width="100%" border="1">
+		                <caption>标签序列配置</caption>
+		                <tr>
+		                    <th style="width:40%;"><span>字段</span> </th>
+		                    <th><span>值</span></th>
+		                </tr>
+                    <!-- <el-checkbox v-model="Oldpaper">旧末版纸</el-checkbox> -->
+
+		                <tr>
+		                    <td><span>订单批次号</span></td>
+		                    <td><input name="Gd_gdbh" type="text" v-model="workData.Gd_gdbh" @input="propertyChange" class="required" style="width: 380px;height: 30px;"></td>
+		                </tr>
+						
+						<tr>
+						    <td><span>印件名称</span></td>
+						    <td>
+								<select @change="selectpYj" v-model="workData.yjdh" style="width: 380px;height: 30px;">
+									<option v-for="option in selectedYj" :value="option.yj_Yjdh">
+									{{ option.yj_Yjno }} - {{ option.yj_yjmc }}
+									</option>
+								</select>
+						    </td>
+						</tr>
+						
+		                <tr v-if="dan">
+		                    <td><span>纸张名称</span></td>
+		                    <td>
+								<select style="width: 380px;height: 30px;">
+									<option v-for="option in selectedPaper">
+									{{ option.bom_物料名称 }}
+									</option>
+								</select>
+		                    </td>
+		                </tr>
+						<tr v-if="shuang">
+						    <td><span>纸张名称</span></td>
+						    <td>
+								<select @change="selectpPaper" style="width: 380px;height: 30px;">
+									<option v-for="option in selectedPaper" :value="option.bom_计划用量">
+									{{ option.bom_物料名称 }}
+									</option>
+								</select>
+						    </td>
+						</tr>
+		                <!-- <tr >
+		                    <td><span style="color: red">码包</span></td>
+		                    <td><input name="mabao" type="text" v-model="workData.mabao" style="width: 380px;height: 30px;" placeholder="利群(新版)专用，不是利群(新版)不要填"></td>
+		                </tr>
+		                <tr v-if="shuang" class="peijian">
+		                    <td><span style="color: red">配件名称</span></td>
+		                    <td>
+		                        <select name="peijian" @change="selectPeijian"  style="width: 380px;height: 30px; color: red" >
+									<option v-for="option in selectedPeijian" :value="option.id">
+									{{ option.peijian_name }}
+									</option>
+		                        </select>
+		                    </td>
+		                </tr> -->
+		                <tr>
+		                    <td><span>规格</span></td>
+		                    <td><input name="tldx" type="text" v-model="workData.gg"  class="required" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <!-- <tr>
+		                    <td><span>总投纸数</span></td>
+		                    <td>
+		                        <input name="num"  v-model="workData.num" value="" style="width: 380px;height: 30px;">
+		                    </td>
+		                </tr> -->
+		                <tr>
+		                    <td><span>总流程</span></td>
+		                    <td><input name="liucheng_total" type="number" v-model="workData.liucheng_total" value="" class="required" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <!-- <tr>
+		                <td><span>版本号标识</span></td>
+		                <td><input name="version" type="text" v-model="workData.version" class="required" style="width: 380px;height: 30px;"></td>
+		                </tr> -->
+		                <tr>
+		                <td><span>起始流程号</span></td>
+		                <td><input name="start_liucheng" type="number" v-model="workData.start_liucheng" value="1" class="required" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                <td><span>截止流程号</span></td>
+		                <td><input name="liucheng_num" type="number" v-model="workData.liucheng_num" value="1" class="required" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                <td>
+		                    <span>备注</span></td>
+		                <td>
+		                    <input name="remark" type="text" v-model="workData.remark" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                    <td>
+		                        <span>左右偏移量</span></td>
+		                    <td>
+		                        <input name="x_offset" type="number" v-model="workData.x_offset" value="0" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                    <td>
+		                        <span>上下偏移量</span></td>
+		                    <td>
+		                        <input name="y_offset" type="number" v-model="workData.y_offset" value="0" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		            </table>
+		        </fieldset>
+	             <div id="liucheng">
+	                 <fieldset class="newlabel">
+	                 <table width="100%" border="1" class="new_craft" id="new_craft">
+	             	   <caption>工艺</caption>
+	             		  <tr>
+							  <td width="40%">上次<span style="color: red">{{department}}</span>工艺更新时间：<span style="color: red" class="shijian">{{update}}</span></td>
+							  <td>
+							      <input type="button" style="margin-left: 1px;" value="增加工艺" @click="addInput"/>
+							  </td>
+						  </tr>
+						  <tr v-for="(item,index) in gyData">
+							  <td></td>
+							  <td><input type="text" v-model="item.gy"></td>
+						  </tr>
+	                 </table>
+	                 </fieldset>
+	             </div>
+		         <div style="position:fixed;bottom:0;width:100%;height:50px;line-height:50px;">
+		         	 <button type='button' onsubmit='return false' class="submitbtn" @click="sendClick" id="send">打印</button>
+		         </div>
+		    </form>
+	  </el-main>
+	</el-container>
+</template>
+
+<script setup>
+	import {
+	  getDocumentData,
+	  getDocumentHistory,
+	  saveDocumentData,
+    getHistory,
+	  getDocumentInfo
+	} from '@/api/mes/job'
+	import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
+	import { ElMessage, ElMessageBox } from 'element-plus'
+	import { ref, reactive } from 'vue'
+  import {hiprint} from "vue-plugin-hiprint";
+	const workData = ref({
+		Gd_gdbh:'',
+		maobao:'',
+		mabao:'',
+		peijian:'',
+    tldx:'3000',
+		gg:'',
+		num:'',
+		liucheng_total:'',
+		version:'',
+		start_liucheng:1,
+		liucheng_num:1,
+		remark:'',
+		x_offset:0,
+		y_offset:0,
+		yjdh: '',
+		yjmc: '',
+	})
+	const department = ref()
+	const dan = ref(true)
+	const shuang = ref(false)
+	const update = ref()
+	const data = ref()
+  const peijian = ref(0)
+  const gyData = ref([])
+	const selectedYj = ref([])
+	const selectedPaper = ref([])
+	const selectedPeijian = ref([])
+	const datas = ref([])
+  const Oldpaper = ref(false)
+
+
+  hiprint.init()
+  // const hiprintTemplate = new hiprint.PrintTemplate({ template: jsondata1 })
+
+const propertyChange = () => {
+	if(workData.value.Gd_gdbh.length<7){
+		shuang.value=false
+		selectedYj.value=[]
+		selectedPaper.value=[]
+		selectedPeijian.value=[]
+		gyData.value=[]
+		workData.value.tldx=3000
+		workData.value.start_liucheng=1
+		workData.value.liucheng_num=1
+		workData.value.x_offset=0
+		workData.value.y_offset=0
+		department.value=null
+		department.value=null
+		return false;
+	}else{
+      const getDocument = async() => {
+        //1.1获取工单基本数据
+        const getDocumentDatas = await getDocumentData({order:workData.value.Gd_gdbh})
+        console.log(getDocumentDatas)
+        if (getDocumentDatas.code === 0) {
+			if(!getDocumentDatas.data){
+				shuang.value=false
+				selectedYj.value=[]
+				selectedPaper.value=[]
+				selectedPeijian.value=[]
+				gyData.value=[]
+				workData.value.start_liucheng=1
+				workData.value.liucheng_num=1
+				workData.value.x_offset=0
+				workData.value.y_offset=0
+				department.value=null
+				department.value=null
+				return false;
+			}
+          workData.value.version=getDocumentDatas.data.paper[0].产品版本号;
+          workData.value.peijian=getDocumentDatas.data.paper;
+          // console.log(selectedPaper.value)
+          if(getDocumentDatas.data.num>1){
+            dan.value=false
+            shuang.value=true
+            selectedPaper.value=getDocumentDatas.data.paper
+            selectedPeijian.value=getDocumentDatas.data.peijian
+
+          }else{
+            dan.value=true
+            shuang.value=false
+            selectedPaper.value=getDocumentDatas.data.paper
+            workData.value.product=getDocumentDatas.data.paper[0].bom_物料名称;
+          }
+		  
+			selectedYj.value=getDocumentDatas.data.yjData
+		  
+          workData.value.num=getDocumentDatas.data.paper[0].bom_计划用量;
+		  
+          if(getDocumentDatas.data.peijian!=undefined){
+            peijian.value=getDocumentDatas.data.peijian[0]['id']
+          }
+        }
+      }
+      getDocument()
+    }
+}
+const selectpYj = (event) => {
+	workData.value.yjmc = selectedYj.value.find(option => option.yj_Yjdh === workData.value.yjdh).yj_yjmc;
+
+   getHistory({order:workData.value.Gd_gdbh, yjdh:workData.value.yjdh}).then(getHistorys =>{
+	   if (getHistorys.code == 0) {
+	   	   update.value = getHistorys.data.update
+	   	   department.value=getHistorys.data.department
+	   	   if(getHistorys.data.data){
+	   		gyData.value = getHistorys.data.data.map((item)=>({
+	   		  gy:item
+	   		}))
+	   	   }else{
+			   gyData.value = []
+		   }
+	   }
+   })
+   
+	}
+  //点击增加工艺按钮
+	const addInput = () => {
+	 gyData.value.push({gy:''})
+	}
+	const sendClick = () => {
+		saveDocument()
+	}
+  const saveDocument = async() => {
+    datas.value=[]
+    gyData.value.map((item)=>{
+      if(item.gy==''){
+      }else{
+        datas.value.push(item.gy)
+      }
+    })
+    // datas.value = gyData.value.map((item)=>(item.gy))
+    data.value= datas.value.join(",")
+    const saveDocumentDatas = await saveDocumentData({order:workData.value.Gd_gdbh,data:`${data.value},`,yjdh:workData.value.yjdh})
+    if (saveDocumentDatas.code === 0) {
+      getDocument()
+    }
+  }
+  const getDocument = async() => {
+    const getDocumentInfos = await getDocumentInfo({
+      order:workData.value.Gd_gdbh,
+      mabao:workData.value.mabao,
+      version:workData.value.version,
+      start_liucheng:workData.value.start_liucheng,
+      tldx:workData.value.tldx,
+      remark:workData.value.remark,
+      string:data.value,
+      num:workData.value.num,
+      yjmc:workData.value.yjmc,
+	  
+    })
+    if (getDocumentInfos.code === 0) {
+
+      console.log(workData)
+      const data = getDocumentInfos.data
+      if(workData.value.liucheng_total=== '' || workData.value.liucheng_total === null){
+        ElMessage({type: 'warning',message: '总流程不能为空'})
+        return false;
+      }
+      console.log(workData.value.start_liucheng)//这个是1
+      console.log(workData.value.liucheng_total)//这个是2 就是打印两次
+
+//在使用中的不带边框的模板
+  const jsondata1= {
+    "panels": [
+      {
+        "index": 0,
+        "name": 1,
+        "paperType": "A4",
+        "height": 297,
+        "width": 210,
+        "paperHeader": 192,
+        "paperFooter": 822,
+        "printElements": [
+          {
+            "options": {
+              "left": workData.value.x_offset+510,
+              "top": workData.value.y_offset+20,
+              "height": 65,
+              "width": 65,
+              "textType": "qrcode",
+              "title": "qrcode",
+              "right": 584.75,
+              "bottom": 77,
+              "vCenter": 552.25,
+              "hCenter": 44.5,
+              "field": "qrcode",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "qrCodeLevel": 0
+            },
+            "printElementType": {
+              "title": "qrcode",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+241.5,
+              "top": workData.value.y_offset+27,
+              "height": 20,
+              "width": 103,
+              "title": "流程单",
+              "right": 344.5,
+              "bottom": 47,
+              "vCenter": 293,
+              "hCenter": 37,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 21.75,
+              "fontWeight": "900",
+              "letterSpacing": 12,
+              "textAlign": "center",
+              "qrCodeLevel": 0,
+              "field": "lcd1",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+31,
+              "top": workData.value.y_offset+40,
+              "height": 9.75,
+              "width": 133,
+              "title": "文本",
+              "right": 159.5,
+              "bottom": 42.75,
+              "vCenter": 100,
+              "hCenter": 37.875,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "qrCodeLevel": 0,
+              "field": "qr",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+61,
+              "height": 36,
+              "width": 58,
+              "title": "生产批次号",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "scpch1",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+55,
+              "top": workData.value.y_offset+65,
+              "height": 36,
+              "width": 100,
+              "title": "文本",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 127,
+              "bottom": 96.75,
+              "vCenter": 98,
+              "hCenter": 78.75,
+              "field": "scpch",
+              "hideTitle": true,
+              "draggable": false
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+97,
+              "height": 36,
+              "width": 58,
+              "title": "销售订单号",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 68.9921875,
+              "bottom": 133.74609375,
+              "vCenter": 39.9921875,
+              "hCenter": 115.74609375,
+              "draggable": false,
+              "field": "xsddh1",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+62,
+              "top": workData.value.y_offset+103,
+              "height": 36,
+              "width": 90,
+              "title": "销售订单号",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 127.24609375,
+              "bottom": 130.74609375,
+              "vCenter": 98.24609375,
+              "hCenter": 112.74609375,
+              "field": "xsddh",
+              "hideTitle": true,
+              "draggable": false
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+172,
+              "top": workData.value.y_offset+97,
+              "height": 36,
+              "width": 35,
+              "title": "码包号",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 206.5,
+              "bottom": 133.5,
+              "vCenter": 188,
+              "hCenter": 115.5,
+              "draggable": false,
+              "field": "mbh1",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+208,
+              "top": workData.value.y_offset+100,
+              "height": 36,
+              "width": 212,
+              "title": "销售订单号",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "left",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 306.49609375,
+              "bottom": 130.74609375,
+              "vCenter": 256.49609375,
+              "hCenter": 112.74609375,
+              "field": "mbh",
+              "hideTitle": true,
+              "draggable": false
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+422,
+              "top": workData.value.y_offset+97,
+              "height": 36,
+              "width": 32,
+              "title": "流程单号",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 456.25,
+              "bottom": 134.25,
+              "vCenter": 437.75,
+              "hCenter": 116.25,
+              "draggable": false,
+              "field": "lcdh1",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+455,
+              "top": workData.value.y_offset+100,
+              "height": 36,
+              "width": 130,
+              "title": "销售订单号",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 24,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 582.5,
+              "bottom": 133.5,
+              "vCenter": 518.5,
+              "hCenter": 115.5,
+              "field": "lcdh",
+              "hideTitle": true,
+              "draggable": false
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+138,
+              "height": 26,
+              "width": 58,
+              "title": "工单",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "bottom",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 71.5,
+              "bottom": 163,
+              "vCenter": 42.5,
+              "hCenter": 150.5,
+              "field": "gd1",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+71,
+              "top": workData.value.y_offset+138,
+              "height": 52,
+              "width": 513,
+              "title": "销售订单号",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "left",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 171.25,
+              "bottom": 188.75,
+              "vCenter": 121.25,
+              "hCenter": 163.75,
+              "field": "gdsm",
+              "hideTitle": true,
+              "draggable": false
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+164,
+              "height": 26,
+              "width": 58,
+              "title": "说明",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 70.75,
+              "bottom": 188.75,
+              "vCenter": 41.75,
+              "hCenter": 175.75,
+              "field": "sm1",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+196,
+              "height": 28,
+              "width": 76,
+              "title": "产品名称",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 70.24609375,
+              "bottom": 231.99609375,
+              "vCenter": 41.24609375,
+              "hCenter": 213.99609375,
+              "draggable": false,
+              "field": "cpmc1",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+89,
+              "top": workData.value.y_offset+205,
+              "height": 28,
+              "width": 203,
+              "title": "文本",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "right": 171.5,
+              "bottom": 224.5,
+              "vCenter": 130,
+              "hCenter": 210.5,
+              "field": "cpmc",
+              "hideTitle": true,
+              "draggable": false
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+291,
+              "top": workData.value.y_offset+196,
+              "height": 28,
+              "width": 59,
+              "title": "总投纸数",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 349.25,
+              "bottom": 224.5,
+              "vCenter": 319.75,
+              "hCenter": 210.5,
+              "draggable": false,
+              "field": "ztzs1",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+350,
+              "top": workData.value.y_offset+205,
+              "height": 28,
+              "width": 90,
+              "title": "产品名称",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 432.5,
+              "bottom": 223.75,
+              "vCenter": 391,
+              "hCenter": 209.75,
+              "field": "ztzs",
+              "hideTitle": true,
+              "draggable": false
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+440,
+              "top": workData.value.y_offset+196,
+              "height": 28,
+              "width": 50,
+              "title": "规矩号",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 497.24609375,
+              "bottom": 223.24609375,
+              "vCenter": 455.74609375,
+              "hCenter": 209.24609375,
+              "draggable": false,
+              "field": "gjh1",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+490,
+              "top": workData.value.y_offset+196,
+              "height": 28,
+              "width": 94,
+              "title": "产品名称",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 571.25,
+              "bottom": 224.5,
+              "vCenter": 529.75,
+              "hCenter": 210.5,
+              "field": "gjh",
+              "hideTitle": true,
+              "draggable": false
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+12,
+              "top": workData.value.y_offset+235,
+              "height": 378,
+              "width": 572,
+              "autoCompletion": true,
+              "right": 584.75,
+              "bottom": 601.5,
+              "vCenter": 298.75,
+              "hCenter": 412.5,
+              "field": "table",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "maxRows": 15,
+              "textAlign": "center",
+              "tableHeaderRowHeight": 22.5,
+              "tableBodyRowHeight": 25,
+              "tableBorder": "noBorder",
+              "tableHeaderBorder": "noBorder",
+              "tableHeaderCellBorder": "noBorder",
+              "tableHeaderBackground": "#ffffff",
+              "tableBodyRowBorder": "noBorder",
+              "tableBodyCellBorder": "noBorder",
+              "tableFooterBorder": "noBorder",
+              "tableFooterCellBorder": "noBorder",
+              "columns": [
+                [
+                  {
+                    "width": 75.564678549134,
+                    "titleSync": false,
+                    "field": "gxmc",
+                    "checked": true,
+                    "columnId": "gxmc",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 28.65374282582224,
+                    "titleSync": false,
+                    "field": "rq",
+                    "checked": true,
+                    "columnId": "rq",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 30.691055236427328,
+                    "titleSync": false,
+                    "field": "sj",
+                    "checked": true,
+                    "columnId": "sj",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 46.073534173378626,
+                    "titleSync": false,
+                    "field": "hgps",
+                    "checked": true,
+                    "columnId": "hgps",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 45.90803945028349,
+                    "titleSync": false,
+                    "field": "cps",
+                    "checked": true,
+                    "columnId": "cps",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 39.283655266049266,
+                    "titleSync": false,
+                    "field": "fps",
+                    "checked": true,
+                    "columnId": "fps",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 34.03023853973766,
+                    "titleSync": false,
+                    "field": "bc",
+                    "checked": true,
+                    "columnId": "bc",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 32.58935487917185,
+                    "titleSync": false,
+                    "field": "jt",
+                    "checked": true,
+                    "columnId": "jt",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 42.96988913874766,
+                    "titleSync": false,
+                    "field": "czg",
+                    "checked": true,
+                    "columnId": "czg",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 102.76126350532134,
+                    "titleSync": false,
+                    "field": "yczlczxx",
+                    "checked": true,
+                    "columnId": "yczlczxx",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 39.91518563922935,
+                    "titleSync": false,
+                    "field": "lzg",
+                    "checked": true,
+                    "columnId": "lzg",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 53.559362796697215,
+                    "titleSync": false,
+                    "field": "fptj",
+                    "checked": true,
+                    "columnId": "fptj",
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1,
+                    "tableQRCodeLevel": 0,
+                    "tableSummaryTitle": true,
+                    "tableSummary": ""
+                  },
+                  {
+                    "width": 85.25,
+                    "checked": false,
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1
+                  },
+                  {
+                    "width": 85.25,
+                    "checked": false,
+                    "fixed": false,
+                    "rowspan": 1,
+                    "colspan": 1
+                  }
+                ]
+              ]
+            },
+            "printElementType": {
+              "title": "表格",
+              "type": "table",
+              "editable": true,
+              "columnDisplayEditable": true,
+              "columnDisplayIndexEditable": true,
+              "columnTitleEditable": true,
+              "columnResizable": true,
+              "columnAlignEditable": true,
+              "isEnableEditField": true,
+              "isEnableContextMenu": true,
+              "isEnableInsertRow": true,
+              "isEnableDeleteRow": true,
+              "isEnableInsertColumn": true,
+              "isEnableDeleteColumn": true,
+              "isEnableMergeCell": true
+            }
+          },
+          // {
+          //   "options": {
+          //     "left": workData.value.x_offset+13,
+          //     "top": workData.value.y_offset+224,
+          //     "height": 9,
+          //     "width": 571,
+          //     "borderWidth": "0.75",
+          //     "draggable": false,
+          //     "coordinateSync": false,
+          //     "widthHeightSync": false
+          //   },
+          //   "printElementType": {
+          //     "title": "横线",
+          //     "type": "hline"
+          //   }
+          // },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+612,
+              "height": 17,
+              "width": 572,
+              "title": "成品检验记录",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 585.25,
+              "bottom": 629,
+              "vCenter": 299.75,
+              "hCenter": 620.5,
+              "draggable": false,
+              "field": "cpjyjl",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+121,
+              "top": workData.value.y_offset+629,
+              "height": 17,
+              "width": 35,
+              "title": "时间",
+              "right": 156.5,
+              "bottom": 645.5,
+              "vCenter": 139,
+              "hCenter": 637,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+156,
+              "top": workData.value.y_offset+629,
+              "height": 17,
+              "width": 52,
+              "title": "合格品数",
+              "right": 185.75,
+              "bottom": 645.5,
+              "vCenter": 169.75,
+              "hCenter": 637,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+208,
+              "top": workData.value.y_offset+629,
+              "height": 17,
+              "width": 38,
+              "title": "废品数",
+              "right": 243.5,
+              "bottom": 645.5,
+              "vCenter": 224.5,
+              "hCenter": 637,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+246,
+              "top": workData.value.y_offset+629,
+              "height": 17,
+              "width": 101,
+              "title": "AB类废品及倒查",
+              "right": 276.5,
+              "bottom": 646.25,
+              "vCenter": 260.5,
+              "hCenter": 637.75,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+347,
+              "top": workData.value.y_offset+629,
+              "height": 17,
+              "width": 35,
+              "title": "工序",
+              "right": 382.25,
+              "bottom": 643.25,
+              "vCenter": 364.75,
+              "hCenter": 634.75,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+382,
+              "top": workData.value.y_offset+629,
+              "height": 17,
+              "width": 45,
+              "title": "检验员",
+              "right": 423,
+              "bottom": 644,
+              "vCenter": 400.5,
+              "hCenter": 635.5,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+462,
+              "top": workData.value.y_offset+629,
+              "height": 17,
+              "width": 35,
+              "title": "时间",
+              "right": 362,
+              "bottom": 648.5,
+              "vCenter": 346,
+              "hCenter": 640,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+497,
+              "top": workData.value.y_offset+629,
+              "height": 17,
+              "width": 52,
+              "title": "合格品数",
+              "right": 544.75,
+              "bottom": 647,
+              "vCenter": 518.75,
+              "hCenter": 638.5,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+549,
+              "top": workData.value.y_offset+629,
+              "height": 17,
+              "width": 36,
+              "title": "废品数",
+              "right": 584,
+              "bottom": 644.75,
+              "vCenter": 565,
+              "hCenter": 636.25,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+646,
+              "height": 17,
+              "width": 35,
+              "title": "机检",
+              "right": 45.5,
+              "bottom": 661.25,
+              "vCenter": 29.5,
+              "hCenter": 652.75,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+663,
+              "height": 17,
+              "width": 572,
+              "title": "机台废次品信息记录",
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "fontSize": 12,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "lineHeight": 15,
+              "qrCodeLevel": 0,
+              "right": 139.75,
+              "bottom": 677.75,
+              "vCenter": 76.25,
+              "hCenter": 669.25,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+680,
+              "height": 16,
+              "width": 54,
+              "title": "废次品工序",
+              "right": 67.5,
+              "bottom": 693.25,
+              "vCenter": 40.5,
+              "hCenter": 685.25,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+67,
+              "top": workData.value.y_offset+680,
+              "height": 128,
+              "width": 89,
+              "title": "废次品留样黏贴处",
+              "right": 157.25,
+              "bottom": 693.5,
+              "vCenter": 112.75,
+              "hCenter": 686.5,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+712,
+              "height": 16,
+              "width": 54,
+              "title": "废次品原因",
+              "right": 67.5,
+              "bottom": 728.5,
+              "vCenter": 40.5,
+              "hCenter": 720.5,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+744,
+              "height": 16,
+              "width": 54,
+              "title": "废次品数量",
+              "right": 65.25,
+              "bottom": 761.5,
+              "vCenter": 38.25,
+              "hCenter": 753.5,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          },
+          {
+            "options": {
+              "left": workData.value.x_offset+13,
+              "top": workData.value.y_offset+776,
+              "height": 16,
+              "width": 54,
+              "title": "联拼号",
+              "right": 65.25,
+              "bottom": 792.25,
+              "vCenter": 38.25,
+              "hCenter": 784.25,
+              "coordinateSync": false,
+              "widthHeightSync": false,
+              "textAlign": "center",
+              "textContentVerticalAlign": "middle",
+              "qrCodeLevel": 0,
+              "draggable": false,
+              "field": "gx",
+              "hideTitle": true
+            },
+            "printElementType": {
+              "title": "文本",
+              "type": "text"
+            }
+          }
+        ],
+        "paperNumberLeft": 565.5,
+        "paperNumberTop": 819,
+        "paperNumberDisabled": true,
+        "paperNumberContinue": true,
+        "backgroundColor": "#f1ebff",
+        "overPrintOptions": {
+          "content": "",
+          "opacity": 0.7,
+          "type": 1
+        },
+        "watermarkOptions": {
+          "content": "",
+          "fillStyle": "rgba(255, 255, 255, 1)",
+          "fontSize": "36px",
+          "rotate": 25,
+          "width": 413,
+          "height": 310,
+          "timestamp": false,
+          "format": "YYYY-MM-DD HH:mm"
+        }
+      }
+    ]
+  }
+
+const jsondata2 ={
+
+}
+  const hiprintTemplate = new hiprint.PrintTemplate({ 
+  template: Oldpaper.value ? jsondata2 : jsondata1 
+});
+
+// 获取起始和结束值
+const start = workData.value.start_liucheng;//起始流程单号
+const end = workData.value.liucheng_num;//截止程单号
+for (let i = start; i <= end; i++) {
+  (function(currentIndex, relativeIndex) {  // 新增 relativeIndex 参数
+    console.log("currentIndex:", currentIndex, "relativeIndex:", relativeIndex);
+    const delay = relativeIndex * 3600;  // 使用 relativeIndex 计算延迟
+    setTimeout(() => {
+      const printdata = {
+        "scpch": getDocumentInfos.data[0].Gd_gdbh,
+        "xsddh": getDocumentInfos.data[0].销售订单号,
+        "mbh": getDocumentInfos.data[0].mabao,
+        "lcdh": `${workData.value.liucheng_total}-${currentIndex}`,
+        "gdsm": getDocumentInfos.data[0].version,
+        "cpmc": getDocumentInfos.data[0].Gd_cpmc,
+        "ztzs": workData.value.num,
+        'table': getDocumentInfos.data.gy_data.map(item => ({
+          gxmc: item 
+        }))
+      };
+      console.log("执行打印:", currentIndex);
+      hiprintTemplate.print2(printdata);
+    }, delay);
+  })(i, i - start + 1);  // 传入 currentIndex 和 relativeIndex
+}
+
+    }
+  }
+	const selectpPaper = (event) => {
+		 workData.value.num=event.target.value
+	}
+	
+
+	const selectPeijian = async(event) => {
+    peijian.value=event.target.value
+		 const getDocumentHistoryss = await getDocumentHistory({
+		 	order:workData.value.Gd_gdbh,
+		 	peijian:event.target.value})
+			console.log(getDocumentHistoryss)
+		 if (getDocumentHistoryss.code === 0) {
+		 		department.value=getDocumentHistoryss.data.department
+		 		update.value=getDocumentHistoryss.data.update
+        if(getDocumentHistoryss.data.data[0]){
+          gyData.value=getDocumentHistoryss.data.data.map((item)=>({
+            gy:item
+          }))
+        }else{
+          gyData.value=[]
+        }
+
+		 }
+	}
+
+
+</script>
+
+<style>
+	.newlabel{
+	    display: block;
+	    -webkit-margin-start: 2px;
+	    -webkit-margin-end: 2px;
+	    -webkit-padding-before: 0.35em;
+	    -webkit-padding-start: 0.75em;
+	    -webkit-padding-end: 0.75em;
+	    -webkit-padding-after: 0.625em;
+	    min-width: -webkit-min-content;
+	    border-width: 2px;
+	    border-style: groove;
+	    border-color: threedface;
+	    border-image: initial;
+	    width:870px;
+	    padding:10px;
+	    margin:10px;
+	    float: left;
+	}
+	.legend{
+	    display: block;
+	    -webkit-padding-start: 2px;
+	    -webkit-padding-end: 2px;
+	    border-width: initial;
+	    border-style: none;
+	    border-color: initial;
+	    border-image: initial;
+	}
+	#daima{
+	    display: block;
+	    border-width: 2px;
+	    border-style: groove;
+	    border-color: initial;
+	    border-image: initial;
+	    float: left;
+	    margin-left: 950px;
+	    margin-top: 18px;
+	    width: 550px;
+	    padding: 10px;
+	    position: fixed;
+	}
+	#daima table{
+
+	}
+	.firm  ul,.product  ul,.tag ul{
+	    width:100%;
+	    padding:10px;
+	    font-size:0;
+	}
+	.firm li,.product li,.tag li{
+	    font-size:12px;
+	}
+	.firm li:first-child ul li,.product li:first-child ul li,.tag li:first-child ul li{
+	    display:inline-block;
+	    width:33.3333%;
+	    height:20px;
+	    line-height:20px;
+	}
+	.firm input,.product input,.tag input{
+	    width:200px;
+	    padding:5px;
+	}
+	.tag select{
+	    width:198px;
+	    padding:5px;
+	}
+	.firm li ul:last-child li{
+	    width:580px;
+	}
+	.firm li ul:last-child li input{
+	    width:476px;
+	}
+	.newlabel table{
+	    margin-top:20px;
+	    min-height: 25px; line-height: 25px;border-collapse: collapse;
+	}
+	.newlabel caption{
+	    padding:5px 0;
+	}
+	.newlabel table,.newlabel table tr th,.newlabel table tr td { border:1px dashed #ddd;padding:5px;}
+	#daima table,#daima table tr th,#daima table tr td { border:1px dashed #ddd;padding:5px;}
+	#createcode{
+	    display:inline-block;
+	    width:100px;
+	    height:30px;
+	    line-height:30px;
+	    margin-left:290px;
+	    border-radius:10px;
+	    background:#0fa2f1;
+	    color:#fff;
+	    text-align:center;
+	    cursor: pointer;
+	    opacity:0.8;
+	    filter:80%;
+	}
+	.submitbtn{
+	    width:100px;
+	    height:30px;
+	    line-height:30px;
+	    background:#0fa2f1;
+	    margin-left:30%;
+	    text-align:center;
+	    outline:none;
+	    border:0;
+	    color:#fff;
+	    border-radius:10px;
+	    opacity:0.8;
+	    filter:80%;
+	}
+	.high{ color: red; }
+	.msg{ font-size: 13px; }
+	.onError{ color: red; }
+	.onSuccess{ color: green; }
+</style>

src/view/performance/chejianbaogong.vue

@@ -3101,6 +3101,7 @@ const warningres = (arr) => {
 	  
 	  // 日产量上报上机时间
 	  if (response.code === 0) {
+		console.log(response.data.length)
 	  if(response.data.length === 0){
 		   if (currentHour < 8 || (currentHour === 8 && minutes < 30)) {
 				  // 如果当前时间早于08:30, 则设置为前一天的晚班时间20:30

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -2708,7 +2708,7 @@ const delgd_delclick = async () => {
   if (gySelection.value !== ''){
     try {
 
-      const res2 = await ProcessDel({UniqId: gySelection.value})
+      const res2 = await ProcessDel({UniqId: gySelection.value,sys_id:userStore.userInfo.nickName})
       res2.code === 0 && ElMessage.success('工艺资料删除成功')
 	  GetInfo()
     } catch(err) {
@@ -3580,6 +3580,8 @@ const GetInfo = async () => {
   gytableData.splice(0, gytableData.length, ...processedData);
   ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
   jstableData.splice(0, jstableData.length, ...res.data.jsData);
+  yjSelection.value = '';
+  gySelection.value = '';
   if(yjtableData.length==0){
     yjzuidahaoma.value = 1
   }else{

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -353,7 +353,7 @@
                       :cell-class-name="sxzhscsCellClass">
               <template v-for="(item, idx) in xzhstableColumns">
                 <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
-                  <div v-if="['难度系数', '损耗代号', '印刷方式', '版距','计损色数', '损耗系数'].includes(item.prop)">
+                  <div v-if="(item.prop === '难度系数' ? !isDisabled : true) && ['难度系数', '损耗代号', '印刷方式', '版距','计损色数', '损耗系数'].includes(item.prop)">
                     <el-input v-model="row[item.prop]" :clearable="false"
                               :id="`input${idx}${$index}`" @keyup.stop="handleKeyDown($event, idx, $index, item.prop)"/>
                   </div>
@@ -1738,6 +1738,10 @@ const onxzhscsclick = () => {
     xzhscsformData['cpdh'] = _Gd_cpdh.value;
     xzhscsformData['gdmc'] = _Gd_cpmc.value;
     _AccountingParameterdata();
+    if (!(userStore.userInfo.nickName === '吴杏')) {
+				console.log("禁用了")
+				isDisabled.value = true;
+			}
     xzhscslist.value = true;
   }
 };
@@ -1783,11 +1787,11 @@ const xzhscsConfirm = async () => {
       return {
         Uniqid: parseInt(item.UniqId),
         chromatic: parseFloat(item.计损色数) ?? '',
-        difficulty: parseFloat(item.难度系数) ?? '',
         loss: item.损耗代号 ??'',
         plate: parseInt(item.版距) ?? '',
         printMode: item.印刷方式 ?? '',
         wastage: parseFloat(item.损耗系数),
+        ...(!isDisabled.value && { difficulty: parseFloat(item.难度系数) ?? '' })
       }
     });
     const AccountingParameterEditdata = await AccountingParameterEdit(formattedData);

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -2000,7 +2000,7 @@
 		
 		<!-- JP检品独立  印件选择-->
 		<el-dialog v-model="JPdialogSelectVisible_Yj" title="选择" destroy-on-close width="600px" style='height: 400px;' @keydown="JPselect_Yj($event)" >
-            <el-table tooltip-effect="dark" :data="JPselectData_Yj"
+            <el-table tooltip-effect="dark" :data="JPselectData_Yj" ref="table_xzyj"
               row-key="ID" highlight-current-row="true"
               border style="width:100%"
 			  :row-style="{ height: '20px' }" :cell-style="{ padding: '0px' }"
@@ -2239,7 +2239,7 @@
 		  
 		<!-- 修改 JP检品独立  印件选择-->
 		<el-dialog v-model="JPdialogSelectVisible_Yjedit" title="选择" destroy-on-close width="600px" @keydown="JPselect_Yjedit($event)" >
-		  <el-table tooltip-effect="dark" :data="JPselectData_Yjedit"
+		  <el-table tooltip-effect="dark" :data="JPselectData_Yjedit" ref="table_xgyj"
 			row-key="ID" highlight-current-row="true"
 			border style="width:100%"
 			@row-dblclick="JPhandleSelectClick_Yjedit" >
@@ -2248,7 +2248,7 @@
 		  </el-table>
 		</el-dialog>
 		    
-		<!-- 修改 JP检品独立 印件选择 -->
+		<!-- 修改 JP检品独立 工序选择 -->
 		<el-dialog v-model="JPdialogSelectVisible_Gxedit" title="选择" destroy-on-close width="600px" style="margin-top: 2%;" @keydown="JPselect_xzedit($event)">
 			<el-table tooltip-effect="dark" :data="JPselectData_Gxedit"  ref="table_gxedit"
 			  row-key="ID" highlight-current-row="true"
@@ -2448,7 +2448,7 @@
 		
 		<!-- 印件选择 -->
 		<el-dialog v-model="dialogSelectVisible_Yj" title="选择" destroy-on-close width="600px" @keydown="select_Yj($event)" >
-            <el-table tooltip-effect="dark" :data="selectData_Yj"
+            <el-table tooltip-effect="dark" :data="selectData_Yj" ref="table_YJH"
               row-key="ID" highlight-current-row="true"
               border style="width:100%" @row-dblclick="handleSelectClick_Yj">
               <el-table-column prop="yjno" label="印件号" width="80" />
@@ -3793,6 +3793,17 @@ const setCurrent_jylbedit = async (row) => {
  	 JPdialogSelectVisible_Yjedit.value = false;
   }
  }
+
+ const table_xgyj = ref();
+ const JPsetCurrent_Yjedit = (row) => {
+   setTimeout(() => {
+	table_xgyj.value?.setCurrentRow(row);
+     const { ls, yjno, yjmc } = row
+	 console.log(row)
+     JPformdataedit['印件号'] = yjno
+     JPformdataedit['印件名称'] = yjmc
+   });
+ };
  //工序选择
   const JPdialogSelectVisible_Gxedit = ref(false)
   const JPselectData_Gxedit = reactive([])
@@ -4275,6 +4286,17 @@ const JPselect_Yj = (event) => {
  }
 }
 
+const table_xzyj = ref();
+ const JPsetCurrent_Yj = (row) => {
+   setTimeout(() => {
+	table_xzyj.value?.setCurrentRow(row);
+     const { ls, yjno, yjmc } = row
+	 console.log(row)
+     JPformdata['印件号'] = yjno
+     JPformdata['印件名称'] = yjmc
+   });
+ };
+
 
 /*
 	工序选择
@@ -6986,6 +7008,18 @@ const MachineChanliang = async(value) => {
          dialogSelectVisible_Yj.value = false;
      }
  }
+ const table_YJH = ref();
+ const setCurrent_Yj = (row) => {
+   setTimeout(() => {
+	table_YJH.value?.setCurrentRow(row);
+     const { ls, yjno, yjmc } = row
+	 console.log(row)
+	 console.log(yjno)
+     formdata3.value.联数 = ls
+     formdata3.value.yjno = yjno
+     formdata3.value.yjmc = yjmc
+   });
+ };
  
  //工序选择
  const dialogSelectVisible_Gx = ref(false)