合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!86

jero-web/src/views/processCenter/components/feedbackInformation.vue

@@ -181,6 +181,13 @@
       deleteData() {
         this.formInline.dataList.pop()
         this.formInline = { ...this.formInline }
+      },
+      submitData(callBack) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callBack && callBack(this.formInline.dataList)
+          }
+        })
       }
     }
   }

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -142,13 +142,13 @@
           res.lawsOpinionGatherId = this.queryProject.id
           res.actiProcInstId = this.$route.query.prcId
         })
-        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
+        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList: list }).then((res) => {
           if (res.success) {
             if (num == 1) {
               this.$message.success(this.$t('OperationSuccessful'))
-              this.$router.push({
-                path: '/collectionOfRegulatoryOpinions'
-              })
+              // this.$router.push({
+              //   path: '/collectionOfRegulatoryOpinions'
+              // })
               this.loading = false
             } else {
               this.completeTask()
@@ -162,8 +162,12 @@
         })
       },
       submit() {
-        let dataList = this.$refs.feedbackInformationRef.formInline.dataList
-        this.insertBatch(dataList, 2)
+        this.$refs.feedbackInformationRef.submitData((res) => {
+          this.loading = true
+          this.insertBatch(res, 2)
+        })
+        // let dataList = this.$refs.feedbackInformationRef.formInline.dataList
+        // this.insertBatch(dataList, 2)
       },
       completeTask() {
         let query = {