From 2c8b6684819cbb7b5bed5523bd9ea27cb836c707 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 25 Dec 2023 17:48:02 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardRevisionFlow.vue | 59 +++++++++++-- .../modules/DepartLiaisonIssueBaseInfo.vue | 82 +++++++++---------- .../modules/ScorerMarkBaseInfo.vue | 4 +- 3 files changed, 93 insertions(+), 52 deletions(-) diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index ac799bff..c64a150c 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -108,7 +108,7 @@
- +
@@ -209,6 +209,13 @@ export default { computed: { pageTitle () { return this.$t('flowCenter') + this.$route.meta.title + '（' + this.currentNodeName + '）' + }, + notPermissField () { + if (this.currentNode === 7) { + return [] + } else { + return ['adviceUserList'] + } } }, mounted () { @@ -366,6 +373,37 @@ export default { } }, methods: { + // 待办中进入时需要初始化人员信息数据 + // 混入中方法重写，部所联络人下发节点，如果有征求意见对象填写意见节点，需要能选人 + initPersonInfoData (isFirstNode) { + console.log('-----------isFirstNode------------', isFirstNode) + if (isFirstNode) { + // 是第一个节点，回显数据 + this.personnelInfoData = this.personnelInfoData.map(item => { + return { + ...item, + userList: item.linkUserIds_dictText + } + }) + } else { + // 不是第一个节点，回显数据，都不可选人, + // 部所联络人下发节点，征求意见对象填写意见节点，需要能选征求意见对象 + this.personnelInfoData = this.personnelInfoData.map(item => { + if (item.variableName === 'adviceUserList' && this.currentNode === 7) { + return { + ...item, + userList: item.linkUserIds_dictText + } + } else { + return { + ...item, + userList: item.linkUserIds_dictText, + canChoose: 0 + } + } + }) + } + }, // 根据流程id获取数据并回显 getProcessData (type, param) { let func @@ -482,13 +520,6 @@ export default { personnelObj: personnelObj }) } - // if (baseInfo.dataSource) { - // paramObj.dataList = baseInfo.dataSource.map(item => { - // return { ...item, ...baseInfo.formInline } - // }) - // } else { - // paramObj.dataList = [baseInfo.formInline] - // } } else { // 需要外层信息至少填了一项 const param = { ...processInfoForm, ...approvalInfoForm, ...personnelObj } @@ -591,6 +622,15 @@ export default { // 提交 handleSubmit () { if (this.loading) return + let personnelObj = {} + if (this.currentNode === 7) { + // 说明是部所联络人下发节点，需要传人员信息 + personnelObj = this.$refs.personnelInfo.getDataObjVerify() + if (!personnelObj) { + this.switchValue = 'user' + return + } + } this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => { const data = await this.$refs.baseInfoRef.getDataValidate() if (!approvalErr && data) { @@ -598,6 +638,9 @@ export default { param.common = Object.assign({}, approvalValues) param.common.taskId = this.$route.query.taskId param.data = data + if (this.currentNode === 7) { + param.flowUser = personnelObj + } this.loading = true enStandardEditAgree(param).then(res => { if (res.success) { diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue index e6d4bbe2..fc132d9f 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue @@ -2,58 +2,56 @@
-
-
- -
-
+
+ +
+
{{ $t('workCenter.enStandardRevision.standardText') }} -
- -
- -

企业标准

- {{ $t('workCenter.enStandardRevision.onLineEditing') }} -
-
- -
-
- * - + +
+ +

企业标准

+ {{ $t('workCenter.enStandardRevision.onLineEditing') }} +
+ +
+ +
+
+ * + {{ $t('workCenter.enStandardRevision.deadlineForComments') }} -
- - - -
- -
-
- * - + + + + +
+ +
+
+ * + {{ $t('workCenter.enStandardRevision.workingGroup') }} -
- - -
+ + +
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue index fc30472e..7c0c54ef 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue @@ -283,7 +283,7 @@ export default { console.log(data) // 给表格赋值,在线编辑不知道要怎么赋值？ if (data.reviewMeetingDetails && data.reviewMeetingDetails.length > 0) { - this.dataSource = Array.from(fixDataSourse) + this.dataSource = JSON.parse(JSON.stringify(fixDataSourse)) for (const i in fixDataSourse) { if (i % 3 === 0) { this.dataSource[i].evaluateScore = data.reviewMeetingDetails[Math.floor(i / 3)].evaluateScore || '' @@ -291,7 +291,7 @@ export default { } } } else { - this.dataSource = Array.from(fixDataSourse) + this.dataSource = JSON.parse(JSON.stringify(fixDataSourse)) } // 给表单赋值 this.$nextTick(() => {