From c90c363ba0f2e6a92ec2099f1736a6f08a9130bb Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 7 Dec 2023 18:29:00 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PersonnelInfo.vue | 13 +++++++++--- .../EnterpriseStandardChangeFlow.vue | 2 +- .../EnterpriseStandardRecheckFlow.vue | 21 ++++++++++--------- .../modules/DrafterEnterOptionBaseInfo.vue | 4 +--- .../processCenter/table/TodoList.vue | 2 +- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue index 19a520d8..d5a8ae54 100644 --- a/src/components/PersonnelInfo.vue +++ b/src/components/PersonnelInfo.vue @@ -103,12 +103,19 @@ export default { // 有校验的获取人员对象 getDataObjVerify () { let personnelObj = {} - for (const item of this.stepsData) { + console.log(this.stepsData) + for (let i = 0; i < this.stepsData.length; i++) { // 该属性还没有人就给他赋值 - if ((item.canChoose || item.sort === 1) && !personnelObj[item.variableName]) { - personnelObj[item.variableName] = item.linkUserIds + if ((this.stepsData[i].canChoose || i === 0) && !personnelObj[this.stepsData[i].variableName]) { + personnelObj[this.stepsData[i].variableName] = this.stepsData[i].linkUserIds } } + // for (const item of this.stepsData) { + // // 该属性还没有人就给他赋值 + // if ((item.canChoose || item.sort === 1) && !personnelObj[item.variableName]) { + // personnelObj[item.variableName] = item.linkUserIds + // } + // } if (!Object.values(personnelObj).every(v => !!v)) { this.$message.warning(this.$t('pleaseEnterPersonnelInfo')) personnelObj = false diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index 19ad52bb..070cc595 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -264,7 +264,7 @@ export default { this.model = res.result this.$nextTick(() => { // 初始化流程信息 - this.processInfoForm.setFieldsValue(pick(this.model[0], 'prcName', 'dueTime', 'prcMes')) + this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes')) // 初始化流程审批信息，草稿进来的才回显审批信息 if (type === 'draft') { this.approvalInfoForm.setFieldsValue(pick(this.model.common, 'commitText', 'commitFile')) diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue index f8a9d37a..60370935 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue @@ -81,7 +81,7 @@
- +
@@ -164,7 +164,7 @@ export default { }, mounted () { // 初始化节点 - const nodeId = this.$route.query.taskName + const nodeId = this.$route.query.nodeId if (nodeId) { if (nodeId === EsRecheckNodes.standardizationSelectContact.value) { // 标准化工程师选择联络人 @@ -199,8 +199,9 @@ export default { this.initPersonInfoData(false) } } - // 如果是正在手动发起流程，人员信息的节点1不显示 - if (!this.$route.query.taskId && !this.$route.query.draftId) { + // 如果没有processInstanceId说明流程还没发起过 + if (!this.$route.query.processInstanceId) { + // 不显示第一个节点人员信息 this.personnelInfoData.shift() // 说明是在新发起一个节点，初始化发起人员信息 this.personnelInfoData[0].linkUserIds = Vue.ls.get(USER_INFO).id @@ -313,12 +314,12 @@ export default { this.$refs.baseInfoRef.initData(this.model.data) } }) - enStandardRecheckIsShowFirstPerson({ id: this.model.data.id }).then(res => { - if (res.success && !res.result) { - // 不显示第一个节点人员信息 - this.personnelInfoData.shift() - } - }) + // enStandardRecheckIsShowFirstPerson({ id: this.model.data.id }).then(res => { + // if (res.success && !res.result) { + // // 不显示第一个节点人员信息 + // this.personnelInfoData.shift() + // } + // }) } else { this.$message.warning(res.message) } diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue index ddb2d6ac..5b1584e4 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue @@ -178,9 +178,7 @@ export default { // 拿到外面传进来的数据初始化 initData (data) { // 给表单赋值 - this.$nextTick(() => { - this.formInline = Object.assign({}, data) - }) + this.formInline = Object.assign({}, data) }, // 外层要获取数据 getData () { diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue index 94df66a2..e8160776 100644 --- a/src/views/workCenter/processCenter/table/TodoList.vue +++ b/src/views/workCenter/processCenter/table/TodoList.vue @@ -305,7 +305,7 @@ export default { } const param = {} param.userId = value - param.taskId = this.$route.query.taskId + param.taskId = this.currentTurnTo.taskId func(param).then(res => { if (res.success) { this.$message.success(res.message)