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

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue

@@ -1315,6 +1315,14 @@ export default {
             this.$message.warning("请勿重复添加数据");
           } else {
             this.dataList.push(item);
+            this.dataList.forEach(item => {
+              if(item.XCXSSRQ === null){
+                item.XCXSSRQ = ''
+              }
+              if(item.ZCCSSRQ === null){
+                item.ZCCSSRQ = ''
+              }
+            })
             exits.push(item.id);
           }
         });
@@ -1368,11 +1376,13 @@ export default {
             this.dataList.forEach(item => {
               if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
                 item.xcxssrqgj = ''
+                this.$set(item, "XCXSSRQ", item.xcxssrqgj)
               }else{
                 this.$set(item, "XCXSSRQ", item.xcxssrqgj)
               }
               if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
                 item.zccssrqgj = ''
+                this.$set(item, "ZCCSSRQ", item.zccssrqgj)
               }else{
                 this.$set(item, "ZCCSSRQ", item.zccssrqgj)
               }

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

@@ -1308,11 +1308,13 @@ export default {
               this.dataList.forEach(item => {
                 if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
                   item.xcxssrqgj = ''
+                  this.$set(item, "XCXSSRQ", item.xcxssrqgj)
                 }else{
                   this.$set(item, "XCXSSRQ", item.xcxssrqgj)
                 }
                 if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
                   item.zccssrqgj = ''
+                  this.$set(item, "ZCCSSRQ", item.zccssrqgj)
                 }else{
                   this.$set(item, "ZCCSSRQ", item.zccssrqgj)
                 }

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -815,7 +815,7 @@ export default {
       this.listForm.commentText = this.commentText
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
-      this.isSubmit = true
+      // this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,