Merge branch 'dev-xx' into dev

src/api/finance/ReconciliationDepositSlip.js

@@ -50,6 +50,19 @@ export const postReal = data => {
   });
 };
 
+/**
+ * toB 计算仓储&配送费用
+ * @param {*} data
+ * @returns
+ */
+export const postCalculateRealCostByWaybillId = data => {
+  return request({
+    url: `/api/logpm-statisticsdata/merchantStatistics/calculateRealCostByWaybillId/${data}`,
+    method: 'patch',
+  });
+};
+
+
 /**
  * 生成对账单
  * @param {*} data
@@ -62,3 +75,29 @@ export const postCreateReconciliationOrder = data => {
     data,
   });
 };
+
+/**
+ * toB 批量结算完成
+ * @param {*} data
+ * @returns
+ */
+export const postCreateFinishWaybillId = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/merchantStatistics/createFinishWaybillId',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * toB 生成对账单
+ * @param {*} data
+ * @returns
+ */
+export const postCreateReconciliationwWaybillId = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/merchantStatistics/createReconciliationwWaybillId',
+    method: 'post',
+    data,
+  });
+};

src/option/finance/ReconciliationDepositSlip.js

@@ -108,7 +108,7 @@ export const columnList = [
   },
   {
     prop: 'typeServiceName',
-    label: '订单类型',
+    label: '配送类型',
     type: 3,
     values: '',
     width: '150',
@@ -130,6 +130,30 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  // {
+  //   prop: 'typeServiceName',
+  //   label: '服务类型',
+  //   type: 3,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [
+  //     {
+  //       label: '商配',
+  //       value: 1,
+  //     },
+  //     {
+  //       label: '市配',
+  //       value: 2,
+  //     },
+  //     {
+  //       label: '自提',
+  //       value: 3,
+  //     },
+  //   ],
+  //   fixed: false,
+  //   sortable: true,
+  //   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

@@ -119,7 +119,7 @@
             @selection="selectionChange"
           >
             <template #default="slotProps">
-              <template v-if="slotProps.scope.column.label === '操作'">
+              <template v-if="item.name !== 1 && slotProps.scope.column.label === '操作'">
                 <el-text @click="() => handleComputedPrice(slotProps.scope)">计算费用</el-text>
               </template>
             </template>
@@ -224,6 +224,9 @@ import {
   postReal,
   postOrderInfoListExport,
   postCreateReconciliationOrder,
+  postCreateFinishWaybillId,
+  postCreateReconciliationwWaybillId,
+  postCalculateRealCostByWaybillId
 } from '@/api/finance/ReconciliationDepositSlip';
 import {
   downloadXls,
@@ -636,7 +639,8 @@ const handleComputedPrice = ({ row }) => {
     try {
       details.loadingObj.pageLoading = true;
 
-      const res = await postReal(row.orderInfoId);
+      // const res = await postReal(row.orderInfoId);
+      const res = await postCalculateRealCostByWaybillId(row.waybillId);
       const { code, msg } = res.data;
 
       if (code !== 200) return msg && ElMessage.warning(msg);

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;