diff --git a/src/views/IO/workOrder/delayAudit/data.ts b/src/views/IO/workOrder/delayAudit/data.ts index c49c2a9..f9a6e29 100644 --- a/src/views/IO/workOrder/delayAudit/data.ts +++ b/src/views/IO/workOrder/delayAudit/data.ts @@ -37,23 +37,21 @@ import { FormSchema } from '@/components/Form'; export const formSchemas: FormSchema[] = [ { field: 'projectName', - label: '项目名称', - component: 'Select', - componentProps: { - options: [ - ], - }, + label: '合同名称', + component: 'Input', }, ]; export const columns: BasicColumn[] = [ { - title: '所属项目', - dataIndex: 'projectName', + title: '点位名称', + dataIndex: 'faultLocation', + width:'20%' }, { title: '所属合同', dataIndex: 'contractName', + width:'20%' }, { title: '延期原因', @@ -62,10 +60,12 @@ export const columns: BasicColumn[] = [ { title: '延期前时间', dataIndex: 'beforeDelayTime', + width:'12%' }, { title: '延期后时间', dataIndex: 'afterDelayTime', + width:'12%' }, { title: '处理结果', diff --git a/src/views/IO/workOrder/delayAudit/index.vue b/src/views/IO/workOrder/delayAudit/index.vue index 076dbdd..5800edf 100644 --- a/src/views/IO/workOrder/delayAudit/index.vue +++ b/src/views/IO/workOrder/delayAudit/index.vue @@ -61,20 +61,20 @@ const showDrawer = (id:any) => { detailDrawerRef.value.showDrawer(id); }; - const projectOptions = ref([]); - const getProjectOptions = async () => { - const res = await getProjectInfo(); - res.forEach((i: any) => { - i.value = i.projectName; - i.label = i.projectName; - }); - projectOptions.value = res; - formSchemas[0].componentProps.options = projectOptions.value; - }; - const getOptions = () => { - getProjectOptions(); - }; - getOptions(); + // const projectOptions = ref([]); + // const getProjectOptions = async () => { + // const res = await getProjectInfo(); + // res.forEach((i: any) => { + // i.value = i.projectName; + // i.label = i.projectName; + // }); + // projectOptions.value = res; + // formSchemas[0].componentProps.options = projectOptions.value; + // }; + // const getOptions = () => { + // getProjectOptions(); + // }; + // getOptions(); onActivated(()=>{ reload() }) diff --git a/src/views/IO/workOrder/orderHandle/data.ts b/src/views/IO/workOrder/orderHandle/data.ts index afbefc3..14a9e9f 100644 --- a/src/views/IO/workOrder/orderHandle/data.ts +++ b/src/views/IO/workOrder/orderHandle/data.ts @@ -22,7 +22,7 @@ const statusOptions = [ label: '作废', value: 8, }, - { + { label: '待接单(派遣)', value: 9, }, @@ -65,16 +65,26 @@ export const formSchemas: FormSchema[] = [ valueFormat: 'YYYY-MM-DD', }, }, + { + field: 'faultLocation', + label: '故障地点', + component: 'Select', + componentProps: { + options: [], + }, + }, ]; export const columns: BasicColumn[] = [ { title: '编号', dataIndex: 'id', + width: 200, }, { title: '报修时间', dataIndex: 'repairTime', + width: 150, }, { title: '响应级别', @@ -87,14 +97,17 @@ export const columns: BasicColumn[] = [ { title: '故障地点', dataIndex: 'faultLocation', + width: '18%', }, { title: '剩余处理时间', dataIndex: 'restTime', + width: 150, }, - { + { title: '剩余接单时间', dataIndex: 'orderAcceptDeadline', + width: 150, }, { title: '当前状态', diff --git a/src/views/IO/workOrder/orderHandle/index.vue b/src/views/IO/workOrder/orderHandle/index.vue index 62cfbfb..e62c727 100644 --- a/src/views/IO/workOrder/orderHandle/index.vue +++ b/src/views/IO/workOrder/orderHandle/index.vue @@ -10,7 +10,11 @@ cancel-text="否" @confirm="receive(record.id)" > - 接单 + 接单 { + const res = await queryPointNames(); + faultLocationOptions.value = res; + faultLocationOptions.value.forEach((i: any) => { + i.value = i.pointName; + i.label = i.pointName; + }); + formSchemas[2].componentProps.options = faultLocationOptions.value; + }; const getOptions = () => { getProjectOptions(); + getFaultLocationOptions(); }; getOptions(); onActivated(() => { diff --git a/src/views/project/contractManage/addModal.vue b/src/views/project/contractManage/addModal.vue index 8432d36..ff66a69 100644 --- a/src/views/project/contractManage/addModal.vue +++ b/src/views/project/contractManage/addModal.vue @@ -263,7 +263,7 @@ partyB: [{ required: true, message: '请选择' }], partyBPerson: [{ required: true, message: '请输入' }], contractContent: [{ required: true, message: '请输入' }], - remark: [{ required: true, message: '请输入' }], + // remark: [{ required: true, message: '请输入' }], }; const handleOk = () => { formRef.value.validate().then((valid) => { diff --git a/src/views/project/contractManage/index.vue b/src/views/project/contractManage/index.vue index 8bc7c7f..8aa7123 100644 --- a/src/views/project/contractManage/index.vue +++ b/src/views/project/contractManage/index.vue @@ -29,7 +29,7 @@ @cancel="closeService" width="80%" > - + @@ -66,33 +66,41 @@ - + - + - + diff --git a/src/views/project/projectManage/index.vue b/src/views/project/projectManage/index.vue index 4aed0a0..ec5f71e 100644 --- a/src/views/project/projectManage/index.vue +++ b/src/views/project/projectManage/index.vue @@ -33,7 +33,7 @@ import { list, removeByIds } from './api'; import { formSchemas, columns } from './data'; import detailDrawer from './detailDrawer.vue'; - import { ref } from 'vue'; + import { ref,onActivated } from 'vue'; import addModal from './addModal.vue'; import addDept from './addDept.vue'; import { commonDownload } from '@/api/common/index'; @@ -86,7 +86,7 @@ addModalRef.value.showModal(2, id); }; const addDeptRef = ref(); - const showDept = (id:any) => { + const showDept = (id: any) => { addDeptRef.value.showModal(id); }; //下载 @@ -101,6 +101,9 @@ }); } }; + onActivated(() => { + reload(); + });