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

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

@@ -602,6 +602,9 @@
         name: "bzrkStep2",
         data () {
             return {
+                userId:this.$store.getters.userInfo.userId,
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
                 approvalOpinion: '', // 通过/驳回
                 textarea: '', // 意见
                 title: '', // 新增编辑抽屉标题
@@ -668,6 +671,10 @@
                     glwj: '', // 关联文件
                     xglc: '', // 相关流程
                     chjl: '', // 参会记录
+                    //流程信息
+                    prcNum:'',
+                    prcName:'',
+                    standType: '',
                 }, // 标准信息
                 standSortOptions: [], // 标准类别
                 standNatureOptions: [], // 标准性质
@@ -688,6 +695,9 @@
                 user3: '',
                 user4: '',
                 user5: '',
+                // 流程路由信息
+                prcNum : this.$route.query.prcNum,
+                prcName : this.$route.query.prcName,
             }
         },
         components: {
@@ -699,16 +709,29 @@
             getData() {
                 return new Promise((resolve, reject) => {
                     inboundLiaisonDetail({
-                        taskIds: this.$route.query.taskIds,
+                        taskIds: this.taskIds,
-                        pId: this.$route.query.prcId
+                        pId: this.pId
                     }).then(res => {
                         if (res) {
-                          this.form = JSON.parse(res.mesg)
+                          const processForm = JSON.parse(res.mesg)
+                          this.getFormFieldList(processForm)
                         }
                     }).catch(e => {
                     })
                 })
             },
+            /**
+             * @description: 动态表单读取
+             */
+            getFormFieldList (item) {
+                this.$nextTick(() => {
+                    this.form = JSON.parse(JSON.stringify(item))
+                    this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+                    this.form.prcNum = this.prcNum
+                    this.form.prcName = this.prcName
+                    this.form['id'] = item.id
+                })
+            },
             closeDrawer() {
                 this.ListModel = false
             },
@@ -730,18 +753,18 @@
             handleSubmit() {
                 const json = JSON.stringify(this.form);
                 console.log(json)
-                // this.$http.post('lawss/activiti/completeTask', {
+                this.$http.post('lawss/activiti/completeTask', {
-                //     taskIds: res.data,
+                    taskIds: this.taskIds,
-                //     userId : this.$store.getters.userInfo.userId,
+                    userId : this.userId,
-                //     json: json
+                    json: json
-                // }, {
+                }, {
-                //     _this: this
+                    _this: this
-                // }, res => {
+                }, res => {
-                //     console.log(res);
+                    console.log(res);
-                //     if (res.ok) {
+                    if (res.success) {
-                //         this.processCreateStand(json)
+                        this.processCreateStand(json)
-                //     }
+                    }
-                // })
+                })
             },
 
             /**