diff --git a/src/api/data_report.ts b/src/api/data_report.ts index 42e12da..ebc507f 100644 --- a/src/api/data_report.ts +++ b/src/api/data_report.ts @@ -21,3 +21,12 @@ export function apidistribution_project_departments(params?: any) { return request.get({ url: '/cost_consultation_report/distribution_project_departments', params }) } + +export function apiproject_schedule_statistics(params?: any) { + return request.get({ url: '/cost_consultation_report/project_schedule_statistics', params }) +} + +export function apiproject_commission_statistics(params?: any) { + return request.get({ url: '/cost_consultation_report/project_commission_statistics', params }) +} + diff --git a/src/components/detailPage/index.vue b/src/components/detailPage/index.vue index a1e79cc..65d5b87 100644 --- a/src/components/detailPage/index.vue +++ b/src/components/detailPage/index.vue @@ -16,6 +16,7 @@ class="mr-5"> {{ items.name }} + diff --git a/src/views/data_report_commission/index.vue b/src/views/data_report_commission/index.vue index 9151317..a3b6a67 100644 --- a/src/views/data_report_commission/index.vue +++ b/src/views/data_report_commission/index.vue @@ -2,21 +2,16 @@
- - + + - - + + - - - - - 查询 + 查询 重置 - @@ -24,19 +19,26 @@
- - - - - - - - - - - - - + + + + + + +
@@ -48,34 +50,26 @@ diff --git a/src/views/data_report_process/index.vue b/src/views/data_report_process/index.vue index 3c0dd42..e81ef6a 100644 --- a/src/views/data_report_process/index.vue +++ b/src/views/data_report_process/index.vue @@ -2,21 +2,17 @@
- - + + - + - - - - 查询 重置 - + @@ -24,26 +20,26 @@
- - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + +
@@ -56,29 +52,18 @@ diff --git a/src/views/supervision_accept/index.vue b/src/views/supervision_accept/index.vue index a6685b0..dd776d2 100644 --- a/src/views/supervision_accept/index.vue +++ b/src/views/supervision_accept/index.vue @@ -52,10 +52,15 @@ @click="handleDelete(row.id)"> 删除 + + 详情 + 验收 + @@ -65,6 +70,7 @@
+ @@ -103,14 +109,18 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionAcceptLists, apiSupervisionAcceptDelete, apiSupervisionAcceptDetail, apisupervision_accept } from '@/api/supervision_accept' -import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import DetailPopup from './detail.vue' const dialogTableVisible = ref(false) + + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) +const showDetail = ref(false) const formData = reactive({ "id": 1, @@ -120,14 +130,6 @@ const formData = reactive({ "annex": [] }) -const handleAvatarSuccess_four = (response: any) => { - Array.isArray(formData.annex) ? '' : formData.annex = [] - // @ts-ignore - response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg); -}; - -// 删除上传的文件 -const delFileFn = (index: number) => { formData.annex.splice(index, 1) } // 查询条件 const queryParams = reactive({ @@ -184,5 +186,14 @@ const handleAccept = async (row: Object | any[]) => { } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionAcceptDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + getLists() diff --git a/src/views/supervision_commencement_report/detail.js b/src/views/supervision_commencement_report/detail.js new file mode 100644 index 0000000..9b5c296 --- /dev/null +++ b/src/views/supervision_commencement_report/detail.js @@ -0,0 +1,34 @@ +const detailConfig = { + title: "工程监理--第一次工地会议", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "文档名称", + value: "doc_name" + }, + { + label: "文档简介", + value: "doc_desc" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + { + label: "附件", + value: "annex", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_commencement_report/index.vue b/src/views/supervision_commencement_report/index.vue index 3536818..f18a7a5 100644 --- a/src/views/supervision_commencement_report/index.vue +++ b/src/views/supervision_commencement_report/index.vue @@ -30,18 +30,6 @@ - - - @@ -66,20 +54,25 @@
+
diff --git a/src/views/supervision_construction_management_personnel/detail.js b/src/views/supervision_construction_management_personnel/detail.js new file mode 100644 index 0000000..3436aca --- /dev/null +++ b/src/views/supervision_construction_management_personnel/detail.js @@ -0,0 +1,81 @@ +const detailConfig = { + title: "工程监理--施工管理人员", + config: [ + { + label: "所属单位", + value: "company_name" + }, + { + label: "姓名", + value: "name" + }, + { + label: "身份证", + value: "id_card" + }, + { + label: "技术职称", + value: "technical_title" + }, + { + label: "岗位", + value: "job" + }, + { + label: "资质名称1", + value: "qualification_name_one" + }, + { + label: "认证机构1", + value: "qualification_number_one" + }, + { + label: "资质编号1", + value: "qualification_number_one" + }, + { + label: "发证日期1", + value: "effective_date_one" + }, + { + label: "有效日期1", + value: "effective_date_one" + }, + { + label: "资质1状态", + value: "qualification_one_status_text" + }, + { + label: "资质名称2", + value: "qualification_name_two" + }, + { + label: "认证机构2", + value: "certification_body_two" + }, + { + label: "资质编号2", + value: "qualification_number_two" + }, { + label: "发证日期2", + value: "get_date_two" + }, { + label: "有效日期2", + value: "effective_date_two" + }, { + label: "资质2状态", + value: "qualification_two_status_text" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + + ] + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_construction_management_personnel/edit.vue b/src/views/supervision_construction_management_personnel/edit.vue index 34d613b..d3e055b 100644 --- a/src/views/supervision_construction_management_personnel/edit.vue +++ b/src/views/supervision_construction_management_personnel/edit.vue @@ -1,508 +1,388 @@ diff --git a/src/views/supervision_construction_management_personnel/index.vue b/src/views/supervision_construction_management_personnel/index.vue index d0f2c37..c7cae34 100644 --- a/src/views/supervision_construction_management_personnel/index.vue +++ b/src/views/supervision_construction_management_personnel/index.vue @@ -66,6 +66,11 @@ type="danger" link @click="handleDelete(row.id)"> 删除 + + 详情 + @@ -75,6 +80,8 @@ + + @@ -82,14 +89,16 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionConstructionManagementPersonnelLists, apiSupervisionConstructionManagementPersonnelDelete, apiSupervisionConstructionManagementPersonnelDetail } from '@/api/supervision_construction_management_personnel' -import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) - +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ @@ -139,6 +148,15 @@ const handleDelete = async (id: number | any[]) => { await apiSupervisionConstructionManagementPersonnelDelete({ id }) getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionConstructionManagementPersonnelDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + getLists() diff --git a/src/views/supervision_construction_planning/detail.js b/src/views/supervision_construction_planning/detail.js new file mode 100644 index 0000000..750481b --- /dev/null +++ b/src/views/supervision_construction_planning/detail.js @@ -0,0 +1,34 @@ +const detailConfig = { + title: "工程监理--监理合同交底", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "文档名称", + value: "doc_name" + }, + { + label: "文档简介", + value: "doc_desc" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + { + label: "附件", + value: "annex", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_construction_planning/index.vue b/src/views/supervision_construction_planning/index.vue index 6c451c0..8096105 100644 --- a/src/views/supervision_construction_planning/index.vue +++ b/src/views/supervision_construction_planning/index.vue @@ -29,18 +29,6 @@ - - - @@ -61,6 +53,8 @@ + @@ -68,13 +62,16 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionConstructionPlanningLists, apiSupervisionConstructionPlanningDelete, apiSupervisionConstructionPlanningDetail } from '@/api/supervision_construction_planning' -import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) +const showDetail = ref(false) // 查询条件 @@ -113,7 +110,7 @@ const handleEdit = async (data: any) => { showEdit.value = true await nextTick() editRef.value?.open('edit') - editRef.value?.setFormData(data) + editRef.value?.setFormData(res) } // 删除 @@ -123,5 +120,15 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionConstructionPlanningDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + + getLists() diff --git a/src/views/supervision_contract_disclosure/detail.js b/src/views/supervision_contract_disclosure/detail.js new file mode 100644 index 0000000..750481b --- /dev/null +++ b/src/views/supervision_contract_disclosure/detail.js @@ -0,0 +1,34 @@ +const detailConfig = { + title: "工程监理--监理合同交底", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "文档名称", + value: "doc_name" + }, + { + label: "文档简介", + value: "doc_desc" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + { + label: "附件", + value: "annex", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_contract_disclosure/index.vue b/src/views/supervision_contract_disclosure/index.vue index e38574c..1da43a2 100644 --- a/src/views/supervision_contract_disclosure/index.vue +++ b/src/views/supervision_contract_disclosure/index.vue @@ -40,8 +40,8 @@ type="danger" link @click="handleDelete(row.id)"> 删除 - + 详情 @@ -53,6 +53,9 @@ + + @@ -60,13 +63,15 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionContractDisclosureLists, apiSupervisionContractDisclosureDelete, apiSupervisionContractDisclosureDetail } from '@/api/supervision_contract_disclosure' -import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' +import detailConfig from './detail' import EditPopup from './edit.vue' const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) +const showDetail = ref(false) // 查询条件 @@ -115,7 +120,14 @@ const handleDelete = async (id: number | any[]) => { getLists() } - +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionContractDisclosureDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} getLists() diff --git a/src/views/supervision_design_disclosure/detail.js b/src/views/supervision_design_disclosure/detail.js new file mode 100644 index 0000000..9b5c296 --- /dev/null +++ b/src/views/supervision_design_disclosure/detail.js @@ -0,0 +1,34 @@ +const detailConfig = { + title: "工程监理--第一次工地会议", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "文档名称", + value: "doc_name" + }, + { + label: "文档简介", + value: "doc_desc" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + { + label: "附件", + value: "annex", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_design_disclosure/index.vue b/src/views/supervision_design_disclosure/index.vue index c6f9c57..aa65ce9 100644 --- a/src/views/supervision_design_disclosure/index.vue +++ b/src/views/supervision_design_disclosure/index.vue @@ -29,18 +29,6 @@ - - - @@ -61,6 +53,8 @@ + @@ -68,14 +62,15 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionDesignDisclosureLists, apiSupervisionDesignDisclosureDelete, apiSupervisionDesignDisclosureDetail } from '@/api/supervision_design_disclosure' -import { timeFormat } from '@/utils/util' +import detailConfig from './detail' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) - +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ @@ -122,6 +117,15 @@ const handleDelete = async (id: number | any[]) => { await apiSupervisionDesignDisclosureDelete({ id }) getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionDesignDisclosureDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + getLists() diff --git a/src/views/supervision_device_entry/detail.js b/src/views/supervision_device_entry/detail.js new file mode 100644 index 0000000..f1ceea0 --- /dev/null +++ b/src/views/supervision_device_entry/detail.js @@ -0,0 +1,80 @@ + +import { apisupervision_material_entry_detail, } from '@/api/supervision_material_entry' + +const detailConfig = { + title: "工程监理--设备进场", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "进场时间", + value: "enter_time" + }, + { + label: "施工单位", + value: "company_name" + }, + { + label: "进场结果", + value: "enter_result_text" + }, + { + label: "共同参与人", + value: "co_participant" + }, + { + label: "备注", + value: "remark", + column: 1 + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + + ], + table: { + title: "材料信息", + tableConfig: [ + { + label: "材料名称", + value: 'name' + + }, + { + label: "材料品牌", + value: 'brand' + + }, + { + label: "单位", + value: 'unit' + }, + { + label: "是否合同约定品牌", + value: 'contract_brand_text', + + }, + { + label: "型号", + value: 'model', + }, + { + label: "进场数量", + value: 'entry_number' + }, + + ], + fetchFun: apisupervision_material_entry_detail, + query: 'material_entry_id' + } + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_device_entry/index.vue b/src/views/supervision_device_entry/index.vue index 828ea27..27ef740 100644 --- a/src/views/supervision_device_entry/index.vue +++ b/src/views/supervision_device_entry/index.vue @@ -48,6 +48,10 @@ @click="handleDelete(row.id)"> 删除 + + 详情 + @@ -57,6 +61,8 @@ + + @@ -67,11 +73,14 @@ import { apiSupervisionDeviceEntryLists, apiSupervisionDeviceEntryDelete, apiSup import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) - +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ @@ -120,5 +129,15 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionDeviceEntryDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + + getLists() diff --git a/src/views/supervision_first_meeting/detail.js b/src/views/supervision_first_meeting/detail.js new file mode 100644 index 0000000..9b5c296 --- /dev/null +++ b/src/views/supervision_first_meeting/detail.js @@ -0,0 +1,34 @@ +const detailConfig = { + title: "工程监理--第一次工地会议", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "文档名称", + value: "doc_name" + }, + { + label: "文档简介", + value: "doc_desc" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + { + label: "附件", + value: "annex", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_first_meeting/index.vue b/src/views/supervision_first_meeting/index.vue index dc39125..5b1a354 100644 --- a/src/views/supervision_first_meeting/index.vue +++ b/src/views/supervision_first_meeting/index.vue @@ -29,18 +29,6 @@ - - - @@ -61,6 +53,8 @@ + @@ -68,14 +62,16 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionFirstMeetingLists, apiSupervisionFirstMeetingDelete, apiSupervisionFirstMeetingDetail } from '@/api/supervision_first_meeting' -import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) - +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ @@ -123,5 +119,15 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionFirstMeetingDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + + getLists() diff --git a/src/views/supervision_inspection/detail.vue b/src/views/supervision_inspection/detail.vue new file mode 100644 index 0000000..006594e --- /dev/null +++ b/src/views/supervision_inspection/detail.vue @@ -0,0 +1,161 @@ + + + diff --git a/src/views/supervision_inspection/edit.vue b/src/views/supervision_inspection/edit.vue index 7e9b517..27b9bed 100644 --- a/src/views/supervision_inspection/edit.vue +++ b/src/views/supervision_inspection/edit.vue @@ -86,8 +86,8 @@ - - + + diff --git a/src/views/supervision_inspection/index.vue b/src/views/supervision_inspection/index.vue index 0adf8c2..7be88b6 100644 --- a/src/views/supervision_inspection/index.vue +++ b/src/views/supervision_inspection/index.vue @@ -57,6 +57,10 @@ @click="handleDelete(row.id)"> 删除 + + 详情 + @@ -66,6 +70,7 @@ + @@ -73,14 +78,16 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionInspectionLists, apiSupervisionInspectionDelete, apiSupervisionInspectionDetail } from '@/api/supervision_inspection' -import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import DetailPopup from './detail.vue' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) - +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ @@ -129,5 +136,14 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionInspectionDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + getLists() diff --git a/src/views/supervision_large_equipment/detail.js b/src/views/supervision_large_equipment/detail.js new file mode 100644 index 0000000..937a5ea --- /dev/null +++ b/src/views/supervision_large_equipment/detail.js @@ -0,0 +1,79 @@ +const detailConfig = { + title: "工程监理--第一次工地会议", + config: [ + { + label: "所属单位", + value: "company_name" + }, + { + label: "设备名称", + value: "name" + }, + { + label: "资质名称1", + value: "qualification_name_one" + }, + { + label: "认证机构1", + value: "certification_body_one" + }, + { + label: "资质编号1", + value: "qualification_number_one" + }, + { + label: "发证日期1", + value: "qualification_number_one" + }, { + label: "资质编号1", + value: "get_date_one" + }, { + label: "发证日期1", + value: "get_date_one" + }, { + label: "有效日期1", + value: "effective_date_one" + }, { + label: "资质1状态", + value: "qualification_one_status_text" + }, { + label: "资质名称2", + value: "qualification_name_two" + }, + { + label: "认证机构2", + value: "certification_body_two" + }, + { + label: "资质编号2", + value: "qualification_number_two" + }, { + label: "发证日期2", + value: "get_date_two" + }, { + label: "有效日期2", + value: "effective_date_two" + }, + { + label: "资质2状态", + value: "qualification_two_status_text" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + { + label: "附件", + value: "annex", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_large_equipment/edit.vue b/src/views/supervision_large_equipment/edit.vue index 129c49d..e50f7a9 100644 --- a/src/views/supervision_large_equipment/edit.vue +++ b/src/views/supervision_large_equipment/edit.vue @@ -1,222 +1,136 @@ diff --git a/src/views/supervision_large_equipment/index.vue b/src/views/supervision_large_equipment/index.vue index fd6fe7d..f0b63fb 100644 --- a/src/views/supervision_large_equipment/index.vue +++ b/src/views/supervision_large_equipment/index.vue @@ -61,6 +61,10 @@ type="danger" link @click="handleDelete(row.id)"> 删除 + + 详情 + @@ -70,6 +74,7 @@ + @@ -80,10 +85,14 @@ import { apiSupervisionLargeEquipmentLists, apiSupervisionLargeEquipmentDelete, import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) +const showDetail = ref(false) // 查询条件 @@ -135,5 +144,15 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionLargeEquipmentDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + + getLists() diff --git a/src/views/supervision_material_entry/detail.js b/src/views/supervision_material_entry/detail.js new file mode 100644 index 0000000..9d3a462 --- /dev/null +++ b/src/views/supervision_material_entry/detail.js @@ -0,0 +1,88 @@ + +import { apisupervision_material_entry_detail, } from '@/api/supervision_material_entry' + +const detailConfig = { + title: "工程监理--材料进场", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "采购单位", + value: "company_name" + }, + { + label: "进场主题", + value: "theme" + }, + { + label: "进场时间", + value: "enter_time" + }, + { + label: "共同参与人", + value: "co_participant" + }, + { + label: "进场结果", + value: "enter_result_text" + }, + { + label: "是否平行检验", + value: "parallel_test_text" + }, + { + label: "备注", + value: "remark", + column: 1 + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + + ], + table: { + title: "材料信息", + tableConfig: [ + { + label: "材料名称", + value: 'name' + + }, + { + label: "材料品牌", + value: 'brand' + + }, + { + label: "单位", + value: 'unit' + }, + { + label: "是否合同约定品牌", + value: 'contract_brand_text', + + }, + { + label: "型号", + value: 'model', + }, + { + label: "进场数量", + value: 'entry_number' + }, + + ], + fetchFun: apisupervision_material_entry_detail, + query: 'material_entry_id' + } + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_material_entry/index.vue b/src/views/supervision_material_entry/index.vue index d1c7f43..0c67036 100644 --- a/src/views/supervision_material_entry/index.vue +++ b/src/views/supervision_material_entry/index.vue @@ -43,14 +43,18 @@ @@ -60,6 +64,7 @@ + @@ -70,11 +75,14 @@ import { apiSupervisionMaterialEntryLists, apiSupervisionMaterialEntryDelete, ap import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) - +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ @@ -123,6 +131,14 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionMaterialEntryDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + getLists() - diff --git a/src/views/supervision_material_equipment_info/detail.js b/src/views/supervision_material_equipment_info/detail.js new file mode 100644 index 0000000..b94d686 --- /dev/null +++ b/src/views/supervision_material_equipment_info/detail.js @@ -0,0 +1,43 @@ +const detailConfig = { + title: "工程监理--材料设备信息", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "材料/设备名称", + value: "name" + }, + { + label: "材料/设备品牌", + value: "brand" + }, + { + label: "型号", + value: "model" + }, + { + label: "计数单位", + value: "unit" + }, + { + label: "合同约定品牌", + value: "contract_brand_text" + }, + { + label: "类型", + value: "type_text" + }, + { + label: "备注", + value: "remark", + column: 1 + }, + + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_material_equipment_info/index.vue b/src/views/supervision_material_equipment_info/index.vue index 2b29686..e693cd0 100644 --- a/src/views/supervision_material_equipment_info/index.vue +++ b/src/views/supervision_material_equipment_info/index.vue @@ -78,6 +78,10 @@ type="danger" link @click="handleDelete(row.id)"> 删除 + + 详情 + @@ -87,20 +91,25 @@ + diff --git a/src/views/supervision_monitoring_equipment/detail.js b/src/views/supervision_monitoring_equipment/detail.js index 0fb3726..9928ec4 100644 --- a/src/views/supervision_monitoring_equipment/detail.js +++ b/src/views/supervision_monitoring_equipment/detail.js @@ -15,7 +15,7 @@ const detailConfig = { }, { label: "设备类型", - value: "device_type" + value: "device_type_text" }, { label: "设备序列号", @@ -41,7 +41,7 @@ const detailConfig = { }, { label: "是否显示", - value: 'is_show' + value: 'is_show_text' }, ], diff --git a/src/views/supervision_monitoring_equipment/index.vue b/src/views/supervision_monitoring_equipment/index.vue index cf4c86e..ba975ac 100644 --- a/src/views/supervision_monitoring_equipment/index.vue +++ b/src/views/supervision_monitoring_equipment/index.vue @@ -72,8 +72,8 @@ type="danger" link @click="handleDelete(row.id)"> 删除 - + 详情 diff --git a/src/views/supervision_participating_units/detail.js b/src/views/supervision_participating_units/detail.js index 69b0679..8c54fcc 100644 --- a/src/views/supervision_participating_units/detail.js +++ b/src/views/supervision_participating_units/detail.js @@ -16,7 +16,7 @@ const detailConfig = { }, { label: "单位类别", - value: "unit_type" + value: "unit_type_text" }, { label: "资质等级", diff --git a/src/views/supervision_participating_units/index.vue b/src/views/supervision_participating_units/index.vue index 92cd63b..2c046e9 100644 --- a/src/views/supervision_participating_units/index.vue +++ b/src/views/supervision_participating_units/index.vue @@ -52,8 +52,8 @@ type="danger" link @click="handleDelete(row.id)"> 删除 - + 详情 diff --git a/src/views/supervision_participating_units_qualifications/detail.js b/src/views/supervision_participating_units_qualifications/detail.js new file mode 100644 index 0000000..ceb8c86 --- /dev/null +++ b/src/views/supervision_participating_units_qualifications/detail.js @@ -0,0 +1,48 @@ +const detailConfig = { + title: "工程监理--第一次工地会议", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "所属单位", + value: "company_name" + }, + { + label: "资质名称", + value: "qualification_name" + }, + { + label: "资质编号", + value: "qualification_number" + }, + { + label: "发证日期", + value: "get_date" + }, + { + label: "有效日期", + value: "effective_date" + }, + { + label: "资质状态", + value: "qualification_status_text" + }, + { + label: "备注", + value: "remark", + column: 1 + + }, + { + label: "附件", + value: "annex", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_participating_units_qualifications/edit.vue b/src/views/supervision_participating_units_qualifications/edit.vue index 0e35373..9c34c1a 100644 --- a/src/views/supervision_participating_units_qualifications/edit.vue +++ b/src/views/supervision_participating_units_qualifications/edit.vue @@ -2,7 +2,7 @@
- + @@ -38,7 +38,6 @@ - @@ -76,18 +75,10 @@ const mode = ref('add') const showDialog = ref(false) const showDialog1 = ref(false) -const handleAvatarSuccess_four = (response: any) => { - if (!Array.isArray(formData.annex)) formData.annex = [] - // @ts-ignore - response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg); -}; - -// 删除上传的文件 -const delFileFn = (index: number) => { formData.annex.splice(index, 1) } // 弹窗标题 const popupTitle = computed(() => { - return mode.value == 'edit' ? '编辑工程监理--参建单位资质' : '新增工程监理--参建单位资质' + return mode.value == 'edit' ? '编辑工程监理--参建单位资质' : '工程监理--参建单位资质' }) // 表单数据 diff --git a/src/views/supervision_participating_units_qualifications/index.vue b/src/views/supervision_participating_units_qualifications/index.vue index 310f6e4..13284ad 100644 --- a/src/views/supervision_participating_units_qualifications/index.vue +++ b/src/views/supervision_participating_units_qualifications/index.vue @@ -52,6 +52,11 @@ type="danger" link @click="handleDelete(row.id)"> 删除 + + 详情 + @@ -61,6 +66,8 @@
+ @@ -71,10 +78,15 @@ import { apiSupervisionParticipatingUnitsQualificationsLists, apiSupervisionPart import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) +const showDetail = ref(false) + // 查询条件 @@ -110,11 +122,11 @@ const handleAdd = async () => { } // 编辑 -const handleEdit = async (data: any) => { +const handleEdit = async (data: any, mode = 'add') => { let res = await apiSupervisionParticipatingUnitsQualificationsDetail({ id: data.id }) showEdit.value = true await nextTick() - editRef.value?.open('edit') + editRef.value?.open(mode) editRef.value?.setFormData(res) } @@ -125,5 +137,13 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionParticipatingUnitsQualificationsDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} getLists() diff --git a/src/views/supervision_planning/index.vue b/src/views/supervision_planning/index.vue index 1e83bd1..c544021 100644 --- a/src/views/supervision_planning/index.vue +++ b/src/views/supervision_planning/index.vue @@ -71,7 +71,7 @@ @click="handleDelete(row.id)"> 删除 - 详情 diff --git a/src/views/supervision_project/detail.js b/src/views/supervision_project/detail.js index 45a0a12..bb55952 100644 --- a/src/views/supervision_project/detail.js +++ b/src/views/supervision_project/detail.js @@ -7,11 +7,11 @@ const detailConfig = { }, { label: "行业", - value: "industry" + value: "industry_text" }, { label: "性质", - value: "nature" + value: "nature_text" }, { label: "建设单位", @@ -19,7 +19,7 @@ const detailConfig = { }, { label: "建设区域", - value: "build_area" + value: "build_area_text" }, { label: "项目地址", @@ -27,7 +27,7 @@ const detailConfig = { }, { label: "项目等级", - value: "project_level" + value: "project_level_text" }, { label: "总投资(万元)", @@ -88,7 +88,7 @@ const detailConfig = { }, { label: "工程状态", - value: "engineering_status" + value: "engineering_status_text" }, { label: "项目负责人员", diff --git a/src/views/supervision_project/edit.vue b/src/views/supervision_project/edit.vue index c80703c..0c7c582 100644 --- a/src/views/supervision_project/edit.vue +++ b/src/views/supervision_project/edit.vue @@ -26,8 +26,7 @@ - - + @@ -65,14 +64,12 @@ - - - + @@ -91,8 +88,7 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -151,8 +122,7 @@ - - + @@ -172,21 +142,12 @@ - - + - - - - - - - - @@ -199,6 +160,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/supervision_project/index.vue b/src/views/supervision_project/index.vue index b7b1763..ba84097 100644 --- a/src/views/supervision_project/index.vue +++ b/src/views/supervision_project/index.vue @@ -112,7 +112,7 @@ @click="handleDelete(row.id)"> 删除 - 详情 diff --git a/src/views/supervision_rules/detail.js b/src/views/supervision_rules/detail.js new file mode 100644 index 0000000..9b5c296 --- /dev/null +++ b/src/views/supervision_rules/detail.js @@ -0,0 +1,34 @@ +const detailConfig = { + title: "工程监理--第一次工地会议", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "文档名称", + value: "doc_name" + }, + { + label: "文档简介", + value: "doc_desc" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + { + label: "附件", + value: "annex", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_rules/index.vue b/src/views/supervision_rules/index.vue index 3d7667e..453f8ea 100644 --- a/src/views/supervision_rules/index.vue +++ b/src/views/supervision_rules/index.vue @@ -28,18 +28,6 @@ - - - @@ -64,20 +52,25 @@ + diff --git a/src/views/supervision_rules_disclosure/detail.js b/src/views/supervision_rules_disclosure/detail.js new file mode 100644 index 0000000..9b5c296 --- /dev/null +++ b/src/views/supervision_rules_disclosure/detail.js @@ -0,0 +1,34 @@ +const detailConfig = { + title: "工程监理--第一次工地会议", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "文档名称", + value: "doc_name" + }, + { + label: "文档简介", + value: "doc_desc" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + { + label: "附件", + value: "annex", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_rules_disclosure/index.vue b/src/views/supervision_rules_disclosure/index.vue index 78f6439..11999d5 100644 --- a/src/views/supervision_rules_disclosure/index.vue +++ b/src/views/supervision_rules_disclosure/index.vue @@ -30,18 +30,6 @@ - - - @@ -66,21 +54,25 @@ + diff --git a/src/views/supervision_safety_management_personnel/detail.js b/src/views/supervision_safety_management_personnel/detail.js new file mode 100644 index 0000000..cf90760 --- /dev/null +++ b/src/views/supervision_safety_management_personnel/detail.js @@ -0,0 +1,86 @@ +const detailConfig = { + title: "工程监理--施工管理人员", + config: [ + { + label: "所属单位", + value: "company_name" + }, + { + label: "姓名", + value: "name" + }, + { + label: "身份证", + value: "id_card" + }, + { + label: "技术职称", + value: "technical_title" + }, + { + label: "岗位", + value: "job" + }, + { + label: "资质名称1", + value: "qualification_name_one" + }, + { + label: "认证机构1", + value: "certification_body_one" + }, + { + label: "资质编号1", + value: "qualification_number_one" + }, + { + label: "发证日期1", + value: "get_date_one" + }, + { + label: "有效日期1", + value: "effective_date_one" + }, + { + label: "资质1状态", + value: "qualification_one_status_text" + }, + { + label: "资质名称2", + value: "qualification_name_two" + }, + { + label: "认证机构2", + value: "certification_body_two" + }, + { + label: "资质编号2", + value: "qualification_number_two" + }, { + label: "发证日期2", + value: "get_date_two" + }, { + label: "有效日期2", + value: "effective_date_two" + }, { + label: "资质2状态", + value: "qualification_two_status_text" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + { + label: "附件", + value: "annex", + column: 1 + }, + + ] + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_safety_management_personnel/edit.vue b/src/views/supervision_safety_management_personnel/edit.vue index b80b4f7..d33ac71 100644 --- a/src/views/supervision_safety_management_personnel/edit.vue +++ b/src/views/supervision_safety_management_personnel/edit.vue @@ -5,7 +5,7 @@ - + @@ -20,8 +20,7 @@ - - + @@ -33,8 +32,7 @@ - - + @@ -50,8 +48,7 @@ - - + - - + @@ -92,8 +88,7 @@ - - + - - + @@ -128,7 +122,6 @@ - diff --git a/src/views/supervision_safety_management_personnel/index.vue b/src/views/supervision_safety_management_personnel/index.vue index 27bf21f..cf5dbde 100644 --- a/src/views/supervision_safety_management_personnel/index.vue +++ b/src/views/supervision_safety_management_personnel/index.vue @@ -65,6 +65,11 @@ type="danger" link @click="handleDelete(row.id)"> 删除 + + 详情 + @@ -74,6 +79,8 @@ + + @@ -81,13 +88,16 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionSafetyManagementPersonnelLists, apiSupervisionSafetyManagementPersonnelDelete, apiSupervisionSafetyManagementPersonnelDetail } from '@/api/supervision_safety_management_personnel' -import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) +const showDetail = ref(false) // 查询条件 @@ -139,5 +149,14 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionSafetyManagementPersonnelDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + getLists() diff --git a/src/views/supervision_side_station/detail.vue b/src/views/supervision_side_station/detail.vue new file mode 100644 index 0000000..46a1dec --- /dev/null +++ b/src/views/supervision_side_station/detail.vue @@ -0,0 +1,170 @@ + + + diff --git a/src/views/supervision_side_station/index.vue b/src/views/supervision_side_station/index.vue index 80fe266..4e7688c 100644 --- a/src/views/supervision_side_station/index.vue +++ b/src/views/supervision_side_station/index.vue @@ -56,6 +56,10 @@ @click="handleDelete(row.id)"> 删除 + + 详情 + @@ -65,6 +69,7 @@ + @@ -72,13 +77,17 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionSideStationLists, apiSupervisionSideStationDelete, apiSupervisionSideStationDetail } from '@/api/supervision_side_station' -import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import DetailPopup from './detail.vue' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) +const showDetail = ref(false) + // 查询条件 @@ -128,5 +137,15 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionSideStationDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + + getLists() diff --git a/src/views/supervision_special_operation_personnel/detail.js b/src/views/supervision_special_operation_personnel/detail.js new file mode 100644 index 0000000..96ace83 --- /dev/null +++ b/src/views/supervision_special_operation_personnel/detail.js @@ -0,0 +1,61 @@ +const detailConfig = { + title: "工程监理--特种作业人员资质", + config: [ + { + label: "所属单位", + value: "company_name" + }, + { + label: "姓名", + value: "name" + }, + { + label: "工种", + value: "work_type" + }, + { + label: "身份证", + value: "id_card" + }, + { + label: "资格有效期", + value: "validity_period" + }, + { + label: "进场时间", + value: "enter_time" + }, + { + label: "离场时间", + value: "leave_time" + }, + { + label: "状态", + value: "status_text" + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + + { + label: "备注", + value: "remark", + column: 1, + }, + + { + label: "附件", + value: "annex", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_special_operation_personnel/edit.vue b/src/views/supervision_special_operation_personnel/edit.vue index 3627e30..00438af 100644 --- a/src/views/supervision_special_operation_personnel/edit.vue +++ b/src/views/supervision_special_operation_personnel/edit.vue @@ -2,7 +2,7 @@
- + { - return mode.value == 'edit' ? '编辑工程监理--特种作业人员资质' : '新增工程监理--特种作业人员资质' + return mode.value == 'edit' ? '编辑工程监理--特种作业人员资质' : '工程监理--特种作业人员资质' }) // 表单数据 @@ -96,14 +96,7 @@ const formData = reactive({ create_user: "", create_time: "", }) -const handleAvatarSuccess_four = (response: any) => { - if (!Array.isArray(formData.annex)) formData.annex = [] - // @ts-ignore - response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg); -}; -// 删除上传的文件 -const delFileFn = (index: number) => { formData.annex.splice(index, 1) } const customEvent1 = (e) => { formData.unit_qualification_id = e.id diff --git a/src/views/supervision_special_operation_personnel/index.vue b/src/views/supervision_special_operation_personnel/index.vue index 383d86d..004f4ca 100644 --- a/src/views/supervision_special_operation_personnel/index.vue +++ b/src/views/supervision_special_operation_personnel/index.vue @@ -54,6 +54,11 @@ type="danger" link @click="handleDelete(row.id)"> 删除 + + 详情 + @@ -63,6 +68,8 @@
+ @@ -70,13 +77,16 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionSpecialOperationPersonnelLists, apiSupervisionSpecialOperationPersonnelDelete, apiSupervisionSpecialOperationPersonnelDetail } from '@/api/supervision_special_operation_personnel' -import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) +const showDetail = ref(false) // 查询条件 @@ -112,11 +122,11 @@ const handleAdd = async () => { } // 编辑 -const handleEdit = async (data: any) => { +const handleEdit = async (data: any, mode = 'edit') => { let res = await apiSupervisionSpecialOperationPersonnelDetail({ id: data.id }) showEdit.value = true await nextTick() - editRef.value?.open('edit') + editRef.value?.open(mode) editRef.value?.setFormData(res) } @@ -127,5 +137,15 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 详情 +const handleDetail = async (id: any) => { + let res = await apiSupervisionSpecialOperationPersonnelDetail({ id }) + showDetail.value = true + await nextTick() + detailRef.value?.open() + detailRef.value?.setFormData(res) +} + + getLists() diff --git a/src/views/supervision_test_blocks_specimens/detail.js b/src/views/supervision_test_blocks_specimens/detail.js new file mode 100644 index 0000000..0c5d4f8 --- /dev/null +++ b/src/views/supervision_test_blocks_specimens/detail.js @@ -0,0 +1,87 @@ +import { apisupervision_problem } from '@/api/supervision_inspection' + +const detailConfig = { + title: "工程监理--设备进场", + config: [ + { + label: "项目名称", + value: "project_name" + }, + { + label: "试验类型", + value: "test_type" + }, + { + label: "编号", + value: "code" + }, + { + label: "见证人", + value: "witness" + }, + { + label: "试验部位", + value: "test_site" + }, + { + label: "单位名称", + value: "company_name", + }, + { + label: "开始日期", + value: "start_date", + }, + { + label: "结束日期", + value: "end_date", + }, + { + label: "试验结果", + value: "test_result_text", + }, + { + label: "备注", + value: "remark", + column: 1 + }, + { + label: "创建人", + value: "create_user" + }, + { + label: "创建时间", + value: "create_time" + }, + { + label: "附件", + value: "annex", + column: 1 + + }, + + ], + table: { + title: "问题", + tableConfig: [ + { + label: "问题分类", + value: 'problem_cate_text', + + }, + { + label: "问题说明", + value: 'problem_description' + }, + { + label: "问题名称", + value: 'problem_name', + }, + + ], + fetchFun: apisupervision_problem, + query: 'data_id' + } + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/supervision_test_blocks_specimens/index.vue b/src/views/supervision_test_blocks_specimens/index.vue index b5d2c61..ff7257a 100644 --- a/src/views/supervision_test_blocks_specimens/index.vue +++ b/src/views/supervision_test_blocks_specimens/index.vue @@ -76,6 +76,10 @@ type="danger" link @click="handleDelete(row.id)"> 删除 + + 详情 + @@ -85,20 +89,25 @@ + diff --git a/src/views/supervision_witness_sampling/edit.vue b/src/views/supervision_witness_sampling/edit.vue index 41213f2..dd25bcc 100644 --- a/src/views/supervision_witness_sampling/edit.vue +++ b/src/views/supervision_witness_sampling/edit.vue @@ -67,7 +67,10 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiSupervisionWitnessSamplingAdd, apiSupervisionWitnessSamplingEdit, apiSupervisionWitnessSamplingDetail } from '@/api/supervision_witness_sampling' import { supervision_project, supervision_material_entry } from "@/components/dialogTable/dialogTableConfig" +// import { apisupervision_material_entry_detail, } from '@/api/supervision_material_entry' import { apisupervision_material_entry_detail, } from '@/api/supervision_material_entry' +import { apiSupervisionWitnessSamplingListsDetail, } from '@/api/supervision_witness_sampling' + import type { PropType } from 'vue' defineProps({ @@ -210,7 +213,7 @@ const setFormData = async (data: Record) => { } } - let res = await apisupervision_material_entry_detail({ material_entry_id: formData.material_entry_id }) + let res = await apiSupervisionWitnessSamplingListsDetail({ witness_sampling_id: formData.id }) formData.sampling_detail = res.lists } diff --git a/src/views/supervision_witness_sampling/index.vue b/src/views/supervision_witness_sampling/index.vue index e4d6251..58de58b 100644 --- a/src/views/supervision_witness_sampling/index.vue +++ b/src/views/supervision_witness_sampling/index.vue @@ -93,7 +93,6 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSupervisionWitnessSamplingLists, apiSupervisionWitnessSamplingDelete, apiSupervisionWitnessSamplingDetail } from '@/api/supervision_witness_sampling' -import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' import { useRouter } from 'vue-router'