+
@@ -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({
From 7bda79899fdab83bd4636665faebbb4cb7c65903 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 26 Feb 2024 10:12:19 +0800
Subject: [PATCH 2/8] bug
---
.../src/views/convenienceStore/goodsFile.vue | 2 +-
.../src/views/convenienceStore/index.vue | 2 +-
.../views/convenienceStore/stockStatistic.vue | 2 +-
.../service/StockStatisticService.java | 10 +++++++
.../service/StockTrackService.java | 2 +-
.../impl/StockStatisticServiceImpl.java | 29 +++++++++++++++++++
6 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index 60d12f0a1..80926eebf 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -319,7 +319,7 @@
-
+
上架
下架
diff --git a/fuintAdmin/src/views/convenienceStore/index.vue b/fuintAdmin/src/views/convenienceStore/index.vue
index e75fb3e38..a20b99ebc 100644
--- a/fuintAdmin/src/views/convenienceStore/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/index.vue
@@ -241,7 +241,7 @@
-
+
上架
下架
diff --git a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
index ca64a0bcc..4efd547f6 100644
--- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
@@ -386,7 +386,7 @@ export default {
From a69b4d806e23bbc918e3b2931c8a9abd98264b88 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 26 Feb 2024 15:05:21 +0800
Subject: [PATCH 4/8] bug
---
.../order/service/LJOrderService.java | 7 +
.../service/impl/LJOrderServiceImpl.java | 30 +++
.../service/impl/OrderGoodsServiceImpl.java | 9 +-
fuintCashierWeb/src/api/LodopFuncs.js | 40 +++-
fuintCashierWeb/src/utils/request.js | 2 +-
.../views/cashier/NewComponents/homeindex.vue | 224 +++++++++---------
.../cashier/orderComponents/order_Cashier.vue | 5 +-
.../cashier/orderComponents/order_Goods.vue | 5 +-
.../cashier/orderComponents/order_Oil.vue | 5 +-
.../orderComponents/order_Ordinary.vue | 5 +-
.../cashier/orderComponents/order_Vip.vue | 5 +-
fuintCashierWeb/src/views/details/index.vue | 48 ++--
12 files changed, 237 insertions(+), 148 deletions(-)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java
index 5dc294766..015f9702b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java
@@ -61,4 +61,11 @@ public interface LJOrderService extends IService {
Map orderStatistics(LJOrder order);
LJOrder getStatisticsByTime(Date time ,Integer goodsId);
+
+ /**
+ * 添加商品订单信息
+ * @param order
+ * @param goodsId 商品id
+ */
+ void addGoodOrder(LJOrder order,Integer goodsId);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
index f25502b04..78291e992 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
@@ -1,26 +1,37 @@
package com.fuint.business.order.service.impl;
+import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.order.entity.LJOrder;
+import com.fuint.business.order.entity.OrderGoods;
import com.fuint.business.order.mapper.LJOrderMapper;
import com.fuint.business.order.service.LJOrderService;
+import com.fuint.business.order.service.OrderGoodsService;
import com.fuint.business.order.vo.Excel.LJOrderExcel;
import com.fuint.business.order.vo.LJOrderVo;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
@Service
public class LJOrderServiceImpl extends ServiceImpl implements LJOrderService {
+ @Autowired
+ @Lazy
+ private OrderGoodsService orderGoodsService;
+
@Override
public IPage selectOrderList(Page page, LJOrder order) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@@ -110,4 +121,23 @@ public class LJOrderServiceImpl extends ServiceImpl impl
public LJOrder getStatisticsByTime(Date time, Integer goodsId) {
return baseMapper.getStatisticsByTime(time, goodsId);
}
+
+ @Override
+ public void addGoodOrder(LJOrder order,Integer goodsId) {
+ if (ObjectUtil.isEmpty(order.getOrderNo())){
+// 根据日期生成订单信息
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String timestamp = dateFormat.format(new Date());
+ String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6);
+ String orderNo = "2345"+timestamp+randomString;
+ order.setOrderNo(orderNo);
+ }
+ baseMapper.insert(order);
+ LJOrder ljOrder = this.selectGoodsOrder(order.getOrderNo());
+ OrderGoods orderGoods = new OrderGoods();
+ orderGoods.setGoodsId(goodsId);
+ orderGoods.setOrderId(ljOrder.getId());
+ orderGoods.setNum(ljOrder.getGoodsNum());
+ orderGoodsService.save(orderGoods);
+ }
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java
index 8043140e0..79562e954 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OrderGoodsServiceImpl.java
@@ -62,10 +62,11 @@ public class OrderGoodsServiceImpl extends ServiceImpl执行安装";
var strLodopUpdate = strFontTag + "需要升级!点击这里执行升级";
@@ -110,7 +128,7 @@ function getLodop(oOBJECT, oEMBED) {
var strLodop7Update_ARM = strLodop7FontTag + "需升级，" + strLodop7HrefARM;
var strInstallOK = "，成功后请刷新本页面或重启浏览器。";
var LODOP;
- try {
+
var isWinIE = (/MSIE/i.test(navigator.userAgent)) || (/Trident/i.test(navigator.userAgent));
var isWinIE64 = isWinIE && (/x64/i.test(navigator.userAgent));
var isLinuxX86 = (/Linux/i.test(navigator.platform)) && (/x86/i.test(navigator.platform));
@@ -186,4 +204,4 @@ function getLodop(oOBJECT, oEMBED) {
alert("getLodop出错:" + err);
}
}
-export { getLodop };
+export { getLodop,connectFlag };
diff --git a/fuintCashierWeb/src/utils/request.js b/fuintCashierWeb/src/utils/request.js
index e2297c9d0..6d4541c86 100644
--- a/fuintCashierWeb/src/utils/request.js
+++ b/fuintCashierWeb/src/utils/request.js
@@ -49,7 +49,7 @@ service.interceptors.request.use(config => {
const s_url = sessionObj.url; // 请求地址
const s_data = sessionObj.data; // 请求数据
const s_time = sessionObj.time; // 请求时间
- const interval = 2000; // 间隔时间(ms)，小于此时间视为重复提交
+ const interval = 999; // 间隔时间(ms)，小于此时间视为重复提交
if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
const message = '数据正在处理，请耐心等待';
console.warn(`[${s_url}]: ` + message)
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 0227a3e1b..03f25ce72 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -1248,7 +1248,7 @@
import {addHangBill} from "@/api/cashier/hangbill";
import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit";
import {cashierOrderByOrderNo} from "@/api/cashier/cashierorder";
- import {getLodop} from "@/api/LodopFuncs";
+ import {getLodop,connectFlag} from "@/api/LodopFuncs";
import {giftCardExchange} from "@/api/cashier/giftCard/giftcard";
import BigNumber from "bignumber.js";
import {
@@ -2183,11 +2183,16 @@
this.isPay = true
},
- async printLocally() {
+ printLocally() {
+ if (!connectFlag){
+ return
+ }
+ try {
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
- LODOP.PRINT_INIT();
- var bodyStyle = `
`
- var fromHtml = bodyStyle+this.$refs.report.innerHTML
+ var fromHtml = bodyStyle + this.$refs.report.innerHTML
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
- LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
+ 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();
+ // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
+ // let preview = LODOP.PREVIEW();
+ // console.log("preview",preview);
+ LODOP.PRINT();
+ }
+ }catch (e){
+ console.log(e,'打印机报错')
+ }
},
async printLocally1() {
+ if (!connectFlag){
+ return
+ }
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
- LODOP.PRINT_INIT();
- var bodyStyle = `
`
- var fromHtml = bodyStyle+this.$refs.report1.innerHTML
+ var fromHtml = bodyStyle + this.$refs.report1.innerHTML
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
- LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
+ 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();
+ // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
+ // let preview = LODOP.PREVIEW();
+ // console.log("preview",preview);
+ LODOP.PRINT();
+ }
},
async printLocally2() {
+ if (!connectFlag){
+ return
+ }
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
- LODOP.PRINT_INIT();
- var bodyStyle = `
- `
- var fromHtml = bodyStyle+this.$refs.report2.innerHTML
+ .box-ge{
+ border-bottom: 1px solid #000000 ;
+ box-sizing: border-box;
+ padding: 10px;
+ }
+ .box-title{
+ font-size: 18px;
+ text-align: center;
+ align-items: center;
+ margin-top: 15px;
+ }
+ .input-hui{
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 14px;
+ margin: 15px 0px;
+ background: #b2b2b2;
+ box-sizing: border-box;
+ padding: 5px 0px;
+ }
+ .input-hui-frou{
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 14px;
+ margin: 15px 0px;
+ background: #b2b2b2;
+ box-sizing: border-box;
+ padding: 5px 0px;
+ div{
+ width: 25%;
+ text-align: left;
+ }
+ }
+ .input-box-frou{
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 14px;
+ margin: 5px 0px;
+ div{
+ width: 25%;
+ text-align: left;
+ }
+ }
+ .box-center{
+ height: 500px;
+ }
+
+ `
+ var fromHtml = bodyStyle+this.$refs.report2.innerHTML
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
+ 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();
+ 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();
+ }
},
clear(){
// this.autofocus = false
@@ -3854,24 +3873,15 @@
let isPaySuccess = false;
await addLJGoods(_this.map).then( response => {
+ console.log('3867386738673867')
_this.orderNo = response.data.orderNo;
if (response.data.oilOrder!=null){
if (response.data.oilOrder.orderStatus == "paid"){
+
_this.isPaySuccess = true;
isPaySuccess = true
_this.isPay = true;
- _this.seekZero = 0
_this.loading = false;
- _this.amount = 0
- // for (let i =0;i<_this.oilPreferentialData.length;i++){
- // _this.oilPreferentialData[i].oilPreferential.storeId = response.data.oilOrder.storeId
- // _this.oilPreferentialData[i].oilPreferential.orderAmount = response.data.oilOrder.orderAmount
- // _this.oilPreferentialData[i].oilPreferential.userId = response.data.oilOrder.userId
- // _this.oilPreferentialData[i].oilPreferential.oilId = response.data.oilOrder.oils
- // _this.oilPreferentialData[i].oilPreferential.mtUserLevel = _this.member.gradeId
- // _this.oilPreferentialData[i].oilPreferential.cardFavorableId = _this.cardFavorableId
- // usePaymentActive(_this.oilPreferentialData[i].oilPreferential).then(res => {})
- // }
_this.printLocally()
_this.resetting1()
return;
@@ -3882,8 +3892,6 @@
_this.isPaySuccess = true;
isPaySuccess = true
_this.isPay = true;
- _this.seekZero = 0
- _this.amount = 0
_this.loading = false;
_this.printLocally()
_this.resetting1()
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index caa7e6bcd..308308da7 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -443,7 +443,7 @@ import {getOilNameList} from "@/api/cashier/oilnumgun";
import {getOrderGoods} from "@/api/cashier/goodsorder";
import {exportExcelCashierApi} from "@/api/order/exportExcel";
import {refundApi} from "@/api/cashier/refund";
-import {getLodop} from "@/api/LodopFuncs";
+import {connectFlag, getLodop} from "@/api/LodopFuncs";
import {getOilNumberGun} from "@/api/cashier/oilGuns";
import {formatDate} from "@/utils";
import ScanPayCodeDialog from "@/views/cashier/components/scanPayCodeDialog.vue";
@@ -564,6 +564,9 @@ import ScanPayCodeDialog from "@/views/cashier/components/scanPayCodeDialog.vue"
},
async printLocally() {
+ if (!connectFlag){
+ return
+ }
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
LODOP.PRINT_INIT();
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
index c691c3c46..1a38f7b87 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
@@ -301,7 +301,7 @@ import {getDicts} from "@/api/dict/data";
import { exportExcelGoodsOrderApi } from "@/api/order/exportExcel";
import {cashierOrder} from "@/api/cashier/cashierorder";
import {refundApi, getOrderInfoApi} from "@/api/cashier/refund";
-import {getLodop} from "@/api/LodopFuncs";
+import {connectFlag, getLodop} from "@/api/LodopFuncs";
export default {
name: "order_Cashier",
@@ -399,6 +399,9 @@ export default {
},
async printLocally() {
+ if (!connectFlag){
+ return
+ }
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
LODOP.PRINT_INIT();
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index 6e178d4c6..45c2aad87 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -349,7 +349,7 @@
import {cashierOrder} from "@/api/cashier/cashierorder";
import {getOrderInfoApi, refundApi} from "@/api/cashier/refund";
import {exportExcelOilOrderApi} from "@/api/order/exportExcel";
- import {getLodop} from "@/api/LodopFuncs";
+ import {connectFlag, getLodop} from "@/api/LodopFuncs";
import {getInfoByIdApi} from "@/api/cashier/cardfavorablerecord";
export default {
@@ -429,6 +429,9 @@
},
methods:{
async printLocally() {
+ if (!connectFlag){
+ return
+ }
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
LODOP.PRINT_INIT();
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
index a5cd092e8..1679ebae4 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
@@ -260,7 +260,7 @@ import {listOilOrder, oilOrderInfo} from "@/api/cashier/oilorder";
import {getOilNameList} from "@/api/cashier/oilnumgun";
import {getOilNumberGun} from "@/api/cashier/oilGuns";
import {refundApi} from "@/api/cashier/refund";
-import {getLodop} from "@/api/LodopFuncs";
+import {connectFlag, getLodop} from "@/api/LodopFuncs";
export default {
name: "order_Cashier",
@@ -390,6 +390,9 @@ import {getLodop} from "@/api/LodopFuncs";
},
async printLocally() {
+ if (!connectFlag){
+ return
+ }
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
LODOP.PRINT_INIT();
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
index ab152e876..60fc0fed9 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
@@ -281,7 +281,7 @@ import {getDicts} from "@/api/dict/data";
import {queryStaffs} from "@/api/cashier/staff";
import {refundApi} from "@/api/cashier/refund";
import {exportExcelVipApi} from "@/api/order/exportExcel";
-import {getLodop} from "@/api/LodopFuncs";
+import {connectFlag, getLodop} from "@/api/LodopFuncs";
export default {
name: "order_Cashier",
@@ -379,6 +379,9 @@ export default {
},
async printLocally() {
+ if (!connectFlag){
+ return
+ }
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
LODOP.PRINT_INIT();
diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue
index 2d809d549..21c7499d9 100644
--- a/fuintCashierWeb/src/views/details/index.vue
+++ b/fuintCashierWeb/src/views/details/index.vue
@@ -927,7 +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";
+import {connectFlag, getLodop} from "@/api/LodopFuncs";
export default {
components: {
@@ -1630,10 +1630,14 @@ export default {
},
async printLocally1() {
+ if (!connectFlag){
+ return
+ }
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
- LODOP.PRINT_INIT();
- var bodyStyle = `
`
- var fromHtml = bodyStyle+this.$refs.report1.innerHTML
+ var fromHtml = bodyStyle + this.$refs.report1.innerHTML
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
- LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
+ 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();
+ // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
+ // let preview = LODOP.PREVIEW();
+ // console.log("preview",preview);
+ LODOP.PRINT();
+ }
},
async printLocally2() {
+ if (!connectFlag){
+ return
+ }
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
- LODOP.PRINT_INIT();
- var bodyStyle = `
`
- var fromHtml = bodyStyle+this.$refs.report2.innerHTML
+ var fromHtml = bodyStyle + this.$refs.report2.innerHTML
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
- LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
+ 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();
+ // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
+ // let preview = LODOP.PREVIEW();
+ // console.log("preview",preview);
+ LODOP.PRINT();
+ }
},
async collection() {
From 71ad3c3085d335b3d947cdb0910f0852a1c5ef9b Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Mon, 26 Feb 2024 15:08:32 +0800
Subject: [PATCH 5/8] =?UTF-8?q?bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fuintAdmin/src/layout/components/Navbar.vue | 2 +-
.../convenienceStore/inventory/details.vue | 3 +-
fuintAdmin/src/views/integral/gift/index.vue | 32 +-
.../views/oilConfig/oilInventory/order.vue | 4 +-
fuintAdmin/src/views/order/order_Cashier.vue | 8 +-
fuintAdmin/src/views/order/order_Goods.vue | 16 +-
fuintAdmin/src/views/order/order_Oil.vue | 16 +-
fuintAdmin_zt/src/api/system/Site/site.js | 8 +
fuintAdmin_zt/src/views/Site/index.vue | 658 ++++++++++--------
.../impl/CommissionRecordServiceImpl.java | 2 +-
.../entity/MtInventoryDetails.java | 2 +-
.../mapper/xml/MtInventoryDetailsMapper.xml | 10 +-
.../mapper/xml/MtInventoryMapper.xml | 1 +
.../mapper/xml/MtPurchaseMapper.xml | 4 +-
.../service/impl/MtInventoryServiceImpl.java | 3 +-
.../mapper/xml/IntegralGiftMapper.xml | 3 +-
.../service/impl/IntegralGiftServiceImpl.java | 25 +-
.../business/order/entity/AllOrderInfo.java | 1 +
.../order/mapper/xml/HandoverRecordMapper.xml | 7 +-
.../service/impl/AllOrderInfoServiceImpl.java | 39 +-
.../mapper/xml/OilPurchaseOrderMapper.xml | 2 +-
.../impl/OilInventoryOrderServiceImpl.java | 4 +-
.../service/impl/OilTankServiceImpl.java | 2 +-
.../business/store/entity/ChainStoreInfo.java | 2 +
.../store/mapper/xml/OilOrdersMapper.xml | 9 +-
.../impl/ChainStoreInfoServiceImpl.java | 10 +-
.../userManager/mapper/UserBalanceMapper.java | 3 +-
.../service/impl/UserBalanceServiceImpl.java | 29 +-
.../dept/controller/SysDeptController.java | 10 +
.../system/dept/service/ISysDeptService.java | 2 +
.../dept/service/impl/SysDeptServiceImpl.java | 9 +
.../src/main/resources/application.properties | 2 +-
.../com/fuint/repository/model/TAccount.java | 2 +
.../main/resources/mapper/TAccountMapper.xml | 2 +-
fuintCashierWeb/src/router/index.js | 5 +
.../views/cashier/NewComponents/Handover.vue | 8 +-
.../views/cashier/NewComponents/Integral.vue | 130 ++++
.../integralOrder/pointsCashier.vue | 4 +-
fuintCashierWeb/src/views/cashier/index.vue | 98 ++-
.../cashier/orderComponents/order_Cashier.vue | 123 +++-
40 files changed, 901 insertions(+), 399 deletions(-)
diff --git a/fuintAdmin/src/layout/components/Navbar.vue b/fuintAdmin/src/layout/components/Navbar.vue
index 30eda514a..1cd4ab25e 100644
--- a/fuintAdmin/src/layout/components/Navbar.vue
+++ b/fuintAdmin/src/layout/components/Navbar.vue
@@ -7,7 +7,7 @@
diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue
index ea4b59967..b8ddb109e 100644
--- a/fuintAdmin/src/views/order/order_Oil.vue
+++ b/fuintAdmin/src/views/order/order_Oil.vue
@@ -216,17 +216,17 @@
-
-
+
+
- 退款
-
-
+
+
+
+
+
+
+
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
index bdd754db6..54992ab2e 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
@@ -412,6 +412,42 @@