From 54ee76ad5ec190513aaa027723650627d2df50c0 Mon Sep 17 00:00:00 2001
From: wbc <942429426@qq.com>
Date: Wed, 25 Jun 2025 15:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=89=B9=E9=87=8F=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E5=AF=BC=E5=85=A5=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/IO/workOrder/delayAudit/data.ts   |  4 ++++
 src/views/IO/workOrder/delayAudit/index.vue |  2 +-
 src/views/property/point/index.vue          | 21 +++++++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/views/IO/workOrder/delayAudit/data.ts b/src/views/IO/workOrder/delayAudit/data.ts
index 97db985..7024e53 100644
--- a/src/views/IO/workOrder/delayAudit/data.ts
+++ b/src/views/IO/workOrder/delayAudit/data.ts
@@ -41,7 +41,11 @@ export const formSchemas: FormSchema[] = [
     component: 'Select',
     componentProps: {
       options: [],
+      style:{
+        width:'400px'
+      }
     },
+    // colProps: { span:24},
   },
 ];
 
diff --git a/src/views/IO/workOrder/delayAudit/index.vue b/src/views/IO/workOrder/delayAudit/index.vue
index 6881142..3a5acd3 100644
--- a/src/views/IO/workOrder/delayAudit/index.vue
+++ b/src/views/IO/workOrder/delayAudit/index.vue
@@ -7,7 +7,7 @@
             type="link"
             @click="showAuditModal(record.id)"
             v-if="
-              record.handleResult == '待处理' && (!roleList.includes('yunwei') || !roleList.includes('yezhu') )
+              record.handleResult == '待处理' && !roleList.includes('yunwei') && !roleList.includes('yezhu') 
             "
             >审核</a-button
           >
diff --git a/src/views/property/point/index.vue b/src/views/property/point/index.vue
index 3c8e9cb..13142c6 100644
--- a/src/views/property/point/index.vue
+++ b/src/views/property/point/index.vue
@@ -35,7 +35,7 @@
               :showUploadList="false"
               v-if="checkedTree.length > 0"
             >
-              <a-button type="primary"> 批量点位上报 </a-button>
+              <a-button type="primary" :loading="batchLoading"> 批量点位上报 </a-button>
             </a-upload>
             <a-button @click="downloadExcel(exportExcel, '点位信息', getForm().getFieldsValue())"
               >导出</a-button
@@ -68,7 +68,7 @@
 <script setup lang="ts">
   import { PageWrapper } from '@/components/Page';
   import { BasicTable, useTable } from '@/components/Table';
-  import { list, tree, removeByIds, listUpload, exportExcel,uploadWorkOrderInfo} from './api';
+  import { list, tree, removeByIds, listUpload, exportExcel, uploadWorkOrderInfo } from './api';
   import { formSchemas, columns } from './data';
   import detailDrawer from './detailDrawer.vue';
   import addModal from './addModal.vue';
@@ -159,12 +159,25 @@
     // message.success('导入成功');
     reload();
   };
-  const reportUpload = async (file: any) => {
+  const batchLoading = ref(false);
+  const reportUpload = (file: any) => {
     console.log(file);
     const params = {
       file: file,
     };
-    await uploadWorkOrderInfo(params);
+    batchLoading.value = true;
+    uploadWorkOrderInfo(params).then((res) => {
+      batchLoading.value = false;
+      console.log(res);
+      res.forEach((i:any) => {
+        if (i.includes('失败')) {
+          message.error(i);
+        } else {
+          message.success(i);
+        }
+      });
+    });
+
     return false;
   };
   const reportChange = () => {