bug fixed

src/pages/index/components/personnel_management.vue

@@ -106,7 +106,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="收费员姓名:">
-                <el-input v-model="formInline2.tollCollectorName" placeholder="请输入"></el-input>
+                <el-input v-model="formInline2.tollmanName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -134,7 +134,7 @@
           </el-table-column>
         </el-table>
         <div class="table-pagination">
-          <el-pagination layout="total, prev, pager, next, jumper" :total="total1" @current-change="handlePageChange2"
+          <el-pagination layout="total, prev, pager, next, jumper" :total="total2" @current-change="handlePageChange2"
                          :current-page.sync="pageNum2" :page-size.sync="pageSize2">
           </el-pagination>
         </div>
@@ -268,7 +268,7 @@ export default {
       pageSize2: 10,
       pageNum2: 1,
       formInline2: {
-        tollCollectorName: '',
+        tollmanName: '',
       },
       title2: '',
       dialogVisible2: false,
@@ -279,6 +279,8 @@ export default {
         birthDay: '',
         positionPermission: '',
       },
+      queryParams1: {},
+      queryParams2: {}
     }
   },
   mounted() {
@@ -294,13 +296,10 @@ export default {
       return rowIndex % 2 === 0 ? 'even-row' : 'odd-row';
     },
     onSubmit1() {
-      this.loading1 = true
-      api_l.optPersonnelManagementShiftPage({parkId: this.formInline1.parkId}).then(res => {
-        this.tableData1 = res.data.records
-        this.total1 = res.data.total
-        this.loading1 = false
-      })
-      },
+      this.pageNum1 = 1
+      this.queryParams1 = {...this.formInline1}
+      this.getTableData1()
+    },
     handleAdd() {
       this.title = '添加'
       this.formLabelAlign = {}
@@ -351,13 +350,9 @@ export default {
       }
     },
     onSubmit2() {
-      this.loading2 = true
-      api_l.optPersonnelManagementBasicDetail({tollmanName: this.formInline2.tollCollectorName}).then(res => {
-        this.tableData2 = res.data.records
-        this.total2 = res.data.total
-        this.loading2 = false
-      })
-
+      this.pageNum2 = 1
+      this.queryParams2 = {...this.formInline2}
+      this.getTableData2()
     },
     handleAdd2() {
       this.title2 = '添加'
@@ -396,13 +391,21 @@ export default {
       this.getTableData1()
     },
     getTableData1() {
-      api_l.optPersonnelManagementShiftPage().then(res => {
+      this.loading1 = true
+      const {pageNum1, pageSize1} = this
+      api_l.optPersonnelManagementShiftPage({current: pageNum1, size: pageSize1, ...this.queryParams1}).then(res => {
+        this.loading1 = false
         this.tableData1 = res.data.records
+        this.total1 = res.data.total
       })
     },
     getTableData2() {
-      api_l.optPersonnelManagementBasicDetail({}).then(res => {
+      this.loading2 = true
+      const {pageNum2, pageSize2} = this
+      api_l.optPersonnelManagementBasicDetail({current: pageNum2, size: pageSize2, ...this.queryParams2}).then(res => {
+        this.loading2 = false
         this.tableData2 = res.data.records
+        this.total2 = res.data.total
       })
     },
     handlePageChange2() {