From 8a5fadef293f6503d4289c3b474e85a2990c2bb8 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Wed, 22 Nov 2023 10:57:48 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/distrilbutionBillLadingList.vue | 125 ++++++++++++++----
 1 file changed, 101 insertions(+), 24 deletions(-)

diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index f7743bf3..b8d029f8 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -45,6 +45,9 @@
             <el-button type="danger" icon="el-icon-delete" v-if="permission.distrilbutionBillLadingList_export"
               @click="handleExportInfo" plain>导出
             </el-button>
+
+            <el-button type="primary" @click="printBatchOrder">批量打印</el-button>
+
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -67,6 +70,9 @@
             <el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)"
               v-if="permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions < 20">编辑提货信息</el-text>
             <!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
+
+            <el-text size="small" text 
+              @click="handlePreview(slotProps.scope.row)">打印</el-text>
           </template>
         </tablecmt>
       </el-row>
@@ -115,6 +121,31 @@
           </span>
         </template>
       </el-dialog>
+
+      
+
+  <!-- 打印模块 -->
+  <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
+        <div>
+          <div v-html="html"></div>
+
+          <!-- <div v-for="(item,index) in qrCodeObj">
+            <el-row>
+              <el-col :span="24" >
+                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+              </el-col>
+            </el-row>
+          </div> -->
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="isShow = false">确 定</el-button>
+          <el-button @click="isShow = false">取 消</el-button>
+        </span>
+      </el-dialog>
+
+
     </div>
     <!-- <div class="avue-crud" :style="`height:`+ height ">
       <el-form :disabled="view" ref="form" :model="form" label-width="80px">
@@ -284,6 +315,9 @@ import {
   getListOwnNUm,
   getBillLadingExport,
 } from '@/api/distribution/distrilbutionBillLading';
+import {
+  printBatch,
+} from '@/api/distribution/distributionDeliveryList';
 import option from '@/option/distribution/distrilbutionBillLading';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -309,7 +343,7 @@ export default {
           label: '提货批次',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -330,7 +364,7 @@ export default {
           label: '运单号',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -340,7 +374,7 @@ export default {
           label: '收货单位',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -360,7 +394,7 @@ export default {
           label: '联系电话',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -381,7 +415,7 @@ export default {
           label: '入库时间',
           type: 4,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -391,7 +425,7 @@ export default {
           label: '到付运费',
           type: 1,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -428,10 +462,10 @@ export default {
         },
         {
           prop: 'otherFee',
-          label: '其他增值费用',
+          label: '增值费用',
           type: 1,
           values: '',
-          width: '150',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -451,7 +485,7 @@ export default {
           label: '应提件数',
           type: 1,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -461,7 +495,7 @@ export default {
           label: '实提件数',
           type: 1,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -471,7 +505,7 @@ export default {
           label: '品牌',
           type: 2,
           values: '',
-          width: '130',
+          width: '120',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -481,7 +515,7 @@ export default {
           label: '货品信息',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -491,7 +525,7 @@ export default {
           label: '提货手机',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -511,7 +545,7 @@ export default {
           label: '提货车牌',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -521,7 +555,7 @@ export default {
           label: '提货证件',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -531,7 +565,7 @@ export default {
           label: '证件类型',
           type: 3,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -541,7 +575,7 @@ export default {
           label: '状态',
           type: 1,
           values: '',
-          width: '130',
+          width: '100',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -551,7 +585,7 @@ export default {
           label: '费用合计',
           type: 1,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -573,6 +607,10 @@ export default {
       height: 0,
       // 弹框标题
       title: '',
+            // 打印模版
+            html: '',
+      // 是否显示打印模版
+      isShow: false,
       // 是否展示弹框
       box: false,
       // 是否显示查询
@@ -768,9 +806,7 @@ export default {
     handleRemove(file, fileList) {
       console.log(file, fileList);
     },
-    handlePreview(file) {
-      console.log(file);
-    },
+
     textbox(e, index) {
       console.log('e,index', e, index);
       this.costList[index + 1] = e;
@@ -830,9 +866,7 @@ export default {
           return;
         }
         for (let a = 0; a < clientType.length; a++) {
-          // console.log("进来了",clientType[a].dictKey , costListName[i]);
           if (clientType[a].dictKey == costListName[i]) {
-            // console.log("进来了",clientType[a].dictKey , costListName[i]);
             let zhi = costList[costListName[i]];
             if (!zhi) {
               this.pan = true;
@@ -927,7 +961,6 @@ export default {
           ids = this.ids;
           break;
       }
-      console.log('签收！！', ids);
       await getBillLadingDetail(ids);
     },
     //删除
@@ -943,6 +976,50 @@ export default {
         },
       });
     },
+
+
+    // 预览页面
+    async handlePreview(row){
+      console.log('row :>> ', row);
+      const res = await printBatch({ ids: row.id, type: 3 });
+      console.log('res :>> ', res);
+      const {
+        data: { code, data },
+      } = res;
+      if (code === 200) {
+        // 初始化打印页面
+        this.html = '';
+        data.forEach(item => {
+          this.html += item.templateHtml;
+        });
+        this.isShow = true;
+      }
+
+    },
+        /**
+     * 批量打印
+     */
+     async printBatchOrder() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.isShow = true;
+      const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 3 });
+      console.log('res :>> ', res);
+      const {
+        data: { code, data },
+      } = res;
+      if (code === 200) {
+        // 初始化打印页面
+        this.html = '';
+        data.forEach(item => {
+          this.html += item.templateHtml;
+        });
+      }
+    },
+
+
     handleEdits(row) {
       this.$router.push({
         path: '/distribution/inventory/distrilbutionBillLading',

From ede1dd502176c30976815f6a7bc9c2f4147c6741 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Wed, 22 Nov 2023 18:11:14 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrder.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index bc4c48ba..39b99545 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -83,6 +83,7 @@
           <el-table-column prop="menu" label="操作" :width="220" align="center">
             <template #default="{row}">
               <el-button v-if="this.permissionList.viewBtn" type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
+              <el-button v-if="this.permissionList.viewBtn" type="primary" text icon="el-icon-view" @click="handleProcessor(row)">回复处理信息</el-button>
               <el-button v-if="this.permissionList.editBtn" type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
               <el-button v-if="this.permissionList.delBtn" type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
             </template>

From a57148edfb8d359cd33b42c75f8bce9ccd6cccd2 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Tue, 28 Nov 2023 09:36:52 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vite.config.js b/vite.config.js
index bd7133ab..d2a2d77e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -22,8 +22,7 @@ export default ({ mode, command }) => {
           // sst
           // target: 'http://192.168.10.94:8888',
           // target: 'http://192.168.10.29:13000',
-          target: 'http://test.api.huitongys.com',
-          // target: 'http://h5uapi.huitongys.com',
+          target: 'http://h5uapi.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },

From f7edd729b39e328db27964c657588d1c295eb444 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 5 Dec 2023 20:26:37 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vite.config.js b/vite.config.js
index 15f870bf..b23a2b18 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -14,8 +14,6 @@ export default ({ mode, command }) => {
         '/api': {
           // target: 'http://192.168.10.126:8889',
           // hy
-          target: 'http://192.168.10.48:13000',
-          // lmy
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
           // tjj

From 036ff7ff3610a8fea0aa501de298a3a0edffbe1c Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 11 Dec 2023 17:05:19 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/reservationAddFrom.vue           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index fae2efba..175a22c2 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -2752,21 +2752,21 @@ export default {
       console.log('orderList-------------》', this.orderList);
       if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!');
       const list = [...this.orderList, ...this.orderData];
-      let _name = list[0].customerName;
-      let _address = list[0].customerAddress;
-      let _phone = list[0].customerTelephone;
-      let _marketName = list[0].mallName;
+      let _name = list[0].customerName.trim();
+      let _address = list[0].customerAddress.trim();
+      let _phone = list[0].customerTelephone.trim();
+      let _marketName = list[0].mallName.trim();
 
       // 循环查看数据是否符合要求
       const isRturn = list.every(item => {
-        if (item.mallName !== _marketName) {
+        if (item.mallName.trim() !== _marketName) {
           this.$message.warning('请选择统一商场!!!');
           return false;
         }
         if (
-          item.customerName !== _name ||
-          item.customerAddress !== _address ||
-          item.customerTelephone !== _phone
+          (item.customerName.trim() !== _name) ||
+          (item.customerAddres.trim() !== _address) ||
+         (item.customerTelephone.trim() !== _phone)
         ) {
           this.$message.warning('请选择统一顾客订单!!!');
           return false;

From 0c42aecccda02519065d36e41baa6091efa7c7c8 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 11 Dec 2023 20:32:16 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E5=AF=B9=E8=AE=A2=E5=8D=95=E7=9A=84=E9=87=8D=E5=A4=8D=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/reservation/reservationAddFrom.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 175a22c2..442e4e17 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -2765,7 +2765,7 @@ export default {
         }
         if (
           (item.customerName.trim() !== _name) ||
-          (item.customerAddres.trim() !== _address) ||
+          (item.customerAddress.trim() !== _address) ||
          (item.customerTelephone.trim() !== _phone)
         ) {
           this.$message.warning('请选择统一顾客订单!!!');