From e68c7e7df28de7fe75c822ac8185f5179093822a Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 18 Jan 2024 09:57:12 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug79978?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/workCenter/zh.js | 2 +- .../PlanApprovalChangeFlow.vue | 4 ++ .../modules/ApprovalBaseInfo.vue | 72 ++++++++++++++----- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 4b22ae25..12d9c5df 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -58,7 +58,7 @@ module.exports = { authorizationDepart: '授权部门', principalDrafter: '主起草人', mainDraftUnit: '主起草单位', - headOfMainDraftingUnit: '起草单位负责人', + headOfMainDraftingUnit: '主起草单位负责人', standardPusher: '标准推进人', suitUnit: '配合单位', projectStatement: '立项说明', diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index 8fb33411..16f980c9 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -590,6 +590,10 @@ export default { this.$refs.approvalBaseInfo.isEditSetData = true const param = this.model.dataList[0] param.enStandardSystem = param.enStandardSystem ? param.enStandardSystem.split(',').map(item => { return { value: item } }) : [] + // 处理隶属工作组格式 + if (param.workGroup) { + param.workGroup = { value: param.workGroup, label: param.workGroup_dictText } + } this.$refs.approvalBaseInfo.formInline = param setTimeout(() => { this.$refs.approvalBaseInfo.isEditSetData = false diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue index 1ca2f5b8..892158a4 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue @@ -284,22 +284,9 @@ - - - -
-
- - {{ $t('finishDate') }} -
- - {{ retractableFlag.finishDate ? $t('putAway') : $t('open') }} -
-
-
-
+
* {{ $t('workCenter.enterpriseInitChangePlan.draftPlanFinishDate') }} @@ -316,7 +303,7 @@
-
+
* {{ $t('workCenter.enterpriseInitChangePlan.exposureDraftPlanFinishDate') }} @@ -333,7 +320,7 @@
-
+
* {{ $t('workCenter.enterpriseInitChangePlan.planSubmissionDate') }} @@ -476,6 +463,28 @@ :backDepart="true" />
+ +
+
+ + {{ $t('workCenter.revisionPlanActivelyReport.affiliatedWorkingGroup') }} + +
+ + + +
@@ -614,6 +623,7 @@ import { getTreeList, getStandardGradeClassification } from '@/api/enterpriseStandardLibraryApi' +import { getWorkGroupTreeList } from '@/api/api' export default { name: 'ApprovalBaseInfo', @@ -756,6 +766,7 @@ export default { StandardSource, ProjectType, loading: false, + workingGroupTreeList: [], // 隶属工作组下拉框数据 standardSystemOptions: [], // 标准体系下拉框数据 formInline: {}, isFormInline: true, @@ -916,7 +927,6 @@ export default { // 各模块的收齐和展开状态 retractableFlag: { baseInfo: true, // 基础信息部分 - finishDate: true, // 完成日期部分 rangeOfApplication: true, // 适用范围部分 projectStatement: true // 立项说明部分 }, @@ -933,6 +943,8 @@ export default { this.initStandardSystemOptions() // 获取企标级别映射数据 this.getStandardGradeClassification() + // 获取隶属工作组数据 + this.getWorkGroupTree() }, mounted () { console.log(this.$route.query.processId) @@ -966,6 +978,25 @@ export default { const processName = (this.formInline.newEnStandardNo || '') + '-' + (this.formInline.newEnStandardName || '') + '-' + '立项' this.$emit('processNameChange', processName) }, + // 获取内部工作组树 + getWorkGroupTree () { + getWorkGroupTreeList().then((res) => { + if (res.success) { + this.workingGroupTreeList = this.dealTreeData(res.result) + } else { + this.workingGroupTreeList = [] + } + }) + }, + // 处理内部工作组数据结构 + dealTreeData (treeData) { + return treeData.map(item => { + item.label = item.name + item.value = item.id + item.children = this.dealTreeData(item.subset) + return item + }) + }, // 获取企标级别映射数据 getStandardGradeClassification () { getStandardGradeClassification().then(res => { @@ -1110,10 +1141,13 @@ export default { .form-flex-item-long { width: 100%; + .title-text { + width: 220px !important; + } } -.title-text-long { - width: 220px !important; +.title-text { + width: 140px !important; } /deep/ .ant-form-item-children > .ant-calendar-picker {