diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue index 91dd507c7..feeeb0bf1 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue @@ -15,29 +15,33 @@ + - - - + + + + + + + + - - - - - + + @@ -49,45 +53,43 @@ + + - - - - - + + + - - - - - + + + - - - - 至 - - + + + + 搜索 重置 @@ -98,7 +100,7 @@
- +
{{ orderStatistics.wechat?orderStatistics.wechat:0 }}/0
@@ -107,7 +109,7 @@
- +
{{ orderStatistics.alipay?orderStatistics.alipay:0 }}/0
@@ -117,7 +119,7 @@
- +
{{ orderStatistics.balance?orderStatistics.balance:0 }}/0
@@ -127,7 +129,7 @@
- +
{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0
@@ -276,7 +278,9 @@ import { exportExcelTradingApi, getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, - getTradingPageApi + getTradingPageApi, + getDicts, + getStaffByStorId } from "@/api/allOrder"; export default { @@ -312,6 +316,9 @@ export default { deptType:"3", storeId:"", deptId:"", + userName:"", + staffId:"", + dataRange:[], }, orderStatistics:{ CASH:"0", @@ -351,7 +358,8 @@ export default { await getmyDataApi(this.addDateRange(this.queryParams)).then( response => { this.queryParams.deptId = response.data.deptId; this.getList() - + this.getDicts() + this.getStaffByStorId() }) }, exportExcelCashier() { @@ -382,6 +390,7 @@ export default { // 获取列表信息 async getList(val){ + // await this.getDeptList() let dateRange = [] if (this.beginTime && this.endTime) { @@ -397,6 +406,21 @@ export default { }) }, + // 获取字典 + async getStaffByStorId() { + getStaffByStorId().then(response => { + this.staffList = response.data; + }) + }, + // 获取字典 + async getDicts() { + getDicts("payment_channel").then(response => { + this.dict = response.data; + }) + getDicts("payment_type").then(response => { + this.dictPayType = response.data; + }) + }, getOrdersInfo(data) { this.dialogVisible = true; this.ordersInfo = data diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue index cce83ae3c..66176f758 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue @@ -146,7 +146,7 @@
- +
{{ map.s1 || 0 }}/{{ map.s2 || 0 }}
@@ -155,7 +155,7 @@
- +
{{ map.s3 || 0 }}/{{ map.s4 || 0 }}
@@ -165,7 +165,7 @@
- +
{{ map.s5 || 0 }}/{{ map.s6 || 0 }}
@@ -176,7 +176,7 @@
- +
{{ map.s7 || 0 }}/{{ map.s8 || 0 }}