飞行器、订单部分分页bug修复

src/views/aircraft/index.vue

@@ -251,19 +251,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <!--分页-->
+    <!--分页组件-->
-    <div class="pagination-container">
+    <pagination />
-      <el-pagination
-        :background="true"
-        :current-page.sync="page.page"
-        :page-size.sync="page.size"
-        :layout="'total, sizes, prev, pager, next, jumper'"
-        :page-sizes="[10, 20, 50, 100]"
-        :total="page.total"
-        @size-change="crud.sizeChangeHandler"
-        @current-change="crud.pageChangeHandler"
-      />
-    </div>
   </div>
 </template>
 
@@ -277,6 +266,7 @@ import { allScenic } from "@/api/system/scenic";
 import { get } from "@/api/system/dictDetail";
 import { upload } from "@/utils/upload";
 import { mapGetters } from "vuex";
+import pagination from '@crud/Pagination'
 import rrOperation from "@crud/RR.operation";
 // crud交由presenter持有
 const defaultForm = {
@@ -294,7 +284,7 @@ const defaultForm = {
 };
 export default {
   name: "aircraft",
-  components: { udOperation },
+  components: { udOperation, pagination },
   cruds() {
     return CRUD({
       title: "飞行器",
@@ -349,12 +339,6 @@ export default {
       dialogVisible: false,
       dialogImageUrl: "",
       uploadDisabled: false,
-      // ini
-      page: {
-        page: 1,
-        size: 10,
-        total: 5,
-      },
       areaOptions: [],
       scenicOptions: [],
       employeeOptions: [],
@@ -514,18 +498,14 @@ export default {
       return true;
     },
 
-    [CRUD.HOOK.beforeRefresh]() {
+    [CRUD.HOOK.beforeRefresh](crud, form) {
-      // 设置分页参数
-      this.crud.params.current = this.page.page;
-      this.crud.params.size = this.page.size;
-
       // 设置查询参数
       this.crud.params.employeesId = this.query.employeesId;
       this.crud.params.areaId = this.query.areaId;
       this.crud.params.name = this.query.name;
+      crud.query.current = crud.page.page;
       return true;
     },
-
     [CRUD.HOOK.afterRefresh]() {
       // 更新分页数据
       const response = this.crud.data;

src/views/order/loadOrder/loadOrderDetail/index.vue

@@ -136,7 +136,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination-container">
+      <!-- <div class="pagination-container">
         <el-pagination
           :current-page.sync="taskPage.page"
           :page-sizes="[10, 20, 50, 100]"
@@ -146,7 +146,7 @@
           @size-change="handleTaskSizeChange"
           @current-change="handleTaskCurrentChange"
         />
-      </div>
+      </div> -->
     </el-card>
 
     <!-- 图片预览 -->

src/views/order/settlementOrder/index.vue

@@ -129,7 +129,7 @@ export default {
     async fetchData() {
       this.loading = true
       try {
-        const response = await getSettleOrderList(this.query)
+        const response = await getSettleOrderList({...this.page,...this.query})
         const operatorList = await getUserNameValue(0);
 
         const operatorMap = new Map();