From f20b20e5e36bc276b19277bcf2334e448d9976d9 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 26 Nov 2024 15:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E8=B0=83=E6=95=B42B=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finance/ReconciliationDepositSlip.js      | 166 +++++++++++-------
 .../finance/ReconciliationDepositSlip.vue     |   7 +
 2 files changed, 113 insertions(+), 60 deletions(-)

diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js
index 73e111b4..05962d15 100644
--- a/src/option/finance/ReconciliationDepositSlip.js
+++ b/src/option/finance/ReconciliationDepositSlip.js
@@ -93,7 +93,7 @@ export const columnList = [
   },
   {
     prop: 'signStatusName',
-    label: '签收状态',
+    label: '运单状态',
     type: 3,
     values: '',
     width: '150',
@@ -108,7 +108,31 @@ export const columnList = [
   },
   {
     prop: 'typeServiceName',
-    label: '订单类型',
+    label: '配送类型',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [
+      {
+        label: '商配',
+        value: 1,
+      },
+      {
+        label: '市配',
+        value: 2,
+      },
+      {
+        label: '自提',
+        value: 3,
+      },
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'typeServiceName',
+    label: '服务类型',
     type: 3,
     values: '',
     width: '150',
@@ -141,6 +165,28 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'goodsName',
+    label: '单据类型',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'goodsName',
+    label: '结算模式',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'goodsName',
     label: '货物品类',
@@ -518,42 +564,42 @@ export const columnList = [
     head: false,
     isshowSummary: true,
   },
-  // {
-  //   prop: 'deliveryCrossingFee',
-  //   label: '回扣',
-  //   type: 1,
-  //   values: '',
-  //   width: '130',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  //   isshowSummary: true,
-  // },
-  // {
-  //   prop: 'deliveryCrossingFee',
-  //   label: '申明价值',
-  //   type: 1,
-  //   values: '',
-  //   width: '130',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  //   isshowSummary: true,
-  // },
-  // {
-  //   prop: 'deliveryCrossingFee',
-  //   label: '保价费',
-  //   type: 1,
-  //   values: '',
-  //   width: '130',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  //   isshowSummary: true,
-  // },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '回扣',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '申明价值',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '保价费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
   {
     prop: 'shipperPerson',
     label: '发货人',
@@ -712,28 +758,28 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-  // {
-  //   prop: 'signNum',
-  //   label: '签收人',
-  //   type: 1,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  // },
-  // {
-  //   prop: 'signNum',
-  //   label: '配送司机',
-  //   type: 1,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  // },
+  {
+    prop: 'signNum',
+    label: '签收人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'signNum',
+    label: '配送司机',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'syncFeeStatus',
     label: '是否计算价格',
diff --git a/src/views/finance/ReconciliationDepositSlip.vue b/src/views/finance/ReconciliationDepositSlip.vue
index de37ef89..a6ff0f21 100644
--- a/src/views/finance/ReconciliationDepositSlip.vue
+++ b/src/views/finance/ReconciliationDepositSlip.vue
@@ -96,6 +96,8 @@
               <!-- 审核 -->
               <el-button type="primary" icon="Stamp" @click="handleConfirm">生成对账单</el-button>
 
+              <el-button type="primary" icon="Stamp" @click="handleJiesuan">批量结算完成</el-button>
+
               <!-- 导出 -->
               <el-button type="primary" icon="Download" @click="handleExport">导 出</el-button>
             </div>
@@ -598,6 +600,11 @@ const handleConfirm = async () => {
   setNodeHeight(_node, details.popUpShow.confirmVisited ? '' : '500px', true);
 };
 
+const handleJiesuan= async () => {
+  if (details.selectionList.length === 0) return ElMessage.warning('请选择需要确认的数据');
+}
+
+
 const handleSubmitConfrim = () => {
   ElMessageBox.confirm('是否确认对账单?', '提示', {
     confirmButtonText: '确定',