生产工单->打印工单

src/views/mes/pro/workorder/indexApply.vue

@@ -159,7 +159,7 @@
         <el-button type="warning" plain size="mini" v-print="printContent" id="printbtn" style="display: none"
           >打印工单
         </el-button>
-        <el-button type="warning" plain size="mini" ref="printbtn" @click="handlePrint"
+        <el-button type="warning" plain size="mini" ref="printbtn" @click="handlePrint" :loading="printloading"
           >打印工单
         </el-button>
       </el-col>
@@ -620,14 +620,13 @@ export default {
         popTitle: '', // 打印页面的页眉
         extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
         previewBeforeOpenCallback() {
-          console.log('previewBeforeOpenCallback')
         },
         previewOpenCallback() {},
         beforeOpenCallback(vue) {
           // vue.printLoading = true;
         },
         openCallback(vue) {
-          // vue.printLoading = false;
+          vue.printloading = false;
         },
         closeCallback() {},
         clickMounted(vue) {
@@ -735,7 +734,8 @@ export default {
         ],
       },
       productionSolutionTable: [],
-      workOrderTable: []
+      workOrderTable: [],
+      printloading: false
     };
   },
   activated() {
@@ -752,6 +752,8 @@ export default {
       this.daterangePurchaseDate = [dayjs().format('YYYY-MM-DD'), dayjs().add(7, 'day').format('YYYY-MM-DD')]
     },
     handlePrint(){
+      if(!this.ids || this.ids.length === 0) return this.$message.warning('请选择工单')
+      this.printloading = true;
       printInfo(this.ids).then(res=>{
         if(!res.data || res.data.length === 0) {
           return this.$message.warning('没有数据')
@@ -763,6 +765,8 @@ export default {
             document.getElementById('printbtn').click()
           })
         }
+      }).finally(() => {
+        this.printloading = false;
       })
     },
     handleCommandClick() {

src/views/mes/pro/workorder/print/productOrderDetail.vue

@@ -8,6 +8,7 @@
           <vue-barcode
           :value="pageHeader.arrangeCode"
           margin-right="5"
+          format="QR"
           :display-value="pageHeader.arrangeCode"
           font="bold"
           margin-left="5"
@@ -49,7 +50,7 @@
         <div>打印时间：{{ date }}</div>
       </div>
       <div class="materialLength">
-        <div>生产制程：{{ pageHeader.materialLength }}</div>
+        <div>生产制程：{{ pageHeader.processDesc }}</div>
       </div>
     </div>
     <table border class="form-header font-size-16" style="table-layout: fixed;width: 100%;border:1px solid #000000;font-size:14px;line-height:25px;">
@@ -61,7 +62,7 @@
         <td colspan="2" align="center">生产量</td>
         <td colspan="2" align="center">Loss数</td>
         <td colspan="2" align="center">参考数</td>
-        <td colspan="2" align="center" style="background-color: #7e7878;-webkit-print-color-adjust: exact;">派工数</td>
+        <td colspan="2" align="center" style="background-color: #7e78788e;-webkit-print-color-adjust: exact;">派工数</td>
         <td colspan="2" align="center">材料总重(KG)</td>
         <td colspan="3" align="center">单层厚(丝)</td>
       </tr>
@@ -72,7 +73,7 @@
         <td colspan="2" align="center">{{ workOrderInfo.quantity }}</td>
         <td colspan="2" align="center">{{ workOrderInfo.lossNum }}</td>
         <td colspan="2" align="center">{{ workOrderInfo.dispatchQuantity }}</td>
-        <td colspan="2" align="center" style="background: #7e7878;-webkit-print-color-adjust: exact;">{{ workOrderInfo.referenceQuantity }}</td>
+        <td colspan="2" align="center" style="background: #7e78788e;-webkit-print-color-adjust: exact;">{{ workOrderInfo.referenceQuantity }}</td>
         <td colspan="2" align="center">{{ workOrderInfo.materialWeight }}</td>
         <td colspan="3" align="center">{{ workOrderInfo.singleLayerThick }}</td>
       </tr>
@@ -93,7 +94,7 @@
         <td colspan="2" align="center">数量</td>
         <td colspan="2" align="center">Loss数</td>
       </tr>
-      <tr v-for="(item,index) in soSizeList" :key="index" height="20" class="color000">
+      <tr v-for="(item,index) in soSizeList" :key="'soSizeList' + index" height="20" class="color000">
         <td colspan="2" align="center">{{ item[0]&&item[0].colorNo }}</td>
         <td colspan="2" align="center" style="word-wrap:break-word;word-break:break-all">{{ item[0]&&item[0].clientCmd }}</td>
         <td colspan="2" align="center">{{ item[0]&&item[0].quantity }}</td>
@@ -114,7 +115,7 @@
         <td colspan="17" align="center" style="text-align: left">客户货品名称：</td>
       </tr>
       <!--  -->
-          <tbody v-for="(soDirective, index) in soDirectives" :key="index" >
+          <tbody v-for="(soDirective, index) in soDirectives" :key="'soDirectives' + index" >
             <tr height="20" class="color000">
         <td colspan="3" align="center">产品材质：</td>
         <td colspan="21" align="center" style="word-wrap:break-word;word-break:break-all">{{ soDirective.productSpec }}</td>
@@ -162,13 +163,13 @@
       </tbody>
 
       <tr height="20" class="color000">
-        <td colspan="3" align="center">生产制造</td>
+        <td colspan="3" align="center">生产制程</td>
         <td colspan="9" align="center">描述</td>
         <td colspan="3" align="center">数量</td>
         <td colspan="3" align="center">审核/签字</td>
         <td colspan="6" align="center">备注</td>
       </tr>
-      <tr height="20" v-for="(item,index) in processList" :key="index" class="color000">
+      <tr height="20" v-for="(item,index) in processList" :key="'processList' + index" class="color000">
         <td colspan="3" align="center">{{ item.processName }}</td>
         <td colspan="9" align="center" style="word-wrap:break-word;word-break:break-all">{{ item.desc }}</td>
         <td colspan="3" align="center">{{ item.quantity }}</td>
@@ -197,7 +198,7 @@
         <td colspan="2" align="center">库位</td>
         <td colspan="2" align="center">备注</td>
       </tr>
-      <tr v-for="(item,index) in processItemList" :key="index" height="20" class="color000">
+      <tr v-for="(item,index) in processItemList" :key="'processItemList' + index" height="20" class="color000">
         <td colspan="2" align="center">{{ item.itemType }}</td>
         <td colspan="2" align="center" style="word-wrap:break-word;word-break:break-all">{{ item.itemCode }}</td>
         <td colspan="6" align="center" style="word-wrap:break-word;word-break:break-all">{{ item.itemName }}</td>
@@ -371,16 +372,19 @@ export default {
       for(let i=0; i<this.workOrderTable.body.soSizeList.length; i+=3 ){
           result.push(this.workOrderTable.body.soSizeList.slice(i,i+3));
       }
+      if (result.length === 0) {
+        result = [[{}]]
+      }
       return result
     },
     soDirectives (){
-      return this.workOrderTable.body.soDirectives
+      return this.workOrderTable.body.soDirectives.length === 0 ? [{}] : this.workOrderTable.body.soDirectives
     },
     processList (){
-      return this.workOrderTable.body.processList
+      return this.workOrderTable.body.processList.length === 0 ? [{}] : this.workOrderTable.body.processList
     },
     processItemList (){
-      return this.workOrderTable.body.processItemList
+      return this.workOrderTable.body.processItemList.length === 0 ? [{}] : this.workOrderTable.body.processItemList
     },
     img (){
       return this.workOrderTable.body.img
@@ -399,10 +403,9 @@ export default {
 .productOrderBox{
   position: relative;
   width: 920px;
-  height: 1100px;
+  height: 1300px;
   padding: 0 49px;
   padding-top:20px;
-  padding-bottom:80px;
   box-sizing: border-box;
 }
 .pageTop{
@@ -415,7 +418,7 @@ export default {
     letter-spacing: 2px;
   }
   .GOM {
-    color: #9f9c97;
+    color: #9f9c978e;
     position: absolute;
     left: 50%;
     font-size:28px;

src/views/mes/pro/workorder/print/productOrderSpecification.vue

@@ -130,7 +130,7 @@
         <td colspan="3" align="center">生产制程</td>
         <td colspan="21" align="center">描述</td>
       </tr>
-      <tr height="20" v-for="(item,index) in body.processes" :key="index" class="color000">
+      <tr height="20" v-for="(item,index) in body.processes" :key="'processes' + index" class="color000">
         <td colspan="3" align="center">{{ item.processName }}</td>
         <td colspan="21" align="center" style="word-wrap:break-word;word-break:break-all">{{ item.desc }}</td>
       </tr>
@@ -317,10 +317,9 @@ export default {
 .productOrderSpecification{
   position: relative;
   width: 920px;
-  height: 1100px;
+  height: 1300px;
   padding: 0 49px;
   padding-top:20px;
-  padding-bottom:80px;
   box-sizing: border-box;
 
 }