Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!242

src/components/phoneRole/index.vue

@@ -33,7 +33,7 @@
           :immediate-check="false"
           :offset="300"
         >
-          <van-checkbox-group v-if="!checkMore" v-model="result" :max="1" @change="itemChange">
+          <van-checkbox-group v-if="!checkMore" v-model="result" :max="1">
             <van-cell-group>
               <van-cell
                 v-for="(item, index) in roleList"
@@ -48,7 +48,7 @@
               </van-cell>
             </van-cell-group>
           </van-checkbox-group>
-          <van-checkbox-group v-if="checkMore" v-model="result" @change="itemChange">
+          <van-checkbox-group v-if="checkMore" v-model="result">
             <van-cell-group>
               <van-cell
                 v-for="(item, index) in roleList"
@@ -132,8 +132,6 @@ export default {
     this.getPhoneData()
   },
   methods: {
-    itemChange (data) {
-    },
     /** 查询 */
     queryPhone() {
       this.getPhoneData()

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:'', //账户
+          accounts:'', //账户
-          password:'', //密码
+          passwords:'', //密码
         }],
         associationData: [{
           contactPerson: '', //协议联络人
@@ -567,13 +567,15 @@ export default {
     //流程提交
     handleSubmit() {
       this.isSubmit = true
-      this.wbbzform.dlFlag = '1',
+      this.wbbzform.dlFlag = '1'
       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)
+      console.log(json);
+      return
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

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

@@ -150,13 +150,13 @@
             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">

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

@@ -150,13 +150,13 @@
             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">