From 72e0baa460538cf0d0e2ccdbe85fbe3c26fca424 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 29 Jul 2024 18:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=B4=E5=8F=91=E9=9B=B6?=
 =?UTF-8?q?=E6=8B=85=E8=A1=A5=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/distribution/VehicleStowage.js     |  2 +-
 .../artery/TripartiteTransfer.vue             |  7 -----
 .../distribution/artery/VehicleStowage.vue    | 27 ++++++++++++++-----
 .../artery/zeroAdditionalRecording.vue        | 11 ++++++--
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js
index be7aba8f..0a33a0ce 100644
--- a/src/option/distribution/VehicleStowage.js
+++ b/src/option/distribution/VehicleStowage.js
@@ -391,7 +391,7 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '250',
+    width: '350',
     checkarr: [],
     fixed: 'right',
     sortable: false,
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index 686e87bf..feaf0329 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -193,7 +193,6 @@
           </template>
 
           <template v-if="slotProps.scope.column.label === '操作'">
-            <!-- <el-text @click="handleShowzeroAdditionalRecording(slotProps.scope)"> 删除 </el-text> -->
             <!-- 文员签收 -->
             <el-text
               v-if="
@@ -1050,12 +1049,6 @@ const handleShowTruckLoadingDetails = ({ row }) => {
   });
 };
 
-/** 跳转零担补录 */
-const handleShowzeroAdditionalRecording = ({ row }) => {
-  // 跳转到零担补录页面
-  $router.push('/distribution/artery/zeroAdditionalRecording');
-};
-
 /** 新增中转 */
 const addTransfer = async () => {
   $router.push({
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index 748b36ae..d0aa4dfc 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -241,6 +241,17 @@
                 零担补录
               </el-text>
 
+              <el-text
+                v-if="
+                  slotProps.scope.row.isCustomer === '1' &&
+                  permissionObj.VehicleStowage_zeroAdditionalRecording &&
+                  Number(slotProps.scope.row.loadStatus) !== 80
+                "
+                @click="handleShowzeroAdditionalRecording(slotProps.scope, true)"
+              >
+                直发签收零担补录
+              </el-text>
+
               <!-- 装车明细 -->
               <el-text
                 v-if="permissionObj.VehicleStowage_loadingDetails"
@@ -973,15 +984,19 @@ const handleShowTruckLoadingDetails = ({ row }) => {
 };
 
 /** 显示零担补录 */
-const handleShowzeroAdditionalRecording = ({ row }) => {
+const handleShowzeroAdditionalRecording = ({ row }, type = false) => {
+  const _obj = {
+    name: '零担补录',
+    loadId: row.id,
+    carsNo: row.carsNo,
+  };
+
+  type && (_obj.type = 'sign');
+
   // 跳转到零担补录页面
   $router.push({
     path: '/distribution/artery/zeroAdditionalRecording',
-    query: {
-      name: '零担补录',
-      loadId: row.id,
-      carsNo: row.carsNo,
-    },
+    query: _obj,
   });
 };
 
diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue
index 07b02966..81da5048 100644
--- a/src/views/distribution/artery/zeroAdditionalRecording.vue
+++ b/src/views/distribution/artery/zeroAdditionalRecording.vue
@@ -424,6 +424,9 @@ const onLoad = debounce(async (params = {}) => {
       loadId: details.loadId,
     };
 
+    // 当配置直发商家的签收零担补录时, type为1, 只查出生成了签收单的数据
+    if ($route.query.type === 'sign') submitData.type = 1;
+
     const res = await postloadZeroSuppleList(submitData);
     console.log('res :>> ', res);
     const { code, data } = res.data;
@@ -778,12 +781,16 @@ const handleEditZeroSubmit = async () => {
     };
 
     for (const iterator of details.newData) {
-      submitData.zeroSuppleList.push({
+      const _obj = {
         orderCode: iterator.orderCode,
         waybillNo: iterator.waybillNo,
         enterNum: iterator.loadingNum,
         finalNodeId: iterator.finalNodeId,
-      });
+      };
+
+      if ($route.query.type === 'sign') _obj.signOrderId = iterator.signOrderId;
+
+      submitData.zeroSuppleList.push(_obj);
     }
 
     console.log('submitData :>> ', submitData);