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

src/views/warehouseManagement/stockManagement/components/printStockEnter.vue

@@ -22,7 +22,7 @@
       <div style="margin-bottom: 20px; width: 100%;">
         <div style="width: 100%; display: flex;">
           <div style="width: 40%;">
-            <strong>供应商名称：</strong>{{ rowList.supplierName || '' }}
+            <strong>供应商名称：</strong>{{ rowList.extraInfo?.supplierName || '' }}
           </div>
           <div style="width: 30%;">
             <strong>日期：</strong>{{ rowList.storageTime || '' }}
@@ -87,7 +87,7 @@
           <div style="height: 30px;"></div>
         </div>
         <div style="width: 25%;">
-          <strong>仓库：</strong>
+          <strong>仓库：</strong>{{ row?.warehouseName || '' }}
           <div style="height: 30px;"></div>
         </div>
         <div style="width: 25%;">
@@ -143,12 +143,14 @@
       return {
         QRvisible: false,
         rowList: [],
+        row: {}
       };
     },
 
     methods: {
 
-      async init(id) {
+      async init(id, row) {
+        this.row = row;
         const res = await storageApi.getInboundDetailsById(id);
         console.log('res', res);
         this.rowList = res;

src/views/warehouseManagement/stockManagement/index.vue

@@ -722,7 +722,7 @@
           });
         }
 
-        this.$refs.printStockEnterRef.init(this.currentRow.id);
+        this.$refs.printStockEnterRef.init(this.currentRow.id, this.currentRow);
       }
     }
   };