Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue

@@ -436,9 +436,9 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes);
-        this.dataList = mes.dataList;
-        this.roleForm = mes.roleForm;
-        this.commentText = mes.commentText;
+        this.dataList = mes.dataList || mes.json.standardInfoList;
+        this.roleForm = mes.roleForm || mes.json.roleForm;
+        this.commentText = mes.commentText || mes.json.commentText;
       });
     },
     //点击新增事件
@@ -609,6 +609,7 @@ export default {
           this.$message.warning('请完善人员信息')
         } else {
           if(!this.submitFlag){
+            console.log('第一次提交');
             this.$refs['roleForm'].validate((valid) => {
               if (valid) {
                 this.isSubmit = true
@@ -647,6 +648,7 @@ export default {
               }
             })
           }else{
+            console.log('修改后提交');
             this.$refs["roleForm"].validate((valid) => {
               if (valid) {
                 let specialJson = {