diff --git a/src/api/consult_new_start_project.ts b/src/api/consult_new_start_project.ts new file mode 100644 index 0000000..28fa10a --- /dev/null +++ b/src/api/consult_new_start_project.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 项目咨询--新开工项目管理列表 +export function apiConsultNewStartProjectLists(params: any) { + return request.get({ url: '/consult_basic.consult_new_start_project/lists', params }) +} + +// 添加项目咨询--新开工项目管理 +export function apiConsultNewStartProjectAdd(params: any) { + return request.post({ url: '/consult_basic.consult_new_start_project/add', params }) +} + +// 编辑项目咨询--新开工项目管理 +export function apiConsultNewStartProjectEdit(params: any) { + return request.post({ url: '/consult_basic.consult_new_start_project/edit', params }) +} + +// 删除项目咨询--新开工项目管理 +export function apiConsultNewStartProjectDelete(params: any) { + return request.post({ url: '/consult_basic.consult_new_start_project/delete', params }) +} + +// 项目咨询--新开工项目管理详情 +export function apiConsultNewStartProjectDetail(params: any) { + return request.get({ url: '/consult_basic.consult_new_start_project/detail', params }) +} \ No newline at end of file diff --git a/src/api/consult_project.ts b/src/api/consult_project.ts new file mode 100644 index 0000000..f04f423 --- /dev/null +++ b/src/api/consult_project.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 项目咨询--基本信息列表 +export function apiConsultProjectLists(params: any) { + return request.get({ url: '/consult_basic.consult_project/lists', params }) +} + +// 添加项目咨询--基本信息 +export function apiConsultProjectAdd(params: any) { + return request.post({ url: '/consult_basic.consult_project/add', params }) +} + +// 编辑项目咨询--基本信息 +export function apiConsultProjectEdit(params: any) { + return request.post({ url: '/consult_basic.consult_project/edit', params }) +} + +// 删除项目咨询--基本信息 +export function apiConsultProjectDelete(params: any) { + return request.post({ url: '/consult_basic.consult_project/delete', params }) +} + +// 项目咨询--基本信息详情 +export function apiConsultProjectDetail(params: any) { + return request.get({ url: '/consult_basic.consult_project/detail', params }) +} \ No newline at end of file diff --git a/src/api/data_report.ts b/src/api/data_report.ts index 7b667cc..42e12da 100644 --- a/src/api/data_report.ts +++ b/src/api/data_report.ts @@ -2,20 +2,22 @@ import request from '@/utils/request' export function cost_approved_project_list(params: any) { - return request.post({ url: '/cost_consultation_report/cost_approved_project_list', params }) + return request.get({ url: '/cost_consultation_report/cost_approved_project_list', params }) } -// 获取首页文章数据 export function cost_project_report(params?: any) { return request.get({ url: '/cost_consultation_report/cost_project_report', params }) } -// 底部导航详情 export function project_trace(params?: any) { return request.get({ url: '/cost_consultation_report/project_trace', params }) } -// 底部导航保存 -export function setDecorateTabbar(params: any) { - return request.post({ url: '/decorate.tabbar/save', params }) +export function apiproject_invoice_receipt(params?: any) { + return request.get({ url: '/cost_consultation_report/project_invoice_receipt', params }) } + +export function apidistribution_project_departments(params?: any) { + return request.get({ url: '/cost_consultation_report/distribution_project_departments', params }) +} + diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts index b1560d9..d9a2a04 100644 --- a/src/components/dialogTable/dialogTableConfig.ts +++ b/src/components/dialogTable/dialogTableConfig.ts @@ -22,6 +22,7 @@ import { apiSupervisionParticipatingUnitsQualificationsLists } from '@/api/super import { apiCostApprovedProjectLists } from '@/api/cost_approved_project' import { apiCostProjectLists } from '@/api/cost_project' import { apiTaskTypeLists } from '@/api/task_type' +import {apiSupervisionMaterialEquipmentInfoLists}from "@/api/supervision_material_equipment_info" @@ -201,7 +202,7 @@ export const supervision_material_entry:Iconfig = { } export const supervision_material_equipment_info:Iconfig = { - fetchFn: apiSupervisionMaterialEntryLists, + fetchFn: apiSupervisionMaterialEquipmentInfoLists, serchList: [ { label: '材料/设备名称', @@ -213,15 +214,30 @@ export const supervision_material_equipment_info:Iconfig = { }, { label:"合同约定品牌", - value:'brand', + value:'contract_brand', select:[ { name:"否", - value:"0" + value:0 }, { name:"是", - value:"1" + value:1 + }, + + ] + }, + { + label:"类型", + value:'type', + select:[ + { + name:"材料", + value:0 + }, + { + name:"设备", + value:1 }, ] @@ -254,7 +270,7 @@ export const supervision_participating_units_qualifications:Iconfig = { ], tableList: [ { project_name: "项目名称" }, - { company_id: "所属单位" }, + { company_name: "所属单位" }, { qualification_name: "资质名称" }, { qualification_number: "资质编号" }, { get_date: "发证日期" }, diff --git a/src/views/consult_new_start_project/edit.vue b/src/views/consult_new_start_project/edit.vue new file mode 100644 index 0000000..7641a2e --- /dev/null +++ b/src/views/consult_new_start_project/edit.vue @@ -0,0 +1,307 @@ + + + diff --git a/src/views/consult_new_start_project/index.vue b/src/views/consult_new_start_project/index.vue new file mode 100644 index 0000000..f97fcfa --- /dev/null +++ b/src/views/consult_new_start_project/index.vue @@ -0,0 +1,147 @@ + + + + diff --git a/src/views/consult_project/edit.vue b/src/views/consult_project/edit.vue new file mode 100644 index 0000000..67a4fdb --- /dev/null +++ b/src/views/consult_project/edit.vue @@ -0,0 +1,363 @@ + + + diff --git a/src/views/consult_project/index.vue b/src/views/consult_project/index.vue new file mode 100644 index 0000000..76499b6 --- /dev/null +++ b/src/views/consult_project/index.vue @@ -0,0 +1,146 @@ + + + + diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue index 402f2cb..58c4e58 100644 --- a/src/views/cost_projects/edit.vue +++ b/src/views/cost_projects/edit.vue @@ -261,7 +261,9 @@ const formData = reactive({ jhgq: '', depar: '', principal: '', + principal_id: '', person: '', + person_id: '', invest: '', budget: '', cost: '', @@ -413,7 +415,7 @@ const open = (type = 'add') => { //打开弹窗 const userclick = async (e: any) => { e == 'person' ? persoleType.value = 2 : persoleType.value = 1 - label.value = e + // label.value = e showDialog1.value = true await nextTick() personnel.value.open() @@ -426,8 +428,21 @@ const persoleType = ref('1') const submituser = (e: any) => { let flag = Array.isArray(e) let personl; + let personl_id; personl = (flag ? (e.map(item => [item.name])).join(',') : e.name) - formData[label.value] = personl + personl_id = (flag ? (e.map(item => [item.id])).join(',') : e.id) + + console.log(personl_id, 'personl_id') + if (flag) { + formData.person = personl; + formData.person_id = personl_id + } else { + formData.principal = personl + formData.principal_id = personl_id + } + // formData.person_id = (flag ? (e.map(item => [item.id])).join(',') : e.id) + // formData[label.value] = personl + showDialog1.value = false } diff --git a/src/views/data_report_collection/index.vue b/src/views/data_report_collection/index.vue index dd22592..47dfc37 100644 --- a/src/views/data_report_collection/index.vue +++ b/src/views/data_report_collection/index.vue @@ -2,20 +2,17 @@
- - + + - - - - + 查询 重置 - @@ -24,21 +21,13 @@
- - - - - - - - - - - - - - - + + + + + + +
@@ -51,17 +40,16 @@ - diff --git a/src/views/data_report_commission/index.vue b/src/views/data_report_commission/index.vue index dd22592..9151317 100644 --- a/src/views/data_report_commission/index.vue +++ b/src/views/data_report_commission/index.vue @@ -24,21 +24,19 @@
- + - - - - - - - - - - - - - + + + + + + + + + + +
@@ -81,4 +79,3 @@ const { pager, getLists, resetParams, resetPage } = usePaging({ getLists() - diff --git a/src/views/data_report_course/index.vue b/src/views/data_report_course/index.vue index 30b6072..f3562f1 100644 --- a/src/views/data_report_course/index.vue +++ b/src/views/data_report_course/index.vue @@ -36,7 +36,8 @@ {{ row.data_reception_status ? '已开始' : "未开始" }} - + @@ -86,4 +87,3 @@ const { pager, getLists, resetParams, resetPage } = usePaging({ getLists() - diff --git a/src/views/data_report_department/index.vue b/src/views/data_report_department/index.vue index 6578ff3..520f5f2 100644 --- a/src/views/data_report_department/index.vue +++ b/src/views/data_report_department/index.vue @@ -23,14 +23,13 @@ - diff --git a/src/views/data_report_profit/index.vue b/src/views/data_report_profit/index.vue index dd22592..8a0f183 100644 --- a/src/views/data_report_profit/index.vue +++ b/src/views/data_report_profit/index.vue @@ -24,21 +24,12 @@
- - - - - - - - - - - - - - - + + + + + +
@@ -81,4 +72,3 @@ const { pager, getLists, resetParams, resetPage } = usePaging({ getLists() - diff --git a/src/views/supervision_accept/edit.vue b/src/views/supervision_accept/edit.vue index d51d49d..3e3a255 100644 --- a/src/views/supervision_accept/edit.vue +++ b/src/views/supervision_accept/edit.vue @@ -17,7 +17,7 @@ - + @@ -37,8 +37,7 @@ - + @@ -74,7 +73,7 @@ - + diff --git a/src/views/supervision_accept/index.vue b/src/views/supervision_accept/index.vue index 63c2df3..fdf3b57 100644 --- a/src/views/supervision_accept/index.vue +++ b/src/views/supervision_accept/index.vue @@ -6,7 +6,10 @@ - + + + 查询 @@ -183,4 +186,3 @@ const handleAccept = async (row: Object | any[]) => { getLists() - diff --git a/src/views/supervision_check_item/edit.vue b/src/views/supervision_check_item/edit.vue index f4c05ad..5ddb960 100644 --- a/src/views/supervision_check_item/edit.vue +++ b/src/views/supervision_check_item/edit.vue @@ -50,7 +50,10 @@ -
检查项
+
+ 检查项 + + +
@@ -164,7 +167,6 @@ const handleAdd = () => { const handleDelete = async (row: any) => { - if (formData.check_item_detail.length == 1) return if (row.id) { await apisupervision_check_item_detail_delete({ id: row.id }) } diff --git a/src/views/supervision_commencement_report/index.vue b/src/views/supervision_commencement_report/index.vue index 787233d..76fb8d4 100644 --- a/src/views/supervision_commencement_report/index.vue +++ b/src/views/supervision_commencement_report/index.vue @@ -34,7 +34,7 @@