fix 修改bug

src/views/recycleOrder/auditNotSubmit/index.vue

@@ -1,10 +1,6 @@
 <template>
     <order-page ref="pageRef" :pageConfig="pageConfig" permissionKey="auditNotSubmit">
         <template #toolbar>
-            <el-button type="warning" plain v-permission="'recycleOrder:auditNotSubmit:batchAudit'"
-                @click="handleBatchAudit">
-                批量初审
-            </el-button>
             <el-button type="success" plain v-permission="'recycleOrder:auditNotSubmit:batchAuditComplete'"
                 @click="handleBatchAuditComplete">
                 批量审核完成
@@ -34,13 +30,6 @@ const pageConfig = reactive({
     cacheKey: 'auditNotSubmitTable'
 });
 
-//批量初审
-function handleBatchAudit() {
-    pageRef.value?.operatBatch({
-        title: '确认批量审核？',
-        url: '/recycleOrder/batchAudit'
-    });
-}
 //批量审核完成
 function handleBatchAuditComplete() {
     pageRef.value?.operatBatch({

src/views/recycleOrder/awaitAudit/index.vue

@@ -1,10 +1,6 @@
 <template>
     <order-page ref="pageRef" :pageConfig="pageConfig" permissionKey="awaitAudit">
         <template #toolbar>
-            <el-button type="warning" plain class="ele-btn-icon" v-permission="'recycleOrder:awaitAudit:batchAudit'"
-                @click="handleBatchAudit">
-                批量初审
-            </el-button>
             <el-button type="success" plain class="ele-btn-icon" :icon="DownloadOutlined"
                 v-permission="'recycleOrder:awaitAudit:batchAuditComplete'" @click="handleBatchAuditComplete">
                 批量审核完成
@@ -30,13 +26,6 @@ const pageConfig = reactive({
     cacheKey: 'awaitAuditTable'
 });
 
-//批量初审
-function handleBatchAudit() {
-    pageRef.value?.operatBatch({
-        title: '确认批量初审？',
-        url: '/recycleOrder/batchAudit'
-    });
-}
 
 //批量审核完成
 function handleBatchAuditComplete() {

src/views/recycleOrder/awaitDelivery/index.vue

@@ -1,10 +1,6 @@
 <template>
     <order-page ref="pageRef" :pageConfig="pageConfig" permissionKey="awaitDelivery">
         <template #toolbar>
-            <el-button type="warning" plain v-permission="'recycleOrder:awaitDelivery:batchAudit'"
-                @click="handleBatchAudit">
-                批量初审
-            </el-button>
             <el-button type="success" plain v-permission="'recycleOrder:awaitDelivery:batchReceive'"
                 @click="handleBatchReceive()">
                 批量确认收货
@@ -29,13 +25,6 @@ const pageConfig = reactive({
     cacheKey: 'awaitDeliveryTable'
 });
 
-//批量初审
-function handleBatchAudit() {
-    pageRef.value?.operatBatch({
-        title: '确认批量审核？',
-        url: '/recycleOrder/batchAudit'
-    });
-}
 
 //批量取消订单
 function handleBatchReceive(row) {

src/views/recycleOrder/awaitPay/index.vue

@@ -1,9 +1,6 @@
 <template>
     <order-page ref="pageRef" :pageConfig="pageConfig" permissionKey="awaitPay">
         <template #toolbar>
-            <el-button type="warning" plain v-permission="'recycleOrder:awaitPay:batchAudit'" @click="handleBatchAudit">
-                批量初审
-            </el-button>
             <el-button type="success" plain v-permission="'recycleOrder:awaitPay:batchPayment'"
                 @click="handleBatchPayment">
                 批量支付书款
@@ -29,24 +26,8 @@ const pageConfig = reactive({
     cacheKey: 'awaitPayTable'
 });
 
-//批量初审
-function handleBatchAudit() {
-    pageRef.value?.operatBatch({
-        title: '确认批量审核？',
-        url: '/recycleOrder/batchAudit'
-    });
-}
 //批量支付书款
-function handleBatchPayment(row) {
-    pageRef.value?.operatBatch({
-        title: '确认支付书款？',
-        row,
-        url: '/recycleOrder/batchAuditComplete'
-    });
-}
-
-//导出数据
-function exportData() {
-    pageRef.value?.exportData('待付款订单');
+function handleBatchPayment() {
+    pageRef.value?.handleBatchPayment(null);
 }
 </script>

src/views/recycleOrder/awaitPickup/index.vue

@@ -1,10 +1,6 @@
 <template>
     <order-page ref="pageRef" :pageConfig="pageConfig" permissionKey="awaitPickup">
         <template #toolbar>
-            <el-button type="warning" plain v-permission="'recycleOrder:awaitPickup:batchAudit'"
-                @click="handleBatchAudit">
-                批量初审
-            </el-button>
             <el-button type="danger" plain v-permission="'recycleOrder:awaitPickup:batchCancel'"
                 @click="handleBatchCancel">
                 批量取消订单
@@ -32,14 +28,6 @@ const pageConfig = reactive({
     cacheKey: 'awaitPickupTable'
 });
 
-//批量初审
-function handleBatchAudit() {
-    pageRef.value?.operatBatch({
-        title: '确认批量审核？',
-        url: '/recycleOrder/batchAudit'
-    });
-}
-
 //批量取消订单
 function handleBatchCancel() {
     pageRef.value?.operatBatch({

src/views/recycleOrder/awaitSign/index.vue

@@ -1,10 +1,6 @@
 <template>
     <order-page ref="pageRef" :pageConfig="pageConfig" permissionKey="awaitSign">
         <template #toolbar>
-            <el-button type="warning" plain v-permission="'recycleOrder:awaitSign:batchAudit'"
-                @click="handleBatchAudit">
-                批量初审
-            </el-button>
             <el-button type="danger" plain v-permission="'recycleOrder:awaitSign:batchCancel'"
                 @click="handleBatchCancel">
                 批量取消订单
@@ -29,13 +25,6 @@ const pageConfig = reactive({
     cacheKey: 'awaitSignTable'
 });
 
-//批量初审
-function handleBatchAudit() {
-    pageRef.value?.operatBatch({
-        title: '确认批量审核？',
-        url: '/recycleOrder/batchAudit'
-    });
-}
 
 //批量取消订单
 function handleBatchCancel() {

src/views/recycleOrder/cancelled/index.vue

@@ -1,10 +1,10 @@
 <template>
     <order-page ref="pageRef" :pageConfig="pageConfig" permissionKey="cancelled">
         <template #toolbar>
-            <el-button type="warning" plain class="ele-btn-icon" v-permission="'recycleOrder:cancelled:batchAudit'"
+            <!-- <el-button type="warning" plain class="ele-btn-icon" v-permission="'recycleOrder:cancelled:batchAudit'"
                 @click="handleBatchAudit">
                 批量初审
-            </el-button>
+            </el-button> -->
         </template>
     </order-page>
 </template>
@@ -27,11 +27,4 @@ const pageConfig = reactive({
     cacheKey: 'recycleOrderCancelledTable'
 });
 
-//批量初审
-function handleBatchAudit() {
-    pageRef.value?.operatBatch({
-        title: '确认审核？',
-        url: '/recycleOrder/batchAudit'
-    });
-}
 </script>

src/views/recycleOrder/completed/index.vue

@@ -1,10 +1,6 @@
 <template>
     <order-page ref="pageRef" :pageConfig="pageConfig" permissionKey="completed">
         <template #toolbar>
-            <el-button type="warning" plain class="ele-btn-icon" v-permission="'recycleOrder:completed:batchAudit'"
-                @click="handleBatchAudit">
-                批量初审
-            </el-button>
             <el-button type="success" plain class="ele-btn-icon" :icon="DownloadOutlined"
                 v-permission="'recycleOrder:completed:export'" @click="exportData">
                 导出订单明细
@@ -31,14 +27,6 @@ const pageConfig = reactive({
     cacheKey: 'recycleOrderCompletedTable'
 });
 
-//批量初审
-function handleBatchAudit() {
-    pageRef.value?.operatBatch({
-        title: '确认审核？',
-        url: '/recycleOrder/batchAudit'
-    });
-}
-
 //导出数据
 function exportData() {
     pageRef.value?.exportData('已完成订单');

src/views/recycleOrder/components/order-detail.vue

@@ -114,7 +114,7 @@ function toOrderDetail() {
 function handleBatchPayment() {
     messageBoxConfirm({
         message: '确认支付书款？',
-        fetch: () => proxy.$http.post('/order/orderInfo/adminPay', {
+        fetch: () => proxy.$http.post('/order/orderInfo/payout', {
             orderIds: [orderId.value]
         })
     });

src/views/recycleOrder/components/order-page-all.vue

@@ -4,7 +4,7 @@
         <order-search @search="reload" />
         <ele-card :body-style="{ paddingTop: '8px' }" flex-table>
             <!-- 表格 -->
-            <ele-pro-table ref="tableRef" row-key="postId" :columns="columns" :datasource="datasource"
+            <ele-pro-table ref="tableRef" row-key="orderId" :columns="columns" :datasource="datasource"
                 :show-overflow-tooltip="true" v-model:selections="selections" highlight-current-row
                 :export-config="{ fileName: pageConfig.fileName }" :cache-key="pageConfig.cacheKey">
                 <template #toolbar>
@@ -467,5 +467,20 @@ function openEditUserTag(row) {
     userTagRef.value?.handleOpen(row);
 }
 
-defineExpose({ reload, exportData, operatBatch, handleConfirmReceipt, handleCancelOrder });
+function handleBatchPayment(row) {
+    const rows = row == null ? selections.value : [row];
+    console.log(row,rows,'xxxx');
+    if (!rows.length) {
+        EleMessage.error('请至少选择一条数据');
+        return;
+    }
+    messageBoxConfirm({
+        message: '确认支付书款？',
+        fetch: () => proxy.$http.post('/order/orderInfo/payout', {
+            orderIds: rows.map(item => item.orderId)
+        })
+    });
+}
+
+defineExpose({ reload, exportData, operatBatch, handleConfirmReceipt, handleCancelOrder, handleBatchPayment });
 </script>