diff --git a/fuintAdmin/src/api/order/cashierorder.js b/fuintAdmin/src/api/order/cashierorder.js index fd4322055..7dbc846a4 100644 --- a/fuintAdmin/src/api/order/cashierorder.js +++ b/fuintAdmin/src/api/order/cashierorder.js @@ -9,6 +9,15 @@ export function listCashierOrder(query) { }) } +// 查询收银台订单列表 +export function cashierOrderSeekZeroAmount(query) { + return request({ + url: '/business/cashierOrder/seekZeroAmount', + method: 'get', + params: query + }) +} + // 根据id查询收银台订单列表 export function cashierOrder(id) { return request({ diff --git a/fuintAdmin/src/api/order/oilorder.js b/fuintAdmin/src/api/order/oilorder.js index 7418e3bdd..63fc72c11 100644 --- a/fuintAdmin/src/api/order/oilorder.js +++ b/fuintAdmin/src/api/order/oilorder.js @@ -80,3 +80,11 @@ export function orderStatisticsApi(query) { } +// 查询油罐信息 +export function getOilNumberGun() { + return request({ + url: '/business/petrolStationManagement/oilGun/selectByNumberTGUn', + method: 'get', + }) +} + diff --git a/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue b/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue index 72d283a14..d436bc395 100644 --- a/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue +++ b/fuintAdmin/src/views/EventMarketing/Writeoffrecords/index.vue @@ -62,10 +62,14 @@ - + + + - + diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue index 8c04e7099..a4857d409 100644 --- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue @@ -269,20 +269,20 @@ 参数二维码 - + 进行中 - 待生效 + 已结束 diff --git a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue index d00523afe..a40ea1b8e 100644 --- a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue +++ b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue @@ -49,16 +49,19 @@ - + + - +