diff --git a/src/views/aircraft/index.vue b/src/views/aircraft/index.vue
index 1f7eb22..c701574 100644
--- a/src/views/aircraft/index.vue
+++ b/src/views/aircraft/index.vue
@@ -251,19 +251,8 @@
-
-
+
+
@@ -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]() {
- // 设置分页参数
- this.crud.params.current = this.page.page;
- this.crud.params.size = this.page.size;
-
+ [CRUD.HOOK.beforeRefresh](crud, form) {
// 设置查询参数
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;
diff --git a/src/views/order/loadOrder/loadOrderDetail/index.vue b/src/views/order/loadOrder/loadOrderDetail/index.vue
index 3dc8ed1..b0a4973 100644
--- a/src/views/order/loadOrder/loadOrderDetail/index.vue
+++ b/src/views/order/loadOrder/loadOrderDetail/index.vue
@@ -136,7 +136,7 @@
-