diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts index efec597..15d1c1e 100644 --- a/src/components/dialogTable/dialogTableConfig.ts +++ b/src/components/dialogTable/dialogTableConfig.ts @@ -1,26 +1,21 @@ - -import { apiSupervisionProjectLists } from '@/api/supervision_project' - - interface Iconfig{ - /** 列表查询的参数,会带一些默认的参数查询*/ - queryParams:object, - /** 请求列表的接口*/ fetchFn:Function, /**用户可搜索的内容,select为下拉列表 */ - serchList:Array<{label:String,value:String,select?:Array<{label:string,value:string|Number}>}>, + serchList:Array<{label:String,value:String,select?:Array<{name:string,value:string|Number}>|String }>, /**table配置 */ tableList:Array, } +import { useDictData } from '@/hooks/useDictOptions' +import { apiSupervisionProjectLists } from '@/api/supervision_project' +import { apiSupervisionParticipatingUnitsLists, } from '@/api/supervision_participating_units' +import { apiSupervisionCheckItemLists } from '@/api/supervision_check_item' + + export const supervision_project:Iconfig = { - queryParams: { - project_name: "", - project_code: "", - }, fetchFn: apiSupervisionProjectLists, serchList: [ { @@ -31,14 +26,14 @@ export const supervision_project:Iconfig = { label: '项目编号', value: "project_code" }, - { - label: '项目分类', - value: "project_type", - // select: [ - // { label: "是", value: 0 }, - // { label: "否", value: 1 }, - // ] - } + // { + // label: '项目分类', + // value: "project_type", + // select: [ + // { label: "是", value: 0 }, + // { label: "否", value: 1 }, + // ] + // } ], tableList: [ { project_name: "项目名称" }, @@ -64,3 +59,47 @@ export const supervision_project:Iconfig = { { part_a_unit: "甲方单位" }, ] } + + +export const supervision_participating_units:Iconfig = { + fetchFn: apiSupervisionParticipatingUnitsLists, + serchList: [ + { + label: '单位名称', + value: "unit_name" + }, + { + label: '资质等级', + value: "qualification_grade" + }, + ], + tableList: [ + { unit_name: "单位名称" }, + { unit_type_text: "单位类别" }, + { qualification_grade: "资质等级" }, + { telephone: "联系电话" }, + { duty: "责任范围" }, + ] +} + +export const supervision_check_item:Iconfig = { + fetchFn: apiSupervisionCheckItemLists, + serchList: [ + { + label: '节点名称', + value: "node_name" + }, + { + label: '节点类型', + value: "node_type", + select:'check_item_node_type' + }, + ], + tableList: [ + { project_name: "项目名称" }, + { node_name: "节点名称" }, + { node_type_text: "节点类型" }, + { node_code: "节点编号" }, + ] +} + diff --git a/src/components/dialogTable/index.vue b/src/components/dialogTable/index.vue index d93792b..92048cb 100644 --- a/src/components/dialogTable/index.vue +++ b/src/components/dialogTable/index.vue @@ -5,9 +5,12 @@ - - + + + @@ -18,7 +21,10 @@
- + + + @@ -38,29 +47,46 @@ \ No newline at end of file diff --git a/src/components/supervision_project/index.vue b/src/components/supervision_project/index.vue deleted file mode 100644 index 2365014..0000000 --- a/src/components/supervision_project/index.vue +++ /dev/null @@ -1,83 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/supervision_accept/edit.vue b/src/views/supervision_accept/edit.vue index 2e48c32..987c481 100644 --- a/src/views/supervision_accept/edit.vue +++ b/src/views/supervision_accept/edit.vue @@ -85,20 +85,23 @@ - + +
- - - + + +
- - + +
@@ -165,7 +168,7 @@ @@ -196,6 +199,8 @@ import { apisupervision_inspection_result_delete, apisupervision_problem_delete, import { apisupervision_check_item_detailLists } from '@/api/supervision_check_item' import { apiSupervisionAcceptAdd, apiSupervisionAcceptEdit, apiSupervisionAcceptDetail, apisupervision_accept_result, apisupervision_accept_result_delete } from '@/api/supervision_accept' import type { PropType } from 'vue' +import { supervision_project, supervision_participating_units, supervision_check_item } from "@/components/dialogTable/dialogTableConfig" + defineProps({ dictData: { type: Object as PropType>, @@ -342,7 +347,7 @@ const customEvents = (e) => { const customEvent1 = (e) => { formData.company_id = e.id - formData.company_name = e.project_name + formData.company_name = e.unit_name showDialog2.value = false } diff --git a/src/views/supervision_check_item/edit.vue b/src/views/supervision_check_item/edit.vue index 96b5948..a488beb 100644 --- a/src/views/supervision_check_item/edit.vue +++ b/src/views/supervision_check_item/edit.vue @@ -85,7 +85,7 @@
- + @@ -99,7 +99,7 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiSupervisionCheckItemAdd, apiSupervisionCheckItemEdit, apiSupervisionCheckItemDetail, apisupervision_check_item_detailLists, apisupervision_check_item_detail_delete } from '@/api/supervision_check_item' -import { timeFormat } from '@/utils/util' +import { supervision_project } from "@/components/dialogTable/dialogTableConfig" import type { PropType } from 'vue' defineProps({ dictData: { diff --git a/src/views/supervision_commencement_report/edit.vue b/src/views/supervision_commencement_report/edit.vue index bffe263..b7adc1f 100644 --- a/src/views/supervision_commencement_report/edit.vue +++ b/src/views/supervision_commencement_report/edit.vue @@ -133,7 +133,8 @@ defineExpose({