From e115cd1fa867203a6ad5b747495a042117dfa57b Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 29 Nov 2024 16:50:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=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/option/waybill/TemporaryStorageList.js    |  8 +-
 .../distribution/inventory/CreateOrder.vue    | 88 +++++++++++++------
 .../finance/ReconciliationDepositSlip.vue     |  6 +-
 3 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/src/option/waybill/TemporaryStorageList.js b/src/option/waybill/TemporaryStorageList.js
index 35d0d365..b7f4525e 100644
--- a/src/option/waybill/TemporaryStorageList.js
+++ b/src/option/waybill/TemporaryStorageList.js
@@ -670,9 +670,9 @@ export const packageColumnList = [
     head: false,
   },
   {
-    prop: 'volume',
+    prop: 'confirmVolume',
     label: '方数',
-    type: 2,
+    type: 13,
     values: '',
     width: '150',
     checkarr: [],
@@ -681,9 +681,9 @@ export const packageColumnList = [
     head: false,
   },
   {
-    prop: 'weight',
+    prop: 'confirmWeight',
     label: '重量',
-    type: 2,
+    type: 13,
     values: '',
     width: '150',
     checkarr: [],
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 19a587a7..622733ce 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -1165,7 +1165,25 @@
               :isShowRefresh="false"
             >
               <template #default="slotProps">
-                <template v-if="slotProps.scope.column.label === '是否维护'">
+                <template v-if="slotProps.scope.column.label === '方数'">
+                  <el-input-number
+                    :controls="false"
+                    v-model="slotProps.scope.row.confirmVolume"
+                    :precision="4"
+                    :value-on-clear="0"
+                  />
+                </template>
+
+                <template v-else-if="slotProps.scope.column.label === '重量'">
+                  <el-input-number
+                    :controls="false"
+                    v-model="slotProps.scope.row.confirmWeight"
+                    :precision="3"
+                    :value-on-clear="0"
+                  />
+                </template>
+
+                <template v-else-if="slotProps.scope.column.label === '是否维护'">
                   <el-tag
                     :class="{
                       red: slotProps.scope.row.MaintenanceOrNot === '否',
@@ -2091,6 +2109,33 @@ getList({}).then(res => {
   });
 });
 
+/** 初始化包件数据 */
+const initPackage = element => {
+  element.MaintenanceOrNot = element.incomeCategoryId ? '是' : '否';
+
+  // 收入结算
+  element.confirmIncomeCategoryName = element.incomeCategoryName || '其它';
+  element.confirmIncomeCategoryId = element.incomeCategoryId || '';
+  element.incomeCategoryName = element.incomeCategoryName || '其它';
+  element.incomeCategory = element.incomeCategoryName || '其它';
+  element.incomeCategoryId = element.incomeCategoryId || '';
+
+  // 成本结算
+  element.confirmCostCategoryName = element.costCategoryName || '其它';
+  element.confirmCostCategoryId = element.costCategoryId || '';
+  element.costCategoryName = element.costCategoryName || '其它';
+  element.costCategory = element.costCategoryName || '其它';
+  element.costCategoryId = element.costCategoryId || '';
+
+  element.volume = isNumber(element.volume) ? Number(element.volume) : 0;
+  element.confirmVolume = element.volume; // 配置包条提交时再反写体积
+  element.initVolume = element.volume; // 编辑提交时对比是否编辑
+
+  element.weight = isNumber(element.weight) ? Number(element.weight) : 0;
+  element.confirmWeight = element.weight; // 配置包条提交时再反写重量
+  element.initWeight = element.weight; // 编辑提交时对比是否编辑
+};
+
 /** 初始化获取暂存单转运单信息 */
 const onLoad = async (idsArr = []) => {
   try {
@@ -2191,6 +2236,8 @@ const onLoad = async (idsArr = []) => {
             val.chargeType = val.chargeType || 1;
 
             val.goodsListOptions = [];
+
+            val.goodsId = val.goodsId || '';
             // 计算运费小计
             handleComputed(val);
             // 计算件数最大值
@@ -2228,21 +2275,7 @@ const onLoad = async (idsArr = []) => {
         for (let i = 0; i < details.package.data.length; i++) {
           const element = details.package.data[i];
 
-          element.MaintenanceOrNot = element.incomeCategoryId ? '是' : '否';
-
-          // 收入结算
-          element.confirmIncomeCategoryName = element.incomeCategoryName || '其它';
-          element.confirmIncomeCategoryId = element.incomeCategoryId || '';
-          element.incomeCategoryName = element.incomeCategoryName || '其它';
-          element.incomeCategory = element.incomeCategoryName || '其它';
-          element.incomeCategoryId = element.incomeCategoryId || '';
-
-          // 成本结算
-          element.confirmCostCategoryName = element.costCategoryName || '其它';
-          element.confirmCostCategoryId = element.costCategoryId || '';
-          element.costCategoryName = element.costCategoryName || '其它';
-          element.costCategory = element.costCategoryName || '其它';
-          element.costCategoryId = element.costCategoryId || '';
+          initPackage(element);
 
           !element.incomeCategoryId && (_flag = true);
         }
@@ -2402,23 +2435,13 @@ const onEditLoad = async () => {
       for (let i = 0; i < details.package.data.length; i++) {
         const element = details.package.data[i];
 
-        element.MaintenanceOrNot = element.incomeCategoryId ? '是' : '否';
+        initPackage(element);
 
         // 收入结算
-        element.confirmIncomeCategoryName = element.incomeCategoryName || '其它';
-        element.confirmIncomeCategoryId = element.incomeCategoryId || '';
         element.cloneIncomeCategoryId = element.incomeCategoryId || ''; // 编辑提交时, 跟据confirmIncomeCategoryId判断是否修改
-        element.incomeCategoryName = element.incomeCategoryName || '其它';
-        element.incomeCategory = element.incomeCategoryName || '其它';
-        element.incomeCategoryId = element.incomeCategoryId || '';
 
         // 成本结算
-        element.confirmCostCategoryName = element.costCategoryName || '其它';
-        element.confirmCostCategoryId = element.costCategoryId || '';
         element.cloneCostCategoryId = element.costCategoryId || ''; // 编辑提交时, 跟据confirmCostCategoryId判断是否修改
-        element.costCategoryName = element.costCategoryName || '其它';
-        element.costCategory = element.costCategoryName || '其它';
-        element.costCategoryId = element.costCategoryId || '';
 
         !element.incomeCategoryId && (_flag = true);
       }
@@ -3902,7 +3925,9 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 
             if (
               value.cloneCostCategoryId === value.confirmCostCategoryId &&
-              value.cloneIncomeCategoryId === value.confirmIncomeCategoryId
+              value.cloneIncomeCategoryId === value.confirmIncomeCategoryId &&
+              value.initVolume === value.volume &&
+              value.initWeight === value.weight
             )
               continue;
 
@@ -3912,6 +3937,8 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
               incomeCategoryName: value.confirmIncomeCategoryName,
               costCategoryId: value.confirmCostCategoryId,
               costCategoryName: value.confirmCostCategoryName,
+              weight: value.weight,
+              volume: value.volume,
             };
 
             submitData.updateAdvanceDetailList.push(_obj);
@@ -4750,10 +4777,15 @@ const handleClearPackageQuery = () => {
 
 /** 确认包件结算品类弹窗 */
 const handleSubmitPackage = () => {
+  console.log('details.goodsList :>> ', details.goodsList);
   const _goodsArr = [];
 
   for (let i = 0; i < details.package.data.length; i++) {
     const value = details.package.data[i];
+    console.log('value :>> ', value);
+
+    value.weight = value.confirmWeight;
+    value.volume = value.confirmVolume;
 
     // if (!value.incomeCategoryId) return ElMessage.error('请选择包件结算品类');
     value.confirmCostCategoryId = value.costCategoryId;
diff --git a/src/views/finance/ReconciliationDepositSlip.vue b/src/views/finance/ReconciliationDepositSlip.vue
index 0022fb4a..c506e771 100644
--- a/src/views/finance/ReconciliationDepositSlip.vue
+++ b/src/views/finance/ReconciliationDepositSlip.vue
@@ -109,7 +109,7 @@
                 icon="Stamp"
                 @click="handleBatchSettle"
               >
-                批量结算
+                批量确认收款
               </el-button>
 
               <!-- 导出 -->
@@ -615,9 +615,9 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
 /** 批量结算 */
 const handleBatchSettle = () => {
   try {
-    if (details.selectionList.length === 0) return ElMessage.warning('请选择需要结算的数据');
+    if (details.selectionList.length === 0) return ElMessage.warning('请选择需要确认的数据');
 
-    ElMessageBox.confirm('是否批量结算?', '提示', {
+    ElMessageBox.confirm('是否批量确认收款?', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning',

From cfa3f20d73768fafadf3893ccce3a1550416ac6a Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 29 Nov 2024 17:53:53 +0800
Subject: [PATCH 2/3] =?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/option/finance/WaybillAudit.js          | 12 ++++++------
 src/views/finance/SettlementInformation.vue |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/option/finance/WaybillAudit.js b/src/option/finance/WaybillAudit.js
index c713bb7f..04315da1 100644
--- a/src/option/finance/WaybillAudit.js
+++ b/src/option/finance/WaybillAudit.js
@@ -879,13 +879,13 @@ export const columnList = [
   {
     prop: 'payStatusName',
     label: '收款状态',
-    type: 1,
+    type: 3,
     values: '',
     width: '150',
     checkarr: [
-      {label: '未收款', value: '10'},
+      { label: '未收款', value: '10' },
       // {label: '部分收款', value: '20'},
-      {label: '已收款', value: '30'},
+      { label: '已收款', value: '30' },
     ],
     fixed: false,
     sortable: true,
@@ -894,13 +894,13 @@ export const columnList = [
   {
     prop: 'settlementStatusName',
     label: '结算状态',
-    type: 1,
+    type: 3,
     values: '',
     width: '150',
     checkarr: [
-      {label: '未结算', value: '10'},
+      { label: '未结算', value: '10' },
       // {label: '部分结算', value: '20'},
-      {label: '已结算', value: '30'},
+      { label: '已结算', value: '30' },
     ],
     fixed: false,
     sortable: true,
diff --git a/src/views/finance/SettlementInformation.vue b/src/views/finance/SettlementInformation.vue
index c9f0d2c4..d5dea334 100644
--- a/src/views/finance/SettlementInformation.vue
+++ b/src/views/finance/SettlementInformation.vue
@@ -239,7 +239,7 @@ const details = reactive({
     },
     {
       prop: 'createTime',
-      label: '异动操作时间',
+      label: '结算操作时间',
       type: 1,
       values: '',
       width: '150',

From cfc4dc12e15a48cbfe31948cc948cb1429de9917 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 29 Nov 2024 17:59:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportforms/DeliveryDetailsReport.js      | 76 ++++++++++---------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/option/reportforms/DeliveryDetailsReport.js b/src/option/reportforms/DeliveryDetailsReport.js
index 122301dd..15461f9c 100644
--- a/src/option/reportforms/DeliveryDetailsReport.js
+++ b/src/option/reportforms/DeliveryDetailsReport.js
@@ -32,14 +32,18 @@ export const columnList = [
     values: '',
     width: '150',
     checkarr: [
-        {
-            label: '商配',
-            value: '商配'
-        },
-        {
-            label: '市配',
-            value: '市配'
-        }
+      {
+        label: '商配',
+        value: '商配',
+      },
+      {
+        label: '市配',
+        value: '市配',
+      },
+      {
+        label: '自提',
+        value: '自提',
+      },
     ],
     fixed: false,
     sortable: true,
@@ -52,14 +56,14 @@ export const columnList = [
     values: '',
     width: '150',
     checkarr: [
-        {
-            label: '已复核',
-            value: '已复核'
-        },
-        {
-            label: '未复核',
-            value: '未复核'
-        }
+      {
+        label: '已复核',
+        value: '已复核',
+      },
+      {
+        label: '未复核',
+        value: '未复核',
+      },
     ],
     fixed: false,
     sortable: true,
@@ -165,7 +169,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true,//开启统计
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'loadNum',
@@ -177,7 +181,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true,//开启统计
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'signNum',
@@ -189,7 +193,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true,//开启统计
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'planStockNum',
@@ -201,7 +205,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true,//开启统计
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'loadStockNum',
@@ -213,7 +217,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true,//开启统计
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'signStockNum',
@@ -225,19 +229,19 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true,//开启统计
+    isshowSummary: true, //开启统计
   },
-//   {
-//     prop: 'signStatus',
-//     label: '签收状态',
-//     type: 1,
-//     values: '',
-//     width: '150',
-//     checkarr: [],
-//     fixed: false,
-//     sortable: true,
-//     head: false,
-//   },
+  //   {
+  //     prop: 'signStatus',
+  //     label: '签收状态',
+  //     type: 1,
+  //     values: '',
+  //     width: '150',
+  //     checkarr: [],
+  //     fixed: false,
+  //     sortable: true,
+  //     head: false,
+  //   },
   {
     prop: 'signTime',
     label: '签收时间',
@@ -293,7 +297,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true,//开启统计
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'exceptionSignNum',
@@ -305,7 +309,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true,//开启统计
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'deliveryMode',
@@ -350,7 +354,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true,//开启统计
+    isshowSummary: true, //开启统计
   },
   // {
   //   prop: 'createUserName',