From 1c40a93cffc183125e8a3a742f66068d7681c001 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 15 Jul 2024 16:56:16 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/MainFinderDistributesBaseInfo.vue | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
index cd1d184..72a0ac6 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
@@ -69,7 +69,7 @@
         <j-expand-table
           :can-drag="true"
           :scroll="{x: '100%'}"
-          ref="table"
+          ref="expandTable"
           rowKey="standardNumber"
           :columns="columnsEvaluate"
           :dataSource="dataSourceEvaluate"
@@ -525,7 +525,11 @@ export default {
       // 把数据抛出，在线编辑不知道要不要抛
       const data = {}
       data.standardInfo = Object.assign({}, this.formInline)
-      data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
+      if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) {
+        data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
+      } else {
+        data.detailInfoList = JSON.parse(JSON.stringify(this.dataSourceEvaluate))
+      }
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
@@ -533,27 +537,25 @@ export default {
       let data = {}
       await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
-          if (!this.$refs.personRuleForm) {
-            this.$message.warning(this.$t('workCenter.regulatoryComplianceCheckProcess.pleaseClickNext'))
-            data = false
+          if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) {
+            // 排查任务是否下发选了是
+            if (valid) {
+              data.standardInfo = Object.assign({}, this.formInline)
+              data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
+            } else {
+              data = false
+            }
           } else {
-            if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) {
-              if (valid) {
-                data.standardInfo = Object.assign({}, this.formInline)
-                data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
+            // 排查任务是否下发选了否
+            await this.$refs.personRuleForm.validate(personValid => {
+              const expandTableValid = this.$refs.expandTable.submit()
+              if (valid && personValid && expandTableValid) {
+                data.standardInfo = Object.assign({}, this.formInline, this.personFormInline)
+                data.detailInfoList = JSON.parse(JSON.stringify(this.dataSourceEvaluate))
               } else {
                 data = false
               }
-            } else {
-              await this.$refs.personRuleForm.validate(personValid => {
-                if (valid && personValid) {
-                  data.standardInfo = Object.assign({}, this.formInline, this.personFormInline)
-                  data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
-                } else {
-                  data = false
-                }
-              })
-            }
+            })
           }
         } else {
           data = false