Merge remote-tracking branch 'origin/master'

src/views/basic/corpMaintain/corpSelect.vue

@@ -441,7 +441,7 @@ import {
             },
 
             handleCurrentChange(val) {
-                this.query.page = val;
+                this.query.page = val.page;
                 this.getList();
             },
             getBasicThirdSys() {

src/views/system/dept/authDept.vue

@@ -637,6 +637,7 @@ export default {
     },
     onUserSubmit() {
       this.userQuery.deptId = this.currentRow.id;
+      this.userQuery.page=1;
       this.getUerList();
     },
     getUerList() {

src/views/system/param/busTypePre.vue

@@ -150,6 +150,7 @@ export default {
     },
     cancelDialog() {
       this.modifyDialogVisible = false;
+      this.getList();
     },
     search() {
       this.filterQuery.page = 1;

src/views/system/param/busTypePreModify.vue

@@ -54,7 +54,7 @@
 
         <el-col :span="11">
           <el-form-item label="目标往来仓库" prop="defaultInvCode">
-            <el-select v-model="inputQuery.defaultInvCode" placeholder="目标往来仓库" clearable size="small"
+            <el-select v-model="inputQuery.defaultInvName" placeholder="目标往来仓库" clearable size="small"
                        @change="invChange"
                        style="width: 90%">
               <el-option