From 7fefb82a032f764e339e2adc0b4d126a37999970 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sat, 6 May 2023 10:37:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E9=AB=98=E7=BA=A7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 66 ++++++++++--- .../components/listOfRegulations.vue | 99 ++++++++++++++----- 2 files changed, 131 insertions(+), 34 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index aeef59c80..62cc82161 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -592,18 +592,18 @@ value: 'serialNumber', text: this.$t('standardNo') }, - { - type: 'Personnel', - value: 'sdt', - valueName: 'sdtName', - text: this.$t('engineeringInterfacePerson') - }, - { - type: 'Personnel', - value: 'dutyPerson', - valueName: 'dutyPersonName', - text: this.$t('personLiable') - }, + // { + // type: 'Personnel', + // value: 'sdt', + // valueName: 'sdtName', + // text: this.$t('engineeringInterfacePerson') + // }, + // { + // type: 'Personnel', + // value: 'dutyPerson', + // valueName: 'dutyPersonName', + // text: this.$t('personLiable') + // }, { type: 'date', value: 'endTime', @@ -829,6 +829,7 @@ this.userInfoQuery = this.userInfo() this.getProcessStatus() this.getDeliverableTree() + this.querydreId() this.getRoleByUserId(() => { this.getAndUserId() }) @@ -878,6 +879,47 @@ this.$message.warning(this.$t('selectLeastOne')) } }, + querydreId() { + let query = { + projectLibraryId: this.$route.query.id + } + getAction('/project/projectCertificationInventoryEO/queryDutyPersonByProjectId', query).then((res) => { + if (res.success) { + let engineeringInterfacePerson = { + value: 'sdt', + text: this.$t('engineeringInterfacePerson'), + options: [] + } + let personLiable = { + value: 'dutyPerson', + text: this.$t('personLiable'), + options: [] + } + if (res.result.interfaceList && res.result.interfaceList.length > 0) { + res.result.interfaceList.forEach(val => { + engineeringInterfacePerson.options.push({ + value: val.id, + key: val.id, + label: val.userName + }) + }) + } + if (res.result.dutyList && res.result.dutyList.length > 0) { + res.result.dutyList.forEach(val => { + personLiable.options.push({ + value: val.id, + key: val.id, + label: val.userName + }) + }) + } + this.fieldList.push(engineeringInterfacePerson) + this.fieldList.push(personLiable) + } else { + + } + }) + }, getDeliverableTree() { getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 0f62ff8c9..5135f18f9 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1249,28 +1249,28 @@ text: this.$t('certificationLevel'), dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 }, - { - type: 'deliverables', - value: 'designDeliverableType', - text: this.$t('designaconformancedeliverabletype'), - }, - { - type: 'deliverables', - value: 'verifyDeliverableType', - text: this.$t('verifytheconformancedeliverabletype'), - }, - { - type: 'Personnel', - value: 'designDutyId', - valueName: 'designDutyIdName', - text: this.$t('responsiblepersonfordesigncompliance') - }, - { - type: 'Personnel', - value: 'verifyDutyId', - valueName: 'verifyDutyIdName', - text: this.$t('responsiblepersonforverifyingcompliance') - }, + // { + // type: 'deliverables', + // value: 'designDeliverableType', + // text: this.$t('designaconformancedeliverabletype'), + // }, + // { + // type: 'deliverables', + // value: 'verifyDeliverableType', + // text: this.$t('verifytheconformancedeliverabletype'), + // }, + // { + // type: 'Personnel', + // value: 'designDutyId', + // valueName: 'designDutyIdName', + // text: this.$t('responsiblepersonfordesigncompliance') + // }, + // { + // type: 'Personnel', + // value: 'verifyDutyId', + // valueName: 'verifyDutyIdName', + // text: this.$t('responsiblepersonforverifyingcompliance') + // }, // { // type: '', // value: 'dutyTerritory', @@ -1435,6 +1435,8 @@ this.getHeader() this.queryLawEngineerByProjectId() this.queryengineeringInterfacePersonId() + this.querydesignDutyId() + this.queryverifyDutyId() this.getRoleByUserId(() => { this.getAndUserId() }) @@ -1577,6 +1579,59 @@ } }) }, + querydesignDutyId() { + let query = { + projectLibraryId: this.$route.query.id + } + getAction('/project/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => { + if (res.success) { + let designDuty = { + value: 'designDutyId', + text: this.$t('responsiblepersonfordesigncompliance'), + options: [] + } + console.log(res) + if (res.result.designDutyList && res.result.designDutyList.length > 0) { + res.result.designDutyList.forEach(val => { + designDuty.options.push({ + value: val.id, + key: val.id, + label: val.userName + }) + }) + } + this.fieldList.push(designDuty) + } else { + + } + }) + }, + queryverifyDutyId() { + let query = { + projectLibraryId: this.$route.query.id + } + getAction('/project/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => { + if (res.success) { + let verifyDuty = { + value: 'verifyDutyId', + text: this.$t('responsiblepersonforverifyingcompliance'), + options: [] + } + if (res.result.verifyDutyList && res.result.verifyDutyList.length > 0) { + res.result.verifyDutyList.forEach(val => { + verifyDuty.options.push({ + value: val.id, + key: val.id, + label: val.userName + }) + }) + } + this.fieldList.push(verifyDuty) + } else { + + } + }) + }, //流程状态点击事件 designFlowStatusClick(row, name) { let query = {}