diff --git a/fuintAdmin/src/api/EventMarketing/activeRecommend.js b/fuintAdmin/src/api/EventMarketing/activeRecommend.js index 31a964ac1..cbaf12c49 100644 --- a/fuintAdmin/src/api/EventMarketing/activeRecommend.js +++ b/fuintAdmin/src/api/EventMarketing/activeRecommend.js @@ -3,12 +3,27 @@ import request from '@/utils/request' // 查询推荐有礼列表 export function listActiveRecommend(query) { return request({ - url: '/business/marketingActivity/activeRecommend/list', + url: 'business/marketingActivity/activeRecommend', + method: 'get', + params: query + }) +} +//优惠券 +export function listFavorable(query) { + return request({ + url: 'business/marketingActivity/cardFavorable', + method: 'get', + params: query + }) +} +// 兑换券 +export function listExchange(query) { + return request({ + url: 'business/marketingActivity/cardExchange', method: 'get', params: query }) } - // 查询推荐有礼详细 export function getActiveRecommend(id) { return request({ @@ -20,7 +35,7 @@ export function getActiveRecommend(id) { // 新增推荐有礼 export function addActiveRecommend(data) { return request({ - url: '/business/marketingActivity/activeRecommend', + url: 'business/marketingActivity/activeRecommend', method: 'post', data: data }) @@ -29,7 +44,7 @@ export function addActiveRecommend(data) { // 修改推荐有礼 export function updateActiveRecommend(data) { return request({ - url: '/business/marketingActivity/activeRecommend', + url: 'business/marketingActivity/activeRecommend', method: 'put', data: data }) diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 963fa2c2d..9b13a873d 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -654,7 +654,6 @@ export default { activeEndTime00: [ { required: true, message: '必填项不能为空', trigger: 'blur' }, ], - adaptUserType: [ { required: true, message: '必填项不能为空', trigger: 'blur' }, ], dieselUserLevel: [ @@ -942,8 +941,6 @@ export default { this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1') this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2') this.form.shiwudata = response.data.activeConsumptionChildList.filter(item => item.activeGift == '4') - - this.open = true; this.title = "修改消费有礼活动"; }); diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue index 593f3b705..41d767334 100644 --- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue @@ -1,220 +1,509 @@ + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index 7f03e35f7..7bfb748b5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -158,8 +158,7 @@ public class FyPayServiceImpl implements FyPayService { cashierOrder.setStatus("paid"); } if (!ObjectUtil.isEmpty(hangBill)){ - hangBill.setPayStatus("paid"); - hangBillService.updateHangBills(hangBill,allAmount); + hangBillService.updateHangBills(hangBill,allAmount,"paid"); } if (ArrayUtil.isEmpty(list)){ for (OilOrder order : list) { 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 2438593f7..4fcb1018d 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 @@ -75,7 +75,30 @@ public class HangBillController extends BaseController { */ @PutMapping public ResponseObject edit(@Validated @RequestBody Map map){ - int row = hangBillService.updateHangBill(map); + HangBill hangBill = hangBillService.updateHangBill(map); + return getSuccessResult(hangBill); + } + + /** + * 批量归还 + * @param map + * @return + */ + @PostMapping("/batch") + public ResponseObject batchUpdate(@Validated @RequestBody Map map){ + int row = hangBillService.batchUpdate(map); return getSuccessResult(row); } + + /** + * 根据订单号查询挂账记录信息 + * @param map + * @return + */ + @PostMapping("/orderNo") + public ResponseObject queryByOrderNo(@Validated @RequestBody Map map){ + String orderNo = map.get("orderNo"); + HangBill hangBill = hangBillService.selectHangBillByOrderNo(orderNo); + return getSuccessResult(hangBill); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java index 2e0c10e20..3ddf4ca9b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java @@ -42,6 +42,10 @@ public class CashierOrder extends BaseEntity implements Serializable { * 商品订单id */ private Integer goodsOrderId; + /** + * 终端 + */ + private String terminal; /** * 付款用户 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml index 652fc41c8..82c7d2acf 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml @@ -15,6 +15,9 @@ and order_no like concat('%', #{order.orderNo}, '%') + + and terminal like concat('%', #{order.terminal}, '%') + and date_format(pay_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d') diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml index b22fb3efd..2d7dae4f5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml @@ -21,6 +21,9 @@ and pay_type = #{order.payType} + + and order_status != #{order.orderStatus} + and order_no like concat('%', #{order.orderNo}, '%') diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java index 0de3a7ebd..885cd0652 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java @@ -53,7 +53,14 @@ public interface HangBillService extends IService { * @param map * @return */ - public int updateHangBill(Map map); + public HangBill updateHangBill(Map map); + + /** + * 批量归还挂账金额 + * @param map + * @return + */ + public int batchUpdate(Map map); /** * 修改挂账信息 @@ -61,5 +68,5 @@ public interface HangBillService extends IService { * @param repaidAmount * @return */ - public int updateHangBills(HangBill hangBill,Double repaidAmount); + public int updateHangBills(HangBill hangBill,Double repaidAmount,String status); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java index f8c724d9a..4cc3f048c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java @@ -1,5 +1,8 @@ package com.fuint.business.order.service.impl; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -83,7 +86,73 @@ public class HangBillServiceImpl extends ServiceImpl i private OilConfigService oilConfigService; @Override - public int updateHangBill(Map map) { + public HangBill updateHangBill(Map map) { + String payType = map.get("payType"); +// 调用支付接口 + this.pay(map); + +// 根据id查询挂账信息 + HangBill hangBill = baseMapper.selectById(Integer.parseInt(map.get("id"))); + if (payType.equals("CASH")){ + hangBill.setPayStatus("paid"); + } + int row = 0; + hangBill.setRemark(map.get("remark")); +// 支付成功后修改挂账信息 + if (hangBill.getPayStatus().equals("paid")){ + Double repaidAmount1 = Double.valueOf(map.get("repaidAmount")); + Double amount = hangBill.getAmount(); + Double repaidAmount = hangBill.getRepaidAmount(); + Double outstandAmount = hangBill.getOutstandAmount(); + Double repaidAmountAfter = repaidAmount+repaidAmount1; +// 修改挂账信息 + hangBill.setRepaidAmount(repaidAmountAfter); + hangBill.setOutstandAmount(amount-repaidAmountAfter); + if (amount.equals(repaidAmountAfter)){ + hangBill.setStatus("1"); + hangBill.setReturnType("1"); + }else { + hangBill.setStatus("2"); + } + } + row = baseMapper.updateById(hangBill); + return baseMapper.selectById(Integer.parseInt(map.get("id"))); + } + + @Override + public int batchUpdate(Map map) { + this.pay(map); + List jsonObjects = JSONArray.parseArray(map.get("list"), JSONObject.class); + int row = 0; + for (JSONObject jsonObject : jsonObjects) { +// 现将需要修改的支付状态改为未支付 + HangBill hangBill1 = baseMapper.selectById((Integer) jsonObject.get("id")); + hangBill1.setPayStatus("unpaid"); + baseMapper.updateById(hangBill1); + HangBill hangBill = baseMapper.selectById((Integer) jsonObject.get("id")); + if (map.get("payType").equals("CASH")){ + HangBill hangBill2 = this.updateStatus(hangBill, Double.valueOf(jsonObject.get("repaidAmount").toString())); + hangBill2.setPayStatus("paid"); + hangBill2.setRemark(map.get("remark")); + row = baseMapper.updateById(hangBill2); + } + } + return row; + } + + @Override + public int updateHangBills(HangBill hangBill, Double repaidAmount,String status) { + HangBill hangBill1 = this.updateStatus(hangBill, repaidAmount); + hangBill1.setPayStatus(status); + int row = baseMapper.updateById(hangBill1); + return row; + } + + /** + * 调用支付接口 + * @param map + */ + private void pay(Map map){ String payType = map.get("payType"); if (!map.get("repaidAmount").equals("0") && !payType.equals("CASH")){ Integer allAmount = (int) (Double.valueOf(map.get("repaidAmount"))*100); @@ -111,39 +180,6 @@ public class HangBillServiceImpl extends ServiceImpl i e.printStackTrace(); } } -// 根据id查询挂账信息 - HangBill hangBill = baseMapper.selectById(Integer.parseInt(map.get("id"))); - if (payType.equals("CASH")){ - hangBill.setPayStatus("paid"); - } - int row = 0; - hangBill.setRemark(map.get("remark")); -// 支付成功后修改挂账信息 - if (hangBill.getPayStatus().equals("paid")){ - Double repaidAmount1 = Double.valueOf(map.get("repaidAmount")); - Double amount = hangBill.getAmount(); - Double repaidAmount = hangBill.getRepaidAmount(); - Double outstandAmount = hangBill.getOutstandAmount(); - Double repaidAmountAfter = repaidAmount+repaidAmount1; -// 修改挂账信息 - hangBill.setRepaidAmount(repaidAmountAfter); - hangBill.setOutstandAmount(amount-repaidAmountAfter); - if (outstandAmount == repaidAmountAfter){ - hangBill.setStatus("1"); - hangBill.setReturnType("1"); - }else { - hangBill.setStatus("2"); - } - } - row = baseMapper.updateById(hangBill); - return row; - } - - @Override - public int updateHangBills(HangBill hangBill, Double repaidAmount) { - HangBill hangBill1 = this.updateStatus(hangBill, repaidAmount); - int row = baseMapper.updateById(hangBill1); - return row; } private HangBill updateStatus(HangBill hangBill,Double repaidAmount1){ @@ -154,7 +190,7 @@ public class HangBillServiceImpl extends ServiceImpl i // 修改挂账信息 hangBill.setRepaidAmount(repaidAmountAfter); hangBill.setOutstandAmount(amount-repaidAmountAfter); - if (outstandAmount == repaidAmountAfter){ + if (amount.equals(repaidAmountAfter)){ hangBill.setStatus("1"); hangBill.setReturnType("1"); }else { diff --git a/fuintCashierWeb/src/api/cashier/cardvaluerecord.js b/fuintCashierWeb/src/api/cashier/cardvaluerecord.js new file mode 100644 index 000000000..09a953231 --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/cardvaluerecord.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 查询挂账信息列表 +export function listCardValueRecord(query) { + return request({ + url: '/business/marketingActivity/cardValueRecord', + method: 'get', + params: query + }) +} diff --git a/fuintCashierWeb/src/api/cashier/hangbill.js b/fuintCashierWeb/src/api/cashier/hangbill.js index a23d5b4ea..c941330d8 100644 --- a/fuintCashierWeb/src/api/cashier/hangbill.js +++ b/fuintCashierWeb/src/api/cashier/hangbill.js @@ -34,6 +34,24 @@ export function addHangBill(data) { }) } +// 批量归还挂账信息 +export function batchHangBill(data) { + return request({ + url: '/business/hangBill/batch', + method: 'post', + data: data + }) +} + +// 根据订单号查询挂账记录信息 +export function queryHangBill(data) { + return request({ + url: '/business/hangBill/orderNo', + method: 'post', + data: data + }) +} + // 修改挂账记录及收款 export function editHangBill(data) { return request({ diff --git a/fuintCashierWeb/src/api/cashier/integral/category.js b/fuintCashierWeb/src/api/cashier/integral/category.js new file mode 100644 index 000000000..aa9661d56 --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/integral/category.js @@ -0,0 +1,27 @@ +import request from "@/utils/request"; + +// 查询积分分类 +export function getGiftCategoryApi(data) { + return request({ + url: 'business/integral/integralGiftCategory/queryByPage', + method: 'get', + params: data + }) + } + // 新增有关信息 + export function insertGiftCategoryApi(data) { + return request({ + url: 'business/integral/integralGiftCategory', + method: 'post', + data: data + }) + } + // 修改有关信息 + export function updateGiftCategoryApi(data) { + return request({ + url: 'business/integral/integralGiftCategory', + method: 'put', + data: data + }) + } + diff --git a/fuintCashierWeb/src/api/cashier/integral/gift.js b/fuintCashierWeb/src/api/cashier/integral/gift.js new file mode 100644 index 000000000..9a032d4cc --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/integral/gift.js @@ -0,0 +1,55 @@ +import request from "@/utils/request"; + +// 查询油罐列表 +export function getGiftApi(data) { + return request({ + url: 'business/integral/integralGift/queryByPage', + method: 'get', + params: data + }) + } + // 新增有关信息 + export function insertGiftApi(data) { + return request({ + url: 'business/integral/integralGift', + method: 'post', + data: data + }) + } + // 修改有关信息 + export function updateGiftApi(data) { + return request({ + url: 'business/integral/integralGift', + method: 'put', + data: data + }) + } + + + // 修改库存 + export function updateGiftInventoryApi(data) { + return request({ + url: 'business/integral/integralGift/updateInventory', + method: 'get', + params: data + }) + } + + + //兑换券 + export function getCardFavorableApi(data) { + return request({ + url: 'business/marketingActivity/cardFavorable?pageNo=1&pageSize=10', + method: 'get', + params: data + }) + } + + //优惠券 + export function getCardExchangeApi(data) { + return request({ + url: 'business/marketingActivity/cardExchange?pageNo=1&pageSize=10', + method: 'get', + params: data + }) + } diff --git a/fuintCashierWeb/src/api/cashier/integral/order.js b/fuintCashierWeb/src/api/cashier/integral/order.js new file mode 100644 index 000000000..8380621e9 --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/integral/order.js @@ -0,0 +1,39 @@ +import request from "@/utils/request"; + +// 查询列表 +export function getOrderApi(data) { + return request({ + url: 'business/integral/integralOrders/queryByPage', + method: 'get', + params: data + }) + } + + // 新增有关信息 + export function insertOrderApi(data) { + return request({ + url: 'business/integral/integralOrders', + method: 'post', + data: data + }) + } + // 修改有关信息 + export function updateOrderApi(data) { + return request({ + url: 'business/integral/integralOrders', + method: 'put', + data: data + }) + } + + export function getStatisticsApi(data) { + return request({ + url: 'business/integral/integralOrders/statistics', + method: 'get', + params: data + }) + } + + + + diff --git a/fuintCashierWeb/src/api/cashier/integral/settings.js b/fuintCashierWeb/src/api/cashier/integral/settings.js new file mode 100644 index 000000000..07886119e --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/integral/settings.js @@ -0,0 +1,27 @@ +import request from "@/utils/request"; + +// 查询油罐列表 +export function getSettingsApi(data) { + return request({ + url: 'business/integral/integralSettings/getSettings', + method: 'get', + params: data + }) + } + // 新增有关信息 + export function insertSettingsApi(data) { + return request({ + url: 'business/integral/integralSettings', + method: 'post', + data: data + }) + } + // 修改有关信息 + export function updateSettingsApi(data) { + return request({ + url: 'business/integral/integralSettings', + method: 'put', + data: data + }) + } + diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue index 1145eb465..c92e418ce 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue @@ -7,8 +7,8 @@ - - + + @@ -18,8 +18,8 @@ - - + + diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue index 542cb6762..f1ade4335 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue @@ -107,7 +107,7 @@
列表
新增挂账记录 - 批量挂账归还 + 批量挂账归还
@@ -408,11 +408,11 @@ v-loading="loading">
付款金额
- ￥{{ form2.repaidAmount }} + ￥{{ payAmount }}
请自行核实归还金额,提交完成后将自动处理
- @@ -458,7 +458,7 @@ - + 查询 @@ -508,7 +508,9 @@ width="120"> @@ -523,16 +525,66 @@ @current-change="getList">
+
+ 挂账金额：{{ amount }} + 未归还金额：{{ outstandAmount }} + + + + +
取 消 - 确 定 + 确 定 + + + + + + + + + + + + + + + + + + + + + + + {{ item.dictLabel }} + + + + + + + 取 消 + 确认归还
+ + diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/outcome.vue b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/outcome.vue new file mode 100644 index 000000000..59472c0b9 --- /dev/null +++ b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/outcome.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue new file mode 100644 index 000000000..8ba7f77db --- /dev/null +++ b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue @@ -0,0 +1,256 @@ + + + + + diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsMall.vue b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsMall.vue new file mode 100644 index 000000000..2f6d2168e --- /dev/null +++ b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsMall.vue @@ -0,0 +1,318 @@ + + + + + + + diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index 5fc92143b..4f4a0fd5b 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -74,9 +74,12 @@ style="width: 100%"> @@ -359,6 +362,26 @@ import {getOrderGoods} from "@/api/cashier/goodsorder"; this.getStaffList(); }, methods:{ + // 获取员工姓名 + getRealName(list,val){ + let name = ""; + list.forEach(item => { + if (item.id == val){ + name = item.realName + } + }) + return name; + }, + // 获取员工手机号 + getMobile(list,val){ + let name = ""; + list.forEach(item => { + if (item.id == val){ + name = item.mobile + } + }) + return name; + }, // 补打 patchwork(data){ const orderNo = data.orderNo diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue index f47f3366d..fe56f6fca 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue @@ -102,9 +102,12 @@ style="width: 100%"> @@ -140,16 +143,16 @@ - - - + + @@ -190,6 +193,8 @@ export default { name: "order_Cashier", data(){ return{ + // 终端列表 + terminalList:[], // 员工列表 staffList:[], // 日期范围 @@ -218,6 +223,7 @@ export default { }, // 支付列表 payList:[], + // tableData: [{ // date: '2016-05-03', // name: '王小狼', @@ -273,12 +279,36 @@ export default { created() { this.getList(); this.getStaffList(); + this.getPayList(); }, methods:{ + // 根据员工id查询员工信息 + queryStaf(list,id){ + let name = ""; + list.forEach(item => { + if (item.id == id){ + name = `${item.realName}(${item.mobile})` + } + }) + return name; + }, + getVal(list,val){ + let name = ""; + list.forEach(item => { + if (item.dictValue == val){ + name = item.dictLabel + } + }) + return name; + }, + // 获取付款类型列表 getPayList(){ getDicts("payment_type").then( response => { this.payList = response.data; }) + getDicts("terminal").then( response => { + this.terminalList = response.data; + }) }, // 获取商品详情 getGoods(id){ diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue index 0161662c6..57371d0e2 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue @@ -2,260 +2,263 @@