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

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -2618,49 +2618,50 @@ export default {
     /**
      * @description: 动态表单读取
      */
-    // getFormFieldList(item) {
-    //   this.$nextTick(() => {
-    //     this.form = JSON.parse(JSON.stringify(item))
-    //     this.defaultCheckedKeys = [this.form.standSystem];
-    //     this.defaultCheckedKeys1 = [this.form.cycvppsbm];
-    //     this.defaultCheckedKeys2 = [this.form.kccvppsbm];
-    //     this.defaultCheckedKeys3 = [this.form.dybxh];
-    //     this.treeCheckedKeys = this.form.treeListId.split(',')
-    //     this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
-    //     this.form.standYear = this.form.standYear ? this.form.standYear : ''
-    //     this.form.prcNum = this.prcNum
-    //     this.form.prcName = this.prcName
-    //     this.form['id'] = item.id
-    //
-    //
-    //     // 遍历对象
-    //     for (const p in this.form) {
-    //       if (typeof (this.form[p]) != "function") {
-    //         this.initializeFileList(p, this.form[p]);
-    //       }
-    //     }
-    //
-    //     this.$forceUpdate()
-    //   })
-    // },
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
-        this.defaultCheckedKeys = [this.form.standSystem]
+        this.defaultCheckedKeys = [this.form.standSystem];
-        this.defaultCheckedKeys1 = [this.form.cycvppsbm]
+        this.defaultCheckedKeys1 = [this.form.cycvppsbm];
-        this.defaultCheckedKeys2 = [this.form.kccvppsbm]
+        this.defaultCheckedKeys2 = [this.form.kccvppsbm];
-        this.defaultCheckedKeys3 = [this.form.dybxh]
+        this.defaultCheckedKeys3 = [this.form.dybxh];
+        this.treeCheckedKeys = this.form.treeListId.split(',')
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
         this.form.standYear = this.form.standYear ? this.form.standYear : ''
-        if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
-          this.form.country = this.form.country.split(",");
-        }
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+
+
+        // 遍历对象
+        for (const p in this.form) {
+          if (typeof (this.form[p]) != "function") {
+            this.initializeFileList(p, this.form[p]);
+          }
+        }
+
+        this.$forceUpdate()
       })
     },
+    // getFormFieldList(item) {
+    //   this.$nextTick(() => {
+    //     this.form = JSON.parse(JSON.stringify(item))
+    //     this.defaultCheckedKeys = [this.form.standSystem]
+    //     this.defaultCheckedKeys1 = [this.form.cycvppsbm]
+    //     this.defaultCheckedKeys2 = [this.form.kccvppsbm]
+    //     this.defaultCheckedKeys3 = [this.form.dybxh]
+    //     this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+    //     this.form.standYear = this.form.standYear ? this.form.standYear : ''
+    //     if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+    //       this.form.country = this.form.country.split(",");
+    //     }
+    //     this.form.prcNum = this.prcNum
+    //     this.form.prcName = this.prcName
+    //     this.form['id'] = item.id
+    //   })
+    // },
     initializeFileList(property, value) {
+      console.log(property);
       switch (property) {
         case 'xgd':
           this.getFileList(value, this.xgdFileList);

src/pages/processCenter/pages/phone/qbfz/step6.vue

@@ -251,31 +251,25 @@ export default {
     },
     //流程提交
     handleSubmit() {
-      this.$refs['qbfsForm'].validate((valid) => {
+      this.isSubmit = true;
-        if (valid) {
+      this.qbfsForm.commentText = this.commentText;
-          this.isSubmit = true;
+      this.qbfsForm.sdFlag = '0'
-          this.qbfsForm.commentText = this.commentText;
+      this.qbfsForm.dataList = this.dataList;
-          this.qbfsForm.sdFlag = '0'
+      let json = JSON.stringify(this.qbfsForm);
-          this.qbfsForm.dataList = this.dataList;
+      this.$http.post("lawss/activiti/completeTask", {
-          let json = JSON.stringify(this.qbfsForm);
+        taskIds: this.$route.query.taskIds,
-          this.$http.post("lawss/activiti/completeTask", {
+        userId: this.$store.getters.userInfo.account,
-            taskIds: this.$route.query.taskIds,
+        json: json
-            userId: this.$store.getters.userInfo.account,
+      }, {
-            json: json
+        _this: this
-          }, {
+      }, res => {
-            _this: this
+        if (res.success) {
-          }, res => {
+          this.$message.success(res.message);
-            if (res.success) {
+          this.$router.push("/processCenter");
-              this.$message.success(res.message);
-              this.$router.push("/processCenter");
-            }
-            this.isSubmit = false;
-          }, e => {
-          });
-        }else{
-          this.$message.warning('请完善基础信息')
         }
-      })
+        this.isSubmit = false;
+      }, e => {
+      });
     },
 
     handleTabs(name) {