交班统计
-
@@ -386,6 +390,8 @@
import {addHandoverApi, getHandoverApi, printLocallyApi} from "@/api/cashier/handover";
import BigNumber from "bignumber.js";
import {removeUserId} from "@/utils/auth";
+import { getLodop } from "@/api/LodopFuncs";
+import Vue from 'vue';
export default {
name: "Handover",
@@ -496,11 +502,91 @@ import {removeUserId} from "@/utils/auth";
}
});
},
- printLocally() {
- printLocallyApi(this.handoverList).then(res=>{
+ async printLocally() {
+ //初始化打印函数
+ let LODOP = getLodop(); // 初始化打印
+ LODOP.PRINT_INIT();
+ var bodyStyle = `
+ `
+ var fromHtml = bodyStyle+this.$refs.report.innerHTML
+
+
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
+
+ LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
+
+ // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
+ // let preview = LODOP.PREVIEW();
+ console.log("preview",preview);
+ LODOP.PRINT();
+
- })
},
+
+ downloadFile() {
+ window.location.href = process.env.VUE_APP_SERVER_URL+"business/handoverRecord/downloadFile";
+
+ },
+
+
// 交班
async shift() {
let msg = '交班并退出系统, 是否继续?'
@@ -699,6 +785,32 @@ import {removeUserId} from "@/utils/auth";
+ `
+ var fromHtml = bodyStyle+this.$refs.report.innerHTML
- })
+
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
+
+ LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
+
+ // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
+ let preview = LODOP.PREVIEW();
+ // console.log("preview",preview);
+ LODOP.PRINT();
},
// getHandover() {
// getHandoverApi().then(res=>{
@@ -422,7 +499,7 @@ import BigNumber from "bignumber.js";
});
},
-
+
paymentAggregation(flag) {
let count = [];
if (this.handoverList && this.handoverList.paymentAggregation) {
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 0d4372997..338b66be2 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -446,7 +446,7 @@
￥{{ +oilActualPay + (+goodsActualPay) }}
- 合计金额：{{ oilAmount + goodsAmount }}元、优惠合计{{ oilDiscount + goodsDiscount + fullReduction + couponAmount }}元
+ 合计金额：{{ (oilAmount + goodsAmount).toFixed(2) }}元、优惠合计{{ (oilDiscount + goodsDiscount + fullReduction + couponAmount).toFixed(2) }}元
@@ -751,6 +751,38 @@
确 定
+
+
+
@@ -1033,6 +1065,8 @@
isExistOilOrder:false,
// 是否存在固定等级会员优惠
isFixingLevel:false,
+ // 是否为
+ isFixingBalance:false,
// 查询优惠活动信息所需参数
preferentialData:{
userId:"",
@@ -1085,6 +1119,14 @@
},
},
methods:{
+ async printLocally() {
+ const printHTML = document.querySelector('#reportSuccess').innerHTML
+ // 将打印的区域赋值，进行打印
+ window.document.body.innerHTML = printHTML
+ window.print() // 调用window打印方法
+ window.location.reload() // 打印完成后重新加载页面
+
+ },
clear(){
this.dialogVisiblej = false
this.seekZero = 0
@@ -1319,7 +1361,9 @@
this.countAmountFull();
this.isUseBalance = false;
}
- this.getOilCoupon()
+ if (!this.isFixingLevel){
+ this.getOilCoupon()
+ }
},
handleCheckAllChange5(val) {
if (val){
@@ -1454,7 +1498,7 @@
_this.gradeDiscount = [];
if (response.data) {
_this.oilOrder.forEach(item => {
- let discount = {type: "", full: 0, reduce: 0, liters: 0}
+ let discount = {type:"",discount:0,oilName:item.oilName,gunName:item.gunName}
if (item.type == "汽油") {
if (response.data.fixingLevel){
_this.isFixingLevel = true
@@ -1462,145 +1506,60 @@
if (response.data.fixingLevel.discountType == '自定义优惠' && response.data.fixingLevel.status == 'qy') {
if (response.data.fixingLevel.gasolineDiscount == "满减优惠") {
let oilDiscount = 0;
- discount.type = "满减优惠"
for (let i = 1; i <= gasolineRule.length; i++) {
// 将满减条件加入等级优惠列表
if (gasolineRule.length > 1) {
if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
- discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
oilDiscount = gasolineRule[gasolineRule.length - 1].gasolineRule2
- discount.reduce = gasolineRule[gasolineRule.length - 1].gasolineRule2
break;
}
if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
oilDiscount = gasolineRule[i - 1].gasolineRule2
- discount.reduce = gasolineRule[i - 1].gasolineRule2
}
} else {
if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
oilDiscount = gasolineRule[i - 1].gasolineRule2
- discount.reduce = gasolineRule[i - 1].gasolineRule2
}
}
}
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('满减优惠')
- }
gasolineDiscount += +oilDiscount
+ discount.discount = gasolineDiscount
} else if (response.data.fixingLevel.gasolineDiscount == "每升优惠") {
- discount.type = "每升优惠"
let oilDiscount = 0;
for (let i = 1; i <= gasolineRule.length; i++) {
// 将满减条件加入等级优惠列表
if (gasolineRule.length > 1) {
if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
- discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
oilDiscount = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
- discount.reduce = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
- discount.liters = gasolineRule[i - 1].gasolineRule3
break;
}
if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.liters = gasolineRule[i - 1].gasolineRule3
}
} else {
if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.liters = gasolineRule[i - 1].gasolineRule3
}
}
}
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('每升优惠')
- }
gasolineDiscount += +oilDiscount
+ discount.discount = gasolineDiscount
} else {
gasolineDiscount = 0;
}
}
-
- }else {
- if (response.data.userGrade) {
- let gasolineRule = JSON.parse(response.data.userGrade.gasolineRule).sort((a, b) => a.gasolineRule1 - b.gasolineRule1);
- if (response.data.userGrade.preferential == '自定义优惠' && response.data.userGrade.status == 'qy') {
- if (response.data.userGrade.gasolineDiscount == "满减优惠") {
- let oilDiscount = 0;
- discount.type = "满减优惠"
- for (let i = 1; i <= gasolineRule.length; i++) {
- // 将满减条件加入等级优惠列表
- if (gasolineRule.length > 1) {
- if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
- discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
- oilDiscount = gasolineRule[gasolineRule.length - 1].gasolineRule2
- discount.reduce = gasolineRule[gasolineRule.length - 1].gasolineRule2
- break;
- }
- if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
- oilDiscount = gasolineRule[i - 1].gasolineRule2
- discount.reduce = gasolineRule[i - 1].gasolineRule2
- }
- } else {
- if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
- oilDiscount = gasolineRule[i - 1].gasolineRule2
- discount.reduce = gasolineRule[i - 1].gasolineRule2
- }
- }
- }
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('满减优惠')
- }
- gasolineDiscount += +oilDiscount
- } else if (response.data.userGrade.gasolineDiscount == "每升优惠") {
- discount.type = "每升优惠"
- let oilDiscount = 0;
- for (let i = 1; i <= gasolineRule.length; i++) {
- // 将满减条件加入等级优惠列表
- if (gasolineRule.length > 1) {
- if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
- discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
- oilDiscount = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
- discount.reduce = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
- discount.liters = gasolineRule[i - 1].gasolineRule3
- break;
- }
- if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
- oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.liters = gasolineRule[i - 1].gasolineRule3
- }
- } else {
- if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
- oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.liters = gasolineRule[i - 1].gasolineRule3
- }
- }
- }
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('每升优惠')
- }
- gasolineDiscount += +oilDiscount
- } else {
- gasolineDiscount = 0;
- }
- }
-
- }
+ //
+ // if (response.data.fixingLevel.storeValue=="no" && _this.consumeAmount>0){
+ // _this.oilDiscount = 0
+ // _this.checkAll4 = false
+ // console.log(111)
+ // }else {
+ _this.oilDiscount += discount.discount
+ _this.gradeDiscount.push(discount)
+ _this.checkAll2 = true
+ _this.checkedCities2.push(discount.gunName)
+ // console.log(222)
+ // }
}
}
if (item.type == "柴油") {
@@ -1610,300 +1569,127 @@
if (response.data.fixingLevel.discountType == '自定义优惠' && response.data.fixingLevel.status == 'qy') {
if (response.data.fixingLevel.dieselDiscount == "满减优惠") {
let oilDiscount = 0;
- discount.type = "满减优惠"
for (let i = 1; i <= dieselRule.length; i++) {
// 将满减条件加入等级优惠列表
if (dieselRule.length > 1) {
if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
- discount.full = dieselRule[dieselRule.length - 1].dieselRule1
oilDiscount = dieselRule[dieselRule.length - 1].dieselRule2
- discount.reduce = dieselRule[dieselRule.length - 1].dieselRule2
break;
}
if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
- discount.full = dieselRule[i - 1].dieselRule1
oilDiscount = dieselRule[i - 1].dieselRule2
- discount.reduce = dieselRule[i - 1].dieselRule2
}
} else {
- discount.full = dieselRule[i - 1].dieselRule1
if (item.amount >= dieselRule[i - 1].dieselRule1) {
oilDiscount = dieselRule[i - 1].dieselRule2
- discount.reduce = dieselRule[i - 1].dieselRule2
}
}
}
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('满减优惠')
- }
dieselDiscount += +oilDiscount
+ discount.discount = dieselDiscount
} else if (response.data.fixingLevel.dieselDiscount == "每升优惠") {
let oilDiscount = 0;
for (let i = 1; i <= dieselRule.length; i++) {
- discount.type = "每升优惠"
// 将满减条件加入等级优惠列表
if (dieselRule.length > 1) {
if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
- discount.full = dieselRule[dieselRule.length - 1].dieselRule1
oilDiscount = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
- discount.reduce = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
- discount.liters = dieselRule[dieselRule.length - 1].dieselRule3
break;
}
if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
- discount.full = dieselRule[i - 1].dieselRule1
oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.liters = dieselRule[i - 1].dieselRule3
}
} else {
- discount.full = dieselRule[i - 1].dieselRule1
if (item.amount >= dieselRule[i - 1].dieselRule1) {
oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.liters = dieselRule[i - 1].dieselRule3
}
}
}
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('每升优惠')
- }
dieselDiscount += +oilDiscount
+ discount.discount = dieselDiscount
} else {
dieselDiscount = 0;
}
}
- }else {
- if (response.data.userGrade) {
- let dieselRule = JSON.parse(response.data.userGrade.dieselRule).sort((a, b) => a.dieselRule1 - b.dieselRule1);
- if (response.data.userGrade.preferential == '自定义优惠' && response.data.userGrade.status == 'qy') {
- if (response.data.userGrade.dieselDiscount == "满减优惠") {
- let oilDiscount = 0;
- discount.type = "满减优惠"
- for (let i = 1; i <= dieselRule.length; i++) {
- // 将满减条件加入等级优惠列表
- if (dieselRule.length > 1) {
- if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
- discount.full = dieselRule[dieselRule.length - 1].dieselRule1
- oilDiscount = dieselRule[dieselRule.length - 1].dieselRule2
- discount.reduce = dieselRule[dieselRule.length - 1].dieselRule2
- break;
- }
- if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
- discount.full = dieselRule[i - 1].dieselRule1
- oilDiscount = dieselRule[i - 1].dieselRule2
- discount.reduce = dieselRule[i - 1].dieselRule2
- }
- } else {
- discount.full = dieselRule[i - 1].dieselRule1
- if (item.amount >= dieselRule[i - 1].dieselRule1) {
- oilDiscount = dieselRule[i - 1].dieselRule2
- discount.reduce = dieselRule[i - 1].dieselRule2
- }
- }
- }
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('满减优惠')
- }
- dieselDiscount += +oilDiscount
- } else if (response.data.userGrade.dieselDiscount == "每升优惠") {
- let oilDiscount = 0;
- for (let i = 1; i <= dieselRule.length; i++) {
- discount.type = "每升优惠"
- // 将满减条件加入等级优惠列表
- if (dieselRule.length > 1) {
- if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
- discount.full = dieselRule[dieselRule.length - 1].dieselRule1
- oilDiscount = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
- discount.reduce = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
- discount.liters = dieselRule[dieselRule.length - 1].dieselRule3
- break;
- }
- if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
- discount.full = dieselRule[i - 1].dieselRule1
- oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.liters = dieselRule[i - 1].dieselRule3
- }
- } else {
- discount.full = dieselRule[i - 1].dieselRule1
- if (item.amount >= dieselRule[i - 1].dieselRule1) {
- oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.liters = dieselRule[i - 1].dieselRule3
- }
- }
- }
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('每升优惠')
- }
- dieselDiscount += +oilDiscount
- } else {
- dieselDiscount = 0;
- }
- }
-
- }
+ // if (response.data.fixingLevel.storeValue=="no" && _this.consumeAmount>0){
+ // _this.oilDiscount = 0
+ // _this.checkAll4 = false
+ // }else {
+ _this.oilDiscount += discount.discount
+ _this.gradeDiscount.push(discount)
+ _this.checkAll2 = true
+ _this.checkedCities2.push(discount.gunName)
+ // }
}
}
if (item.type == "天然气") {
if (response.data.fixingLevel){
_this.isFixingLevel = true
- let naturalGasRule = JSON.parse(response.data.fixingLevel.naturalGasRule).sort((a, b) => a.naturalGasRule1 - b.naturalGasRule1);
+ let naturalGasRule = JSON.parse(response.data.fixingLevel.naturalGasRule).sort((a, b) => a.naturalGas1 - b.naturalGas1);
if (response.data.fixingLevel.discountType == '自定义优惠' && response.data.fixingLevel.status == 'qy') {
if (response.data.fixingLevel.naturalGasDiscount == "满减优惠") {
let oilDiscount = 0;
- discount.type = "满减优惠"
for (let i = 1; i <= naturalGasRule.length; i++) {
// 将满减条件加入等级优惠列表
if (naturalGasRule.length > 1) {
- if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
- discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
- oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2;
- discount.reduce = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2
+ if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGas1) {
+ oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGas2;
break;
}
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = naturalGasRule[i - 1].naturalGasRule2
- discount.reduce = naturalGasRule[i - 1].naturalGasRule2
+ if (item.amount >= naturalGasRule[i - 1].naturalGas1 && item.amount < naturalGasRule[i].naturalGas1) {
+ oilDiscount = naturalGasRule[i - 1].naturalGas2
}
} else {
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = naturalGasRule[i - 1].naturalGasRule2
- discount.reduce = naturalGasRule[i - 1].naturalGasRule2
+ if (item.amount >= naturalGasRule[i - 1].naturalGas1) {
+ oilDiscount = naturalGasRule[i - 1].naturalGas2
}
}
}
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('满减优惠')
- }
naturalGasDiscount += +oilDiscount
+ discount.discount = naturalGasDiscount
} else if (response.data.fixingLevel.naturalGasDiscount == "每单位优惠") {
let oilDiscount = 0;
- discount.type = "每单位优惠"
for (let i = 1; i <= naturalGasRule.length; i++) {
// 将满减条件加入等级优惠列表
if (naturalGasRule.length > 1) {
- if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
- discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
- oilDiscount = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
- discount.reduce = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
- discount.liters = naturalGasRule[naturalGasRule.length - 1].naturalGasRule3
+ if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGas1) {
+ oilDiscount = (item.liters * naturalGasRule[naturalGasRule.length - 1].naturalGas3).toFixed(2)
break;
}
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.liters = naturalGasRule[i - 1].naturalGasRule3
+ if (item.amount >= naturalGasRule[i - 1].naturalGas1 && item.amount < naturalGasRule[i].naturalGas1) {
+ oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGas3).toFixed(2)
}
} else {
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.liters = naturalGasRule[i - 1].naturalGasRule3
+ if (item.amount >= naturalGasRule[i - 1].naturalGas1) {
+ oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGas3).toFixed(2)
}
}
}
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('每单位优惠')
- }
naturalGasDiscount += +oilDiscount
+ discount.discount = naturalGasDiscount
} else {
naturalGasDiscount = 0;
}
}
- }else {
- if (response.data.userGrade.userGrade) {
- let naturalGasRule = JSON.parse(response.data.userGrade.naturalGasRule).sort((a, b) => a.naturalGasRule1 - b.naturalGasRule1);
- if (response.data.userGrade.preferential == '自定义优惠' && response.data.userGrade.status == 'qy') {
- if (response.data.userGrade.naturalGasDiscount == "满减优惠") {
- let oilDiscount = 0;
- discount.type = "满减优惠"
- for (let i = 1; i <= naturalGasRule.length; i++) {
- // 将满减条件加入等级优惠列表
- if (naturalGasRule.length > 1) {
- if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
- discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
- oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2;
- discount.reduce = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2
- break;
- }
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = naturalGasRule[i - 1].naturalGasRule2
- discount.reduce = naturalGasRule[i - 1].naturalGasRule2
- }
- } else {
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = naturalGasRule[i - 1].naturalGasRule2
- discount.reduce = naturalGasRule[i - 1].naturalGasRule2
- }
- }
- }
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('满减优惠')
- }
- naturalGasDiscount += +oilDiscount
- } else if (response.data.userGrade.naturalGasDiscount == "每单位优惠") {
- let oilDiscount = 0;
- discount.type = "每单位优惠"
- for (let i = 1; i <= naturalGasRule.length; i++) {
- // 将满减条件加入等级优惠列表
- if (naturalGasRule.length > 1) {
- if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
- discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
- oilDiscount = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
- discount.reduce = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
- discount.liters = naturalGasRule[naturalGasRule.length - 1].naturalGasRule3
- break;
- }
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.liters = naturalGasRule[i - 1].naturalGasRule3
- }
- } else {
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.liters = naturalGasRule[i - 1].naturalGasRule3
- }
- }
- }
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('每单位优惠')
- }
- naturalGasDiscount += +oilDiscount
- } else {
- naturalGasDiscount = 0;
- }
- }
-
- }
+ // if (response.data.fixingLevel.storeValue=="no" && _this.consumeAmount>0){
+ // _this.oilDiscount = 0
+ // _this.checkAll4 = false
+ // }else {
+ _this.oilDiscount += discount.discount
+ _this.gradeDiscount.push(discount)
+ _this.checkAll2 = true
+ _this.checkedCities2.push(discount.gunName)
+ // }
}
+
}
})
}
- _this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
- _this.checkAll2 = true;
- _this.isDefaultUseCard();
+ // _this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
+ // _this.checkAll2 = true;
+ // _this.isDefaultUseCard();
})
},
// 选择会员
@@ -1931,7 +1717,10 @@
if (this.balance>0){
this.checkAll4 = true
}
- await this.getOilCoupon()
+ await this.getGrade(this.member.id,this.member.gradeId)
+ if (!this.isFixingLevel){
+ await this.getOilCoupon()
+ }
},
getOilCoupon(){
let type = 0;
@@ -1971,7 +1760,7 @@
if(!this.isOilStorageCard) {
_this.oilDiscount += res.data.memberFavorableAmount
_this.checkAll2 = true
- this.checkedCities2.push(discount.oilName)
+ this.checkedCities2.push(discount.gunName)
}
}
if (res.data.cardFavorableAmount){
@@ -1990,7 +1779,7 @@
if(!this.isOilStorageCard) {
_this.fullReduction += res.data.activeFavorableAmount
_this.checkAll1 = true
- this.checkedCities1.push(discount.oilName)
+ this.checkedCities1.push(discount.gunName)
}
}
// }
@@ -2392,7 +2181,7 @@
}
// 校验油罐内油是否足够
- await getOilTank(this.form.tankId).then(res => {
+ await getOilTank(this.form.tankId).then(async res => {
if (res.data.storedQuantity-this.form.liters<0){
this.$modal.msgError("所加油的升数大于油罐内的升数，请重新选择加油升数")
return;
@@ -2425,7 +2214,10 @@
if (this.balance>0){
this.checkAll4 = true
}
- this.getOilCoupon()
+ await this.getGrade(this.member.id,this.member.gradeId)
+ if (!this.isFixingLevel){
+ await this.getOilCoupon()
+ }
}
}
})
@@ -2672,6 +2464,7 @@
_this.oilPreferentialData[i].oilPreferential.cardFavorableId = _this.cardFavorableId
usePaymentActive(_this.oilPreferentialData[i].oilPreferential).then(res => {})
}
+ _this.printLocally()
return;
}
}
@@ -2682,6 +2475,7 @@
_this.seekZero = 0
_this.amount = 0
_this.resetting1()
+ _this.printLocally()
return;
}
}
@@ -2801,6 +2595,7 @@
_this.isQuery = false;
_this.amount = 0
+ _this.printLocally()
_this.loading = false;
if (response.data.oilOrderAmount>0){
for (let i =0;i<_this.oilPreferentialData.length;i++){
@@ -3276,6 +3071,14 @@
/*color: white;*/
}
+ .box-center{
+ width: 100%;
+ //height: 10px;
+ background-color: white;
+ margin: 10px auto;
+ box-sizing: border-box;
+ overflow: auto;
+ }
.center-left-bottom{
width: 100%;
background-color: white;
@@ -3315,6 +3118,20 @@
margin: 15px 10px ;
}
+ .input-box{
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 14px;
+ margin: 5px 0px;
+ }
+ .box-title{
+ font-size: 18px;
+ text-align: center;
+ align-items: center;
+ margin-top: 15px;
+ }
.bottom-price{
font-size: 26px;
font-weight: bold;
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
index 6ec9e892f..b6c355787 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
@@ -92,58 +92,47 @@
-
+
{{getType(terminalList,scope.row.terminal)}}
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}
+
-
+
+
+
+
+
+
+
+
+
+ {{getType(payList,scope.row.payType)}}
+
+
+
+
+ 未支付
+ 已支付
+ 已退款
+ 支付失败
+
+
-
-
-
-
-
- 未支付
- 已支付
- 支付失败
-
-
{{ scope.row.payTime ? parseTime(scope.row.payTime):"--" }}
-
+
@@ -220,6 +209,9 @@ import {cashierOrder, listCashierOrder, orderStatisticsApi} from "@/api/cashier/
import {getDicts} from "@/api/dict/data";
import {queryStaffs} from "@/api/cashier/staff";
import {exportExcelCashierApi} from "@/api/order/exportExcel";
+import {listOilOrder} from "@/api/cashier/oilorder";
+import {getOilNameList} from "@/api/cashier/oilnumgun";
+import {getOilNumberGun} from "@/api/cashier/oilGuns";
export default {
name: "order_Cashier",
@@ -260,6 +252,9 @@ import {exportExcelCashierApi} from "@/api/order/exportExcel";
theTotalAmountOfOil:'0',
theTotalAmountOfTheItem:'0',
},
+ oilNameList:[],
+ oilGunList:[],
+ payList:[],
}
},
created() {
@@ -267,8 +262,30 @@ import {exportExcelCashierApi} from "@/api/order/exportExcel";
this.getOrderStatistics();
this.getTerList();
+ this.getOilNameGun();
},
methods:{
+ getOilNameGun(){
+ getOilNameList().then( response => {
+ this.oilNameList = response.data;
+ })
+ getDicts("payment_type").then( response => {
+ this.payList = response.data;
+ })
+ },
+ // 获取油枪信息
+ getOilGunList(){
+ getOilNumberGun().then(res => {
+ res.data.forEach(item => {
+ if (item.oilGunList.length>0){
+ item.oilGunList.forEach(i => {
+ i.oilName = item.oilName
+ this.oilGunList.push(i)
+ })
+ }
+ })
+ })
+ },
exportExcelApplet() {
exportExcelCashierApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
@@ -341,7 +358,7 @@ import {exportExcelCashierApi} from "@/api/order/exportExcel";
this.queryParams.page = val
}
console.log("123123123",this.queryParams)
- listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+ listOilOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
this.list = response.data.records;
this.total = response.data.total;
})
@@ -363,6 +380,33 @@ import {exportExcelCashierApi} from "@/api/order/exportExcel";
// this.resetForm("queryForm");
this.handleQuery();
},
+ // 获取油号名称
+ getName(oilNameList,id){
+ let name = ""
+ let _this = this;
+ if(oilNameList!=null && oilNameList!=""){
+ oilNameList.forEach(item => {
+ if (item.id == id){
+ name = item.oilName;
+ _this.oilType = item.oilType;
+ }
+ })
+ }
+ return name;
+ },
+ // 获取油枪名称
+ getName1(oilNameList,id){
+ let name = ""
+ let _this = this;
+ if(oilNameList!=null && oilNameList!=""){
+ oilNameList.forEach(item => {
+ if (item.id == id){
+ name = item.gunName;
+ }
+ })
+ }
+ return name;
+ },
}
}
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
index 8802f27c4..3a2c1ff74 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
@@ -122,10 +122,10 @@
{{ props.row.mobile }}
- {{ props.row.realName }}
+ {{ props.row.realName || "--" }}
- {{ props.row.staffMobile }}
+ {{ props.row.staffMobile || "--" }}
充值满{{ props.row.rechargeBalance }}元赠送{{ props.row.giftBalance }}元
@@ -149,7 +149,11 @@
支付失败
-
+
+
+ {{scope.row.realName || "--"}}
+
+
{{ scope.row.remark ? scope.row.remark:"--" }}
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 63c18ac9c..5cc822b11 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -187,7 +187,8 @@
},
onLoad(query) {
if (query.storeId) {
- uni.setStorageSync("y_storeId", query.storeId)
+ // uni.setStorageSync("y_storeId", query.storeId)
+ uni.setStorageSync("storeId", query.storeId)
}
if (query.type) {
uni.setStorageSync("y_type", query.type)
@@ -220,9 +221,6 @@
this.storeId = uni.getStorageSync("storeId")
this.chainStoreId = uni.getStorageSync("chainStoreId")
this.staffId = uni.getStorageSync("inviteStaffId")
- uni.showLoading({
- title: uni.getStorageSync("storeId") + "++" + uni.getStorageSync("inviteStaffId") + q
- })
this.getUserAuthority();
this.getOilType();
} else {
@@ -409,9 +407,7 @@
})
}
}).catch((res) => {
- uni.showLoading({
- title: res + "---" + 1
- })
+
})
},
// 获取当前位置
@@ -443,8 +439,8 @@
.toFixed(1)
_this.store = response.data.store
uni.setStorageSync("storeId", response.data.store.id)
- uni.setStorageSync("chainStoreId", response.data.store
- .chainStoreId)
+ uni.setStorageSync("chainStoreId", response.data.store.chainStoreId)
+ // console.log(uni.getStorageSync("chainStoreId"));
let welfare = response.data.store.welfare
if (welfare) {
if (welfare.includes(",")) {
diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index a69194c0e..c4027f805 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -243,6 +243,8 @@
_this.getStaffList(id)
_this.store = res.data
_this.storeId = res.data.id;
+ uni.setStorageSync("storeId", _this.store.id)
+ uni.setStorageSync("chainStoreId", _this.store.chainStoreId)
let welfare = res.data.welfare
if (welfare) {
if (welfare.includes(",")) {
diff --git a/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue b/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue
index 43e4f27ce..3d96444fb 100644
--- a/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue
+++ b/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue
@@ -20,7 +20,7 @@
-
+
{{form.giftName}}
@@ -51,7 +51,7 @@
- {{form.courierCompanies}}:{{form.theTrackingNumber}}
+ {{form.courierCompanies?form.courierCompanies:'暂无物流信息'}}:{{form.theTrackingNumber?form.theTrackingNumber:''}}
门店自提
@@ -75,7 +75,7 @@
-
+
@@ -106,7 +106,8 @@
shippingType: '',
amount: '',
courierCompanies: '',
- theTrackingNumber: ''
+ theTrackingNumber: '',
+ orderStatus: ''
}
}
@@ -118,6 +119,8 @@
onShow() {
uni.$on('pointsGoodsDetails', (data) => {
this.pointsGoodsDetails = data
+
+ console.log("this.pointsGoodsDetails", this.pointsGoodsDetails)
if (this.pointsGoodsDetails != null) {
// this.dataProcessing()
this.form.orderNumber = this.pointsGoodsDetails.orderNumber
@@ -132,6 +135,7 @@
this.form.shippingType = this.pointsGoodsDetails.shippingType
this.form.courierCompanies = this.pointsGoodsDetails.courierCompanies
this.form.theTrackingNumber = this.pointsGoodsDetails.theTrackingNumber
+ this.form.orderStatus = this.pointsGoodsDetails.orderStatus
// 当前订单状态
if (this.pointsGoodsDetails.orderStatus) {
diff --git a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
index db0f34105..175ebca75 100644
--- a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
+++ b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
@@ -19,7 +19,7 @@
-
+
@@ -70,15 +70,18 @@
-
+
{{item.giftName}}
+
+ 库存:{{item.remainingInventory === -1?"不限":item.remainingInventory}}
+
-
+
￥{{item.exchangeAmount}}
-
- 库存:{{item.remainingInventory === -1?"不限":item.remainingInventory}}
-
+
-
+
{{item.giftName}}
- {{item.createTime}}
+ {{item.createTime}} {{item.orderType==0?"（商城兑换）":"（积分兑换）"}}
{{item.amount?"￥"+item.amount:''}}
diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue
index 2dbdbc965..b3cccc207 100644
--- a/gasStation-uni/pagesHome/order/order.vue
+++ b/gasStation-uni/pagesHome/order/order.vue
@@ -17,7 +17,7 @@
-
+
{{storeName}}
@@ -35,14 +35,20 @@
-
- 家庭住址
+
+ {{addrInfo.name}}--{{addrInfo.mobile}}
{{addrInfo.address}}
+
+ 请选择家庭住址
+
+
+
@@ -52,7 +58,7 @@
-
+
{{goodsInfo.giftName}}
@@ -215,6 +221,12 @@
return
}
+ if (_this.appltType == "WECHAT") {
+ _this.paymentType = "WECHAT"
+ } else {
+ _this.paymentType = "ALIPAY"
+ }
+
let integralOrders = {
giftId: this.goodsInfo.id,
amount: _this.allAmout,
@@ -228,8 +240,8 @@
}
if (this.shippingType == "物流配送") {
- if (addrInfo) {
- integralOrders.addressId = addrInfo.id
+ if (this.addrInfo) {
+ integralOrders.addressId = this.addrInfo.id
} else {
uni.showToast({
title: "请填写配送信息!",
@@ -360,7 +372,6 @@
// let flag = await this.checkTheRedemptionLimit(this.goodsInfo.id)
let flag = await this.enquiryForCollection(this.goodsInfo.id)
let num = e.value + Number(flag)
- console.log("123123", num);
//判断库存
if (num > this.goodsInfo.exchangeTimes) {
uni.showToast({
@@ -368,9 +379,6 @@
icon: "none"
})
-
- console.log("exchangeTimes", this.goodsInfo.exchangeTimes)
- console.log("flag", flag)
e.value = this.goodsInfo.exchangeTimes - flag
this.value = this.goodsInfo.exchangeTimes - flag
@@ -394,17 +402,23 @@
this.flag = true
this.allData()
} else {
+ this.flag = false
+
this.value = e.value
this.allData()
}
},
+
+
transferIndex(index) {
// this.qhindex = index
const deliveryData = JSON.parse(this.goodsInfo.deliveryMethod);
console.log("deliveryData", deliveryData)
if (deliveryData.length >= 2) {
+ deliveryData[0] = '门店自提'
+ deliveryData[1] = '物流配送'
this.shippingType = deliveryData[index]
this.qhindex = index
} else if (deliveryData[0] == '门店自提') {
@@ -454,8 +468,6 @@
) {
- console.log("11111111")
-
this.allAmout = this.goodsInfo.shippingFeeAmount
}
console.log("allAmout", this.allAmout)
@@ -514,8 +526,8 @@
- getAddr() {
- request({
+ async getAddr() {
+ await request({
url: 'business/userManager/mtUserExpressAddress/getList',
method: 'get',
}).then((res) => {
diff --git a/gasStation-uni/pagesLogin/login/login.vue b/gasStation-uni/pagesLogin/login/login.vue
index 0380fcd65..5ba0aa001 100644
--- a/gasStation-uni/pagesLogin/login/login.vue
+++ b/gasStation-uni/pagesLogin/login/login.vue
@@ -86,13 +86,13 @@
method: 'post',
data: {
authCode: authCode,
- storeId: 0,
+ storeId: uni.getStorageSync("storeId"),
staffId: "",
phone: "18457621459",
encryptedData: encryptedData,
},
}).then((resp) => {
- console.log(resp)
+ // console.log(resp)
if (resp.code == 200) {
uni.setStorageSync('App-Token', resp.data.token);
@@ -210,7 +210,8 @@
url: "clientApi/sign/alipayLogin/getUserid",
method: 'post',
data: {
- storeId: uni.getStorageSync("y_storeId"),
+ storeId: uni.getStorageSync("storeId"),
+ // storeId: uni.getStorageSync("y_storeId"),
type: uni.getStorageSync("y_type"),
userId: uni.getStorageSync("y_userId"),
},
diff --git a/gasStation-uni/pagesMy/comment/comment.vue b/gasStation-uni/pagesMy/comment/comment.vue
index 2f850f8ec..d7b0b2159 100644
--- a/gasStation-uni/pagesMy/comment/comment.vue
+++ b/gasStation-uni/pagesMy/comment/comment.vue
@@ -13,20 +13,21 @@
您对工作人员满意吗
-
+
+
- username(13583017106)
+ {{user.name?user.name:"未填写"}}({{user.mobile}})
-
+
@@ -38,13 +39,14 @@