[update] 处理流程中人员信息

src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue

@@ -247,8 +247,11 @@ export default {
         this.currentNode = 5
       } else if (taskName === '主起草单位主管级领导批准') {
         this.currentNode = 6
-      } else {
+      } else if (taskName === '标准化归档') {
         this.currentNode = 7
+      } else {
+        // 预留加签节点
+        this.currentNode = 999
       }
     }
     // 如果是查看进入的，不可编辑，不可操作
@@ -425,24 +428,23 @@ export default {
       }
       this.processInfoForm.validateFields((err, values) => {
         this.approvalInfoForm.validateFields((approvalErr, approvalValues) => {
-          this.$refs.baseInfoRef.getDataValidate((data) => {
-            if (!err && !approvalErr && data) {
-              const param = {} // 传给后端的数据
-              param.common = { ...values, ...approvalValues }
-              param.dataList = data.dataSource
-              param.flowUser = personnelObj
-              standardizationInitApproval(param).then(res => {
-                if (res.success) {
-                  this.$message.success(res.message)
-                  this.goBack()
-                } else {
-                  this.$message.warning(res.message)
-                }
-              }).finally(() => {
-                this.loading = false
-              })
-            }
-          })
+          const data = this.$refs.baseInfoRef.getDataValidate()
+          if (!err && !approvalErr && data) {
+            const param = {} // 传给后端的数据
+            param.common = { ...values, ...approvalValues }
+            param.dataList = data.dataSource
+            param.flowUser = personnelObj
+            standardizationInitApproval(param).then(res => {
+              if (res.success) {
+                this.$message.success(res.message)
+                this.goBack()
+              } else {
+                this.$message.warning(res.message)
+              }
+            }).finally(() => {
+              this.loading = false
+            })
+          }
         })
       })
     },
@@ -478,35 +480,37 @@ export default {
       if (this.loading) return
       // 流程审批信息校验
       this.approvalInfoForm.validateFields((approvalErr, approvalValues) => {
-        this.$refs.baseInfoFormRef.getDataValidate(data => {
-          if (approvalErr && data) {
-            // 只有表格
-            const param = {}
-            param.common = approvalValues
-            param.dataList = data.dataSource
-            standardizationInitAgree(param).then(res => {
-              if (res.success) {
-                this.$message.success(res.message)
-                this.goBack()
-              } else {
-                this.$message.warning(res.message)
-              }
-            }).finally(() => {
-              this.loading = false
-            })
-          }
-        })
+        const data = this.$refs.baseInfoFormRef.getDataValidate()
+        if (!approvalErr && data) {
+          // 只有表格
+          const param = {}
+          param.common = approvalValues
+          param.common.taskId = this.$route.query.taskId
+          param.dataList = data.dataSource
+          standardizationInitAgree(param).then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.goBack()
+            } else {
+              this.$message.warning(res.message)
+            }
+          }).finally(() => {
+            this.loading = false
+          })
+        }
       })
     },
     // 同意(节点2，3，6有同意)
     handleAgree () {
       if (this.loading) return
       this.approvalInfoForm.validateFields((err, values) => {
-        if (!err) {
-          this.loading = true
+        const data = this.$refs.baseInfoFormRef.getDataValidate()
+        if (!err && data) {
+          // 只有表格
           const param = {}
-          param.common = Object.assign({}, values)
-          param.taskId = this.$route.query.taskId
+          param.common = values
+          param.common.taskId = this.$route.query.taskId
+          param.dataList = data.dataSource
           standardizationInitAgree(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)