From c44d679fbfe18bb78c866e9a0ed9b0a16059d739 Mon Sep 17 00:00:00 2001 From: wbc <942429426@qq.com> Date: Wed, 11 Jun 2025 15:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IO/workOrder/orderAudit/auditModal.vue | 4 +- src/views/IO/workOrder/orderSearch/api.ts | 2 +- src/views/IO/workOrder/orderSearch/data.ts | 24 ++++++ src/views/IO/workOrder/orderSearch/index.vue | 40 +++++++--- src/views/IO/workOrder/orderSend/index.vue | 2 +- .../IO/workOrder/orderSend/sendModal.vue | 77 +++++++++++-------- src/views/property/point/data.ts | 8 +- src/views/property/point/index.vue | 1 - 8 files changed, 106 insertions(+), 52 deletions(-) diff --git a/src/views/IO/workOrder/orderAudit/auditModal.vue b/src/views/IO/workOrder/orderAudit/auditModal.vue index 9e064aa..cb1719d 100644 --- a/src/views/IO/workOrder/orderAudit/auditModal.vue +++ b/src/views/IO/workOrder/orderAudit/auditModal.vue @@ -174,8 +174,8 @@ orderTakingCost: [{ required: true, message: '请输入' }], isHandleOverTime: [{ required: true, message: '请选择' }], handleCost: [{ required: true, message: '请输入' }], - otherCost: [{ required: true, message: '请输入' }], - otherCostReason: [{ required: true, message: '请输入' }], + // otherCost: [{ required: true, message: '请输入' }], + // otherCostReason: [{ required: true, message: '请输入' }], auditOpinion: [{ required: true, message: '请输入' }], // isCloseCase: [{ required: true, message: '请选择' }], }; diff --git a/src/views/IO/workOrder/orderSearch/api.ts b/src/views/IO/workOrder/orderSearch/api.ts index 89d526a..8a5760c 100644 --- a/src/views/IO/workOrder/orderSearch/api.ts +++ b/src/views/IO/workOrder/orderSearch/api.ts @@ -4,7 +4,6 @@ import { defHttp } from '@/utils/http/axios'; enum Api { root = '/platform/workOrder', list = '/platform/workOrder/list', - export = '/workflow/leave/export', getSubcategoryType = '/platform/subcategoryType/list', workOrderAdd = '/platform/workOrder/add', getProjectInfo = '/platform/projectInfo/getNames', @@ -14,6 +13,7 @@ enum Api { dealInfo = '/platform/dealInfo/getInfoByOrderId', getOrderDelayHistory = '/platform/orderDelayHistory/queryByWorkOrderId', getIoCompanyByName = '/platform/contractInfo/getIoCompany', + export = '/platform/excel/ExportPointInfo', } diff --git a/src/views/IO/workOrder/orderSearch/data.ts b/src/views/IO/workOrder/orderSearch/data.ts index 0d6fda9..ee9cf65 100644 --- a/src/views/IO/workOrder/orderSearch/data.ts +++ b/src/views/IO/workOrder/orderSearch/data.ts @@ -88,6 +88,30 @@ export const formSchemas: FormSchema[] = [ options: [], }, }, + { + label: '编号', + field: 'id', + component: 'Input', + componentProps: { + placeholder: '输入编号', + }, + }, + { + field: 'faultLocation', + label: '故障地点', + component: 'Select', + componentProps: { + options: [], + }, + }, + { + field: 'status', + label: '当前状态', + component: 'Select', + componentProps: { + options: statusOptions, + }, + }, ]; export const columns: BasicColumn[] = [ diff --git a/src/views/IO/workOrder/orderSearch/index.vue b/src/views/IO/workOrder/orderSearch/index.vue index 552011a..64e1aed 100644 --- a/src/views/IO/workOrder/orderSearch/index.vue +++ b/src/views/IO/workOrder/orderSearch/index.vue @@ -2,7 +2,11 @@ - - + + diff --git a/src/views/IO/workOrder/orderSend/index.vue b/src/views/IO/workOrder/orderSend/index.vue index 6a167aa..ca26ac0 100644 --- a/src/views/IO/workOrder/orderSend/index.vue +++ b/src/views/IO/workOrder/orderSend/index.vue @@ -2,7 +2,7 @@