diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java index c33e37fda..eadf0467e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java @@ -63,7 +63,7 @@ public class CardValueRecordController extends BaseController { * @return */ @GetMapping("/list") - public ResponseObject selectAllPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, + public ResponseObject selectAllPage(@RequestParam(value = "pageNo[page]",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, CardValueRecord cardValueRecord) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java index 6a708b747..6f649a1b6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java @@ -33,7 +33,7 @@ public class CashierOrderController extends BaseController { */ @GetMapping("/list") public ResponseObject list(CashierOrder order, - @RequestParam(value = "page",defaultValue = "1") Integer pageNo, + @RequestParam(value = "page[page]",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ Page page =new Page(pageNo,pageSize); IPage list = cashierOrderService.selectCashierOrderList(page,order); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java index 8b4947e1d..e9f013435 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java @@ -39,7 +39,7 @@ public class HangBillController extends BaseController { */ @GetMapping("/list") public ResponseObject list(HangBillVo hangBillVo, - @RequestParam(value = "page",defaultValue = "1") Integer pageNo, + @RequestParam(value = "page[page]",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ Page page =new Page(pageNo,pageSize); IPage list = hangBillService.selectHangBillList(page,hangBillVo); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java index 9181ca561..2deacf6b8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java @@ -38,7 +38,7 @@ public class OilOrderController extends BaseController { @GetMapping("/list") public ResponseObject list(OilOrder order, - @RequestParam(value = "page",defaultValue = "1") Integer pageNo, + @RequestParam(value = "page[page]",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ Page page =new Page(pageNo,pageSize); IPage list = orderService.selectOilOrderList(page,order); diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue index 46bbf37c8..7c9a6bb3a 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue @@ -383,6 +383,7 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE listHangBill(this.addDateRange(this.queryParams, dateRange)).then( response => { this.hangBillList = response.data.records this.total = response.data.total; + this.queryParams.page = response.data.current; this.isSysDate = false }) this.getStatistic(); diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index 2c0ea4004..9ec9778c1 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -191,6 +191,7 @@
补打小票
@@ -1381,6 +1382,7 @@ export default { listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then(response => { this.orderList = response.data.records; this.total = response.data.total; + this.queryParams.page = response.data.current; this.isSysDate = false }) this.getSeekZero() diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue index d07d82190..0e6f35372 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue @@ -834,6 +834,7 @@ export default { listOilOrder(this.addDateRange(this.queryParams, dateRange)).then(response => { this.oilOrderList = response.data.records; this.total = response.data.total; + this.queryParams.page = response.data.current; this.isSysDate = false }) },