Explorar o código

【修改】 bug【修改】 bug

Howie %!s(int64=3) %!d(string=hai) anos
pai
achega
7cb38861a3

+ 4 - 4
src/views/supply/pickup/check.vue

@@ -569,16 +569,16 @@ export default {
     // 点击打印
     toPrint() {
     
-      // if (!this.isAllEqual(this.tableSelection)) {
-      //   return this.$errorMsg("只能选择同一个提货订单");
-      // }
+      if (!this.isAllEqual(this.tableSelection)) {
+        return this.$errorMsg("只能选择同一个提货订单");
+      }
 
       if (!this.tableSelection[0].printNum) {
         this.queryItem = this.tableSelection;
         console.log(this.tableSelection);
         getDetails(this.tableSelection)
         this.$refs.preView.show(this.hiprintTemplate, detailArr)
-      } else {
+      } else {    
         this.queryItem = this.tableSelection;
         this.dialogForm.createMan = JSON.parse(
           localStorage.getItem("supply_user")

+ 2 - 1
src/views/supply/pickup/components/design/print-data.js

@@ -61,7 +61,8 @@ function getDetails(ids, nickName) {
           nowDate: nowDate(),
           takerName: item.type === 2 ? `退货人:${item.takerName || ''}` : `提货人:${item.takerName || ''}`,
           customerName: item.customerName || '',
-          correspondName: '',
+          correspondName:item.correspondName,
+          correspondNames: '',
           pickCar: item.pickCar || '',
           createBy: JSON.parse(
             localStorage.getItem("supply_user")