Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-ui/src/views/bussiness/processMange_line.vue

@@ -46,11 +46,17 @@
               @change="getList"
             >
               <el-option
-                v-for="item in productLineList"
-                :key="item.productionLineNo"
+                v-for="(item, index) in productLineList"
+                :key="index"
                 :label="item.productionLineName"
                 :value="item.productionLineNo"
               >
+                <span class="discribe" style="float: left">{{
+                  item.productionLineName
+                }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{
+                  item.productionLineDepartment
+                }}</span>
               </el-option>
             </el-select>
           </div>
@@ -488,9 +494,10 @@ export default {
         if (res.code == 200) {
           this.tableData = res.rows.map((item) => item.resultMap);
           this.tableData.forEach((item) => {
-            item.productionLineName = this.productLineList.find(
-              (i) => i.productLineNo == item.productLineNo
-            ).productionLineName;
+            item.productionLineName =
+              this.productLineList.find(
+                (i) => i.productionLineNo == item.bepTaskProductionLineNo
+              )?.productionLineName || "无产线";
           });
           this.total = res.total;
         } else {

zkqy-ui/src/views/orderMange/codeListManage/printIndex.vue

@@ -219,9 +219,16 @@
                     <el-option
                       v-for="(item, index) in lineOptions"
                       :key="index"
-                      :label="item.productionLineNo"
+                      :label="item.productionLineName"
                       :value="item.productionLineNo"
                     >
+                      <span class="discribe" style="float: left">{{
+                        item.productionLineName
+                      }}</span>
+                      <span
+                        style="float: right; color: #8492a6; font-size: 13px"
+                        >{{ item.productionLineDepartment }}</span
+                      >
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -692,6 +699,7 @@ export default {
       this.supplementCode(qrCode);
     } else {
       // 正常打印
+      this.excuteType = 1;
       this.printHandler();
     }
   },
@@ -1055,14 +1063,14 @@ export default {
       });
       this.changeGrossWeight(this.printTableData[0]);
       // 前端打印
-      // codeListPrint(this.printTableData, "printDom");
+      codeListPrint(this.printTableData, "printDom");
 
-      // if (this.excuteType == 1) {
-      //   this.tableData.push(this.printTableData[0]);
-      // }
+      if (this.excuteType == 1) {
+        this.tableData.push(this.printTableData[0]);
+      }
       // 后端打印
       // console.log("newPrintHandler");
-      this.newPrintHandler();
+      // this.newPrintHandler();
     },
     // 获取机台选项数据
     async getLineOptionLsit() {
@@ -1299,7 +1307,7 @@ export default {
     async handleCurrentChange(val) {
       console.log("row", val);
       if (!val) return;
-      if (this.isStartReadNum) {
+      if (this.isStartReadNum || this.excuteType != 1) {
         this.$refs.proTableRef.setCurrentRow(this.currentRow);
         return;
       }