+
@@ -863,7 +863,7 @@
@@ -1103,7 +1103,7 @@
-
+
订单统计
@@ -1116,10 +1116,6 @@
{{ item.retailPrice }}
￥{{ item.memberPrice }}
-
-
-
-
-
+
+
+
+
+
+
@@ -1209,8 +1266,8 @@
components: {SelectStaff},
data(){
return{
- rechargeBalCard:{},
- rechargeOilCard:{},
+ rechargeBalCard:false,
+ rechargeOilCard:false,
openStaff:false,
cardFuelDieselForm: {
mtStaffId: '',
@@ -1594,6 +1651,10 @@
}
},
methods:{
+ queryUser(){
+ this.refuelMoney = null
+ this.dialogVisiblevip = true
+ },
handleDataFromChild(data) {
this.openStaff = false
// this.cardFuelDieselForm= {
@@ -1776,13 +1837,15 @@
}
},
// 充值后更新会员信息
- getMemberAfter(){
- getUserInfoMobile({mobile:this.member.mobile}).then(res => {
+ async getMemberAfter(){
+ await getUserInfoMobile({mobile:this.member.mobile}).then(res => {
if (res.data){
this.member = res.data
if (res.data.refuelMoney){
this.refuelMoney = JSON.parse(res.data.refuelMoney)
}
+ this.rechargeBalCard = false
+ this.rechargeOilCard = false
}
})
},
@@ -1829,19 +1892,20 @@
let this_ = this
//
let timer = setInterval(async () => {
- await getCheckTheStatusOfYourPaymentApi(id).then(response => {
+ await getCheckTheStatusOfYourPaymentApi(id).then(async response => {
if (response.data != null) {
const payStatus = response.data.payStatus
if (payStatus === "unpaid") {
this_.isQuery = true;
- }else if (payStatus === "paid") {
+ } else if (payStatus === "paid") {
// 当支付成功时
this_.isPaySuccess = true;
this_.isQuery = false;
- // this_.rechargeBalCard = response.data
- // this_.printLocally()
- this_.getMemberAfter();
- }else if (payStatus === "payFail") {
+ this_.rechargeBalCard = true
+ await this_.printLocally1()
+ await this_.getMemberAfter();
+ clearInterval(timer);
+ } else if (payStatus === "payFail") {
this_.isPaySuccess = false;
this_.isQuery = false;
}
@@ -1906,7 +1970,7 @@
let timer = setInterval(async () => {
- getCheckTheStatusOfYourPaymentByFuelApi(id).then(response => {
+ getCheckTheStatusOfYourPaymentByFuelApi(id).then(async response => {
if (response.data != null) {
if (response.data.payStatus == "unpaid") {
this_.isQuery = true;
@@ -1914,9 +1978,10 @@
if (response.data.payStatus == "paid") {
this_.isPaySuccess = true;
this_.isQuery = false;
- this_.rechargeOilCard = response.data
- this_.printLocally()
- this_.getMemberAfter();
+ this_.rechargeOilCard = true
+ await this_.printLocally2()
+ await this_.getMemberAfter();
+ clearInterval(timer);
}
if (response.data.payStatus == "payFail") {
this_.isPaySuccess = false;
@@ -2193,6 +2258,176 @@
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();
+
+ },
+ async printLocally1() {
+ //初始化打印函数
+ let LODOP = getLodop(); // 初始化打印
+ LODOP.PRINT_INIT();
+ var bodyStyle = `
+ `
+ var fromHtml = bodyStyle+this.$refs.report1.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();
+
+ },
+ async printLocally2() {
+ //初始化打印函数
+ let LODOP = getLodop(); // 初始化打印
+ LODOP.PRINT_INIT();
+ var bodyStyle = `
+ `
+ var fromHtml = bodyStyle+this.$refs.report2.innerHTML
+
+
LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
@@ -2310,16 +2545,19 @@
obj = item;
obj.value = `${item.unitName}（${item.personCredit} ${item.contactMobile}）`
results.push(obj)
+ return;
}
if (item.personCredit.includes(queryString)){
obj = item;
obj.value = `${item.unitName}（${item.personCredit} ${item.contactMobile}）`
results.push(obj)
+ return;
}
if (item.contactMobile.includes(queryString)){
obj = item;
obj.value = `${item.unitName}（${item.personCredit} ${item.contactMobile}）`
results.push(obj)
+ return;
}
})
}
@@ -2329,6 +2567,10 @@
changeSeekZero(){
this.seekZero = this.authCode - this.oilActualPay - this.goodsActualPay
},
+ // 计算找零金额
+ changeSeekZero1(){
+ this.seekZero = this.authCode - this.realyPayBills
+ },
// 获取会员等级id
getGradeName(list,id){
let name = "";
@@ -2500,7 +2742,8 @@
this.countAmountFull();
},
// 模糊查询商品信息
- querySearch(queryString, cb) {
+ async querySearch(queryString, cb) {
+ await this.getGoods()
let _this = this;
let results = _this.goodsList;
if (queryString != ""){
@@ -2508,9 +2751,11 @@
_this.goodsList.forEach(item => {
if(item.name.includes(queryString)){
results.push(item)
+ return;
}
if(item.goodsNo.includes(queryString)){
results.push(item)
+ return;
}
})
}
@@ -3155,6 +3400,8 @@
this.member = data;
if (data.refuelMoney){
this.refuelMoney = JSON.parse(data.refuelMoney)
+ }else {
+ this.refuelMoney = null
}
this.dialogVisibleMember = false;
},
@@ -3476,6 +3723,8 @@
this.member = response.data
if (response.data.refuelMoney){
this.refuelMoney = JSON.parse(response.data.refuelMoney)
+ }else {
+ this.refuelMoney = null
}
this.storeId = response.data.storeId
this.isSure = false
diff --git a/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue b/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue
index f13a2497e..569ddf6ca 100644
--- a/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue
+++ b/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue
@@ -69,16 +69,29 @@
+
+
+
+
+
+
+
+
+
+
+ v-model="beginTime"
+ style="width: 160px"
+ type="date"
+ placeholder="开始日期">
+
+ 至
+
+
@@ -203,11 +216,7 @@
{{ scope.row.consumeNum }}
-
-
- {{ parseTime(scope.row.createTime) }}
-
-
+
启用
@@ -521,6 +530,8 @@
openPoint: false,
// 日期范围
dateRange: [],
+ beginTime:"",
+ endTime:"",
// 默认排序
defaultSort: {prop: 'updateTime', order: 'descending'},
// 表单参数
@@ -587,7 +598,12 @@
// 查询列表
getList() {
this.loading = true;
- listUser(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+ let dateRange = []
+ if (this.beginTime && this.endTime) {
+ dateRange.push(this.beginTime.toLocaleDateString())
+ dateRange.push(this.endTime.toLocaleDateString())
+ }
+ listUser(this.addDateRange(this.queryParams, dateRange)).then( response => {
this.list = response.data.records;
this.total = response.data.total;
this.loading = false;
@@ -596,7 +612,12 @@
},
// 获得统计信息
getStatistic(){
- listStatistic(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+ let dateRange = []
+ if (this.beginTime && this.endTime) {
+ dateRange.push(this.beginTime.toLocaleDateString())
+ dateRange.push(this.endTime.toLocaleDateString())
+ }
+ listStatistic(this.addDateRange(this.queryParams, dateRange)).then( response => {
this.addNum = response.data.addNum;
this.yesterdayAddNum = response.data.yesterdayAddNum;
if (!response.data.balance) {
@@ -636,6 +657,8 @@
this.resetForm("queryForm");
this.queryParams.storeIds = '';
this.storeIds = [];
+ this.beginTime = ""
+ this.endTime = ""
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order);
this.handleQuery();
},
diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue
index 97c9b3321..2d809d549 100644
--- a/fuintCashierWeb/src/views/details/index.vue
+++ b/fuintCashierWeb/src/views/details/index.vue
@@ -814,6 +814,80 @@
确 定
+
+
+
+
+
+
+
@@ -853,6 +927,7 @@ import {getUserGradeInfo} from "@/api/cashier/usergrade";
import {getDicts} from "@/api/dict/data";
import {getSysConfig} from "@/api/cashier/user/sysconfig";
import {giftCardExchange} from "@/api/cashier/giftCard/giftcard";
+import {getLodop} from "@/api/LodopFuncs";
export default {
components: {
@@ -874,6 +949,8 @@ export default {
dicts: ['official', 'zhzt', 'zcrzdj', 'payment_type','pay_status'],
data() {
return {
+ rechargeBalCard:false,
+ rechargeOilCard:false,
orderList:[],
openSubCard1:false,
baseUrl: process.env.VUE_APP_BASE_API,
@@ -1460,6 +1537,8 @@ export default {
// _this.refuelMoney = parseFloat(refuelMoney[0].refuelMoney)
}
this.getGrade(response.data.gradeId);
+ this.rechargeBalCard = false
+ this.rechargeOilCard = false
});
},
getAllAmount(){
@@ -1550,6 +1629,176 @@ export default {
},
+ async printLocally1() {
+ //初始化打印函数
+ let LODOP = getLodop(); // 初始化打印
+ LODOP.PRINT_INIT();
+ var bodyStyle = `
+ `
+ var fromHtml = bodyStyle+this.$refs.report1.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();
+
+ },
+ async printLocally2() {
+ //初始化打印函数
+ let LODOP = getLodop(); // 初始化打印
+ LODOP.PRINT_INIT();
+ var bodyStyle = `
+ `
+ var fromHtml = bodyStyle+this.$refs.report2.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();
+
+ },
async collection() {
let actualPayment = 0
let makeChange = 0
@@ -1593,16 +1842,20 @@ export default {
let this_ = this
//
let timer = setInterval(async () => {
- await getCheckTheStatusOfYourPaymentApi(id).then(response => {
+ await getCheckTheStatusOfYourPaymentApi(id).then(async response => {
if (response.data != null) {
const payStatus = response.data.payStatus
if (payStatus === "unpaid") {
this_.isQuery = true;
- }else if (payStatus === "paid") {
+ } else if (payStatus === "paid") {
// 当支付成功时
this_.isPaySuccess = true;
this_.isQuery = false;
- }else if (payStatus === "payFail") {
+ this_.rechargeBalCard = true
+ await this_.printLocally1()
+ await this_.getUserInfo()
+ clearInterval(timer);
+ } else if (payStatus === "payFail") {
this_.isPaySuccess = false;
this_.isQuery = false;
}
@@ -1667,7 +1920,7 @@ export default {
let timer = setInterval(async () => {
- getCheckTheStatusOfYourPaymentByFuelApi(id).then(response => {
+ getCheckTheStatusOfYourPaymentByFuelApi(id).then(async response => {
if (response.data != null) {
if (response.data.payStatus == "unpaid") {
this_.isQuery = true;
@@ -1675,6 +1928,10 @@ export default {
if (response.data.payStatus == "paid") {
this_.isPaySuccess = true;
this_.isQuery = false;
+ this_.rechargeOilCard = true
+ await this_.printLocally2()
+ await this_.getUserInfo()
+ clearInterval(timer);
}
if (response.data.payStatus == "payFail") {
this_.isPaySuccess = false;
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index ad8686322..d1d89f71f 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -98,7 +98,7 @@
{{ store.address }}
- {{ distance }}km
+ {{ distance }}km
@@ -363,7 +363,6 @@
// this.getAddress();
uni.getSetting({
async success(res) {
- // console.log(res, 111,"dingw")
if (!res.authSetting['scope.userLocation']) {
// uni.authorize({
// scope: 'scope.userLocation',
@@ -518,6 +517,7 @@
_this.distance = (Math.ceil(response.data.distance))
.toFixed(1)
_this.store = response.data.store
+ console.log(response,"storeId");
uni.setStorageSync("storeId", response.data.store.id)
uni.setStorageSync("chainStoreId", response.data.store.chainStoreId)
// console.log(uni.getStorageSync("chainStoreId"));
@@ -572,6 +572,7 @@
let params = {
storeId: uni.getStorageSync("storeId")
}
+ console.log(uni.getStorageSync("storeId"));
request({
url: 'business/petrolStationManagement/oilNumber/getList2',
method: 'get',
diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index 1c5ca3ea6..a66c176f8 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -361,7 +361,7 @@
method: 'get',
}).then((res) => {
_this.oilNumberList = res.data;
- if (res.data) {
+ if (res.data.length>0) {
// _this.getOilGun(res.data[0].numberId);
_this.oilPrice = res.data[0].oilPrice
_this.oilUnit = res.data[0].unit
diff --git a/gasStation-uni/utils/request.js b/gasStation-uni/utils/request.js
index 175e53d54..46ba65cc0 100644
--- a/gasStation-uni/utils/request.js
+++ b/gasStation-uni/utils/request.js
@@ -63,7 +63,7 @@ const request = config => {
})
reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code === 1001) {
- showConfirm('您暂未登录，您可以继续留在该页面，或者重新登录?').then(res => {
+ showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
console.log("res", res)
if (res.confirm) {
uni.reLaunch({