diff --git a/fuintAdmin/src/api/order/cardvaluerecord.js b/fuintAdmin/src/api/order/cardvaluerecord.js index ff5e805d9..4ee3177e3 100644 --- a/fuintAdmin/src/api/order/cardvaluerecord.js +++ b/fuintAdmin/src/api/order/cardvaluerecord.js @@ -16,3 +16,11 @@ export function cardValueRecordInfo(id) { method: 'get', }) } +// 查询会员充值统计 +export function orderStatisticsApi(cardValueRecord) { + return request({ + url: '/business/marketingActivity/cardValueRecord/orderStatistics', + method: 'get', + params: cardValueRecord + }) +} diff --git a/fuintAdmin/src/api/order/cashierorder.js b/fuintAdmin/src/api/order/cashierorder.js index c04f1960d..fd4322055 100644 --- a/fuintAdmin/src/api/order/cashierorder.js +++ b/fuintAdmin/src/api/order/cashierorder.js @@ -16,6 +16,7 @@ export function cashierOrder(id) { method: 'get', }) } + // 根据订单号查询油品订单信息 export function orderStatisticsApi(query) { return request({ @@ -24,5 +25,3 @@ export function orderStatisticsApi(query) { params: query }) } - - diff --git a/fuintAdmin/src/api/order/goodsorder.js b/fuintAdmin/src/api/order/goodsorder.js index a3942218c..cdd613bf3 100644 --- a/fuintAdmin/src/api/order/goodsorder.js +++ b/fuintAdmin/src/api/order/goodsorder.js @@ -26,3 +26,12 @@ export function getGoodsOrder(data) { data: data, }) } +// 查询商品订单统计 +export function orderStatisticsApi(query) { + return request({ + url: '/business/order/orderStatistics', + method: 'get', + params: query + }) +} + diff --git a/fuintAdmin/src/api/order/oilnumgun.js b/fuintAdmin/src/api/order/oilnumgun.js index 5371fa1fb..f67264c26 100644 --- a/fuintAdmin/src/api/order/oilnumgun.js +++ b/fuintAdmin/src/api/order/oilnumgun.js @@ -43,3 +43,13 @@ export function getOilNameList() { // data: data }) } + + +// 查询所有油号 +export function oilNumbers() { + return request({ + url: '/business/petrolStationManagement/oilNumber/getOilNumber', + method: 'get', + // data: data + }) +} diff --git a/fuintAdmin/src/api/order/oilorder.js b/fuintAdmin/src/api/order/oilorder.js index 90b388e95..7418e3bdd 100644 --- a/fuintAdmin/src/api/order/oilorder.js +++ b/fuintAdmin/src/api/order/oilorder.js @@ -69,3 +69,14 @@ export function getOilOrderAllAmount(id) { method: 'get', }) } + +// 订单统计 +export function orderStatisticsApi(query) { + return request({ + url: '/business/oilOrder/orderStatistics', + method: 'get', + params: query + }) +} + + diff --git a/fuintAdmin/src/api/order/refund.js b/fuintAdmin/src/api/order/refund.js new file mode 100644 index 000000000..5609d3c54 --- /dev/null +++ b/fuintAdmin/src/api/order/refund.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +// 退款 +export function refundApi(data) { + return request({ + url: '/business/allOrderInfo/refund', + method: 'post', + data: data + }) +} +export function getOrderInfoApi(data) { + return request({ + url: '/business/allOrderInfo/getOrderInfo', + method: 'get', + params: data + }) +} diff --git a/fuintAdmin/src/api/order/user.js b/fuintAdmin/src/api/order/user.js index 9a4171acb..8cf1c7139 100644 --- a/fuintAdmin/src/api/order/user.js +++ b/fuintAdmin/src/api/order/user.js @@ -76,3 +76,12 @@ export function exportUsers() { method: 'get' }) } + + +//下载示例文件 +export function queryUsers() { + return request({ + url: '/business/userManager/user/userList', + method: 'get' + }) +} diff --git a/fuintAdmin/src/api/staffCommission/staffcommission.js b/fuintAdmin/src/api/staffCommission/staffcommission.js index 84e67e956..a5a335787 100644 --- a/fuintAdmin/src/api/staffCommission/staffcommission.js +++ b/fuintAdmin/src/api/staffCommission/staffcommission.js @@ -44,10 +44,29 @@ export function updateCommission(data) { }) } -// 删除会员 +// 删除员工提成方案 export function delCommission(id) { return request({ url: '/business/commission/staffCommission/' + id, method: 'delete' }) } + +// 查询员工提成记录 +export function listCommissionRecord(query) { + return request({ + url: '/commissionRecord/list', + method: 'get', + params: query + }) +} + + +// 查询员工提成总额 +export function allAmountCommissionRecord(query) { + return request({ + url: '/commissionRecord/allAmount', + method: 'get', + params: query + }) +} diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue index 5132a9456..1ab9f8987 100644 --- a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue +++ b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue @@ -83,7 +83,7 @@ @@ -416,8 +416,10 @@ export default { getPurchaseOrderApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => { this.orderList = response.data.records; this.total = response.data.total; + console.log("response",response.data.records[0].purchaseWeight) + console.log("orderList",this.orderList) // 总数计算 - this.sumMethod(response.data.records); + // this.sumMethod(response.data.records); }) this.loading = false; }, @@ -456,6 +458,8 @@ export default { // 折合单价 this.orderForm.discountedPrice = new BigNumber(this.orderForm.totalAmount).dividedBy(this.orderForm.purchaseVolume).toFixed(2); + this.orderForm.totalAmount = Number(this.orderForm.totalAmount); + // 复制id this.orderForm.purchaseId = this.purchaseId @@ -535,6 +539,7 @@ export default { if (data.purchaseWeight > data.canUseT) { this.$message('不能超过油罐储存的最大值！'); data.purchaseWeight = data.canUseT + return } // 密度计算 data.purchaseVolume = new BigNumber(data.purchaseWeight).times(1000).dividedBy(data.productDensity).toFixed(2); @@ -593,9 +598,12 @@ export default { // 计算油的质量（吨） - const massTons = volumeLiters.times(densityGramsPerML).times(1e-3).toFixed(2); + // const massTons = volumeLiters.times(densityGramsPerML).times(1e-3).toFixed(2); + const massTons = Math.floor(volumeLiters.times(densityGramsPerML).times(1e-3) * 100) / 100; + this.canUseT = massTons; // 将结果转换为数字类型并赋值给属性 // console.log("canUseT",this.tankVolume) + console.log("canUseT",this.canUseT) }, inputPurchaseWeight() { @@ -609,10 +617,10 @@ export default { return } - const purchaseWeight = parseFloat(this.orderForm.purchaseWeight); const canUseT = parseFloat(this.canUseT); console.log("purchaseWeight",purchaseWeight) + console.log("canUseT",canUseT) if (canUseT<=0) { this.$message('已无可用吨数！'); this.orderForm.purchaseWeight = '' diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue index 76479e64c..c4270e11e 100644 --- a/fuintAdmin/src/views/order/order_Cashier.vue +++ b/fuintAdmin/src/views/order/order_Cashier.vue @@ -1,19 +1,7 @@ - + - - + - + + - + + - - - - + + @@ -129,6 +130,7 @@ @click="patchwork(scope.row)" type="primary" plain round>补打 退款 @@ -150,7 +152,7 @@ - + @@ -188,7 +190,7 @@ @@ -226,13 +228,13 @@ - +
- ￥{{ cashierOrder.amount }} + ￥{{ cashierOrder.payAmount }}
退款金额
退款单号：{{ cashierOrder.orderNo }}
@@ -245,13 +247,13 @@
- +
退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理
取 消 - 确 定 + 确 定 @@ -264,13 +266,15 @@ import {oilOrderList, oilOrders} from "@/api/order/oilorder"; import {getOilNameList} from "@/api/order/oilnumgun"; import {getOrderGoods} from "@/api/order/goodsorder"; import {exportExcelCashierApi} from "@/api/order/exportExcel"; +import {refundApi} from "@/api/order/refund"; export default { name: "order_Cashier", + data(){ return{ - // 退款密码 - password:"", + // 退款备注 + refundRemark:"", radio1:"油号选错", // 油号列表 oilNameList:[], @@ -293,21 +297,37 @@ import {exportExcelCashierApi} from "@/api/order/exportExcel"; page: 1, pageSize: 10, }, + orderStatistics:{ + numberOfStrokes:'0', + theTotalAmountOfTheOrder:'0', + theTotalAmountPaid:'0', + oilDiscounts:'0', + theTotalAmountOfOil:'0', + theTotalAmountOfTheItem:'0', + }, total:0, - } }, created() { this.getList(); + this.getOrderStatistics(); this.getStaffList(); }, methods:{ + exportExcelCashier() { exportExcelCashierApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{ const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }); this.$download.saveAs(blob,'收银台订单统计.xLsx') }) - }, + }, + // 获取订单统计信息 + + getOrderStatistics() { + orderStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{ + this.orderStatistics = res.data + }) + }, // 获取员工姓名 getRealName(list,val){ let name = ""; @@ -339,9 +359,49 @@ import {exportExcelCashierApi} from "@/api/order/exportExcel"; }, // 退款 handleRefund(id){ - this.dialogRefund = true; - cashierOrder(id).then( response => { - this.cashierOrder = response.data + //退款确定 + this.$confirm('是否将该收银台下的订单全部退款, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.dialogRefund = true; + cashierOrder(id).then( response => { + this.cashierOrder = response.data + if (response.data.status === "refund") { + this.$message({ + type: 'info', + message: '该订单已经退款' + }); + this.dialogRefund = false; + } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + }, + + refundConfirmed() { + this.dialogRefund = false; + console.log("cashierOrder",this.cashierOrder) + let map={ + orderNo: this.cashierOrder.orderNo, + storeId: this.cashierOrder.storeId, + refundRemark:this.radio1 +"-"+ this.refundRemark, + type: "canRefund" + } + refundApi(map).then(res=>{ + this.$message({ + type: 'info', + message: '退款成功' + }); + this.getList(); + this.getOrderStatistics(); + this.getStaffList(); + }) }, // 获取油号名称 diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue index 04051a452..ea719e44e 100644 --- a/fuintAdmin/src/views/order/order_Goods.vue +++ b/fuintAdmin/src/views/order/order_Goods.vue @@ -1,6 +1,6 @@ - + - + @@ -127,6 +140,7 @@ @@ -141,17 +155,14 @@ {{ parseTime(scope.row.payTime) }} - - - - - - - - - - - + + + @@ -167,6 +178,34 @@ + + +
+ ￥{{ goods.payAmount }} +
+
退款金额
+
退款单号：{{ goods.orderNo }}
+
+ 退款原因
+ + + + + +
+
+ +
+ 退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理 +
+ + 取 消 + 确 定 + + @@ -184,10 +223,11 @@ diff --git a/fuintAdmin/src/views/order/order_Ordinary.vue b/fuintAdmin/src/views/order/order_Ordinary.vue index 4aa743d38..c94070ce2 100644 --- a/fuintAdmin/src/views/order/order_Ordinary.vue +++ b/fuintAdmin/src/views/order/order_Ordinary.vue @@ -1,6 +1,6 @@