From 4d8300d2136fa598545d3fd71ddcbd1d1ad3eac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 26 Jul 2024 11:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E7=A0=81=E9=A1=B5?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cost/accounting.vue | 18 +++++++++---------
 src/views/warehouse/index.vue | 16 +++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/views/cost/accounting.vue b/src/views/cost/accounting.vue
index 9c57e00..6c1ee62 100644
--- a/src/views/cost/accounting.vue
+++ b/src/views/cost/accounting.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-26 11:06:58
+ * @LastEditTime: 2024-07-26 11:14:37
  * @LastEditors: zhp
  * @Description:
 -->
@@ -30,12 +30,12 @@
         </el-form-item>
       </el-form>
       <!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
-      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
+      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
         :max-height="tableH">
         <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
           :method-list="tableBtn" @clickBtn="handleClick" /> -->
       </base-table>
-      <pagination :limit.sync="listQuery.size" :page.sync="listQuery.current" :total="listQuery.total"
+      <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
         @pagination="getDataList" />
     </div>
 
@@ -101,8 +101,8 @@ export default {
       // selectedValues: [],
       options,
       listQuery: {
-        // size: 10,
-        // current: 1,
+        pageSize: 20,
+        pageNo: 1,
         total: 0,
         center: undefined,
         start: undefined,
@@ -509,8 +509,8 @@ export default {
       this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
       switch (val.btnName) {
         case 'search':
-          this.listQuery.current = 1;
-          this.listQuery.size = 10;
+          this.listQuery.pageNo = 1;
+          this.listQuery.pageSize = 10;
           this.getDataList();
           break;
         case 'export':
@@ -523,8 +523,8 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.listQuery;
-      queryParams.current = 1
-      queryParams.size = 999
+      // queryParams.current = 1
+      // queryParams.size = 999
       // if (this.facType === 0) {
       this.$modal.confirm('是否确认导出所有数据项?').then(() => {
         this.exportLoading = true;
diff --git a/src/views/warehouse/index.vue b/src/views/warehouse/index.vue
index f6e8bf4..bae2be3 100644
--- a/src/views/warehouse/index.vue
+++ b/src/views/warehouse/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-26 11:05:17
+ * @LastEditTime: 2024-07-26 11:14:34
  * @LastEditors: zhp
  * @Description:
 -->
@@ -54,12 +54,12 @@
         </el-form-item>
       </el-form>
       <!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
-      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
+      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
         :max-height="tableH">
         <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
           :method-list="tableBtn" @clickBtn="handleClick" /> -->
       </base-table>
-      <pagination :limit.sync="listQuery.size" :page.sync="listQuery.current" :total="listQuery.total"
+      <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
         @pagination="getDataList" />
     </div>
 
@@ -100,8 +100,8 @@ export default {
       start: undefined,
       end: undefined,
       listQuery: {
-        size: 10,
-        current: 1,
+        pageSize: 20,
+        pageNo: 1,
         total: 0,
         mDType:0,
         wDType: 0,
@@ -299,8 +299,8 @@ export default {
       this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
       switch (val.btnName) {
         case 'search':
-          this.listQuery.current = 1;
-          this.listQuery.size = 10;
+          this.listQuery.pageNo = 1;
+          this.listQuery.pageSize = 10;
           this.getDataList();
           break;
         case 'export':
@@ -313,8 +313,6 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.listQuery;
-      queryParams.current = 1
-      queryParams.size = 999
       // if (this.facType === 0) {
         this.$modal.confirm('是否确认导出所有数据项?').then(() => {
           this.exportLoading = true;