From 1cd1dd339a575bd57fe6078fc9e046b29d7281d8 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 18 Apr 2023 13:32:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++ jero-web/src/common/lang/zh-cn.js | 4 ++ .../components/globalAdvancedQuery/index.vue | 32 +++++++++- .../components/listOfRegulations.vue | 61 +++++++++++++++++-- 4 files changed, 93 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 87f63b799..e7f18cd7d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1796,4 +1796,8 @@ module.exports = { verify:'Verify', inventoryVerifyEndTime:'Inventory Verify End Time', taskConfirmEndTime:'Task Confirm End Time', + responsiblepersonfordesigncompliance:'Responsible person for design compliance', + responsiblepersonforverifyingcompliance:'Responsible person for verifying compliance', + verifytheconformancedeliverabletype:'Verify the conformance deliverable type', + designaconformancedeliverabletype:'Design a conformance deliverable type', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d0291abba..3e40d7fa1 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1898,4 +1898,8 @@ module.exports = { verify:'验证', inventoryVerifyEndTime:'清单校核截止时间', taskConfirmEndTime:'责任确认截止时间', + responsiblepersonfordesigncompliance:'设计符合性责任人', + responsiblepersonforverifyingcompliance:'验证符合性责任人', + verifytheconformancedeliverabletype:'验证符合性交付物类型', + designaconformancedeliverabletype:'设计符合性交付物类型', } \ No newline at end of file diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index 9a6079385..f4ec4171e 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -141,7 +141,20 @@ :tree-data="item.tree" :placeholder="$t('PleaseSelect')" /> - + + { let data = { ...item } @@ -412,8 +428,16 @@ } } }, - methods: { + getDeliverableTree() { + getAction('/sys/category/getDeliverableTree', {}).then((res) => { + if (res.success) { + this.DeliverableTreeList = res.result + } else { + this.DeliverableTreeList = [] + } + }) + }, show() { if (!this.queryParamsModel || this.queryParamsModel.length === 0) { this.resetLine() @@ -484,6 +508,7 @@ }, handleSelected(node, item) { console.log(node) + console.log(item) let { type, options, dictCode, dictTable, dictText, customReturnField, popup } = node.dataRef item['type'] = type item['options'] = options @@ -498,6 +523,9 @@ this.$set(item, 'val', undefined) this.$set(item, 'valueName', undefined) this.$set(item, 'valueId', undefined) + if(item.type == 'deliverables'){ + this.getDeliverableTree() + } }, handleOpen() { this.show() diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 90cc8f14f..5d90900ff 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1251,18 +1251,40 @@ 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: '', // value: 'dutyTerritory', // text: this.$t('areaOfResponsibility'), // dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 // }, - { - type: 'Personnel', - value: 'engineeringInterfacePerson', - valueName: 'engineeringInterfacePersonName', - text: this.$t('engineeringInterfacePerson') - } + // { + // type: 'Personnel', + // value: 'engineeringInterfacePerson', + // valueName: 'engineeringInterfacePersonName', + // text: this.$t('engineeringInterfacePerson') + // } ], listOptions: [ { @@ -1414,6 +1436,7 @@ this.JLoading = true this.getHeader() this.queryLawEngineerByProjectId() + this.queryengineeringInterfacePersonId() this.getRoleByUserId(() => { this.getAndUserId() }) @@ -1530,6 +1553,32 @@ } }) }, + queryengineeringInterfacePersonId() { + let query = { + projectLibraryId: this.$route.query.id + } + getAction('/project/projectRelatedPersonnel/queryEngineeringInterfacePersonByProjectId', query).then((res) => { + if (res.success) { + let engineeringInterfacePerson = { + value: 'engineeringInterfacePerson', + text: this.$t('engineeringInterfacePerson'), + options: [] + } + if (res.result && res.result.length > 0) { + res.result.forEach(val => { + engineeringInterfacePerson.options.push({ + value: val.id, + key: val.id, + label: val.userName + }) + }) + } + this.fieldList.push(engineeringInterfacePerson) + } else { + + } + }) + }, //流程状态点击事件 designFlowStatusClick(row, name) { let query = {}