diff --git a/fuintAdmin/src/api/order/exportExcel.js b/fuintAdmin/src/api/order/exportExcel.js index 226642ca8..6b6715bb3 100644 --- a/fuintAdmin/src/api/order/exportExcel.js +++ b/fuintAdmin/src/api/order/exportExcel.js @@ -50,4 +50,13 @@ export function exportExcelAppletApi(data) { responseType: 'blob', // 表明响应类型为二进制流 data: data // 通过 data 参数传递需要的数据 }); -} \ No newline at end of file +} +// 导出挂账订单 +export function exportExcelHangBillApi(data) { + return request({ + url: 'business/hangBill/exportExcel', + method: 'post', + responseType: 'blob', // 表明响应类型为二进制流 + data: data // 通过 data 参数传递需要的数据 + }); +} diff --git a/fuintAdmin/src/api/staff/qrcode.js b/fuintAdmin/src/api/staff/qrcode.js index 7bc9ca264..ea8f9db99 100644 --- a/fuintAdmin/src/api/staff/qrcode.js +++ b/fuintAdmin/src/api/staff/qrcode.js @@ -9,6 +9,15 @@ export function listQRCode(query) { }) } +// 查询二维码列表 +export function QRCodeByStoreId(query) { + return request({ + url: '/business/storeInformation/qrCode/createStoreQrCode', + method: 'get', + params: query + }) +} + // 查询二维码详细 export function qrCodeInfo() { return request({ diff --git a/fuintAdmin/src/views/feedBack/index.vue b/fuintAdmin/src/views/feedBack/index.vue index 18e665b13..1ccf05460 100644 --- a/fuintAdmin/src/views/feedBack/index.vue +++ b/fuintAdmin/src/views/feedBack/index.vue @@ -7,7 +7,7 @@ - + diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 4b3f895de..6fc35f1ef 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -567,16 +567,16 @@ export default { this.getStatistic(); this.getConfig(); this.getUserList(); - this.queryUserList(); + // this.queryUserList(); }, methods: { // 定时器 queryUserList(){ - let _this = this; - setInterval(function (){ - _this.getList(); - _this.getStatistic(); - },5000) + // let _this = this; + // setInterval(function (){ + // _this.getList(); + // _this.getStatistic(); + // },5000) }, // 跳转详情页 goDedi(id){ @@ -609,8 +609,16 @@ export default { listStatistic(this.addDateRange(this.queryParams, this.dateRange)).then( response => { this.addNum = response.data.addNum; this.yesterdayAddNum = response.data.yesterdayAddNum; - this.balance = response.data.balance; - this.point = response.data.point; + if (!response.data.balance) { + this.balance = 0 + }else { + this.balance = response.data.balance; + } + if (!response.data.point) { + this.point = 0 + }else { + this.point = response.data.point; + } }); allUserGrade().then( response => { this.allUserGrade = response.data diff --git a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue index a3fb10c2b..f10c68565 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue @@ -10,8 +10,8 @@ @@ -50,8 +50,8 @@ diff --git a/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue b/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue index 419068aa3..eb202df7d 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue @@ -9,7 +9,7 @@ - + diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue index 47ab28987..025acbd47 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue @@ -115,19 +115,19 @@
油品总金额
-
{{orderStatistics.theTotalAmountOfOil}}
+
{{orderStatistics.theTotalAmountOfOil || 0}}
优惠总额
-
{{orderStatistics.theTotalAmountOfTheOffer}}
+
{{orderStatistics.theTotalAmountOfTheOffer || 0}}
交易数量
-
{{orderStatistics.numberOfTransactions}}
+
{{orderStatistics.numberOfTransactions || 0}}
实收总额
-
{{orderStatistics.totalAmountReceived}}
+
{{orderStatistics.totalAmountReceived || 0}}
微信
@@ -308,6 +308,8 @@
微信
支付宝
银联二维码
+
储值卡
+
囤油卡
小程序码
@@ -541,7 +543,12 @@ }, // 订单统计 getOrderStatistics() { - orderStatisticsApi().then(res=>{ + let dateRange = [] + if (this.beginTime && this.endTime) { + dateRange.push(this.beginTime.toLocaleDateString()) + dateRange.push(this.endTime.toLocaleDateString()) + } + orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{ this.orderStatistics = res.data }) }, diff --git a/fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue b/fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue index 7d7a39aba..25494d9ba 100644 --- a/fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue +++ b/fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue @@ -2,219 +2,461 @@
- - + +
+ + + + + + + + + + + + + + + + 搜索 + + + + + + +
+ +
+ 储值卡统计 +
+
+ + + + + + + + +
+
充值笔数
+
{{ inCount }}
+
+
+
充值总额
+
{{ totalRecharge.toFixed(2) }}
+
+
+
消费笔数
+
{{ outCount }}
+
+
+
消费总额
+
{{ totalConsumption.toFixed(2) }}
+
+
+ + +
+
列表
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + +
+
+ + +
+ + + + + +
+ + + + + + + + + + + + + + + + 搜索 + + + + + + +
+ +
+ 升数卡统计 +
+
+ + + + +
+
充值笔数
+
{{ inCount1 }}
+
+
+
充值总额
+
{{ totalRecharge1.toFixed(2) }}
+
+
+
消费笔数
+
{{ outCount1 }}
+
+
+
消费总额
+
{{ totalConsumption1.toFixed(2) }}
+
+
+ + +
+
列表
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ + + -
- - - - - - - - - - - - - - - - 搜索 - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- -
- 储值卡统计 -
-
- - - + + + + + + + + + + + + + + + + + -
-
余额汇总
-
{{ totalBalance.toFixed(2) }}
-
-
-
充值笔数
-
{{ inCount }}
-
-
-
充值总额
-
{{ totalRecharge.toFixed(2) }}
-
-
-
消费笔数
-
{{ outCount }}
-
-
-
消费总额
-
{{ totalConsumption.toFixed(2) }}
-
-
- - -
-
列表
-
- - -
-
-
- - - - - - - - - - - - - - - - - - - -
-
- - -
- - - -
- -
- -
- 升数卡统计 -
-
- - - + + + -
-
充值笔数
-
{{ inCount1 }}
-
-
-
充值总额
-
{{ totalRecharge1.toFixed(2) }}
-
-
-
消费笔数
-
{{ outCount1 }}
-
-
-
消费总额
-
{{ totalConsumption1.toFixed(2) }}
-
-
- - -
-
列表
-
+ + + + + + + + + + + + + + - -
-
-
- - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
-
- - -
+ + + + + + + + + + + + + - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -381,7 +623,6 @@ import {oilNumbers} from "@/api/cashier/oilnumber"; if (val!=undefined){ this.queryParams.page = val } - console.log(this.queryParams) listCardBalanceRecord(this.addDateRange(this.queryParams, this.dateRange)).then(res => { this.cardBalanceList = res.data.records this.total = res.data.total diff --git a/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue b/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue index 2c7d2f041..f13a2497e 100644 --- a/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue +++ b/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue @@ -75,7 +75,7 @@ size="medium" value-format="yyyy-MM-dd" type="daterange" - range-separator="-" + range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" > @@ -559,7 +559,7 @@ this.getConfig(); this.getUserList(); this.getOfficial(); - this.getStatistic(); + // this.getStatistic(); }, methods:{ getOfficial(){ @@ -592,16 +592,23 @@ this.total = response.data.total; this.loading = false; }); + this.getStatistic() }, // 获得统计信息 getStatistic(){ listStatistic(this.addDateRange(this.queryParams, this.dateRange)).then( response => { this.addNum = response.data.addNum; this.yesterdayAddNum = response.data.yesterdayAddNum; - this.balance = response.data.balance; - this.point = response.data.point; - // this.literCard = response.data.literCard; - // this.refuelMoney = response.data.refuelMoney; + if (!response.data.balance) { + this.balance = 0 + }else { + this.balance = response.data.balance; + } + if (!response.data.point) { + this.point = 0 + }else { + this.point = response.data.point; + } }); listUserGrade({page:1,pageSize:20}).then( response => { this.userGradeList = response.data.records; diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue b/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue index 737e15f99..16651821b 100644 --- a/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue +++ b/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue @@ -10,8 +10,8 @@ @@ -50,8 +50,8 @@ diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/goodsOrder.vue b/fuintCashierWeb/src/views/details/userInfoOrder/goodsOrder.vue index d6c819ec2..653227ffd 100644 --- a/fuintCashierWeb/src/views/details/userInfoOrder/goodsOrder.vue +++ b/fuintCashierWeb/src/views/details/userInfoOrder/goodsOrder.vue @@ -9,7 +9,7 @@ - +