diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index 41057be2..2059bf6d 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -664,23 +664,42 @@ export default { this.approvalInfoForm.setFieldsValue({ commitText: '同意' }) } this.approvalInfoForm.validateFields(async (err, values) => { - const data = await this.$refs.baseInfoRef.getDataValidate() - if (!err && data) { - this.loading = true - const param = {} - param.common = Object.assign({}, values) - param.common.taskId = this.$route.query.taskId - param.data = data - enStandardEditAgree(param).then(res => { - if (res.success) { - this.$message.success(res.message) - this.goBack() - } else { - this.$message.warning(res.message) - } - }).finally(() => { - this.loading = false - }) + if (this.currentNode === 4) { + const data = await this.$refs.baseInfoRef.getDataValidate() + if (!err && data) { + this.loading = true + const param = {} + param.common = Object.assign({}, values) + param.common.taskId = this.$route.query.taskId + param.data = data + enStandardEditAgree(param).then(res => { + if (res.success) { + this.$message.success(res.message) + this.goBack() + } else { + this.$message.warning(res.message) + } + }).finally(() => { + this.loading = false + }) + } + } else { + if (!err) { + this.loading = true + const param = {} + param.common = Object.assign({}, values) + param.common.taskId = this.$route.query.taskId + enStandardEditAgree(param).then(res => { + if (res.success) { + this.$message.success(res.message) + this.goBack() + } else { + this.$message.warning(res.message) + } + }).finally(() => { + this.loading = false + }) + } } }) }, diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue index a5749ae3..10c170a5 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue @@ -123,6 +123,7 @@ export default { // 把数据抛出,在线编辑不知道要不要抛 const data = {} data.advices = this.dataSource + data.businessJson = JSON.stringify(this.$refs.baseInfoForm.getData()) return data }, // 外层获取数据要过校验,返回false表示没有通过校验 diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue index 597a8306..66353fbe 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue @@ -39,27 +39,25 @@ -
-
- - -
-
- * - +
+ + +
+
+ * + {{ $t('workCenter.enStandardRevision.departLiaisonLeader') }} -
- - -
+ + +
@@ -214,9 +212,8 @@ export default {