From 1ea21fc47f40c7da4c06e12355de43fe3d4fb06f Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 13 Jul 2023 18:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/distributionStockList.vue       | 17 ++++++++++----
 .../warehouseWarehouseingAddReceipt.vue       |  4 +++-
 .../warehouseWarehousingEntry.vue             | 23 +++++++++++++------
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/views/distribution/inventory/distributionStockList.vue b/src/views/distribution/inventory/distributionStockList.vue
index 026dd6a7..bf106466 100644
--- a/src/views/distribution/inventory/distributionStockList.vue
+++ b/src/views/distribution/inventory/distributionStockList.vue
@@ -252,7 +252,7 @@ export default {
         //   sortable: true,
         // },
         {
-          prop: 'market',
+          prop: 'marketName',
           label: '商场',
           type: 2,
           values: '',
@@ -291,7 +291,7 @@ export default {
         //   sortable: true,
         // },
         {
-          prop: 'shop',
+          prop: 'storeName',
           label: '门店',
           type: 2,
           values: '',
@@ -374,11 +374,11 @@ export default {
           values: '',
           width: '180',
           checkarr: [ {
-            value: 'true',
+            value: `true`,
             label: '是',
           },
             {
-              value: 'false',
+              value: `false`,
               label: '否',
             },],
           fixed: false,
@@ -453,7 +453,7 @@ export default {
           fixed: false,
           sortable: true,
         },{
-          prop: 'unit',
+          prop: 'cargoUnit',
           label: '单位',
           type: 1,
           values: '',
@@ -940,6 +940,13 @@ export default {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
+        this.data.forEach( i =>{
+          if(i.unpack == false){
+            i.unpack = '否'
+          }else{
+            i.unpack = '是'
+          }
+        })
         this.loading = false;
         this.selectionClear();
       });
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index 6c508925..b1ae4c8c 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -707,6 +707,7 @@ export default {
                   message: "操作成功!"
                 });
               });
+              this.form = {};
               this.data = [];
             }else{
               this.$message.warning("请添加物资详情！！！");
@@ -723,9 +724,10 @@ export default {
                 type: "success",
                 message: "操作成功!"
               });
+              this.form = {};
             })
           }
-          this.form = {};
+
         }
       });
 
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
index 55b187a3..c3c1abe4 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
@@ -369,7 +369,7 @@ export default {
               res: 'data',
             },
             tip: '请上传 .xls,.xlsx 标准格式文件',
-            action: '/blade-system/user/import-user',
+            action: '/api/logpm-warehouse/warehouseWarehousingEntry/import-WarehousingEntry',
           },
           {
             label: '数据覆盖',
@@ -407,6 +407,14 @@ export default {
       },
     }
   },
+  watch:{
+    'excelForm.isCovered'() {
+      if (this.excelForm.isCovered !== '') {
+        const column = this.findObject(this.excelOption.column, 'excelFile');
+        column.action = `/api/logpm-warehouse/warehouseWarehousingEntry/import-WarehousingEntry?isCovered=${this.excelForm.isCovered}`;
+      }
+    },
+  },
   mounted () {
     this.init();
     this.onLoad(this.page);
@@ -587,13 +595,14 @@ export default {
 
     },
 
-
+    //下载模板
     handleTemplate() {
-      exportBlob(
-        `/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`
-      ).then(res => {
-        downloadXls(res.data, '入库物品数据模板.xlsx');
-      });
+      console.log("下载模板！！！");
+      // exportBlob(
+      //   `/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`
+      // ).then(res => {
+      //   downloadXls(res.data, '入库物品数据模板.xlsx');
+      // });
     },
     handleImport(){
       this.excelBox = true;