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

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

@@ -135,24 +135,36 @@
             width="180"
             label="职务"
             align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.duties" placeholder="请输入职务"></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="institutionName"
             label="所在部门"
             width="200"
             align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.institutionName" placeholder="请输入所在部门"></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="email"
             label="联系方式"
             width="350"
             align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.email" placeholder="请输入联系方式"></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="tenure"
             width="200"
             label="任期"
             align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.tenure" placeholder="请输入任期"></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="accounts"
@@ -429,7 +441,6 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes);
-        console.log(mes);
         this.wbbzform = mes.form
         this.associationData = mes.form.associationData
         this.getFileInfo();
@@ -475,7 +486,6 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         if(!item.directorUser){
           this.wbbzform = JSON.parse(JSON.stringify(item));
@@ -503,7 +513,6 @@ export default {
                 this.$message.warning('请勿重复添加参与人')
                 return
             }else{
-              console.log(items);
             }
           })
         })
@@ -577,7 +586,6 @@ export default {
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
       let json = JSON.stringify( this.wbbzform)
-      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -606,7 +614,7 @@ export default {
     },
     //添加参与人信息
     addPeople(){
-      var list =[]
+      let list =[]
       this.participantsData.push(list)
     },
     //批量删除参与人信息
@@ -669,7 +677,6 @@ export default {
     },
     // 上传之前钩子
     beforeUpload(file) {
-      console.log(file);
       var filename = file.name;
       var index1 = filename.lastIndexOf(".");
       var index2 = filename.length;

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

@@ -779,6 +779,7 @@ export default {
             }
           });
           this.selectList = [];
+          this.$refs.selection.clearSelection()
         }).catch(() => {
         });
       }

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

@@ -774,6 +774,7 @@ export default {
             }
           });
           this.selectList = [];
+          this.$refs.selection.clearSelection()
         }).catch(() => {
         });
       }

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

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