dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
齐天大圣 2024-10-31 17:13:15 +08:00
parent 2f894d00c5
commit f806e48df7
2 changed files with 79 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -15,29 +15,33 @@
<el-option label="小程序" value="applet"/> <el-option label="小程序" value="applet"/>
<el-option label="收银台" value="cashier"/> <el-option label="收银台" value="cashier"/>
<el-option label="POS端" value="POS"/> <el-option label="POS端" value="POS"/>
<el-option label="平台" value="PC"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" prop="payChannel"> <el-form-item label="" prop="payChannel">
<el-select <el-select
v-model="queryParams.payChannel" v-model="queryParams.type"
clearable clearable
placeholder="请选择订单分类" placeholder="请选择订单分类"
> >
<el-option label="小程序" value="applet"/> <el-option label="油品" value="1"/>
<el-option label="收银台" value="cashier"/> <el-option label="商品" value="2"/>
<el-option label="POS端" value="POS"/> <el-option label="储值卡" value="3"/>
<el-option label="积分" value="4"/>
<el-option label="囤油卡" value="5"/>
<el-option label="收银台订单" value="6"/>
<el-option label="挂账订单" value="7"/>
<el-option label="pos" value="8"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" prop="payType"> <el-form-item label="" prop="payType">
<el-select <el-select v-model="queryParams.payType" placeholder="请选择支付方式" clearable>
v-model="queryParams.payType" <el-option
clearable v-for="dicts in this.dictPayType"
placeholder="请选择支付方式" :key="dicts.dictValue"
> :label="dicts.dictLabel"
<el-option label="现金" value="CASH"/> :value="dicts.dictValue"
<el-option label="微信" value="WECHAT"/> />
<el-option label="支付宝" value="ALIPAY"/>
<el-option label="余额" value="balance"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" prop="status"> <el-form-item label="" prop="status">
@ -49,45 +53,43 @@
<el-option label="已支付" value="paid"/> <el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/> <el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/> <el-option label="已退款" value="refund"/>
<el-option label="支付失败" value="payFail"/>
<el-option label="退款中" value="refunding"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" style="margin-right:22px" prop="status"> <el-form-item label="" prop="paymentChannel">
<el-select <el-select v-model="queryParams.paymentChannel" placeholder="请选择支付通道" clearable>
v-model="queryParams.status" <el-option
clearable v-for="dicts in this.dict"
placeholder="请选择员工" :key="dicts.dictValue"
> :label="dicts.dictLabel"
<el-option label="已支付" value="paid"/> :value="dicts.dictValue"
<el-option label="未支付" value="unpaid"/> />
<el-option label="已退款" value="refund"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" style="margin-right: 0px" prop="status"> <el-form-item label="" prop="staffId">
<el-select <el-select v-model="queryParams.staffId" placeholder="请选择员工" clearable>
v-model="queryParams.status" <el-option
clearable v-for="dicts in this.staffList"
placeholder="请输入付款用户" :key="dicts.id"
> :label="dicts.realName"
<el-option label="已支付" value="paid"/> :value="dicts.id"
<el-option label="未支付" value="unpaid"/> />
<el-option label="已退款" value="refund"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="" prop="userName">
<el-date-picker <el-input v-model="queryParams.userName" placeholder="请输入付款用户"></el-input>
v-model="beginTime"
style="width: 140px"
type="date"
placeholder="交易开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
placeholder="交易结束日期">
</el-date-picker>
</el-form-item> </el-form-item>
<el-date-picker
v-model="queryParams.dataRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
>
</el-date-picker>
<el-form-item style="float: right; margin-right: 0px "> <el-form-item style="float: right; margin-right: 0px ">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@ -98,7 +100,7 @@
<div class="wit_box" > <div class="wit_box" >
<div class="box-gang"> <div class="box-gang">
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start"> <el-tooltip class="item" effect="dark" content="退款金额（元）/笔数" placement="top-start">
<div class="size-bole">{{ orderStatistics.wechat?orderStatistics.wechat:0 }}/0</div> <div class="size-bole">{{ orderStatistics.wechat?orderStatistics.wechat:0 }}/0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -107,7 +109,7 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start"> <el-tooltip class="item" effect="dark" content="油品订单退款金额（元）/笔数" placement="top-start">
<div class="size-bole" style="color:#00CAFF;">{{ orderStatistics.alipay?orderStatistics.alipay:0 }}/0</div> <div class="size-bole" style="color:#00CAFF;">{{ orderStatistics.alipay?orderStatistics.alipay:0 }}/0</div>
</el-tooltip> </el-tooltip>
@ -117,7 +119,7 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start"> <el-tooltip class="item" effect="dark" content="便利店订单退款金额（元）/笔数" placement="top-start">
<div class="size-bole" style="color:#F44522;" >{{ orderStatistics.balance?orderStatistics.balance:0 }}/0</div> <div class="size-bole" style="color:#F44522;" >{{ orderStatistics.balance?orderStatistics.balance:0 }}/0</div>
</el-tooltip> </el-tooltip>
@ -127,7 +129,7 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start"> <el-tooltip class="item" effect="dark" content="积分商城订单退款金额（元）/笔数" placement="top-start">
<div class="size-bole" style="color:#FF7E00;" >{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0</div> <div class="size-bole" style="color:#FF7E00;" >{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0</div>
</el-tooltip> </el-tooltip>
@ -276,7 +278,9 @@ import {
exportExcelTradingApi, getmyDataApi, exportExcelTradingApi, getmyDataApi,
getRunningWaterByTissueApi, getRunningWaterByTissueApi,
getTissueByDataApi, getTissueByDataApi,
getTradingPageApi getTradingPageApi,
getDicts,
getStaffByStorId
} from "@/api/allOrder"; } from "@/api/allOrder";
export default { export default {
@ -312,6 +316,9 @@ export default {
deptType:"3", deptType:"3",
storeId:"", storeId:"",
deptId:"", deptId:"",
userName:"",
staffId:"",
dataRange:[],
}, },
orderStatistics:{ orderStatistics:{
CASH:"0", CASH:"0",
@ -351,7 +358,8 @@ export default {
await getmyDataApi(this.addDateRange(this.queryParams)).then( response => { await getmyDataApi(this.addDateRange(this.queryParams)).then( response => {
this.queryParams.deptId = response.data.deptId; this.queryParams.deptId = response.data.deptId;
this.getList() this.getList()
this.getDicts()
this.getStaffByStorId()
}) })
}, },
exportExcelCashier() { exportExcelCashier() {
@ -382,6 +390,7 @@ export default {
// 获取列表信息 // 获取列表信息
async getList(val){ async getList(val){
// await this.getDeptList() // await this.getDeptList()
let dateRange = [] let dateRange = []
if (this.beginTime && this.endTime) { 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) { getOrdersInfo(data) {
this.dialogVisible = true; this.dialogVisible = true;
this.ordersInfo = data this.ordersInfo = data

8
fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -146,7 +146,7 @@
<div class="wit_box"> <div class="wit_box">
<div class="box-gang"> <div class="box-gang">
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" placement="top-start"> <el-tooltip class="item" effect="dark" placement="top-start" content="微信收款（元）/笔数">
<div class="size-bole">{{ map.s1 || 0 }}/{{ map.s2 || 0 }}</div> <div class="size-bole">{{ map.s1 || 0 }}/{{ map.s2 || 0 }}</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -155,7 +155,7 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" placement="top-start"> <el-tooltip class="item" effect="dark" placement="top-start" content="支付宝收款（元）/笔数">
<div class="size-bole" style="color:#00CAFF;">{{ map.s3 || 0 }}/{{ map.s4 || 0 }}</div> <div class="size-bole" style="color:#00CAFF;">{{ map.s3 || 0 }}/{{ map.s4 || 0 }}</div>
</el-tooltip> </el-tooltip>
@ -165,7 +165,7 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" placement="top-start"> <el-tooltip class="item" effect="dark" placement="top-start" content="银联二维码（元）/笔数">
<div class="size-bole" style="color:#F44522;">{{ map.s5 || 0 }}/{{ map.s6 || 0 }}</div> <div class="size-bole" style="color:#F44522;">{{ map.s5 || 0 }}/{{ map.s6 || 0 }}</div>
</el-tooltip> </el-tooltip>
@ -176,7 +176,7 @@
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start"> <el-tooltip class="item" effect="dark" content="现金收款（元）/笔数" placement="top-start">
<div class="size-bole" style="color:#0D2ED8;">{{ map.s7 || 0 }}/{{ map.s8 || 0 }}</div> <div class="size-bole" style="color:#0D2ED8;">{{ map.s7 || 0 }}/{{ map.s8 || 0 }}</div>
</el-tooltip> </el-tooltip>