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

1

Browse Source
This commit is contained in:
zhaohengkun 2024-10-12 09:01:34 +08:00
parent 9e6ca618aa
commit 7121aaccf0
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
View File

@ -915,6 +915,11 @@ export default {
} }
}, },
async collection1() { async collection1() {
if (this.flag==3){
console.log(919)
this.collection()
return
}
let makeChange = 0 let makeChange = 0
if (!this.payForm.authCode && this.payForm.paymentType !== "CASH") { if (!this.payForm.authCode && this.payForm.paymentType !== "CASH") {
this.$message.error('请先扫码'); this.$message.error('请先扫码');
@ -1077,7 +1082,7 @@ export default {
let isPaySuccess = false; let isPaySuccess = false;
await addLJGoods(_this.map).then( async response => { await addLJGoods(_this.payForm).then( async response => {
_this.orderNo = response.data.orderNo; _this.orderNo = response.data.orderNo;
if (response.data.oilOrder != null) { if (response.data.oilOrder != null) {
if (response.data.oilOrder.orderStatus == "paid") { if (response.data.oilOrder.orderStatus == "paid") {
@ -1136,16 +1141,17 @@ export default {
// 油罐id // 油罐id
// 活动id // 活动id
// 活动类型 // 活动类型
this.payForm.oilOrder = {
oilsPrice: this.oilGunClearing.oilPrice, this.payForm.oilOrder =JSON.stringify({
oilPrice: this.oilGunClearing.oilPrice,
oils: this.oilGunClearing.oilNameId, oils: this.oilGunClearing.oilNameId,
oilGunNum: this.oilGunClearing.id, oilGunNum: this.oilGunClearing.id,
tankId: this.oilGunClearing.tankId, tankId: this.oilGunClearing.tankId,
activeId: null, activeId: null,
activeType: null, activeType: null,
} })
//商品 集合 //商品 集合
this.payForm.goodsOrder = this.goodsList this.payForm.goodsOrder = JSON.stringify(this.goodsList)
//支付方式 //支付方式
this.payForm.payType = this.payType this.payForm.payType = this.payType
//油品订单金额 //油品订单金额
@ -1159,15 +1165,21 @@ export default {
//油枪id //油枪id
this.payForm.oilGunId = this.oilGunClearing.id this.payForm.oilGunId = this.oilGunClearing.id
//活动营销优惠金额 //活动营销优惠金额
console.log("哈哈哈活动", this.chooseAct);
this.payForm.activeAmount = this.chooseAct.disAmount this.payForm.activeAmount = this.chooseAct.disAmount
//优惠卷类型 //优惠卷类型
this.payForm.couponType = this.chooseCoupon.type this.payForm.couponType = this.chooseCoupon.type
//付款用户 //付款用户
this.payForm.payUser = this.chooseVipUser this.payForm.payUser = JSON.stringify(this.chooseVipUser)
//油品优惠金额 //油品优惠金额
this.payForm.oilDiscount = null; this.payForm.oilDiscount = 0;
//商品优惠金额 //商品优惠金额
this.payForm.goodsDiscount = null; this.payForm.goodsDiscount = 0;
// this.payForm.usePoint=0;
// this.payForm.pointAmount=0;
// this.payForm.balanceAmount=0;
// this.payForm.oilCardAmount=0;
// //员工id // //员工id
// this.payForm.staffId = this.$store.getters.userId; // this.payForm.staffId = this.$store.getters.userId;
//会员消费金额 (储值卡需要减少的金额) //会员消费金额 (储值卡需要减少的金额)