From 3a42c1a0ba7c06fe1c52d651446b91db3a5f499e Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Wed, 10 Jan 2024 11:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=9B=91=E7=9D=A3=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/enterprise/qualifications.js | 8 ++++++ .../options/basePage.vue | 6 +++-- .../options/components/goodCredit.vue | 27 +++++++++++++++++-- .../components/qualification_child.vue | 2 ++ .../components/qualification_parent.vue | 27 ++++++++++++++----- .../options/performanceRecord.vue | 17 +++++++++--- .../options/qualification.vue | 10 ++++++- 7 files changed, 82 insertions(+), 15 deletions(-) diff --git a/jwtech-admin-page/src/api/enterprise/qualifications.js b/jwtech-admin-page/src/api/enterprise/qualifications.js index d4c6976b..630b1101 100644 --- a/jwtech-admin-page/src/api/enterprise/qualifications.js +++ b/jwtech-admin-page/src/api/enterprise/qualifications.js @@ -23,6 +23,14 @@ export function getParentQualifications(enterpriseId) { method: 'get' }) } +// 查询父级企业资质列表 +export function listParentQualifications(enterpriseId) { + return request({ + url: '/enterprise/qualifications/listByEid/' + enterpriseId, + method: 'get' + }) +} + // 新增企业资质 export function addQualifications(data) { diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue index d8f18da5..b994bdfa 100644 --- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue +++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue @@ -191,16 +191,18 @@ - + - + diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue index 9954767b..c72ef1ed 100644 --- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue +++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue @@ -231,10 +231,23 @@ - + /> --> + + + @@ -551,6 +564,7 @@ import { updateCredit, exportCredit, } from "@/api/enterprise/credit"; +import { listPerformanceRecord } from "@/api/enterprise/performanceRecord"; import { listApproval } from "@/api/enterprise/approval"; import { getToken } from "@/utils/auth"; import { getFileStream } from "@/api/system/upload"; @@ -648,6 +662,7 @@ export default { creditMsg: {}, remark: "", processList: [], + projectNameOption: [], }; }, created() { @@ -661,6 +676,9 @@ export default { }); }, methods: { + chooseProjectName(data) { + this.form.recordId = data.id; + }, download(filename, name) { let a = document.createElement("a"); a.href = "/static/" + filename; @@ -849,6 +867,11 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); + listPerformanceRecord({ data: { enterpriseId: this.enterpriseId } }).then( + (response) => { + this.projectNameOption = response.records; + } + ); this.open = true; this.title = "添加良好行为加分申报"; }, diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue index 4ab10887..bff1862c 100644 --- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue +++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue @@ -520,6 +520,7 @@ export default { } }); } + this.$emit("parentGetList"); } }); }, @@ -537,6 +538,7 @@ export default { }) .then(() => { this.getList(); + this.$emit("parentGetList"); this.msgSuccess("删除成功"); }) .catch(function () {}); diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue index 8c03f8c1..10fe5d51 100644 --- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue +++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue @@ -24,6 +24,13 @@ min-width="120" :resizable="false" /> + { - this.qualificationsList = response.records.filter( - (item) => !item.parentId - ); - this.total = this.qualificationsList.length; + // this.queryParams.data.enterpriseId = this.enterpriseId; + // listQualifications(this.queryParams).then((response) => { + // this.qualificationsList = response.records.filter( + // (item) => !item.parentId + // ); + // this.total = this.qualificationsList.length; + // console.log("this.qualificationsList", this.qualificationsList); + // this.loading = false; + // }); + listParentQualifications(this.enterpriseId).then((response) => { + // console.log(response); + this.qualificationsList = response.data; + this.total = response.data.length; this.loading = false; }); }, diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue index bb352b62..ea6e373d 100644 --- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue +++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue @@ -270,10 +270,10 @@ style="width: 100%" > @@ -511,6 +511,8 @@ import { updatePerformanceRecord, exportPerformanceRecord, } from "@/api/enterprise/performanceRecord"; +import { getParentQualifications } from "@/api/enterprise/qualifications"; + import { getToken } from "@/utils/auth"; import { getFileStream } from "@/api/system/upload"; @@ -585,6 +587,7 @@ export default { }, fileList: [], performanceRecordMsg: {}, + parentOption: [], }; }, created() { @@ -720,12 +723,18 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); + getParentQualifications(this.enterpriseId).then((response) => { + this.parentOption = response.data; + }); this.open = true; this.title = "添加工程业绩记录"; }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); + getParentQualifications(this.enterpriseId).then((response) => { + this.parentOption = response.data; + }); const id = row.id || this.ids; getPerformanceRecord(id).then((response) => { this.form = response.data; diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/qualification.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/qualification.vue index 88646235..43bb51e6 100644 --- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/qualification.vue +++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/qualification.vue @@ -20,7 +20,11 @@ 添加 - + @@ -46,6 +50,10 @@ export default { if (key == 0) this.$refs.qualificationParent.handleAdd(); if (key == 1) this.$refs.qualificationChild.handleAdd(); }, + parentGetList() { + console.log(4555646); + this.$refs.qualificationParent.getList(); + }, }, };