From 83ab2403594c5dcfee44d6ca097185330d354031 Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Tue, 12 Sep 2023 18:06:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AD=98=E5=93=81?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E5=8B=BE=E9=80=89=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionStockupDetailsSelf.vue        | 56 ++++++++++++++++++-
 vite.config.js                                |  3 +-
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index ae806d7e..18982f56 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -181,7 +181,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="库存品" name="enter">
-            <el-button @click="handleBatchDetail('2')">批量打印</el-button>
+            <el-button @click="handleBatchDetail1('2')">批量打印</el-button>
             <tablecmt
               :columnList="columnList4"
               :tableData="data2"
@@ -190,7 +190,7 @@
               @timeCheck="timesc"
               @btnCheck="btnsc"
               @selectCheck="selectsc"
-              @selection="selectionChange"
+              @selection="selectionChange1"
             >
               <template #default="slotProps">
                 <el-text
@@ -1203,6 +1203,7 @@ export default {
           hide: false,
         },
       ],
+      selectionList1:[]
     };
   },
   mounted() {
@@ -1374,6 +1375,52 @@ export default {
         });
       }
     },
+    //批量打印
+    handleBatchDetail1(type) {
+      console.log('selectionList', this.selectionList1);
+      if (this.selectionList1.length == 0) {
+        this.$message.warning('至少选择一条数据！！');
+        return;
+      }
+      if (type == '1') {
+        //包条码批量
+        let checkcode = [];
+        this.selectionList1.map(item => {
+          console.log('item>>>', item);
+          checkcode.push(item.id);
+        });
+        let qr = {
+          ids: checkcode.join(','),
+          type: '2',
+        };
+        getPrintDetail(qr).then(res => {
+          console.log(',./');
+          this.dialogVisible = true;
+          this.html = '';
+          this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+        });
+      } else if (type == '2') {
+        //包条码批量
+        let myMap = [];
+        this.selectionList1.map(item => {
+          if (!!item.stocklist) {
+            myMap.push(item.stocklist);
+          }
+        });
+        let qr = {
+          ids: myMap.join(','),
+          type: '3',
+        };
+        console.log('><><>>', qr);
+        //库存品订单批量
+        getPrintDetail(qr).then(res => {
+          // console.log(",./");
+          this.dialogVisible = true;
+          this.html = '';
+          this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+        });
+      }
+    },
     //单独打印
     handlePrintDetail(row) {
       console.log('单个答应》》》', row);
@@ -1752,8 +1799,13 @@ export default {
       // console.log("添加阿斯顿发生",list);
       this.selectionList = list;
     },
+    selectionChange1(list) {
+      // console.log("添加阿斯顿发生",list);
+      this.selectionList1 = list;
+    },
     selectionClear() {
       this.selectionList = [];
+      this.checkselect=[]
       // this.$refs.table.clearSelection();
     },
     currentChange(currentPage) {
diff --git a/vite.config.js b/vite.config.js
index 62b62cf2..e599c932 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -13,7 +13,8 @@ export default ({ mode, command }) => {
       proxy: {
         '/api': {
           // target: 'http://192.168.10.126:8889',
-          target: 'http://192.168.10.123:8889',
+          // target: 'http://192.168.10.123:8889',
+          target: 'http://192.168.10.75:8777',
           // target: 'http://192.168.10.29:13000',
           //target: 'http://test3.javablade.com',
           changeOrigin: true,