Merge branch 'dev-xx' of http://47.108.105.48:3000/java_project/logpm_page into dev-xx

src/api/finance/ReconciliationDepositSlip.js

@@ -21,9 +21,9 @@ export const postOrderInfoListExport = data => {
     url: '/api/logpm-statisticsdata/merchantStatistics/orderInfoListExport',
     method: 'post',
     data,
-    responseType: 'blob'
+    responseType: 'blob',
   });
-}
+};
 
 /**
  * 确认结算
@@ -75,4 +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/views/finance/ReconciliationDepositSlip.vue

@@ -121,7 +121,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>
@@ -226,6 +226,8 @@ import {
   postReal,
   postOrderInfoListExport,
   postCreateReconciliationOrder,
+  postCreateFinishWaybillId,
+  postCreateReconciliationwWaybillId,
   postCalculateRealCostByWaybillId
 } from '@/api/finance/ReconciliationDepositSlip';
 import {
@@ -601,10 +603,35 @@ const handleConfirm = async () => {
   setNodeHeight(_node, details.popUpShow.confirmVisited ? '' : '500px', true);
 };
 
-const handleJiesuan= async () => {
+/** toB 批量结算完成 */
+const handleJiesuan = async () => {
   if (details.selectionList.length === 0) return ElMessage.warning('请选择需要确认的数据');
-}
 
+  ElMessageBox.confirm('是否确认对账单?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const submitData = {
+        waybillIds: details.selectionList.map(val => val.waybillId),
+      };
+
+      const res = await postCreateFinishWaybillId(submitData);
+      const { code, msg } = res.data;
+
+      if (code !== 200) return msg && ElMessage.warning(msg);
+      if (msg) ElMessage.success(msg);
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      onLoad();
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
 
 const handleSubmitConfrim = () => {
   ElMessageBox.confirm('是否确认对账单?', '提示', {