From 963c46324c20c42c602cdacfa039e620e172d1bd Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Wed, 22 May 2024 17:12:19 +0800 Subject: [PATCH] no message --- fuintAdmin/src/api/order/oilorder.js | 27 + .../src/views/financialStatement/buy/list.vue | 70 +++ .../views/financialStatement/buy/tab/em.vue | 452 +++++++++++++++++ .../views/financialStatement/buy/tab/gun.vue | 447 +++++++++++++++++ .../views/financialStatement/buy/tab/oil.vue | 467 ++++++++++++++++++ .../reconciliation/tab/ref.vue | 48 +- .../reconciliation/tab/trading.vue | 41 +- .../financialStatement/runningWater/list.vue | 4 +- .../runningWater/tab/day.vue | 51 +- .../runningWater/tab/oilDepot.vue | 41 +- .../reconciliation/tab/ref.vue | 8 +- .../reconciliation/tab/trading.vue | 13 +- .../runningWater/tab/day.vue | 6 +- .../runningWater/tab/instituion.vue | 18 +- .../runningWater/tab/oilDepot.vue | 16 +- .../order/controller/OilOrderController.java | 28 ++ .../business/order/dto/AllOrderInfoDto.java | 1 + .../business/order/mapper/OilOrderMapper.java | 4 + .../order/mapper/xml/AllOrderInfoMapper.xml | 6 +- .../order/mapper/xml/OilOrderMapper.xml | 66 +++ .../order/service/OilOrderService.java | 4 + .../service/impl/AllOrderInfoServiceImpl.java | 85 +++- .../service/impl/OilOrderServiceImpl.java | 18 + .../fuint/business/order/vo/OilOrderVo.java | 9 + .../printer/controller/printerController.java | 2 +- .../printer/template/PrintOilOrderReport.java | 155 +++--- .../business/store/mapper/MtStoreMapper.java | 3 + .../store/mapper/xml/MtStoreMapper.xml | 10 + .../system/dept/mapper/SysDeptMapper.java | 1 + .../system/dept/mapper/xml/SysDeptMapper.xml | 9 +- .../repository/mapper/MtStaffMapper.java | 1 + .../main/resources/mapper/MtStaffMapper.xml | 4 + 32 files changed, 1929 insertions(+), 186 deletions(-) create mode 100644 fuintAdmin/src/views/financialStatement/buy/list.vue create mode 100644 fuintAdmin/src/views/financialStatement/buy/tab/em.vue create mode 100644 fuintAdmin/src/views/financialStatement/buy/tab/gun.vue create mode 100644 fuintAdmin/src/views/financialStatement/buy/tab/oil.vue diff --git a/fuintAdmin/src/api/order/oilorder.js b/fuintAdmin/src/api/order/oilorder.js index 63fc72c11..8248d9826 100644 --- a/fuintAdmin/src/api/order/oilorder.js +++ b/fuintAdmin/src/api/order/oilorder.js @@ -88,3 +88,30 @@ export function getOilNumberGun() { }) } + +export function getgetInfoByEmApi(query) { + return request({ + url: '/business/oilOrder/getInfoByEm', + method: 'get', + params: query + }) +} + + +export function getInfoByOilTypeApi(query) { + return request({ + url: '/business/oilOrder/getInfoByOilType', + method: 'get', + params: query + }) +} + + +export function getInfoByOilGunApi(query) { + return request({ + url: '/business/oilOrder/getInfoByOilGun', + method: 'get', + params: query + }) +} + diff --git a/fuintAdmin/src/views/financialStatement/buy/list.vue b/fuintAdmin/src/views/financialStatement/buy/list.vue new file mode 100644 index 000000000..5494a7acc --- /dev/null +++ b/fuintAdmin/src/views/financialStatement/buy/list.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue new file mode 100644 index 000000000..98898997d --- /dev/null +++ b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue @@ -0,0 +1,452 @@ + + + + + + diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue new file mode 100644 index 000000000..73a024150 --- /dev/null +++ b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue @@ -0,0 +1,447 @@ + + + + + + diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue b/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue new file mode 100644 index 000000000..ff9e6b0fc --- /dev/null +++ b/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue @@ -0,0 +1,467 @@ + + + + + + diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue index 3a02f7612..5ab5f670c 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue @@ -29,18 +29,18 @@ placeholder="结束日期"> - - - - + + + + + + + + - - + + -import {getRunningWaterByTissueApi, getTissueByDataApi, getTradingPageApi} from "@/api/allOrder"; +import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTradingPageApi} from "@/api/allOrder"; export default { name: "reconciliation-ref", @@ -260,7 +260,7 @@ import {getRunningWaterByTissueApi, getTissueByDataApi, getTradingPageApi} from total:0, } }, - created() { + async created() { let start = new Date(); start.setHours(0) start.setMinutes(0) @@ -270,8 +270,9 @@ import {getRunningWaterByTissueApi, getTissueByDataApi, getTradingPageApi} from this.beginTime = start this.endTime = new Date() this.isSysDate = true + await this.getDeptList(); + this.getList(); - this.getDeptList(); }, methods:{ @@ -306,17 +307,24 @@ import {getRunningWaterByTissueApi, getTissueByDataApi, getTradingPageApi} from // 获取列表信息 getList(val){ - - getTradingPageApi(this.addDateRange(this.queryParams)).then( response => { + let dateRange = [] + if (this.beginTime && this.endTime) { + dateRange.push(this.beginTime.toLocaleDateString()) + dateRange.push(this.endTime.toLocaleDateString()) + } + getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => { this.orderList = response.data.records; this.total = response.data.total; this.isSysDate = false }) this.getOrderStatistics() }, - getDeptList() { - getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => { - this.deptList = response.data.records; + async getDeptList() { + // getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => { + // this.deptList = response.data.records; + // }) + await getmyDataApi(this.addDateRange(this.queryParams)).then( response => { + this.queryParams.deptId = response.data.deptId; }) }, // 搜索按钮操作 @@ -333,6 +341,10 @@ import {getRunningWaterByTissueApi, getTissueByDataApi, getTradingPageApi} from } this.beginTime = "" this.endTime = "" + this.status = "refund" + + this.getDeptList() + this.handleQuery(); }, } diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue index f7272e57b..fb040909a 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue @@ -92,27 +92,27 @@
微信收款
-
{{ orderStatistics.cash?orderStatistics.cash:0 }}元/{{orderStatistics.cashcount}}笔
-
-
-
支付宝收款
{{ orderStatistics.wechat?orderStatistics.wechat:0 }}元/{{orderStatistics.wechatcount}}笔
-
会员钱包收款
+
支付宝收款
{{ orderStatistics.alipay?orderStatistics.alipay:0 }}元/{{orderStatistics.alipaycount}}笔
- - - - - - - - +
+
会员钱包收款
+
{{ orderStatistics.balance?orderStatistics.balance:0 }}元/{{orderStatistics.balanceCount}}笔
+
+ + + + + + + +
现金支付收款
-
{{ orderStatistics.balance?orderStatistics.balance:0 }}元/{{orderStatistics.balanceCount}}笔
+
{{ orderStatistics.cash?orderStatistics.cash:0 }}元/{{orderStatistics.cashcount}}笔
@@ -320,7 +320,7 @@ import { total:0, } }, - created() { + async created() { let start = new Date(); start.setHours(0) start.setMinutes(0) @@ -330,16 +330,17 @@ import { this.beginTime = start this.endTime = new Date() this.isSysDate = true + await this.getDeptList(); + this.getList(); - this.getDeptList(); }, methods:{ - getDeptList() { + async getDeptList() { // getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => { // this.deptList = response.data.records; // }) - getmyDataApi(this.addDateRange(this.queryParams)).then( response => { + await getmyDataApi(this.addDateRange(this.queryParams)).then( response => { this.queryParams.deptId = response.data.deptId; }) }, @@ -374,7 +375,7 @@ import { dateRange.push(this.beginTime.toLocaleDateString()) dateRange.push(this.endTime.toLocaleDateString()) } - getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => { + getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => { this.orderList = response.data.records; this.total = response.data.total; this.isSysDate = false @@ -399,6 +400,8 @@ import { } this.beginTime = "" this.endTime = "" + this.getDeptList() + this.handleQuery(); }, } diff --git a/fuintAdmin/src/views/financialStatement/runningWater/list.vue b/fuintAdmin/src/views/financialStatement/runningWater/list.vue index c5b96bb08..12c3e68b9 100644 --- a/fuintAdmin/src/views/financialStatement/runningWater/list.vue +++ b/fuintAdmin/src/views/financialStatement/runningWater/list.vue @@ -5,7 +5,7 @@ - + @@ -29,7 +29,7 @@ export default { name: "runningWater-list", data(){ return{ - radio1:'机构流水分析' + radio1:'油站流水分析' } }, components:{ diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue index 583eac72e..fc0e48e0d 100644 --- a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue +++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue @@ -85,7 +85,7 @@ - + @@ -93,16 +93,16 @@ {{scope.row.unitPrice}} - - - - - - + + + + + + + + + + @@ -126,7 +126,13 @@