From 32847d68b08b61475acbbfa90f4fa7c053b096c7 Mon Sep 17 00:00:00 2001 From: wbc <942429426@qq.com> Date: Sun, 27 Apr 2025 16:50:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=B8=A6=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IO/delayPatrol/waitAudit/faultModal.vue | 4 +- .../IO/delayPatrol/waitPatrol/faultModal.vue | 4 +- src/views/IO/workOrder/delayAudit/api.ts | 67 ++-- src/views/IO/workOrder/delayAudit/data.ts | 12 - .../IO/workOrder/delayAudit/detailDrawer.vue | 5 +- src/views/IO/workOrder/delayAudit/index.vue | 18 +- src/views/IO/workOrder/orderAudit/api.ts | 67 ++-- src/views/IO/workOrder/orderAudit/data.ts | 24 +- .../IO/workOrder/orderAudit/detailDrawer.vue | 4 +- src/views/IO/workOrder/orderAudit/index.vue | 18 +- src/views/IO/workOrder/orderHandle/api.ts | 53 +++ src/views/IO/workOrder/orderHandle/data.ts | 50 +++ .../IO/workOrder/orderHandle/detailDrawer.vue | 331 ++++++++++++++++++ src/views/IO/workOrder/orderHandle/index.vue | 72 ++++ src/views/IO/workOrder/orderSearch/data.ts | 22 -- .../IO/workOrder/orderSearch/detailDrawer.vue | 4 +- .../IO/workOrder/orderSearch/faultModal.vue | 4 +- src/views/IO/workOrder/orderSearch/index.vue | 2 +- src/views/IO/workOrder/orderSend/data.ts | 33 +- .../IO/workOrder/orderSend/detailDrawer.vue | 4 +- .../IO/workOrder/orderSend/faultModal.vue | 4 +- src/views/property/point/pointModal.vue | 4 +- src/views/property/propertyList/addModal.vue | 6 +- 23 files changed, 629 insertions(+), 183 deletions(-) create mode 100644 src/views/IO/workOrder/orderHandle/api.ts create mode 100644 src/views/IO/workOrder/orderHandle/data.ts create mode 100644 src/views/IO/workOrder/orderHandle/detailDrawer.vue create mode 100644 src/views/IO/workOrder/orderHandle/index.vue diff --git a/src/views/IO/delayPatrol/waitAudit/faultModal.vue b/src/views/IO/delayPatrol/waitAudit/faultModal.vue index b9061cd..788ab5e 100644 --- a/src/views/IO/delayPatrol/waitAudit/faultModal.vue +++ b/src/views/IO/delayPatrol/waitAudit/faultModal.vue @@ -149,7 +149,7 @@ - + - + diff --git a/src/views/IO/delayPatrol/waitPatrol/faultModal.vue b/src/views/IO/delayPatrol/waitPatrol/faultModal.vue index e7d8a4e..9b089ef 100644 --- a/src/views/IO/delayPatrol/waitPatrol/faultModal.vue +++ b/src/views/IO/delayPatrol/waitPatrol/faultModal.vue @@ -149,7 +149,7 @@ - + - + diff --git a/src/views/IO/workOrder/delayAudit/api.ts b/src/views/IO/workOrder/delayAudit/api.ts index 90a5083..dc34703 100644 --- a/src/views/IO/workOrder/delayAudit/api.ts +++ b/src/views/IO/workOrder/delayAudit/api.ts @@ -1,58 +1,53 @@ -import { ID, IDS, PageQuery, commonExport } from '@/api/base'; +import { PageQuery, commonExport } from '@/api/base'; import { defHttp } from '@/utils/http/axios'; -import { Dayjs } from 'dayjs'; enum Api { - root = '/workflow/leave', - list = '/workflow/leave/list', + root = '/platform/workOrder', + list = '/platform/workOrder/list', export = '/workflow/leave/export', -} - -export interface Leave { - id: string; - leaveType: string; - startDate: string; - endDate: string; - leaveDays: number; - remark: string; - processInstanceVo?: any; - dateTime?: [string, string] | [Dayjs, Dayjs]; -} - -export interface Resp { - createDept: number; - createBy: number; - createTime: string; - updateBy: number; - updateTime: string; - id: string; - leaveType: string; - startDate: string; - endDate: string; - leaveDays: number; - remark?: any; + getSubcategoryType = '/platform/subcategoryType/list', + workOrderAdd = '/platform/workOrder/add', + getProjectInfo = '/platform/projectInfo/getNames', + getOrganizationType = '/platform/organizationType/list', + getContractNamesByProjectName = '/platform/contractInfo/getContractNamesByProjectName', } export function list(params?: PageQuery) { - return defHttp.get({ url: Api.list, params }); + return defHttp.get({ url: Api.list, params }); } export function exportExcel(data: any) { return commonExport(Api.export, data); } -export function getInfo(id: ID) { - return defHttp.get({ url: `${Api.root}/${id}` }); +export function getInfo(id: any) { + return defHttp.get({ url: `${Api.root}/${id}` }); } export function add(data: any) { - return defHttp.post({ url: Api.root, data }); + return defHttp.post({ url: Api.root, data }); } export function update(data: any) { - return defHttp.put({ url: Api.root, data }); + return defHttp.put({ url: Api.root, data }); } -export function removeByIds(ids: IDS) { - return defHttp.deleteWithMsg({ url: `${Api.root}/${ids.join(',')}` }); +export function removeByIds(ids: any) { + return defHttp.deleteWithMsg({ url: `${Api.root}/${ids.join(',')}` }); +} + +export function getSubcategoryType() { + return defHttp.get({ url: Api.getSubcategoryType }); +} +export function workOrderAdd(data: any) { + return defHttp.post({ url: Api.workOrderAdd, data }); +} +export function getProjectInfo() { + return defHttp.get({ url: Api.getProjectInfo }); +} +export function getOrganizationType() { + return defHttp.get({ url: Api.getOrganizationType }); } +export function getContractNamesByProjectName(data:any) { + return defHttp.post({ url: Api.getContractNamesByProjectName,data }); +} \ No newline at end of file diff --git a/src/views/IO/workOrder/delayAudit/data.ts b/src/views/IO/workOrder/delayAudit/data.ts index 659649e..f2cfeff 100644 --- a/src/views/IO/workOrder/delayAudit/data.ts +++ b/src/views/IO/workOrder/delayAudit/data.ts @@ -8,18 +8,6 @@ export const formSchemas: FormSchema[] = [ component: 'Select', componentProps: { options: [ - { - value: '1', - label: '2323', - }, - { - value: '2', - label: '2323', - }, - { - value: '3', - label: '2323', - }, ], }, }, diff --git a/src/views/IO/workOrder/delayAudit/detailDrawer.vue b/src/views/IO/workOrder/delayAudit/detailDrawer.vue index 90cfcf2..0683995 100644 --- a/src/views/IO/workOrder/delayAudit/detailDrawer.vue +++ b/src/views/IO/workOrder/delayAudit/detailDrawer.vue @@ -55,7 +55,7 @@ -
所属机构：{{ detail.institution }}
+
所属机构：{{ detail.organizationName }}
响应级别：{{ detail.responseLevel }}
@@ -117,6 +117,7 @@ + @@ -136,7 +137,7 @@ repairer: '', handler: '', repairTime: '', - institution: '', + organizationName: '', isAccident: null, faultCategory: '', faultSubcategory: '', diff --git a/src/views/IO/workOrder/delayAudit/index.vue b/src/views/IO/workOrder/delayAudit/index.vue index 9a07f34..2b1fce5 100644 --- a/src/views/IO/workOrder/delayAudit/index.vue +++ b/src/views/IO/workOrder/delayAudit/index.vue @@ -5,7 +5,7 @@ @@ -17,7 +17,7 @@ diff --git a/src/views/IO/workOrder/orderAudit/api.ts b/src/views/IO/workOrder/orderAudit/api.ts index 90a5083..dc34703 100644 --- a/src/views/IO/workOrder/orderAudit/api.ts +++ b/src/views/IO/workOrder/orderAudit/api.ts @@ -1,58 +1,53 @@ -import { ID, IDS, PageQuery, commonExport } from '@/api/base'; +import { PageQuery, commonExport } from '@/api/base'; import { defHttp } from '@/utils/http/axios'; -import { Dayjs } from 'dayjs'; enum Api { - root = '/workflow/leave', - list = '/workflow/leave/list', + root = '/platform/workOrder', + list = '/platform/workOrder/list', export = '/workflow/leave/export', -} - -export interface Leave { - id: string; - leaveType: string; - startDate: string; - endDate: string; - leaveDays: number; - remark: string; - processInstanceVo?: any; - dateTime?: [string, string] | [Dayjs, Dayjs]; -} - -export interface Resp { - createDept: number; - createBy: number; - createTime: string; - updateBy: number; - updateTime: string; - id: string; - leaveType: string; - startDate: string; - endDate: string; - leaveDays: number; - remark?: any; + getSubcategoryType = '/platform/subcategoryType/list', + workOrderAdd = '/platform/workOrder/add', + getProjectInfo = '/platform/projectInfo/getNames', + getOrganizationType = '/platform/organizationType/list', + getContractNamesByProjectName = '/platform/contractInfo/getContractNamesByProjectName', } export function list(params?: PageQuery) { - return defHttp.get({ url: Api.list, params }); + return defHttp.get({ url: Api.list, params }); } export function exportExcel(data: any) { return commonExport(Api.export, data); } -export function getInfo(id: ID) { - return defHttp.get({ url: `${Api.root}/${id}` }); +export function getInfo(id: any) { + return defHttp.get({ url: `${Api.root}/${id}` }); } export function add(data: any) { - return defHttp.post({ url: Api.root, data }); + return defHttp.post({ url: Api.root, data }); } export function update(data: any) { - return defHttp.put({ url: Api.root, data }); + return defHttp.put({ url: Api.root, data }); } -export function removeByIds(ids: IDS) { - return defHttp.deleteWithMsg({ url: `${Api.root}/${ids.join(',')}` }); +export function removeByIds(ids: any) { + return defHttp.deleteWithMsg({ url: `${Api.root}/${ids.join(',')}` }); +} + +export function getSubcategoryType() { + return defHttp.get({ url: Api.getSubcategoryType }); +} +export function workOrderAdd(data: any) { + return defHttp.post({ url: Api.workOrderAdd, data }); +} +export function getProjectInfo() { + return defHttp.get({ url: Api.getProjectInfo }); +} +export function getOrganizationType() { + return defHttp.get({ url: Api.getOrganizationType }); } +export function getContractNamesByProjectName(data:any) { + return defHttp.post({ url: Api.getContractNamesByProjectName,data }); +} \ No newline at end of file diff --git a/src/views/IO/workOrder/orderAudit/data.ts b/src/views/IO/workOrder/orderAudit/data.ts index 3c3c843..124d318 100644 --- a/src/views/IO/workOrder/orderAudit/data.ts +++ b/src/views/IO/workOrder/orderAudit/data.ts @@ -11,31 +11,17 @@ export const formSchemas: FormSchema[] = [ }, }, { - field: 'fixRange', + field: '[startDate, endDate]', label: '报修范围', component: 'RangePicker', - }, - { - label: '地址', - field: 'location', - component: 'Input', componentProps: { - placeholder: '输入天数', + format: 'YYYY-MM-DD', + valueFormat:'YYYY-MM-DD' }, }, + ]; -//列表展示 -const responseLevelOptions = [ - { - value: '常规', - }, - { - value: '紧急', - }, - { - value: '特级', - }, -]; + export const columns: BasicColumn[] = [ { diff --git a/src/views/IO/workOrder/orderAudit/detailDrawer.vue b/src/views/IO/workOrder/orderAudit/detailDrawer.vue index fed9e85..caa0644 100644 --- a/src/views/IO/workOrder/orderAudit/detailDrawer.vue +++ b/src/views/IO/workOrder/orderAudit/detailDrawer.vue @@ -55,7 +55,7 @@ -
所属机构：{{ detail.institution }}
+
所属机构：{{ detail.organizationName }}
响应级别：{{ detail.responseLevel }}
@@ -182,7 +182,7 @@ repairer: '', handler: '', repairTime: '', - institution: '', + organizationName: '', isAccident: null, faultCategory: '', faultSubcategory: '', diff --git a/src/views/IO/workOrder/orderAudit/index.vue b/src/views/IO/workOrder/orderAudit/index.vue index 23dfffa..f949b2d 100644 --- a/src/views/IO/workOrder/orderAudit/index.vue +++ b/src/views/IO/workOrder/orderAudit/index.vue @@ -5,7 +5,7 @@ @@ -17,7 +17,7 @@ diff --git a/src/views/IO/workOrder/orderHandle/api.ts b/src/views/IO/workOrder/orderHandle/api.ts new file mode 100644 index 0000000..dc34703 --- /dev/null +++ b/src/views/IO/workOrder/orderHandle/api.ts @@ -0,0 +1,53 @@ +import { PageQuery, commonExport } from '@/api/base'; +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', + getOrganizationType = '/platform/organizationType/list', + getContractNamesByProjectName = '/platform/contractInfo/getContractNamesByProjectName', +} + +export function list(params?: PageQuery) { + return defHttp.get({ url: Api.list, params }); +} + +export function exportExcel(data: any) { + return commonExport(Api.export, data); +} + +export function getInfo(id: any) { + return defHttp.get({ url: `${Api.root}/${id}` }); +} + +export function add(data: any) { + return defHttp.post({ url: Api.root, data }); +} + +export function update(data: any) { + return defHttp.put({ url: Api.root, data }); +} + +export function removeByIds(ids: any) { + return defHttp.deleteWithMsg({ url: `${Api.root}/${ids.join(',')}` }); +} + +export function getSubcategoryType() { + return defHttp.get({ url: Api.getSubcategoryType }); +} +export function workOrderAdd(data: any) { + return defHttp.post({ url: Api.workOrderAdd, data }); +} +export function getProjectInfo() { + return defHttp.get({ url: Api.getProjectInfo }); +} +export function getOrganizationType() { + return defHttp.get({ url: Api.getOrganizationType }); +} +export function getContractNamesByProjectName(data:any) { + return defHttp.post({ url: Api.getContractNamesByProjectName,data }); +} \ No newline at end of file diff --git a/src/views/IO/workOrder/orderHandle/data.ts b/src/views/IO/workOrder/orderHandle/data.ts new file mode 100644 index 0000000..2f66b28 --- /dev/null +++ b/src/views/IO/workOrder/orderHandle/data.ts @@ -0,0 +1,50 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; +//列表展示 + +export const formSchemas: FormSchema[] = [ + { + label: '编号', + field: 'id', + component: 'Input', + componentProps: { + placeholder: '输入编号', + }, + }, + { + field: '[startDate, endDate]', + label: '报修范围', + component: 'RangePicker', + componentProps: { + format: 'YYYY-MM-DD', + valueFormat:'YYYY-MM-DD' + }, + }, +]; + +export const columns: BasicColumn[] = [ + { + title: '编号', + dataIndex: 'id', + }, + { + title: '报修时间', + dataIndex: 'repairTime', + }, + { + title: '响应级别', + dataIndex: 'responseLevel', + }, + { + title: '故障描述', + dataIndex: 'faultDescription', + }, + { + title: '故障地点', + dataIndex: 'faultLocation', + }, + { + title: '剩余时间', + dataIndex: 'restTime', + }, +]; diff --git a/src/views/IO/workOrder/orderHandle/detailDrawer.vue b/src/views/IO/workOrder/orderHandle/detailDrawer.vue new file mode 100644 index 0000000..0398c79 --- /dev/null +++ b/src/views/IO/workOrder/orderHandle/detailDrawer.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/src/views/IO/workOrder/orderHandle/index.vue b/src/views/IO/workOrder/orderHandle/index.vue new file mode 100644 index 0000000..caff5e8 --- /dev/null +++ b/src/views/IO/workOrder/orderHandle/index.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/views/IO/workOrder/orderSearch/data.ts b/src/views/IO/workOrder/orderSearch/data.ts index e2db2ca..66282bd 100644 --- a/src/views/IO/workOrder/orderSearch/data.ts +++ b/src/views/IO/workOrder/orderSearch/data.ts @@ -43,28 +43,6 @@ export const formSchemas: FormSchema[] = [ label: '报修范围', component: 'RangePicker', }, - { - label: '地址', - field: 'location', - component: 'Input', - }, - { - field: 'status', - label: '状态', - component: 'Select', - componentProps: { - options: [ - { - value: '0', - label: '启用', - }, - { - value: '1', - label: '禁用', - }, - ], - }, - }, { field: 'faultSubcategory', label: '故障小类', diff --git a/src/views/IO/workOrder/orderSearch/detailDrawer.vue b/src/views/IO/workOrder/orderSearch/detailDrawer.vue index 5c4697a..8d0b0f8 100644 --- a/src/views/IO/workOrder/orderSearch/detailDrawer.vue +++ b/src/views/IO/workOrder/orderSearch/detailDrawer.vue @@ -55,7 +55,7 @@ -
所属机构：{{ detail.institution }}
+
所属机构：{{ detail.organizationName }}
响应级别：{{ detail.responseLevel }}
@@ -182,7 +182,7 @@ repairer: '', handler: '', repairTime: '', - institution: '', + organizationName: '', isAccident: null, faultCategory: '', faultSubcategory: '', diff --git a/src/views/IO/workOrder/orderSearch/faultModal.vue b/src/views/IO/workOrder/orderSearch/faultModal.vue index f58d7de..cce8d5b 100644 --- a/src/views/IO/workOrder/orderSearch/faultModal.vue +++ b/src/views/IO/workOrder/orderSearch/faultModal.vue @@ -149,7 +149,7 @@ - + - + diff --git a/src/views/IO/workOrder/orderSearch/index.vue b/src/views/IO/workOrder/orderSearch/index.vue index 18c02e7..35224cf 100644 --- a/src/views/IO/workOrder/orderSearch/index.vue +++ b/src/views/IO/workOrder/orderSearch/index.vue @@ -79,7 +79,7 @@ i.value = i.typeName; i.label = i.typeName; }); - formSchemas[6].componentProps.options = projectOptions.value; + formSchemas[4].componentProps.options = projectOptions.value; }; const getOptions = () => { getProjectOptions(); diff --git a/src/views/IO/workOrder/orderSend/data.ts b/src/views/IO/workOrder/orderSend/data.ts index 2d53cfc..2059599 100644 --- a/src/views/IO/workOrder/orderSend/data.ts +++ b/src/views/IO/workOrder/orderSend/data.ts @@ -8,18 +8,6 @@ export const formSchemas: FormSchema[] = [ component: 'Select', componentProps: { options: [ - { - value: '1', - label: '2323', - }, - { - value: '2', - label: '2323', - }, - { - value: '3', - label: '2323', - }, ], }, }, @@ -36,27 +24,8 @@ export const formSchemas: FormSchema[] = [ label: '报修范围', component: 'RangePicker', }, - { - label: '地址', - field: 'location', - component: 'Input', - componentProps: { - placeholder: '输入天数', - }, - }, -]; -//列表展示 -const responseLevelOptions = [ - { - value: '常规', - }, - { - value: '紧急', - }, - { - value: '特级', - }, ]; + export const columns: BasicColumn[] = [ { title: '编号', diff --git a/src/views/IO/workOrder/orderSend/detailDrawer.vue b/src/views/IO/workOrder/orderSend/detailDrawer.vue index eb6a09b..d460f4d 100644 --- a/src/views/IO/workOrder/orderSend/detailDrawer.vue +++ b/src/views/IO/workOrder/orderSend/detailDrawer.vue @@ -55,7 +55,7 @@ -
所属机构：{{ detail.institution }}
+
所属机构：{{ detail.organizationName }}
响应级别：{{ detail.responseLevel }}
@@ -182,7 +182,7 @@ repairer: '', handler: '', repairTime: '', - institution: '', + organizationName: '', isAccident: null, faultCategory: '', faultSubcategory: '', diff --git a/src/views/IO/workOrder/orderSend/faultModal.vue b/src/views/IO/workOrder/orderSend/faultModal.vue index 5742a0c..45f2c0e 100644 --- a/src/views/IO/workOrder/orderSend/faultModal.vue +++ b/src/views/IO/workOrder/orderSend/faultModal.vue @@ -149,7 +149,7 @@ - + - + diff --git a/src/views/property/point/pointModal.vue b/src/views/property/point/pointModal.vue index 13455ef..32e50e8 100644 --- a/src/views/property/point/pointModal.vue +++ b/src/views/property/point/pointModal.vue @@ -122,7 +122,7 @@ - + - + diff --git a/src/views/property/propertyList/addModal.vue b/src/views/property/propertyList/addModal.vue index 08370df..67a646e 100644 --- a/src/views/property/propertyList/addModal.vue +++ b/src/views/property/propertyList/addModal.vue @@ -14,9 +14,9 @@ - + @@ -205,7 +205,7 @@ const visible = ref(false); const form = reactive({ projectName: '', - institution: null, + organizationName: null, propertyName: '', standards: '', propertyCode: '',