[update] 企标更改流程加标准id

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
           // 授权部门

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()
+      let formInline = {}
-      await this.$refs.ruleForm.validate(async valid => {
+      if (formInline = await this.$refs.baseInfoForm.getDataValidate()) {
-        if (valid) {
+        this.$refs.ruleForm.validate(async valid => {
-          if (formInline && this.dataSource.length > 0) {
+          if (valid) {
-            data.formInline = { ...formInline, ...this.formInline }
+            if (this.dataSource.length > 0) {
-            data.dataSource = this.dataSource
+              data.formInline = { ...formInline, ...this.formInline }
-          } else if (this.dataSource.length <= 0) {
+              data.dataSource = this.dataSource
-            this.$message.warning(this.$t('addAtLeastOneRowOfData'))
+            } else {
-            data = false
+              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
     },
     // 企标编号和名称修改触发流程名称的修改