From e70b83a5a121313eed40eeafeba94ace8da3c4de Mon Sep 17 00:00:00 2001 From: wbc <942429426@qq.com> Date: Mon, 12 May 2025 16:11:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=91=E5=AE=9A=E8=BF=90?= =?UTF-8?q?=E7=BB=B4=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/IO/delayPatrol/waitAudit/api.ts | 4 ++++ src/views/IO/delayPatrol/waitAudit/data.ts | 9 +++++++++ .../IO/delayPatrol/waitAudit/faultModal.vue | 15 +++++++++++++++ src/views/IO/delayPatrol/waitAudit/index.vue | 3 --- src/views/IO/delayPatrol/waitPatrol/api.ts | 4 ++++ .../IO/delayPatrol/waitPatrol/faultModal.vue | 15 +++++++++++++++ src/views/IO/delayPatrol/waitPatrol/index.vue | 3 --- src/views/IO/workOrder/orderSearch/api.ts | 5 +++++ .../IO/workOrder/orderSearch/faultModal.vue | 15 +++++++++++++++ src/views/IO/workOrder/orderSend/api.ts | 4 ++++ src/views/IO/workOrder/orderSend/faultModal.vue | 15 +++++++++++++++ src/views/project/serviceManage/index.vue | 6 +++--- src/views/property/point/addModal.vue | 6 +++--- src/views/property/point/api.ts | 4 ++++ src/views/property/point/pointModal.vue | 16 +++++++++++++++- 15 files changed, 111 insertions(+), 13 deletions(-) diff --git a/src/views/IO/delayPatrol/waitAudit/api.ts b/src/views/IO/delayPatrol/waitAudit/api.ts index 65515a8..b6b080a 100644 --- a/src/views/IO/delayPatrol/waitAudit/api.ts +++ b/src/views/IO/delayPatrol/waitAudit/api.ts @@ -8,6 +8,7 @@ enum Api { getProjectInfo = '/platform/projectInfo/getNames', getOrganizationType = '/platform/organizationType/list', getContractNamesByProjectName = '/platform/contractInfo/getContractNamesByProjectName', + getIoCompanyByName = '/platform/contractInfo/getIoCompany', } export function list(params:any) { @@ -47,4 +48,7 @@ export function getOrganizationType() { export function getContractNamesByProjectName(data:any) { return defHttp.post({ url: Api.getContractNamesByProjectName,data }); +} +export function getIoCompanyByName(name: any) { + return defHttp.get({ url: `${Api.getIoCompanyByName}?name=${name}` }); } \ No newline at end of file diff --git a/src/views/IO/delayPatrol/waitAudit/data.ts b/src/views/IO/delayPatrol/waitAudit/data.ts index a1565e2..3acf8b0 100644 --- a/src/views/IO/delayPatrol/waitAudit/data.ts +++ b/src/views/IO/delayPatrol/waitAudit/data.ts @@ -90,5 +90,14 @@ export const columns: BasicColumn[] = [ { title: '状态', dataIndex: 'status', + customRender: ({ value }) => { + if (value == 0) { + return '未开始'; + } else if (value == 1) { + return '进行中'; + } else if (value == 2) { + return '已完成'; + } + }, }, ]; diff --git a/src/views/IO/delayPatrol/waitAudit/faultModal.vue b/src/views/IO/delayPatrol/waitAudit/faultModal.vue index cde1818..efe031e 100644 --- a/src/views/IO/delayPatrol/waitAudit/faultModal.vue +++ b/src/views/IO/delayPatrol/waitAudit/faultModal.vue @@ -31,10 +31,18 @@ value: 'contractName', options: 'options', }" + @change="contractNameChange" /> + + + + + + + @@ -174,6 +182,7 @@ getProjectInfo, getOrganizationType, getContractNamesByProjectName, + getIoCompanyByName } from './api'; import { message } from 'ant-design-vue'; import AMapLoader from '@amap/amap-jsapi-loader'; @@ -200,7 +209,12 @@ dispatchOpinion: '', longitude: '', latitude: '', + ioCompany:'' }); + const contractNameChange = async(val) =>{ + const res = await getIoCompanyByName(val) + form.ioCompany = res + } //下拉框 const projectNameOptions = ref([]); const getProjectNameOptions = async () => { @@ -376,6 +390,7 @@ }, handleChange, fileLists, + contractNameChange }; }, }; diff --git a/src/views/IO/delayPatrol/waitAudit/index.vue b/src/views/IO/delayPatrol/waitAudit/index.vue index 11189ee..62b814f 100644 --- a/src/views/IO/delayPatrol/waitAudit/index.vue +++ b/src/views/IO/delayPatrol/waitAudit/index.vue @@ -29,9 +29,6 @@ import dayjs from 'dayjs'; defineOptions({ name: 'waitAudit' }); const [registerTable, { reload, getForm }] = useTable({ - rowSelection: { - type: 'checkbox', - }, title: '专项工作列表', api: list, showIndexColumn: true, diff --git a/src/views/IO/delayPatrol/waitPatrol/api.ts b/src/views/IO/delayPatrol/waitPatrol/api.ts index 70b1fed..2e9200d 100644 --- a/src/views/IO/delayPatrol/waitPatrol/api.ts +++ b/src/views/IO/delayPatrol/waitPatrol/api.ts @@ -8,6 +8,7 @@ enum Api { getProjectInfo = '/platform/projectInfo/getNames', getOrganizationType = '/platform/organizationType/list', getContractNamesByProjectName = '/platform/contractInfo/getContractNamesByProjectName', + getIoCompanyByName = '/platform/contractInfo/getIoCompany', } export function list(params:any) { @@ -44,4 +45,7 @@ export function getOrganizationType() { } export function getContractNamesByProjectName(data:any) { return defHttp.post({ url: Api.getContractNamesByProjectName,data }); +} +export function getIoCompanyByName(name: any) { + return defHttp.get({ url: `${Api.getIoCompanyByName}?name=${name}` }); } \ No newline at end of file diff --git a/src/views/IO/delayPatrol/waitPatrol/faultModal.vue b/src/views/IO/delayPatrol/waitPatrol/faultModal.vue index aab6b05..ffec26c 100644 --- a/src/views/IO/delayPatrol/waitPatrol/faultModal.vue +++ b/src/views/IO/delayPatrol/waitPatrol/faultModal.vue @@ -31,10 +31,18 @@ value: 'contractName', options: 'options', }" + @change="contractNameChange" /> + + + + + + + @@ -174,6 +182,7 @@ getProjectInfo, getOrganizationType, getContractNamesByProjectName, + getIoCompanyByName } from './api'; import { message } from 'ant-design-vue'; import AMapLoader from '@amap/amap-jsapi-loader'; @@ -200,8 +209,13 @@ dispatchOpinion: '', longitude: '', latitude: '', + ioCompany:'' }); //下拉框 + const contractNameChange = async(val) =>{ + const res = await getIoCompanyByName(val) + form.ioCompany = res + } const projectNameOptions = ref([]); const getProjectNameOptions = async () => { const res = await getProjectInfo(); @@ -376,6 +390,7 @@ }, handleChange, fileLists, + contractNameChange }; }, }; diff --git a/src/views/IO/delayPatrol/waitPatrol/index.vue b/src/views/IO/delayPatrol/waitPatrol/index.vue index 8f467c5..7b40174 100644 --- a/src/views/IO/delayPatrol/waitPatrol/index.vue +++ b/src/views/IO/delayPatrol/waitPatrol/index.vue @@ -29,9 +29,6 @@ import dayjs from 'dayjs'; defineOptions({ name: 'WaitPatrol' }); const [registerTable, { reload, getForm}] = useTable({ - rowSelection: { - type: 'checkbox', - }, title: '例行工作列表', api: list, showIndexColumn: true, diff --git a/src/views/IO/workOrder/orderSearch/api.ts b/src/views/IO/workOrder/orderSearch/api.ts index c20f3ae..89d526a 100644 --- a/src/views/IO/workOrder/orderSearch/api.ts +++ b/src/views/IO/workOrder/orderSearch/api.ts @@ -13,6 +13,8 @@ enum Api { queryProcess = '/platform/orderProcess/queryProcess', dealInfo = '/platform/dealInfo/getInfoByOrderId', getOrderDelayHistory = '/platform/orderDelayHistory/queryByWorkOrderId', + getIoCompanyByName = '/platform/contractInfo/getIoCompany', + } export function list(params?: PageQuery) { @@ -62,4 +64,7 @@ export function dealInfo(id: any) { } export function getOrderDelayHistory(id: any) { return defHttp.get({ url: `${Api.getOrderDelayHistory}?workOrderId=${id}` }); +} +export function getIoCompanyByName(name: any) { + return defHttp.get({ url: `${Api.getIoCompanyByName}?name=${name}` }); } \ No newline at end of file diff --git a/src/views/IO/workOrder/orderSearch/faultModal.vue b/src/views/IO/workOrder/orderSearch/faultModal.vue index 61f6cbc..9dd8589 100644 --- a/src/views/IO/workOrder/orderSearch/faultModal.vue +++ b/src/views/IO/workOrder/orderSearch/faultModal.vue @@ -31,10 +31,18 @@ value: 'contractName', options: 'options', }" + @change="contractNameChange" /> + + + + + + + @@ -174,6 +182,7 @@ getProjectInfo, getOrganizationType, getContractNamesByProjectName, + getIoCompanyByName } from './api'; import { message } from 'ant-design-vue'; import AMapLoader from '@amap/amap-jsapi-loader'; @@ -200,7 +209,12 @@ dispatchOpinion: '', longitude: '', latitude: '', + ioCompany:'' }); + const contractNameChange = async(val) =>{ + const res = await getIoCompanyByName(val) + form.ioCompany = res + } //下拉框 const projectNameOptions = ref([]); const getProjectNameOptions = async () => { @@ -378,6 +392,7 @@ }, handleChange, fileLists, + contractNameChange }; }, }; diff --git a/src/views/IO/workOrder/orderSend/api.ts b/src/views/IO/workOrder/orderSend/api.ts index af8f52a..bf0384d 100644 --- a/src/views/IO/workOrder/orderSend/api.ts +++ b/src/views/IO/workOrder/orderSend/api.ts @@ -15,6 +15,7 @@ enum Api { getOrderDelayHistory = '/platform/orderDelayHistory/queryByWorkOrderId', dispatchOrder = '/platform/workOrder/dispatchOrder', getIoCompanyNames = '/platform/inspectPlanInfo/getIoCompanyNames', + getIoCompanyByName = '/platform/contractInfo/getIoCompany', } export function list(params?: PageQuery) { @@ -71,4 +72,7 @@ export function dispatchOrder(data:any) { export function getIoCompanyNames() { return defHttp.get({ url: Api.getIoCompanyNames }); +} +export function getIoCompanyByName(name: any) { + return defHttp.get({ url: `${Api.getIoCompanyByName}?name=${name}` }); } \ No newline at end of file diff --git a/src/views/IO/workOrder/orderSend/faultModal.vue b/src/views/IO/workOrder/orderSend/faultModal.vue index 5b40246..8e546c2 100644 --- a/src/views/IO/workOrder/orderSend/faultModal.vue +++ b/src/views/IO/workOrder/orderSend/faultModal.vue @@ -31,10 +31,18 @@ value: 'contractName', options: 'options', }" + @change="contractNameChange" /> + + + + + + + @@ -174,6 +182,7 @@ getProjectInfo, getOrganizationType, getContractNamesByProjectName, + getIoCompanyByName } from './api'; import { message } from 'ant-design-vue'; import AMapLoader from '@amap/amap-jsapi-loader'; @@ -200,7 +209,12 @@ dispatchOpinion: '', longitude: '', latitude: '', + ioCompany:'' }); + const contractNameChange = async(val) =>{ + const res = await getIoCompanyByName(val) + form.ioCompany = res + } //下拉框 const projectNameOptions = ref([]); const getProjectNameOptions = async () => { @@ -378,6 +392,7 @@ }, handleChange, fileLists, + contractNameChange }; }, }; diff --git a/src/views/project/serviceManage/index.vue b/src/views/project/serviceManage/index.vue index 5c9534e..98fd096 100644 --- a/src/views/project/serviceManage/index.vue +++ b/src/views/project/serviceManage/index.vue @@ -12,9 +12,9 @@ 删除目录 - 导入 + > --> 下载导入模板 - 导出 +