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')
"
>审核
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"
>
- 批量点位上报
+ 批量点位上报
导出
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 = () => {