Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/produce/components/jobBooking/components/batchPackagingGrouping.vue

@@ -1412,6 +1412,7 @@
 
         console.log(this.DispositionList, 'this.DispositionList');
         let packInfo = {};
+        console.log(this.warehouseId, this.DispositionList, 'this.isNewUnpack');
         if (this.isNewUnpack == 1) {
           if (this.DispositionList && this.DispositionList.length != 0) {
             packInfo = {
@@ -1471,6 +1472,7 @@
               };
             } else {
               packInfo = {
+                tier: 1,
                 isUnpack: this.objData.isUnpack
               };
             }
@@ -1511,6 +1513,7 @@
               }; // 总包装数量
             } else {
               packInfo = {
+                tier: 1,
                 isUnpack: this.objData.isUnpack
               };
             }

src/views/produce/components/jobBooking/components/batchSemiProductJobBom.vue

@@ -330,10 +330,24 @@
           v-if="
             row.feedQuantity > 1 &&
             item.currentTaskDiagram.isFirstTask != 1 &&
-            row.isAllPackageData != 1
+            row.isAllPackageData != 1 &&
+            !row.extInfo.isLoss
           "
           >拆批</el-link
         >
+
+        <el-link
+          type="text"
+          style="color: orange"
+          @click="openLoss(row, $index)"
+          v-if="
+            ![2, 3, 6].includes(Number(item.currentTaskDiagram.type)) &&
+            !row.extInfo.isLoss &&
+            item.currentTaskDiagram.isFirstTask != 1
+          "
+          >损耗</el-link
+        >
+
         <el-link
           type="success"
           @click="getOk($index)"
@@ -615,6 +629,34 @@
         <el-button type="primary" @click="getQualityParam">确 定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog
+      title="损耗数"
+      :visible.sync="lossVisible"
+      v-if="lossVisible"
+      width="30%"
+      :before-close="handleClose"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="lossForm"
+        label-width="120px"
+        label-position="right"
+      >
+        <el-form-item label="批次号">
+          <el-input v-model="lossForm.batchNo" style="width: 220px"></el-input>
+        </el-form-item>
+        <el-form-item label="损耗数">
+          <el-input v-model="lossForm.quantity" style="width: 220px"></el-input>
+          {{ lossForm.unit }}
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="lossVisible = false">取 消</el-button>
+        <el-button type="primary" @click="getLossParam">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -1000,6 +1042,18 @@
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            minWidth: 100,
+            prop: 'extInfo.isLoss',
+            label: '是否损耗',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              return row.extInfo.isLoss && row.extInfo.isLoss == 1
+                ? '是'
+                : '否';
+            }
+          },
           {
             columnKey: 'action',
             label: '操作',
@@ -1130,24 +1184,63 @@
           isQualified: 1,
           notType: '',
           notReason: '',
-          unit: ''
+          unit: '',
+          isLoss: 0
         },
         itemData: {},
         itemIndex: '',
         printData: {},
-        printStyle: ''
+        printStyle: '',
+        lossForm: {
+          batchNo: '',
+          quantity: '',
+          unit: '',
+          isLoss: 1
+        },
+        lossVisible: false,
+        lossData: {},
+        lossIndex: ''
       };
     },
 
     methods: {
       sunTj() {
         if (this.item.workReportInfo && this.item.singleReport == 1) {
-          this.item.workReportInfo.formedNum = this.newList.filter(
+          const formedNumList = this.newList.filter(
             (v) => v.extInfo.isQualified == 1
-          ).length;
-          this.item.workReportInfo.notFormedNum = this.newList.filter(
+          );
+
+          const notFormedNumList = this.newList.filter(
             (v) => v.extInfo.isQualified !== 1
-          ).length;
+          );
+
+          if (formedNumList.length != 0) {
+            this.item.workReportInfo.formedNum = formedNumList.reduce(
+              (acc, pro) => {
+                return pro.feedQuantity ? acc + Number(pro.feedQuantity) : acc;
+              },
+              0
+            );
+          } else {
+            this.item.workReportInfo.formedNum = 0;
+          }
+
+          if (notFormedNumList.length != 0) {
+            this.item.workReportInfo.notFormedNum = notFormedNumList.reduce(
+              (acc, pro) => {
+                return pro.feedQuantity ? acc + Number(pro.feedQuantity) : acc;
+              },
+              0
+            );
+          } else {
+            this.item.workReportInfo.notFormedNum = 0;
+          }
+          // this.item.workReportInfo.formedNum = this.newList.filter(
+          //   (v) => v.extInfo.isQualified == 1
+          // ).length;
+          // this.item.workReportInfo.notFormedNum = this.newList.filter(
+          //   (v) => v.extInfo.isQualified !== 1
+          // ).length;
         }
       },
       sumweight(arr) {
@@ -1248,6 +1341,7 @@
         this.dialogVisible = false;
         this.dialogEngrave = false;
         this.batchVisible = false;
+        this.lossVisible = false;
       },
 
       batchEngrave() {
@@ -1298,7 +1392,6 @@
       },
 
       openBatch(item, index) {
-        console.log(item, '需要拆批的数据');
         this.batchForm.quantity = '';
         this.batchForm.unit = '';
         this.batchForm.batchNo = '';
@@ -1320,7 +1413,7 @@
           }
 
           if (this.itemData.feedQuantity <= this.batchForm.quantity) {
-            this.$message.warning('拆批数不能大于数量');
+            this.$message.warning('拆批数不能大于或者等于数量');
             return;
           }
 
@@ -1336,13 +1429,16 @@
             batchNo: this.batchForm.batchNo,
             isQualified: this.batchForm.isQualified,
             notType: this.batchForm.notType,
-            notReason: this.batchForm.notReason
+            notReason: this.batchForm.notReason,
+            isLoss: 0
           }).then((res) => {
             res.forEach((item) => {
               dataList.push(this.deepCopy(item));
             });
 
-            this.refreshData(dataList);
+            if (dataList.length != 0) {
+              this.refreshData(dataList);
+            }
           });
         }
         this.batchVisible = false;
@@ -1364,10 +1460,6 @@
         });
         let _arr = [...this.list, ...list];
 
-        console.log(this.list, '拆批的数据');
-
-        // this.list = _arr;
-
         this.$set(this.item, 'product', _arr);
       },
 
@@ -1387,6 +1479,74 @@
         }, result);
       },
 
+      openLoss(item, index) {
+        this.lossForm.quantity = '';
+        this.lossForm.unit = '';
+        this.lossForm.batchNo = '';
+        this.lossData = item;
+        this.lossIndex = index;
+        this.lossForm.batchNo = item.batchNo;
+        this.lossForm.unit = item.unit;
+        this.lossVisible = true;
+      },
+
+      async getLossParam() {
+        if (this.lossForm.quantity && this.lossForm.batchNo) {
+          if (
+            Number(this.lossData.feedQuantity) < Number(this.lossForm.quantity)
+          ) {
+            this.$message.warning('损耗数不能大于数量');
+            return;
+          }
+
+          let dataList = [];
+          await splitBatch({
+            product: this.lossData,
+            splitQt: Number(this.lossForm.quantity),
+            batchNo: this.lossForm.batchNo,
+            isLoss: 1
+          }).then((res) => {
+            res.forEach((item) => {
+              dataList.push(this.deepCopy(item));
+            });
+
+            if (dataList.length != 0) {
+              this.refreshLossData(dataList);
+            }
+          });
+        }
+        this.lossVisible = false;
+      },
+
+      refreshLossData(list) {
+        const number =
+          Number(this.list[this.lossIndex].feedQuantity) -
+          Number(this.lossForm.quantity);
+        this.list[this.lossIndex].extInfo.sourceQuantity = number;
+        this.list[this.lossIndex].feedQuantity = number;
+        this.list[this.lossIndex].extInfo.newWeight =
+          (Number(this.list[this.lossIndex].extInfo.newWeight) * 100000) /
+            100000 -
+          (Number(list[0].extInfo.newWeight) * 100000) / 100000;
+
+        list.forEach((item) => {
+          item.childBatch = 1;
+        });
+
+        const newList = this.list.filter((item) => item.feedQuantity != 0);
+        console.log(newList, 'newList新数据');
+
+        // this.$set(
+        //   this.item,
+        //   'product',
+        //   this.list.filter((item) => item.feedQuantity != 0)
+        // );
+
+        let _arr = [...newList, ...list];
+
+        this.$set(this.item, 'product', _arr);
+      },
+
       // changeHeatNumber() {
       //   if (this.deviceList.length > 0) {
       //     const device = this.deviceList[0];

src/views/produce/components/jobBooking/components/jobBom.vue

@@ -260,16 +260,29 @@
 
             newVal.product.forEach((item) => {
               if (
-                !item.extInfo.isQualified ||
-                item.extInfo.isQualified == 1 ||
-                item.extInfo.isQualified == 3
+                (!item.extInfo.isQualified ||
+                  item.extInfo.isQualified == 1 ||
+                  item.extInfo.isQualified == 3) &&
+                !item.extInfo.isLoss
               ) {
-                formedNum = formedNum + Number(item.feedQuantity);
+                // formedNum = formedNum + Number(item.feedQuantity);
+                formedNum = this.add(formedNum, Number(item.feedQuantity));
               } else {
-                if (item.extInfo.notType == 5 || item.extInfo.notType == 8) {
-                  formedNum = formedNum + Number(item.feedQuantity);
+                if (
+                  (item.extInfo.notType == 5 || item.extInfo.notType == 8) &&
+                  !item.extInfo.isLoss
+                ) {
+                  // formedNum = formedNum + Number(item.feedQuantity);
+
+                  formedNum = this.add(formedNum, Number(item.feedQuantity));
                 } else {
-                  notFormedNum = notFormedNum + Number(item.feedQuantity);
+                  // notFormedNum = notFormedNum + Number(item.feedQuantity);
+                  if (!item.extInfo.isLoss) {
+                    notFormedNum = this.add(
+                      notFormedNum,
+                      Number(item.feedQuantity)
+                    );
+                  }
                 }
               }
             });
@@ -355,6 +368,28 @@
         this.visible = false;
       },
 
+      toInteger(num) {
+        const len = this.getDecimalLength(num);
+        return {
+          int: Math.round(num * Math.pow(10, len)),
+          factor: Math.pow(10, len)
+        };
+      },
+
+      add(a, b) {
+        const { int: aInt, factor: aFactor } = this.toInteger(a);
+        const { int: bInt, factor: bFactor } = this.toInteger(b);
+        const maxFactor = Math.max(aFactor, bFactor);
+        return (
+          (aInt * (maxFactor / aFactor) + bInt * (maxFactor / bFactor)) /
+          maxFactor
+        );
+      },
+
+      getDecimalLength(num) {
+        return (num.toString().split('.')[1] || '').length;
+      },
+
       warehouseSave() {
         this.$set(
           this.item.notFormedList[0],

src/views/produce/components/jobBooking/components/jobDdBom.vue

@@ -193,12 +193,18 @@
                 item.extInfo.isQualified == 1 ||
                 item.extInfo.isQualified == 3
               ) {
-                formedNum = formedNum + Number(item.feedQuantity);
+                // formedNum = formedNum + Number(item.feedQuantity);
+                formedNum = this.add(formedNum, Number(item.feedQuantity));
               } else {
                 if (item.extInfo.notType == 5 || item.extInfo.notType == 8) {
-                  formedNum = formedNum + Number(item.feedQuantity);
+                  // formedNum = formedNum + Number(item.feedQuantity);
+                  formedNum = this.add(formedNum, Number(item.feedQuantity));
                 } else {
-                  notFormedNum = notFormedNum + Number(item.feedQuantity);
+                  // notFormedNum = notFormedNum + Number(item.feedQuantity);
+                  notFormedNum = this.add(
+                    notFormedNum,
+                    Number(item.feedQuantity)
+                  );
                 }
                 // notFormedNum = notFormedNum + Number(item.feedQuantity);
               }
@@ -297,6 +303,28 @@
         }
       },
 
+      toInteger(num) {
+        const len = this.getDecimalLength(num);
+        return {
+          int: Math.round(num * Math.pow(10, len)),
+          factor: Math.pow(10, len)
+        };
+      },
+
+      add(a, b) {
+        const { int: aInt, factor: aFactor } = this.toInteger(a);
+        const { int: bInt, factor: bFactor } = this.toInteger(b);
+        const maxFactor = Math.max(aFactor, bFactor);
+        return (
+          (aInt * (maxFactor / aFactor) + bInt * (maxFactor / bFactor)) /
+          maxFactor
+        );
+      },
+
+      getDecimalLength(num) {
+        return (num.toString().split('.')[1] || '').length;
+      },
+
       tableDataFn(tableData) {
         console.log(tableData);
         let adultCount = 0;

src/views/produce/components/jobBooking/components/newSemiProductJobBom.vue

@@ -918,14 +918,43 @@
 
     methods: {
       sunTj() {
-        console.log(this.newList, 'workReportInfo.formedNum');
+        console.log(this.newList, 'workReportInfo.formedNum2222');
         if (this.item.workReportInfo && this.item.singleReport == 1) {
-          this.item.workReportInfo.formedNum = this.newList.filter(
+          const formedNumList = this.newList.filter(
             (v) => v.extInfo.isQualified == 1
-          ).length;
-          this.item.workReportInfo.notFormedNum = this.newList.filter(
+          );
+
+          const notFormedNumList = this.newList.filter(
             (v) => v.extInfo.isQualified !== 1
-          ).length;
+          );
+
+          if (formedNumList.length != 0) {
+            this.item.workReportInfo.formedNum = formedNumList.reduce(
+              (acc, pro) => {
+                return pro.feedQuantity ? acc + Number(pro.feedQuantity) : acc;
+              },
+              0
+            );
+          } else {
+            this.item.workReportInfo.formedNum = 0;
+          }
+
+          if (notFormedNumList.length != 0) {
+            this.item.workReportInfo.notFormedNum = notFormedNumList.reduce(
+              (acc, pro) => {
+                return pro.feedQuantity ? acc + Number(pro.feedQuantity) : acc;
+              },
+              0
+            );
+          } else {
+            this.item.workReportInfo.notFormedNum = 0;
+          }
+          // this.item.workReportInfo.formedNum = this.newList.filter(
+          //   (v) => v.extInfo.isQualified == 1
+          // ).length;
+          // this.item.workReportInfo.notFormedNum = this.newList.filter(
+          //   (v) => v.extInfo.isQualified !== 1
+          // ).length;
         }
       },
       sumweight(arr) {

src/views/produce/components/jobBooking/components/oneJobQualityBomPL.vue

@@ -271,7 +271,7 @@
                 placeholder="请选择"
                 style="width: 160px"
                 :disabled="isDetails"
-                @change="qualityChange"
+                @change="changeQuality(row.extInfo.appearance, row)"
               >
                 <el-option
                   v-for="item in qualityList"
@@ -529,11 +529,11 @@
           {
             name: '不合格',
             value: 2
-          },
-          {
-            name: '让步接收',
-            value: 3
           }
+          // {
+          //   name: '让步接收',
+          //   value: 3
+          // }
         ],
         notTypeList: [
           {
@@ -593,6 +593,15 @@
         this.list.splice(idx, 1);
       },
 
+      changeQuality(type, item) {
+        // console.log(type, item, '质检结果');
+        if (type == 1) {
+          item.extInfo.notType = '';
+          item.extInfo.notReason = '';
+        }
+        this.qualityChange();
+      },
+
       qualityChange() {
         if (this.item.sampleQuality && this.item.sampleQuality.length != 0) {
           let formedNum = 0;

src/views/produce/components/jobBooking/components/semiProductJobBom.vue

@@ -966,15 +966,47 @@
 
     methods: {
       sunTj() {
-        console.log(this.newList, 'workReportInfo.formedNum');
+        console.log(this.newList, 'workReportInfo.formedNum111');
         if (this.item.workReportInfo && this.item.singleReport == 1) {
-          this.item.workReportInfo.formedNum = this.newList.filter(
+          const formedNumList = this.newList.filter(
             (v) => v.extInfo.isQualified == 1
-          ).length;
-          this.item.workReportInfo.notFormedNum = this.newList.filter(
+          );
+
+          const notFormedNumList = this.newList.filter(
             (v) => v.extInfo.isQualified !== 1
-          ).length;
+          );
+
+          if (formedNumList.length != 0) {
+            this.item.workReportInfo.formedNum = formedNumList.reduce(
+              (acc, pro) => {
+                return pro.feedQuantity ? acc + Number(pro.feedQuantity) : acc;
+              },
+              0
+            );
+          } else {
+            this.item.workReportInfo.formedNum = 0;
+          }
+
+          if (notFormedNumList.length != 0) {
+            this.item.workReportInfo.notFormedNum = notFormedNumList.reduce(
+              (acc, pro) => {
+                return pro.feedQuantity ? acc + Number(pro.feedQuantity) : acc;
+              },
+              0
+            );
+          } else {
+            this.item.workReportInfo.notFormedNum = 0;
+          }
+          // this.item.workReportInfo.formedNum = this.newList.filter(
+          //   (v) => v.extInfo.isQualified == 1
+          // ).length;
+          // this.item.workReportInfo.notFormedNum = this.newList.filter(
+          //   (v) => v.extInfo.isQualified !== 1
+          // ).length;
         }
+
+        // console.log(this.item.workReportInfo.formedNum);
+        // console.log(this.item.workReportInfo.notFormedNum);
       },
       sumweight(arr) {
         console.log(arr, 6666667777);
@@ -1033,7 +1065,7 @@
         await isJuRen().then((res) => {
           this.printStyle = res.data.printStyle;
           if (this.printStyle != 'notExist') {
-            this.getisJuRen();
+            this.getPrintData();
           }
         });
       },

src/views/produce/components/jobBooking/index.vue

@@ -1319,6 +1319,68 @@
         //   return false;
         // }
 
+        console.log(this.List, 'this.List1111');
+
+        if (this.clientEnvironmentId == 3) {
+          for (const item of this.List) {
+            if (item.singleReport == 0) {
+              if (item.currentTaskDiagram.type == 6) {
+                for (const it of item.sampleQuality) {
+                  const data = it.extInfo;
+                  if (data.batchReportInfo.length == 0) {
+                    if (!data.reportWeight) {
+                      this.loading.close();
+                      return this.$message.warning('报工重量不能为空');
+                    }
+                  } else if (data.batchReportInfo.length != 0) {
+                    for (const i of data.batchReportInfo) {
+                      if (i.allFeedQuantity) {
+                        if (!i.allReportWeight) {
+                          this.loading.close();
+                          return this.$message.warning('报工重量不能为空');
+                        }
+                      }
+                    }
+                  }
+                }
+              } else {
+                for (const it of item.semiProductList) {
+                  const data = it.extInfo;
+                  for (const i of data.batchReportInfo) {
+                    if (i.allFeedQuantity) {
+                      if (!i.allReportWeight) {
+                        this.loading.close();
+                        return this.$message.warning('报工重量不能为空');
+                      }
+                    }
+                  }
+
+                  for (const i of data.notBatchReportInfo) {
+                    if (i.allFeedQuantity) {
+                      if (!i.allReportWeight) {
+                        this.loading.close();
+                        return this.$message.warning('不合格品重量不能为空');
+                      }
+                    }
+                  }
+                }
+              }
+            } else {
+              if (item.currentTaskDiagram.type != 4) {
+                for (const it of item.semiProductList) {
+                  const data = it.extInfo;
+                  if (!data.reportWeight) {
+                    this.loading.close();
+                    return this.$message.warning('报工重量不能为空');
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        console.log('123456');
+
         if (this.clientEnvironmentId != 2) {
           for (let i = 0; i < this.List.length; i++) {
             for (let j = 0; j < this.List[i].productRecycleList.length; j++) {
@@ -1425,8 +1487,6 @@
 
         console.log(this.List, 'this.List');
 
-        // return;
-
         // this.List[0].product = this.List[0].semiProductList;
         this.loadingBtn = true;
         jobSave(this.List)

src/views/produce/components/outsourcing/index.vue

@@ -472,9 +472,19 @@
       this.getContactList();
       this.getFactoryList();
       // if (this.activeName == '1') {
-      //   this.attributeData.name = this.outsourceFormVal.name + '委托';
+      //   // this.attributeData.name = this.outsourceFormVal.name + '委托';
+      //   this.$set(
+      //     this.outsourceFormVal,
+      //     'name',
+      //     this.outsourceFormVal.name + '委托'
+      //   );
       // } else if (this.activeName == '2') {
-      //   this.attributeData.name = this.outsourceFormVal.name + '请托';
+      //   // this.attributeData.name = this.outsourceFormVal.name + '请托';
+      //   this.$set(
+      //     this.outsourceFormVal,
+      //     'name',
+      //     this.outsourceFormVal.name + '请托'
+      //   );
       // }
     },
 

src/views/produce/components/picking/detailed.vue

@@ -62,14 +62,14 @@
           </template>
 
           <!-- 操作列 -->
-          <!-- <template v-slot:action="{ row, $index }">
+          <template v-slot:action="{ row, $index }">
             <el-link
               type="text"
               @click="outboundDetails(row, $index)"
               v-if="dataObj.status == 2"
               >出库详情</el-link
             >
-          </template> -->
+          </template>
         </ele-pro-table>
       </div>
 
@@ -222,16 +222,16 @@
             label: '规格',
             align: 'center',
             showOverflowTooltip: true
+          },
+          {
+            prop: 'action',
+            label: '操作',
+            align: 'center',
+            fixed: 'right',
+            slot: 'action',
+            resizable: false,
+            showOverflowTooltip: true
           }
-          // {
-          //   prop: 'action',
-          //   label: '操作',
-          //   align: 'center',
-          //   fixed: 'right',
-          //   slot: 'action',
-          //   resizable: false,
-          //   showOverflowTooltip: true
-          // }
         ];
       },
 
@@ -356,7 +356,7 @@
 
       this.dataObj = obj;
 
-      // this.getOutboundDetailList();
+      this.getOutboundDetailList();
     }
   };
 </script>

src/views/produce/components/warehousing/index.vue

@@ -1044,6 +1044,15 @@
         //     });
         // }
         else if (this.clientEnvironmentId == 3) {
+          for (const item of this.List) {
+            for (const it of item.semiProductList) {
+              const data = it.extInfo;
+              if (!data.reportWeight) {
+                return this.$message.warning('报工重量不能为空');
+              }
+            }
+          }
+
           let _arr = [];
 
           console.log(this.List, 'this.List');

src/views/produceOrder/index.vue

@@ -16,6 +16,7 @@
         <el-tab-pane label="待生产" name="4"></el-tab-pane>
         <el-tab-pane label="已完成" name="6"></el-tab-pane>
         <el-tab-pane label="已延期" name="7"></el-tab-pane>
+        <el-tab-pane label="已终止" name="10"></el-tab-pane>
       </el-tabs>
       <!-- 数据表格 -->
       <!--   :cache-key="cacheKeyUrl" -->
@@ -559,6 +560,12 @@
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'productionCodes',
             label: '生产编号',
@@ -825,6 +832,7 @@
         let res = await getPage({
           ...where,
           ...order,
+          queryTermination: this.tabValue == '10' ? 1 : 0,
           pageNum: page,
           size: limit,
           ...this.sort

src/views/produceOrder/print.vue

@@ -10,33 +10,40 @@
         <div style="text-align: center; font-size: 16px; font-weight: bold; margin: 5px 0;">工艺流程卡</div>
         <table style="width: 100%; border-collapse: collapse; margin-bottom: 6px;">
           <tr>
-            <td rowspan="4" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
+            <td rowspan="5" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
               <img :src="card.qrLeft" alt="二维码" style="width: 90px; height: 90px;" />
             </td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">单号</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.code }}</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">单据日期</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.createDate }}</td>
-            <td rowspan="4" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
+            <td rowspan="5" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
               <img :src="card.qrRight" alt="二维码" style="width: 90px; height: 90px;" />
             </td>
           </tr>
           <tr>
-            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">编号</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">编码</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.productCode }}</td>
-            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">存货名称</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">名称</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.productName }}</td>
           </tr>
           <tr>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">图号</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.imgCode }}</td>
-            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">计划开始时间</td>
-            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.planStartTime }}</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">计量单位</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.unit }}</td>
+          </tr>
+          <tr>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">型号</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.model }}</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">规格</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.specification }}</td>
           </tr>
           <tr>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">计划开始时间</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.planStartTime }}</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">计划结束时间</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.planCompleteTime }}</td>
-            <td colspan="2" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;"></td>
           </tr>
         </table>
 
@@ -59,10 +66,10 @@
           <tbody>
             <tr v-for="(row, idx) in card.printTaskCarDetail" :key="idx">
               <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.taskName }}</td>
-              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.formingNum }}</td>
-              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.formedNum }}</td>
-              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.qualified }}</td>
-              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.noQualifiedSum }}</td>
+              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.formingNum || '' }}</td>
+              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.formedNum || '' }}</td>
+              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.qualified || '' }}</td>
+              <td style="border: 1px solid #000; padding: 3px; text-align: center;">{{ row.noQualifiedSum || '' }}</td>
               <td style="border: 1px solid #000; padding: 3px; text-align: center;"></td>
               <td style="border: 1px solid #000; padding: 3px; text-align: center;"></td>
               <td style="border: 1px solid #000; padding: 3px; text-align: center;"></td>

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',