From 5fd13dd52273bb50bc4083d8268b80d19dba0360 Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Wed, 13 Mar 2024 09:49:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8E=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jwtech-admin-page/src/api/enterprise/zhxx.js | 53 ++ .../projectBrief/options/index.vue | 12 +- .../regulatoryInspection/responsibleUnit.vue | 54 +- .../comprehensiveInfo/index.vue | 626 ++++++++++++++++++ .../projectProcess/contract/index.vue | 4 +- .../designChangeInformation.vue | 20 +- .../projectProcess/firmInfo.vue | 51 +- .../preparationForConstruction.vue | 4 +- .../projectProcess/scheduleManagement.vue | 23 +- .../supervisionAndManagement/index.vue | 4 +- .../options/record.vue | 11 +- .../options/supervision.vue | 5 +- 12 files changed, 796 insertions(+), 71 deletions(-) create mode 100644 jwtech-admin-page/src/api/enterprise/zhxx.js create mode 100644 jwtech-admin-page/src/views/marketSupervision/comprehensiveInfo/index.vue diff --git a/jwtech-admin-page/src/api/enterprise/zhxx.js b/jwtech-admin-page/src/api/enterprise/zhxx.js new file mode 100644 index 00000000..f79394d9 --- /dev/null +++ b/jwtech-admin-page/src/api/enterprise/zhxx.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询综合信息列表 +export function listZhxx(query) { + return request({ + url: '/enterprise/zhxx/list', + method: 'post', + data: query + }) +} + +// 查询综合信息详细 +export function getZhxx(id) { + return request({ + url: '/enterprise/zhxx/' + id, + method: 'get' + }) +} + +// 新增综合信息 +export function addZhxx(data) { + return request({ + url: '/enterprise/zhxx', + method: 'post', + data: data + }) +} + +// 修改综合信息 +export function updateZhxx(data) { + return request({ + url: '/enterprise/zhxx', + method: 'put', + data: data + }) +} + +// 删除综合信息 +export function delZhxx(id) { + return request({ + url: '/enterprise/zhxx/' + id, + method: 'delete' + }) +} + +// 导出综合信息 +export function exportZhxx(query) { + return request({ + url: '/enterprise/zhxx/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue index 941becc2..48357f28 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue @@ -118,7 +118,7 @@ :formatter="engineeringGradeFormat" min-width="120" /> - + @@ -150,7 +150,7 @@ - - + --> - + - + + - + - + + + + + + + { - this.rectificationSituationOptions = response.data; + this.isFinishOptions = response.data; }); }, methods: { @@ -337,11 +367,8 @@ export default { this.loading = false; }); }, - rectificationSituationFormat(row) { - return this.selectDictLabel( - this.rectificationSituationOptions, - row.rectificationSituation - ); + isFinishFormat(row) { + return this.selectDictLabel(this.isFinishOptions, row.isFinish); }, unitIdFormat(row) { return this.unitOptions.find((item) => item.id == row.unitId) @@ -419,12 +446,14 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); + this.isEdit = false; this.open = true; this.title = "添加责任单位"; }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); + this.isEdit = true; const id = row.id || this.ids; getZrdw(id).then((response) => { this.form = response.data; @@ -451,6 +480,7 @@ export default { } else { this.form.inspectionId = this.inspectionId; this.form.rectificationId = this.rectificationId; + this.form.isFinish = "0"; addZrdw(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("新增成功"); diff --git a/jwtech-admin-page/src/views/marketSupervision/comprehensiveInfo/index.vue b/jwtech-admin-page/src/views/marketSupervision/comprehensiveInfo/index.vue new file mode 100644 index 00000000..f4a8164f --- /dev/null +++ b/jwtech-admin-page/src/views/marketSupervision/comprehensiveInfo/index.vue @@ -0,0 +1,626 @@ + + + + + diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/index.vue index cfd4f458..798198d1 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/index.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/index.vue @@ -56,7 +56,7 @@ - + --> - 搜索 + > --> 重置 @@ -57,7 +58,7 @@ - + - - + 查看 - 删除 + > --> diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/firmInfo.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/firmInfo.vue index ce85c8b3..055496fe 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/firmInfo.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/firmInfo.vue @@ -90,6 +90,12 @@ min-width="150" /> + + > 删除 - + --> @@ -164,6 +170,13 @@ min-width="150" /> + + + > 删除 - + --> @@ -238,6 +251,13 @@ min-width="150" /> + + + > 删除 - + --> @@ -312,6 +332,13 @@ min-width="150" /> + + + > 删除 - + --> diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/preparationForConstruction.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/preparationForConstruction.vue index a11060ee..8fad47f7 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/preparationForConstruction.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/preparationForConstruction.vue @@ -3,10 +3,10 @@
- +
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/scheduleManagement.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/scheduleManagement.vue index d4a83f15..dd9cc1c4 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/scheduleManagement.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/scheduleManagement.vue @@ -17,7 +17,7 @@ placeholder="请选择月度" clearable size="small" - @keyup.enter.native="handleQuery" + @change="handleQuery" /> @@ -40,13 +40,13 @@ - 搜索 + > --> 重置 @@ -64,7 +64,8 @@ >新增 --> - + + - - + + 查看 - 删除 + > --> diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/index.vue index bd568162..2a728b37 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/index.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/index.vue @@ -8,10 +8,10 @@
会议纪要 - +
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/options/record.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/options/record.vue index 8ba97053..3d6e2c11 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/options/record.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/options/record.vue @@ -1,12 +1,7 @@ diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/options/supervision.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/options/supervision.vue index 7fc16185..beaa4139 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/options/supervision.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/supervisionAndManagement/options/supervision.vue @@ -5,6 +5,7 @@ @@ -29,10 +30,10 @@ /> -