From eaf63b86fc623ec9991914ae42baac6196bd2b36 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 8 Jan 2024 17:03:13 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8A=A0=E6=A0=87=E5=87=86id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/BaseInfoForm.vue                  |  2 +
 .../modules/MainDrafterInitBaseInfo.vue       | 42 ++++++++++++++-----
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
index f79bb67d..e061dcb3 100644
--- a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
@@ -633,6 +633,8 @@ export default {
         if (res.success) {
           const result = res.result
           const formInline = {}
+          // 企标id
+          formInline.standardId = result.id
           // 标准等级分类
           formInline.gradeClassification = result.grade_classification || undefined
           // 授权部门
diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue
index 5e1652a3..a4f7060c 100644
--- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue
@@ -469,20 +469,40 @@ export default {
     // 外层获取数据要过校验,返回false表示没有通过校验
     async getDataValidate () {
       let data = {}
-      const formInline = await this.$refs.baseInfoForm.getDataValidate()
-      await this.$refs.ruleForm.validate(async valid => {
-        if (valid) {
-          if (formInline && this.dataSource.length > 0) {
-            data.formInline = { ...formInline, ...this.formInline }
-            data.dataSource = this.dataSource
-          } else if (this.dataSource.length <= 0) {
-            this.$message.warning(this.$t('addAtLeastOneRowOfData'))
-            data = false
+      let formInline = {}
+      if (formInline = await this.$refs.baseInfoForm.getDataValidate()) {
+        this.$refs.ruleForm.validate(async valid => {
+          if (valid) {
+            if (this.dataSource.length > 0) {
+              data.formInline = { ...formInline, ...this.formInline }
+              data.dataSource = this.dataSource
+            } else {
+              this.$message.warning(this.$t('addAtLeastOneRowOfData'))
+              data = false
+            }
           } else {
             data = false
           }
-        }
-      })
+        })
+      } else {
+        data = false
+      }
+      // await this.$refs.ruleForm.validate(async valid => {
+      //   if (valid) {
+      //     const formInline = await this.$refs.baseInfoForm.getDataValidate()
+      //     if (formInline && this.dataSource.length > 0) {
+      //       data.formInline = { ...formInline, ...this.formInline }
+      //       data.dataSource = this.dataSource
+      //     } else if (this.dataSource.length <= 0) {
+      //       this.$message.warning(this.$t('addAtLeastOneRowOfData'))
+      //       data = false
+      //     } else {
+      //       data = false
+      //     }
+      //   } else {
+      //     data = false
+      //   }
+      // })
       return data
     },
     // 企标编号和名称修改触发流程名称的修改