dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

收银系统-订单-后端功能

Browse Source
This commit is contained in:
ds 2024-10-24 17:01:00 +08:00
parent d0c8769c5d
commit 4cb9cb3692
7 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java
View File

@ -63,7 +63,7 @@ public class CardValueRecordController extends BaseController {
* @return * @return
*/ */
@GetMapping("/list") @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, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
CardValueRecord cardValueRecord) { CardValueRecord cardValueRecord) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java
View File

@ -33,7 +33,7 @@ public class CashierOrderController extends BaseController {
*/ */
@GetMapping("/list") @GetMapping("/list")
public ResponseObject list(CashierOrder order, 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){ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize); Page page =new Page(pageNo,pageSize);
IPage<CashierOrder> list = cashierOrderService.selectCashierOrderList(page,order); IPage<CashierOrder> list = cashierOrderService.selectCashierOrderList(page,order);

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
View File

@ -39,7 +39,7 @@ public class HangBillController extends BaseController {
*/ */
@GetMapping("/list") @GetMapping("/list")
public ResponseObject list(HangBillVo hangBillVo, 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){ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize); Page page =new Page(pageNo,pageSize);
IPage<HangBillVo> list = hangBillService.selectHangBillList(page,hangBillVo); IPage<HangBillVo> list = hangBillService.selectHangBillList(page,hangBillVo);

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
View File

@ -38,7 +38,7 @@ public class OilOrderController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
public ResponseObject list(OilOrder order, 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){ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize); Page page =new Page(pageNo,pageSize);
IPage<OilOrder> list = orderService.selectOilOrderList(page,order); IPage<OilOrder> list = orderService.selectOilOrderList(page,order);

1
fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue
View File

@ -383,6 +383,7 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
listHangBill(this.addDateRange(this.queryParams, dateRange)).then( response => { listHangBill(this.addDateRange(this.queryParams, dateRange)).then( response => {
this.hangBillList = response.data.records this.hangBillList = response.data.records
this.total = response.data.total; this.total = response.data.total;
this.queryParams.page = response.data.current;
this.isSysDate = false this.isSysDate = false
}) })
this.getStatistic(); this.getStatistic();

2
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

@ -191,6 +191,7 @@
<!-- type="text" plain round>详情2--> <!-- type="text" plain round>详情2-->
<!-- </el-button>--> <!-- </el-button>-->
<div style="color: #fe8c4a" size="mini" <div style="color: #fe8c4a" size="mini"
v-if="scope.row.status === 'paid'"
@click="patchwork(scope.row)" @click="patchwork(scope.row)"
type="text" plain round>补打小票 type="text" plain round>补打小票
</div> </div>
@ -1381,6 +1382,7 @@ export default {
listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then(response => { listCashierOrder(this.addDateRange(this.queryParams, dateRange)).then(response => {
this.orderList = response.data.records; this.orderList = response.data.records;
this.total = response.data.total; this.total = response.data.total;
this.queryParams.page = response.data.current;
this.isSysDate = false this.isSysDate = false
}) })
this.getSeekZero() this.getSeekZero()

1
fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
View File

@ -834,6 +834,7 @@ export default {
listOilOrder(this.addDateRange(this.queryParams, dateRange)).then(response => { listOilOrder(this.addDateRange(this.queryParams, dateRange)).then(response => {
this.oilOrderList = response.data.records; this.oilOrderList = response.data.records;
this.total = response.data.total; this.total = response.data.total;
this.queryParams.page = response.data.current;
this.isSysDate = false this.isSysDate = false
}) })
}, },