修改bug

src/views/recycleOrder/auditNotSubmit/index.vue

@@ -10,18 +10,22 @@
                 导出订单明细
             </el-button>
         </template>
+        <BatchComplete ref="batchCompleteRef" @refresh="refresh" />
     </order-page>
 </template>
 
 <script setup>
 import { ref, reactive } from 'vue';
 import { DownloadOutlined } from '@/components/icons';
+import { ElMessage } from 'element-plus';
 import OrderPage from '@/views/recycleOrder/components/order-page-all.vue';
+import BatchComplete from '@/views/recycleOrder/components/batch-complete.vue';
 
 defineOptions({ name: 'recycleOrderAuditNotSubmit' });
 
 /** 页面组件实例 */
 const pageRef = ref(null);
+const batchCompleteRef = ref(null);
 
 const pageConfig = reactive({
     pageUrl: '/order/orderInfo/auditing/pageList',
@@ -32,10 +36,17 @@ const pageConfig = reactive({
 
 //批量审核完成
 function handleBatchAuditComplete() {
-    pageRef.value?.operatBatch({
-        title: '确认批量审核完成？',
-        url: '/recycleOrder/batchAuditComplete'
-    });
+    let orderIds = pageRef.value?.selections?.map(item => item.orderId);
+    if (!orderIds.length) {
+        ElMessage.error('请至少选择一条数据');
+        return;
+    }
+    batchCompleteRef.value?.handleOpen(orderIds);
+}
+
+//刷新
+function refresh() {
+    pageRef.value?.reload();
 }
 
 //导出数据

src/views/recycleOrder/awaitAudit/index.vue

@@ -1,23 +1,26 @@
 <template>
     <order-page ref="pageRef" :pageConfig="pageConfig" permissionKey="awaitAudit">
         <template #toolbar>
-            <el-button type="success" plain class="ele-btn-icon" :icon="DownloadOutlined"
+            <!-- <el-button type="success" plain class="ele-btn-icon" :icon="DownloadOutlined"
                 v-permission="'recycleOrder:awaitAudit:batchAuditComplete'" @click="handleBatchAuditComplete">
                 批量审核完成
-            </el-button>
+            </el-button> -->
         </template>
+        <BatchComplete ref="batchCompleteRef" @refresh="refresh" />
     </order-page>
 </template>
 
 <script setup>
 import { ref, reactive } from 'vue';
 import { DownloadOutlined } from '@/components/icons';
+import { ElMessage } from 'element-plus';
 import OrderPage from '@/views/recycleOrder/components/order-page-all.vue';
-
+import BatchComplete from '@/views/recycleOrder/components/batch-complete.vue';
 defineOptions({ name: 'recycleOrderAwaitAudit' });
 
 /** 页面组件实例 */
 const pageRef = ref(null);
+const batchCompleteRef = ref(null);
 
 const pageConfig = reactive({
     pageUrl: '/order/orderInfo/audit/pageList',
@@ -29,9 +32,19 @@ const pageConfig = reactive({
 
 //批量审核完成
 function handleBatchAuditComplete() {
-    pageRef.value?.operatBatch({
-        title: '确认批量审核完成？',
-        url: '/recycleOrder/batchAudit'
-    });
+    let orderIds = pageRef.value?.selections?.map(item => item.orderId);
+    if (!orderIds.length) {
+        ElMessage.error('请至少选择一条数据');
+        return;
+    }
+    console.log(orderIds,'orderIds');
+    batchCompleteRef.value?.handleOpen(orderIds);
+}
+
+//刷新
+function refresh() {
+    pageRef.value?.reload();
 }
+
 </script>
+

src/views/recycleOrder/components/batch-complete.vue

@@ -0,0 +1,72 @@
+<!-- 编辑弹窗 -->
+<template>
+    <ele-modal form :width="560" v-model="visible" title="批量审核完成" @open="handleOpen">
+        <SimpleForm :items="items" labelWidth="200px" ref="formRef" :initKeys="form"></SimpleForm>
+        <template #footer>
+            <el-button @click="handleCancel">关闭</el-button>
+            <el-button type="primary" @click="handleSumbit">确定</el-button>
+        </template>
+    </ele-modal>
+</template>
+
+<script setup>
+import { ref, reactive, nextTick } from 'vue';
+import SimpleForm from '@/components/CommonPage/SimpleForm.vue';
+import request from '@/utils/request';
+
+/** 弹窗是否打开 */
+const visible = defineModel({ type: Boolean });
+
+/** 关闭弹窗 */
+const handleCancel = () => {
+    visible.value = false;
+    nextTick(() => {
+        formRef.value?.resetForm();
+    });
+};
+
+const form = ref({
+    orderIds: [],
+    checkType: '1'
+});
+/** 弹窗打开事件 */
+const handleOpen = (orderIds = []) => {
+    if (orderIds.length) {
+        visible.value = true;
+        form.value.orderIds = orderIds;
+        formRef.value?.setData(form.value);
+    } 
+};
+
+const items = reactive([
+    {
+        label: '所选订单未审核图书审核为',
+        prop: 'checkType',
+        type: 'dictRadio',
+        props: { code: 'batch_complete' },
+        required: true
+    }
+]);
+
+const formRef = ref();
+
+const emit = defineEmits(['refresh']);
+const handleSumbit = () => {
+    formRef.value?.submitForm().then((data) => {
+        data.orderIds = form.value.orderIds;
+        request.post('/order/orderInfo/adminCheckBatch', data).then((res) => {
+            if (res.data.code === 200) {
+                visible.value = false;
+                ElMessage.success('操作成功');
+                emit('refresh');
+            } else {
+                ElMessage.error(res.data.msg);
+            }
+        });
+    });
+};
+
+defineExpose({
+    handleOpen
+});
+</script>

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

@@ -469,7 +469,7 @@ function openEditUserTag(row) {
 
 function handleBatchPayment(row) {
     const rows = row == null ? selections.value : [row];
-    console.log(row,rows,'xxxx');
+    console.log(row, rows, 'xxxx');
     if (!rows.length) {
         EleMessage.error('请至少选择一条数据');
         return;
@@ -482,5 +482,5 @@ function handleBatchPayment(row) {
     });
 }
 
-defineExpose({ reload, exportData, operatBatch, handleConfirmReceipt, handleCancelOrder, handleBatchPayment });
+defineExpose({ selections, reload, exportData, operatBatch, handleConfirmReceipt, handleCancelOrder, handleBatchPayment });
 </script>

src/views/recycleOrder/detail/order-book-list.vue

@@ -121,7 +121,7 @@ const columns = ref([
         width: 220,
         align: 'center'
     },
-    { label: '数量', prop: 'number', minWidth: 90, align: 'center' },
+    { label: '数量', prop: 'num', minWidth: 90, align: 'center' },
     {
         label: '审核信息',
         prop: 'auditInfo',