1.增加预对账单的字段

src/option/finance/ReconciliationDepositSlip.js

@@ -130,30 +130,30 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-  {
+  // {
-    prop: 'typeServiceName',
+  //   prop: 'typeServiceName',
-    label: '服务类型',
+  //   label: '服务类型',
-    type: 3,
+  //   type: 3,
-    values: '',
+  //   values: '',
-    width: '150',
+  //   width: '150',
-    checkarr: [
+  //   checkarr: [
-      {
+  //     {
-        label: '商配',
+  //       label: '商配',
-        value: 1,
+  //       value: 1,
-      },
+  //     },
-      {
+  //     {
-        label: '市配',
+  //       label: '市配',
-        value: 2,
+  //       value: 2,
-      },
+  //     },
-      {
+  //     {
-        label: '自提',
+  //       label: '自提',
-        value: 3,
+  //       value: 3,
-      },
+  //     },
-    ],
+  //   ],
-    fixed: false,
+  //   fixed: false,
-    sortable: true,
+  //   sortable: true,
-    head: false,
+  //   head: false,
-  },
+  // },
   {
     prop: 'openTime',
     label: '开单时间',

src/option/finance/WaybillAudit.js

@@ -876,6 +876,36 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'payStatusName',
+    label: '收款状态',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [
+      {label: '未收款', value: '10'},
+      // {label: '部分收款', value: '20'},
+      {label: '已收款', value: '30'},
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'settlementStatusName',
+    label: '结算状态',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [
+      {label: '未结算', value: '10'},
+      // {label: '部分结算', value: '20'},
+      {label: '已结算', value: '30'},
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: '',
     label: '操作',

src/views/finance/ReconciliationDepositSlip.vue

@@ -607,7 +607,7 @@ const handleConfirm = async () => {
 const handleJiesuan = async () => {
   if (details.selectionList.length === 0) return ElMessage.warning('请选择需要确认的数据');
 
-  ElMessageBox.confirm('是否确认对账单?', '提示', {
+  ElMessageBox.confirm('是否确认结算?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning',

src/views/finance/WaybillAudit.vue

@@ -375,6 +375,13 @@ const onLoad = async () => {
     if (code !== 200) return;
     details.data = data.records;
 
+    for (let i = 0; i <  details.data .length; i++) {
+      const value =  details.data [i];
+      
+      !value.payStatus && (value.payStatus = '10')
+      !value.settlementStatus && (value.settlementStatus = '10')
+    }
+
     details.page.total = data.total;
     handleTranslationDataSeclect(details.data, details.columnList);
     return res.data;