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

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue

@@ -234,22 +234,6 @@
           <!--                                        </el-form-item>-->
         </el-form>
       </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                disabled
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">

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

@@ -284,7 +284,7 @@ export default {
       formLoading: false,
       approvalFlag: false,
       showFlag: true,
-      taskId: '',
+      taskIds: '',
       bpnId: '',
       drawerTitle: "",
       nodeList: [],
@@ -330,12 +330,12 @@ export default {
     };
   },
   mounted() {
-   this.taskId = this.$route.query.taskIds
+   this.taskIds = this.$route.query.taskIds
     this.bpnId = this.$route.query.bpnId
     if (this.bpnId !== undefined) {
       this.getData()
     }
-    if(this.taskId){
+    if(this.taskIds){
       this.approvalFlag = true
       this.processTable()
       //被驳回时调用
@@ -387,10 +387,9 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
+      this.toggleType= item.type || item.qbfsForm.type
-      let type = item.type || item.qbfsForm.type
       this.$nextTick(() => {
-        switch (type){
+        switch (this.toggleType){
           case '1':
             this.comName = "merge"
             break
@@ -446,7 +445,6 @@ export default {
         qbzxdFrom.type = this.toggleType
         this.saveLoading = true
         let _formData = new FormData()
-        _formData.append('id', this.bpnId || '')
         _formData.append('createUser', this.$store.getters.userInfo.userId)
         _formData.append('createUserName', this.$store.getters.userInfo.userName)
         _formData.append('prcType', '25')
@@ -469,10 +467,8 @@ export default {
         qbzxdFrom.type = this.toggleType
         this.saveLoading = true
         let _formData = new FormData()
-        console.log(qbzxdFrom);
+        _formData.append("id", this.bpnId || "");
-        _formData.append('id', this.bpnId || '')
+        _formData.append("taskIds", this.taskIds);
-        _formData.append('createUser', this.$store.getters.userInfo.userId)
-        _formData.append('createUserName', this.$store.getters.userInfo.userName)
         _formData.append('prcType', '25')
         _formData.append('json', JSON.stringify({
           roleForm: this.roleForm,

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

@@ -736,8 +736,8 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes)
-        this.qblx_pageData = mes.qblx_pageData
+        this.qblx_pageData = mes.form ? mes.form : mes.qblx_pageData
-        this.fileInfoList = mes.qblx_pageData.qblxFile
+        this.fileInfoList = mes.form ? mes.form.qblxFile :  mes.qblx_pageData.qblxFile
         this.commentText = mes.commentText
         this.roleForm = mes.roleForm
       });
@@ -927,7 +927,6 @@ export default {
       this.saveLoading = true;
       let _formData = new FormData();
       this.qblx_pageData.qblxFile = this.fileInfoList
-      _formData.append("id", this.bpnId || "");
       _formData.append("createUser", this.$store.getters.userInfo.userId);
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "26");