From 190f821ff0f2cb155a41181830de52571746cbeb Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 18 Oct 2024 15:40:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=A5=E5=BA=93=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2loading=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=88=B0=E8=BD=A6?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artery/VehicleArrivalManagement.vue       | 27 ++++++++++++++-
 src/views/waybill/orderPackageListDetails.vue | 33 +++++++++++--------
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index c2f0e707..c69cfbd8 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -319,8 +319,10 @@
                     <el-text @click="handleNodeCost(slotProps.scope)"> 节点费用 </el-text>
                   </el-dropdown-item>
 
+                  <!-- 配置直发商家 -->
                   <el-dropdown-item
                     v-if="
+                      permissionObj.VehicleArrivalManagement_handleDirectGoMarketVesited &&
                       Mydata.id === slotProps.scope.row.nowWarehouseId &&
                       Number(slotProps.scope.row.loadStatus) === 20
                     "
@@ -330,7 +332,13 @@
                     </el-text>
                   </el-dropdown-item>
 
-                  <el-dropdown-item v-if="slotProps.scope.row.isCustomer + '' === '1'">
+                  <!-- 直发商家签收详情 -->
+                  <el-dropdown-item
+                    v-if="
+                      permissionObj.VehicleArrivalManagement_handleDirectGoMarketDetails &&
+                      slotProps.scope.row.isCustomer + '' === '1'
+                    "
+                  >
                     <el-text @click="handleDirectGoMarketDetails(slotProps.scope)">
                       签收详情
                     </el-text>
@@ -351,6 +359,7 @@
                   <!-- 零担装车 -->
                   <el-dropdown-item
                     v-if="
+                      permissionObj.VehicleArrivalManagement_ZeroLoading &&
                       Mydata.id === slotProps.scope.row.nowWarehouseId &&
                       Number(slotProps.scope.row.loadStatus) === 20
                     "
@@ -839,14 +848,30 @@ const permissionObj = reactive({
   VehicleArrivalManagement_shippingSpecification: computed(() => {
     return $store.getters.permission.VehicleArrivalManagement_shippingSpecification;
   }),
+  /** 节点费用 */
+  VehicleArrivalManagement_nodeCost: computed(
+    () => $store.getters.permission.VehicleArrivalManagement_nodeCost
+  ),
   /** 编辑 */
   VehicleArrivalManagement_edit: computed(() => {
     return $store.getters.permission.VehicleArrivalManagement_edit;
   }),
+  /** 配置直发商家 */
+  VehicleArrivalManagement_handleDirectGoMarketVesited: computed(
+    () => $store.getters.permission.VehicleArrivalManagement_handleDirectGoMarketVesited
+  ),
+  /** 直发商家详情 */
+  VehicleArrivalManagement_handleDirectGoMarketDetails: computed(
+    () => $store.getters.permission.VehicleArrivalManagement_handleDirectGoMarketDetails
+  ),
   /** 手动装车 */
   VehicleArrivalManagement_ManualLoading: computed(() => {
     return $store.getters.permission.VehicleArrivalManagement_ManualLoading;
   }),
+  /** 零担装车 */
+  VehicleArrivalManagement_ZeroLoading: computed(
+    () => $store.getters.permission.VehicleArrivalManagement_ZeroLoading
+  ),
 });
 
 /** 请求页面数据 */
diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue
index e4594914..132b76d8 100644
--- a/src/views/waybill/orderPackageListDetails.vue
+++ b/src/views/waybill/orderPackageListDetails.vue
@@ -748,21 +748,28 @@ const handlePutInStorage = ({ row }) => {
     type: 'warning',
   })
     .then(async () => {
-      const submitData = {
-        orderPackageCode: row.orderPackageCode,
-        /** 直接入库 */
-        incomingType: '3',
-      };
+      try {
+        details.loadingObj.pageLoading = true;
+        const submitData = {
+          orderPackageCode: row.orderPackageCode,
+          /** 直接入库 */
+          incomingType: '3',
+        };
 
-      const res = await getopenOrderIncomingPackage(submitData);
-      const { code } = res.data;
+        const res = await getopenOrderIncomingPackage(submitData);
+        const { code } = res.data;
 
-      if (code !== 200) return;
-      initPage();
-      ElMessage({
-        type: 'success',
-        message: '入库成功',
-      });
+        if (code !== 200) return;
+        initPage();
+        ElMessage({
+          type: 'success',
+          message: '入库成功',
+        });
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
     })
     .catch(() => {});
 };