From 27d6824de8bf8c98a663ae3723e4898821bcb78c Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 15 Dec 2023 10:09:44 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RevisionPlanStandardizationInitFlow.vue            |  7 +++++--
 .../modules/BaseInfoTableModal.vue                     | 10 ++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
index 87c265b5..10defa7b 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
@@ -392,6 +392,7 @@ export default {
             param.dataList = data.dataSource
             param.flowUser = personnelObj
             let func
+            this.loading = true
             if (this.$route.query.taskId) {
               // 有taskId说明是驳回的提交
               func = standardizationInitAgree
@@ -445,13 +446,14 @@ export default {
       if (this.loading) return
       // 流程审批信息校验
       this.approvalInfoForm.validateFields((approvalErr, approvalValues) => {
-        const data = this.$refs.baseInfoFormRef.getDataValidate()
+        const data = this.$refs.baseInfoRef.getDataValidate()
         if (!approvalErr && data) {
           // 只有表格
           const param = {}
           param.common = approvalValues
           param.common.taskId = this.$route.query.taskId
           param.dataList = data.dataSource
+          this.loading = true
           standardizationInitAgree(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)
@@ -473,13 +475,14 @@ export default {
         this.approvalInfoForm.setFieldsValue({ commitText: '同意' })
       }
       this.approvalInfoForm.validateFields((err, values) => {
-        const data = this.$refs.baseInfoFormRef.getDataValidate()
+        const data = this.$refs.baseInfoRef.getDataValidate()
         if (!err && data) {
           // 只有表格
           const param = {}
           param.common = values
           param.common.taskId = this.$route.query.taskId
           param.dataList = data.dataSource
+          this.loading = true
           standardizationInitAgree(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
index a74f2700..a5f9b9d9 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
@@ -823,11 +823,21 @@ export default {
       if (!this.formInline.applicationType) {
         this.formInline.applicationType = this.ApplicationCategory.INITIATION.value
       }
+      if (this.formInline.enStandardSystem && this.formInline.enStandardSystem.length > 0) {
+        this.formInline.enStandardSystem = this.formInline.enStandardSystem ? this.formInline.enStandardSystem.split(',').map(item => {
+          return { value: item }
+        }) : []
+      }
     },
     look (record) {
       this.visible = true
       this.model = Object.assign({}, record)
       this.formInline = Object.assign({}, record)
+      if (this.formInline.enStandardSystem && this.formInline.enStandardSystem.length > 0) {
+        this.formInline.enStandardSystem = this.formInline.enStandardSystem ? this.formInline.enStandardSystem.split(',').map(item => {
+          return { value: item }
+        }) : []
+      }
       this.disabled = true
     },
     // 获取标准体系下拉框数据