[update] 流程驳回传JSON

src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue

@@ -17,7 +17,8 @@
             <j-dict-select-tag
               :placeholder="$t('pleaseSelect') + this.$t('workCenter.regulatoryComplianceCheckProcess.checkWhetherTheTaskIsDelivered')"
               dict-code="yn"
-              v-model="formInline.distributeFlag">
+              v-model="formInline.distributeFlag"
+              @change="distributeFlagChange">
             </j-dict-select-tag>
           </a-form-model-item>
         </div>
@@ -47,9 +48,10 @@
           rowKey="standardNumber"
           :columns="columns"
           :dataSource="dataSource"
-          :pagination="false"
+          :pagination="ipagination"
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-          :loading="loading">
+          :loading="loading"
+          @change="handleTableChange">
         </j-table>
       </div>
     </template>
@@ -82,7 +84,9 @@
           :dataSource="dataSourceEvaluate"
           formIsDepend="result"
           :extraForm="extraForm"
-          :loading="loading">
+          :pagination="ipagination"
+          :loading="loading"
+          @change="handleTableChange">
 
           <template slot="result" slot-scope="{text, record}">
             <j-dict-select-tag
@@ -96,7 +100,7 @@
         </j-expand-table>
       </div>
 
-      <a-form-model :model="personFormInline" class="form-add" :rules="rules" ref="ruleForm">
+      <a-form-model :model="personFormInline" class="form-add" :rules="rules" ref="personRuleForm">
         <div class="form-flex-box">
           <!--  会签人员 自动带出法规工程师。可多选其他人？？  -->
           <div class="box-title-text form-flex-item">
@@ -204,6 +208,18 @@ export default {
       YesOrNoEnum,
       loading: false,
       formInline: {},
+      /* 分页参数 */
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '30', '50', '100', '150', '200'],
+        showTotal: (total, range) => {
+          return range[0] + '-' + range[1] + ' ' + this.$t('total') + ' ' + total + ' ' + this.$t('strip')
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
       rules: {
         // 排查任务是否下发
         distributeFlag: [
@@ -502,7 +518,8 @@ export default {
       url: {
         downTemplateUrl: '',
         importExcelUrl: ''
-      }
+      },
+      dataSourceCopy: [] // 列表数组备份，防止切换排查任务是否下发后，填的数据带到新数组里
     }
   },
   methods: {
@@ -511,6 +528,7 @@ export default {
       // 给表单赋值
       this.formInline = Object.assign({}, data.standardInfo)
       this.dataSource = JSON.parse(JSON.stringify(data.detailInfoList))
+      this.dataSourceCopy = JSON.parse(JSON.stringify(data.detailInfoList))
       this.isGetDataAfter = true
     },
     // 外层要获取数据
@@ -524,16 +542,40 @@ export default {
     // 外层获取数据要过校验,返回false表示没有通过校验
     async getDataValidate () {
       let data = {}
-      await this.$refs.ruleForm.validate(valid => {
+      await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
-          data.standardInfo = Object.assign({}, this.formInline)
-          data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
+          if (!this.$refs.personRuleForm) {
+            this.$message.warning(this.$t('workCenter.regulatoryComplianceCheckProcess.pleaseClickNext'))
+            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))
+              } 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
         }
       })
       return data
     },
+    // 排查任务是否下发改变
+    distributeFlagChange (value) {
+      this.dataSource = JSON.parse(JSON.stringify(this.dataSourceCopy))
+    },
     // 下一步
     handleNext () {
       this.clickNextAfter = true
@@ -543,6 +585,9 @@ export default {
       this.selectedRowKeys = selectedRowKeys
       this.selectionRows = selectionRows
     },
+    handleTableChange (pagination) {
+      this.ipagination = pagination
+    },
     // 批量选择人员
     batchCheckPerson () {
       if (this.selectedRowKeys.length <= 0) {