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

src/view/job/processSheet/processSheet.vue

@@ -158,20 +158,6 @@
 	const datas = ref([])
 	const propertyChange = () => {
 		if(workData.value.Gd_gdbh.length!==7){
-			workData.value = {
-        maobao:'',
-        mabao:'',
-        peijian:'',
-        tldx:3000,
-        num:'',
-        liucheng_total:'',
-        version:'',
-        start_liucheng:1,
-        liucheng_num:1,
-        remark:'',
-        x_offset:0,
-        y_offset:0
-      }
 			shuang.value=false
 			selectedPaper.value=[]
 			selectedPeijian.value=[]
@@ -256,21 +242,23 @@
 
     if (getDocumentInfos.code === 0) {
       const data = getDocumentInfos.data
-      for (let i = 0; i < Object.keys(data).length - 4; i++) {
+      for (let i = workData.value.start_liucheng; i <= workData.value.liucheng_num; i++) {
         const printdata  = {
-          "scpch": getDocumentInfos.data[i].Gd_gdbh,
-          "xsddh": getDocumentInfos.data[i].销售订单号.split(' ')[1],
-          "mbh": getDocumentInfos.data[i].mabao,
-          "lcdh": getDocumentInfos.data[i].liucheng_num,
-          "gdsm": workData.value.remark,
-          "cpmc":  getDocumentInfos.data[i].Gd_cpmc,
+          "scpch": getDocumentInfos.data[0].Gd_gdbh,
+          "xsddh": getDocumentInfos.data[0].销售订单号.split(' ')[1],
+          "mbh": getDocumentInfos.data[0].mabao,
+          "lcdh": `${workData.value.liucheng_total}-${i}`,
+          "qrcode": `${getDocumentInfos.data[0].Gd_gdbh}-${workData.value.liucheng_total}-${i}`,
+          "gdsm": getDocumentInfos.data[0].technique_sequence,
+          "cpmc":  getDocumentInfos.data[0].Gd_cpmc,
           "ztzs":  workData.value.num,
-          "gjh":  getDocumentInfos.data[i].version,
+          // "gjh":  getDocumentInfos.data[0].version,
           'table': getDocumentInfos.data.gy_data.map(item=>({
             gxmc:item
           }))
         }
-        hiprintTemplate.print(printdata);
+        hiprintTemplate.print2(printdata);
+        // hiprintTemplate.toPdf(printdata,'流程单');
       }
       // const printdata  = {
       //   "scpch": "123456",
@@ -335,6 +323,7 @@
               "bottom": 77,
               "vCenter": 552.25,
               "hCenter": 44.5,
+              "field": "qrcode",
               "coordinateSync": false,
               "widthHeightSync": false,
               "qrCodeLevel": 0

src/view/performance/chejianbaogong.vue

@@ -12,6 +12,7 @@
 			<el-button type="primary" size="large" @click="onyinban">印版领退</el-button>
 			<el-button type="primary" size="large" @click="onClear" >换型清场</el-button>
 			<el-button type="primary" size="large" @click="oncomplaints" >客诉记录</el-button>
+
 		</div>
 		</header>
 
@@ -29,16 +30,33 @@
 
 <div class="gva-search-box" style="overflow: hidden; padding: 0; display: flex;">
 			<div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0; margin-left: 20px; margin-top: 20px;">
-						  <el-form-item label="工单编号" prop="name">
-							<el-row :gutter="24">
-							  <el-col :span="6">
-								<el-input v-model="formData.工单编号"  placeholder="" />
-							  </el-col>
-							  <el-col :span="18">
-								<el-input v-model="formData.产品名称"  placeholder="" />
-							  </el-col>
-							</el-row>
-						  </el-form-item>
+<!--						  <el-form-item label="工单编号" prop="name">-->
+<!--							<el-row :gutter="24">-->
+<!--							  <el-col :span="6">-->
+<!--								<el-input v-model="formData.工单编号"  placeholder="" />-->
+<!--							  </el-col>-->
+<!--							  <el-col :span="18">-->
+<!--								<el-input v-model="formData.产品名称"  placeholder="" />-->
+<!--							  </el-col>-->
+<!--							</el-row>-->
+<!--						  </el-form-item>-->
+              <el-row :gutter="20">
+                <el-col :span="6">
+                  <el-form-item label="机台号" prop="id">
+                    <el-input v-model="formData.机台号"  placeholder="" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="工单编号" prop="id">
+                    <el-input v-model="formData.工单编号"  placeholder="" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item prop="name">
+                    <el-input v-model="formData.产品名称"  placeholder="" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
 						  <el-row :gutter="20">
 							<el-col :span="6">
 							 <el-form-item label="印件编号" prop="id">
@@ -2394,6 +2412,7 @@ const FacilityProduction = async (addr) => {
   const response = await facilityProduction({machine:JTMC});
   if (response.code === 0) {
     if(response.data){
+      formData.value.机台号=JTMC.split('#')[0]
       formData.value.工单编号 = response.data.工单编号;
       formData.value.印件号 = response.data.印件号;
       formData.value.工序号 = response.data.工序名称.substring(0,2);