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

src/pages/localTool/standAutoSplit/index.vue

@@ -963,7 +963,7 @@ export default {
         _this: this
       }, res => {
         this.addSpiltStandList = res.data.list
-        this.addFileStandtotal = res.data.list.length
+        this.addFileStandtotal = res.data.count
         this.loadData = false
       }, e => {
         this.loadData = false

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

@@ -155,21 +155,21 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="account"
+            prop="accounts"
             label="账户"
             width="300"
             align="center">
             <template slot-scope="scope">
-                 <el-input v-model="scope.row.account" placeholder="请输入账户"></el-input>
+                 <el-input v-model="scope.row.accounts" placeholder="请输入账户"></el-input>
             </template>
           </el-table-column>
           <el-table-column
-            prop="password"
+            prop="passwords"
             label="密码"
             width="300"
             align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.password" placeholder="请输入密码"></el-input>
+              <el-input v-model="scope.row.passwords" placeholder="请输入密码"></el-input>
             </template>
           </el-table-column>
         </el-table>
@@ -382,8 +382,8 @@ export default {
           institutionName: '', //所在部门
           email: '', //联系方式
           tenure:'', //任期
-          account:'', //账户
-          password:'', //密码
+          accounts:'', //账户
+          passwords:'', //密码
         }],
         associationData: [{
           contactPerson: '', //协议联络人
@@ -567,13 +567,17 @@ export default {
     //流程提交
     handleSubmit() {
       this.isSubmit = true
-      this.wbbzform.dlFlag = '1',
+      this.wbbzform.dlFlag = '1'
+      this.wbbzform.comityOptionsOne = this.comityOptionsOne
+      this.wbbzform.comityOptionsTwo = this.comityOptionsTwo
+      this.wbbzform.comityOptionsOneThree = this.comityOptionsOneThree
       this.wbbzform.fileName = this.fileInfoList
-      this.wbbzform.passUser = this.$store.getters.userInfo.userId,
+      this.wbbzform.passUser = this.$store.getters.userInfo.userId
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
-      var json = JSON.stringify( this.wbbzform)
+      let json = JSON.stringify( this.wbbzform)
+      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

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

@@ -130,6 +130,7 @@
           <el-table-column
             prop="duties"
             label="职务"
+            width="180"
             align="center">
           </el-table-column>
           <el-table-column
@@ -146,17 +147,18 @@
           </el-table-column>
           <el-table-column
             prop="tenure"
+            width="200"
             label="任期"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="account"
+            prop="accounts"
             label="账户"
             width="200"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="password"
+            prop="passwords"
             label="密码"
             width="350"
             align="center">
@@ -479,9 +481,23 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         this.wbbzform = JSON.parse(JSON.stringify(item));
+        this.wbbzform.comityOptionsOne.forEach(item =>{
+         if(this.wbbzform.associationName === item.id){
+           this.wbbzform.associationName = item.name
+         }
+        })
+        this.wbbzform.comityOptionsTwo.forEach(item =>{
+          if(this.wbbzform.committee === item.id){
+            this.wbbzform.committee = item.name
+          }
+        })
+        this.wbbzform.comityOptionsOneThree.forEach(item =>{
+          if(this.wbbzform.workingGroup === item.id){
+            this.wbbzform.workingGroup = item.name
+          }
+        })
         this.associationData = item.associationData
         this.participantsData = item.participantsData
         item.fileName.forEach(itemId => {
@@ -547,7 +563,7 @@ export default {
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
       this.wbbzform.associationData = this.associationData
-      var json = JSON.stringify( this.wbbzform)
+      let json = JSON.stringify( this.wbbzform)
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

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

@@ -130,6 +130,7 @@
           <el-table-column
             prop="duties"
             label="职务"
+            width="180"
             align="center">
           </el-table-column>
           <el-table-column
@@ -146,17 +147,18 @@
           </el-table-column>
           <el-table-column
             prop="tenure"
+            width="200"
             label="任期"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="account"
+            prop="accounts"
             label="账户"
             width="200"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="password"
+            prop="passwords"
             label="密码"
             width="350"
             align="center">