From a67d06616c156899a6bb2a3c437c0aba65dbe6fd Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 18 Jul 2024 17:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/AddVehicleStowage.js      | 13 ++++++++++++-
 src/components/tablecmt/tablecmt.vue           |  2 ++
 src/option/waybill/orderPackageListDetails.js  |  2 +-
 .../distribution/artery/AddVehicleStowage.vue  |  6 +++++-
 .../distribution/artery/VehicleStowage.vue     |  4 +---
 .../artery/truckLoadingDetails.vue             | 12 ++++++------
 src/views/waybill/orderPackageList.vue         | 18 +++++++++---------
 7 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/api/distribution/AddVehicleStowage.js b/src/api/distribution/AddVehicleStowage.js
index e5cb8f8e..b1f96a2c 100644
--- a/src/api/distribution/AddVehicleStowage.js
+++ b/src/api/distribution/AddVehicleStowage.js
@@ -88,6 +88,17 @@ export const postSelectEditDetailByLoadId = data => {
   });
 };
 
+/**
+ * 查询编辑配载计划详情 -- 节点费用
+ */
+export const postEditNodeInfo = data => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/editNodeInfo',
+    method: 'post',
+    data,
+  });
+};
+
 /**
  * 查询已添加在调度池的订单
  */
@@ -153,4 +164,4 @@ export const postUpdateLoadFeeByNodeId = data => {
     data,
   });
 };
-// 
+//
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 3ac5c95b..4313c5a2 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -26,6 +26,7 @@
         :sortable="column.sortable"
         :selectable="isselectfun"
         v-show="column.head"
+        resizable
       >
         <!-- <template #header>
         <el-text class="mx-1">{{ column.label }}</el-text>
@@ -38,6 +39,7 @@
           v-if="column.type != 0"
           flexible
           show-overflow-tooltip
+          :resizable="false"
         >
           <template #header>
             <el-text
diff --git a/src/option/waybill/orderPackageListDetails.js b/src/option/waybill/orderPackageListDetails.js
index 3f1f7689..ef4ac77f 100644
--- a/src/option/waybill/orderPackageListDetails.js
+++ b/src/option/waybill/orderPackageListDetails.js
@@ -460,7 +460,7 @@ export const flowNodeColumnList = [
     label: '描述',
     type: 1,
     values: '',
-    width: '250',
+    width: '600',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 4c66d644..1b004b25 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -670,6 +670,7 @@ import {
   postFindDriverListByName,
   postSaveNew,
   postSelectEditDetailByLoadId,
+  postEditNodeInfo,
   postFindUseOrderList,
   postRemoveCarsOrderByCarsOrderId,
   postUpdatePlanNumByCarsOrderId,
@@ -1041,7 +1042,10 @@ const onLoad = async () => {
     }
     // 编辑
     else {
-      const res = await postSelectEditDetailByLoadId({ loadId: details.loadId });
+      const res =
+        details.pageType === 3
+          ? await postEditNodeInfo({ loadId: details.loadId })
+          : await postSelectEditDetailByLoadId({ loadId: details.loadId });
       const { code, data } = res.data;
       if (code !== 200) return;
 
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index 4bd78d56..bf14cefe 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -233,9 +233,7 @@
               <el-text
                 v-if="
                   permissionObj.VehicleStowage_zeroAdditionalRecording &&
-                  Mydata.id === slotProps.scope.row.nowWarehouseId &&
-                  Number(slotProps.scope.row.loadStatus) === 0 &&
-                  Number(slotProps.scope.row.loadingType) === 1
+                  Number(slotProps.scope.row.loadStatus) !== 80
                 "
                 @click="handleShowzeroAdditionalRecording(slotProps.scope)"
               >
diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue
index d9712c81..6ef5e005 100644
--- a/src/views/distribution/artery/truckLoadingDetails.vue
+++ b/src/views/distribution/artery/truckLoadingDetails.vue
@@ -1261,16 +1261,14 @@ const handleBatchBarcode = async () => {
   try {
     details.loadingObj.pageLoading = true;
 
-    let qr = {
-      orderPackageCodes: _arr.map(val => val.scanCode).join(','),
-    };
-
     details.html = '';
     const _promiseArr = [];
 
     _arr.length > 0 &&
       _promiseArr.push(
-        getShowAdvancePackgeCode(qr).then(res => {
+        getShowAdvancePackgeCode({
+          orderPackageCodes: _arr.map(val => val.scanCode).join(','),
+        }).then(res => {
           const { code, data } = res.data;
           if (code !== 200) return;
 
@@ -1279,7 +1277,9 @@ const handleBatchBarcode = async () => {
       );
     _zeroArr.length > 0 &&
       _promiseArr.push(
-        postShowOrderCode(qr).then(res => {
+        postShowOrderCode({
+          orderCodes: _zeroArr.map(val => val.orderCode).join(','),
+        }).then(res => {
           const { code, data } = res.data;
           if (code !== 200) return;
 
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index 36644e6d..ee71c924 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -361,15 +361,15 @@ const details = reactive<any>({
         return [start, end];
       },
     },
-    {
-      text: '最近三个月',
-      value: () => {
-        const end = new Date();
-        const start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-        return [start, end];
-      },
-    },
+    // {
+    //   text: '最近三个月',
+    //   value: () => {
+    //     const end = new Date();
+    //     const start = new Date();
+    //     start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+    //     return [start, end];
+    //   },
+    // },
   ],
   /** 时间选择器数据 */
   stockupDate: [],