From 9372dad8356f691921802eb510426468d3ab88f3 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 12 Oct 2024 11:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/views/index.js                     |  2 +-
 .../distributionDeliveryListdis.vue           | 12 ++--
 .../distributionDeliveryListmar.vue           | 10 ++-
 src/views/waybill/orderPackageListDetails.vue | 52 +++++++++++-----
 .../orderPackageListDetailsByMarket.vue       | 62 ++++++++++++-------
 5 files changed, 91 insertions(+), 47 deletions(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index 2397f02b..aec5fed6 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -461,7 +461,7 @@ export default [
       // 包明细 -- 商家
       {
         path: 'orderPackageListDetailsByMarket',
-        name: '包明细',
+        name: '商家包明细',
         meta: {
           data: 'data',
           keepAlive: true,
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 3f6f95d0..c767307f 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -95,7 +95,7 @@
       <div style="height: 100%">
         <div class="flex-c-sb">
           <div class="flex1">
-            <el-tabs v-model="activeName" @tab-click="handleClick"> 
+            <el-tabs v-model="activeName" @tab-click="handleClick">
               <el-tab-pane label="全部列表" name="first"> </el-tab-pane>
               <el-tab-pane label="待配送" name="second"> </el-tab-pane>
               <el-tab-pane label="配送中" name="third"> </el-tab-pane>
@@ -1000,12 +1000,16 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       this.query.type = '1';
+      const submitData = { ...params, ...this.query };
+
       if (getObjType(this.query.taskTimeArr) === 'array') {
-        params.taskTimeStart = this.query.taskTimeArr[0];
-        params.taskTimeEnd = this.query.taskTimeArr[1];
+        submitData.taskTimeStart = this.query.taskTimeArr[0];
+        submitData.taskTimeEnd = this.query.taskTimeArr[1];
       }
 
-      getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      delete submitData.taskTimeArr;
+
+      getPage(page.currentPage, page.pageSize, submitData).then(res => {
         const data = res.data.data;
         // eslint-disable-next-line no-empty
         for (let i = 0; i < data.records.length; i++) {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index de33d978..0874202e 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -772,12 +772,16 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       this.query.type = '2';
+      const submitData = { ...params, ...this.query };
+
       if (getObjType(this.query.taskTimeArr) === 'array') {
-        params.taskTimeStart = this.query.taskTimeArr[0];
-        params.taskTimeEnd = this.query.taskTimeArr[1];
+        submitData.taskTimeStart = this.query.taskTimeArr[0];
+        submitData.taskTimeEnd = this.query.taskTimeArr[1];
       }
 
-      getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      delete submitData.taskTimeArr;
+
+      getPage(page.currentPage, page.pageSize, submitData).then(res => {
         const data = res.data.data;
         // eslint-disable-next-line no-empty
         // for (let i = 0; i < data.records.length; i++) {
diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue
index 000c3cdd..e4594914 100644
--- a/src/views/waybill/orderPackageListDetails.vue
+++ b/src/views/waybill/orderPackageListDetails.vue
@@ -75,7 +75,12 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <!-- 批量打印 -->
-            <el-button type="primary" icon="Printer" @click="handleBatchBarcode">
+            <el-button
+              type="primary"
+              v-if="permissionObj.orderPackageListDetails_batchPrint"
+              icon="Printer"
+              @click="handleBatchBarcode"
+            >
               批量打印
             </el-button>
 
@@ -143,7 +148,12 @@
               >
                 直接入库
               </el-text>
-              <el-text @click="printOrder(slotProps.scope)"> 查看二维码 </el-text>
+              <el-text
+                v-if="permissionObj.orderPackageListDetails_viewQrCode"
+                @click="printOrder(slotProps.scope)"
+              >
+                查看二维码
+              </el-text>
             </template>
           </template>
         </tablecmt>
@@ -437,26 +447,34 @@ console.log('permission :>> ', permission);
 
 /** 权限按钮 */
 const permissionObj = reactive({
+  /** 批量打印 */
+  orderPackageListDetails_batchPrint: computed(
+    () => $store.getters.permission.orderPackageListDetails_batchPrint
+  ),
   /** 批量删除 */
-  orderPackageListDetails_batchDelete: computed(() => {
-    return $store.getters.permission.orderPackageListDetails_batchDelete;
-  }),
+  orderPackageListDetails_batchDelete: computed(
+    () => $store.getters.permission.orderPackageListDetails_batchDelete
+  ),
   /** 批量入库 */
-  orderPackageListDetails_batchIncoming: computed(() => {
-    return $store.getters.permission.orderPackageListDetails_batchIncoming;
-  }),
+  orderPackageListDetails_batchIncoming: computed(
+    () => $store.getters.permission.orderPackageListDetails_batchIncoming
+  ),
   /** 入库 */
-  orderPackageListDetails_incoming: computed(() => {
-    return $store.getters.permission.orderPackageListDetails_Incoming;
-  }),
+  orderPackageListDetails_incoming: computed(
+    () => $store.getters.permission.orderPackageListDetails_Incoming
+  ),
   /** 流转节点 */
-  orderPackageListDetails_flowNode: computed(() => {
-    return $store.getters.permission.orderPackageListDetails_flowNode;
-  }),
+  orderPackageListDetails_flowNode: computed(
+    () => $store.getters.permission.orderPackageListDetails_flowNode
+  ),
   /** 包内产品 */
-  orderPackageListDetails_InPackageProduct: computed(() => {
-    return $store.getters.permission.orderPackageListDetails_InPackageProduct;
-  }),
+  orderPackageListDetails_InPackageProduct: computed(
+    () => $store.getters.permission.orderPackageListDetails_InPackageProduct
+  ),
+  /** 查看二维码 */
+  orderPackageListDetails_viewQrCode: computed(
+    () => $store.getters.permission.orderPackageListDetails_viewQrCode
+  ),
 });
 
 onMounted(() => {
diff --git a/src/views/waybill/orderPackageListDetailsByMarket.vue b/src/views/waybill/orderPackageListDetailsByMarket.vue
index 67be36f2..b6d27bad 100644
--- a/src/views/waybill/orderPackageListDetailsByMarket.vue
+++ b/src/views/waybill/orderPackageListDetailsByMarket.vue
@@ -75,14 +75,19 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <!-- 批量打印 -->
-            <el-button type="primary" icon="Printer" @click="handleBatchBarcode">
+            <el-button
+              type="primary"
+              v-if="permissionObj.orderPackageListDetailsByMarket_batchPrint"
+              icon="Printer"
+              @click="handleBatchBarcode"
+            >
               批量打印
             </el-button>
 
             <!-- 直接入库 -->
             <el-button
               type="primary"
-              v-if="permissionObj.orderPackageListDetails_batchIncoming"
+              v-if="permissionObj.orderPackageListDetailsByMarket_batchIncoming"
               icon="Position"
               @click="handleBatchPutInStorage"
             >
@@ -92,7 +97,7 @@
             <!-- 批量删除 -->
             <el-button
               type="primary"
-              v-if="permissionObj.orderPackageListDetails_batchDelete"
+              v-if="permissionObj.orderPackageListDetailsByMarket_batchDelete"
               icon="Delete"
               @click="handleBatchDelete"
               >批量删除</el-button
@@ -123,27 +128,32 @@
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
               <el-text
-                v-if="permissionObj.orderPackageListDetails_InPackageProduct"
+                v-if="permissionObj.orderPackageListDetailsByMarket_InPackageProduct"
                 @click="handleShowPackageOrderList(slotProps.scope)"
               >
                 包内产品
               </el-text>
               <el-text
-                v-if="permissionObj.orderPackageListDetails_flowNode"
+                v-if="permissionObj.orderPackageListDetailsByMarket_flowNode"
                 @click="handleShowFlowNode(slotProps.scope)"
               >
                 流转节点
               </el-text>
               <el-text
                 v-if="
-                  permissionObj.orderPackageListDetails_incoming &&
+                  permissionObj.orderPackageListDetailsByMarket_incoming &&
                   Number(slotProps.scope.row.packageStatus) === 0
                 "
                 @click="handlePutInStorage(slotProps.scope)"
               >
                 直接入库
               </el-text>
-              <el-text @click="printOrder(slotProps.scope)"> 查看二维码 </el-text>
+              <el-text
+                v-if="permissionObj.orderPackageListDetailsByMarket_viewQrCode"
+                @click="printOrder(slotProps.scope)"
+              >
+                查看二维码
+              </el-text>
             </template>
           </template>
         </tablecmt>
@@ -437,26 +447,34 @@ console.log('permission :>> ', permission);
 
 /** 权限按钮 */
 const permissionObj = reactive({
+  /** 批量打印 */
+  orderPackageListDetailsByMarket_batchPrint: computed(
+    () => $store.getters.permission.orderPackageListDetailsByMarket_batchPrint
+  ),
   /** 批量删除 */
-  orderPackageListDetails_batchDelete: computed(() => {
-    return $store.getters.permission.orderPackageListDetails_batchDelete;
-  }),
+  orderPackageListDetailsByMarket_batchDelete: computed(
+    () => $store.getters.permission.orderPackageListDetailsByMarket_batchDelete
+  ),
   /** 批量入库 */
-  orderPackageListDetails_batchIncoming: computed(() => {
-    return $store.getters.permission.orderPackageListDetails_batchIncoming;
-  }),
+  orderPackageListDetailsByMarket_batchIncoming: computed(
+    () => $store.getters.permission.orderPackageListDetailsByMarket_batchIncoming
+  ),
   /** 入库 */
-  orderPackageListDetails_incoming: computed(() => {
-    return $store.getters.permission.orderPackageListDetails_Incoming;
-  }),
+  orderPackageListDetailsByMarket_incoming: computed(
+    () => $store.getters.permission.orderPackageListDetailsByMarket_incoming
+  ),
   /** 流转节点 */
-  orderPackageListDetails_flowNode: computed(() => {
-    return $store.getters.permission.orderPackageListDetails_flowNode;
-  }),
+  orderPackageListDetailsByMarket_flowNode: computed(
+    () => $store.getters.permission.orderPackageListDetailsByMarket_flowNode
+  ),
   /** 包内产品 */
-  orderPackageListDetails_InPackageProduct: computed(() => {
-    return $store.getters.permission.orderPackageListDetails_InPackageProduct;
-  }),
+  orderPackageListDetailsByMarket_InPackageProduct: computed(
+    () => $store.getters.permission.orderPackageListDetailsByMarket_InPackageProduct
+  ),
+  /** 查看二维码 */
+  orderPackageListDetailsByMarket_viewQrCode: computed(
+    () => $store.getters.permission.orderPackageListDetailsByMarket_viewQrCode
+  ),
 });
 
 onMounted(() => {