11.5
This commit is contained in:
ds
parent
e56315291c
commit
e58b961d6a
@ -15,9 +15,27 @@
|
||||
<el-option label="小程序" value="applet"/>
|
||||
<el-option label="收银台" value="cashier"/>
|
||||
<el-option label="POS端" value="POS"/>
|
||||
<el-option label="平台" value="PC"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="" prop="payChannel">
|
||||
<el-select
|
||||
v-model="queryParams.type"
|
||||
clearable
|
||||
placeholder="请选择订单分类"
|
||||
>
|
||||
<el-option label="油品" value="1"/>
|
||||
<el-option label="商品" value="2"/>
|
||||
<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-form-item>
|
||||
<!-- <el-form-item label="" prop="payChannel">
|
||||
<el-select
|
||||
v-model="queryParams.payChannel"
|
||||
clearable
|
||||
@ -27,7 +45,7 @@
|
||||
<el-option label="收银台" value="cashier"/>
|
||||
<el-option label="POS端" value="POS"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
|
||||
|
||||
<el-form-item label="" prop="payType">
|
||||
@ -42,7 +60,7 @@
|
||||
<el-option label="余额" value="balance"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="payType">
|
||||
<!-- <el-form-item label="" prop="payType">
|
||||
<el-select
|
||||
v-model="queryParams.payType"
|
||||
clearable
|
||||
@ -53,7 +71,19 @@
|
||||
<el-option label="支付宝" value="ALIPAY"/>
|
||||
<el-option label="余额" value="balance"/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
|
||||
<el-form-item label="" prop="paymentChannel">
|
||||
<el-select v-model="queryParams.paymentChannel" placeholder="请选择支付渠道" clearable>
|
||||
<el-option
|
||||
v-for="dicts in this.dict"
|
||||
:key="dicts.dictValue"
|
||||
:label="dicts.dictLabel"
|
||||
:value="dicts.dictValue"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="" prop="status">
|
||||
<el-select
|
||||
v-model="queryParams.status"
|
||||
@ -63,122 +93,114 @@
|
||||
<el-option label="已支付" value="paid"/>
|
||||
<el-option label="未支付" value="unpaid"/>
|
||||
<el-option label="已退款" value="refund"/>
|
||||
<el-option label="支付失败" value="payFail"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" style="margin-right: 0px" prop="status">
|
||||
<el-select
|
||||
v-model="queryParams.status"
|
||||
clearable
|
||||
placeholder="请选择员工"
|
||||
>
|
||||
<el-option label="已支付" value="paid"/>
|
||||
<el-option label="未支付" value="unpaid"/>
|
||||
<el-option label="已退款" value="refund"/>
|
||||
<el-form-item label="" prop="staffId">
|
||||
<el-select v-model="queryParams.staffId" placeholder="请选择员工" clearable>
|
||||
<el-option
|
||||
v-for="dicts in this.staffList"
|
||||
:key="dicts.acctId"
|
||||
:label="dicts.accountName"
|
||||
:value="dicts.acctId"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="status">
|
||||
<el-select
|
||||
v-model="queryParams.status"
|
||||
clearable
|
||||
placeholder="请输入付款用户"
|
||||
>
|
||||
<el-option label="已支付" value="paid"/>
|
||||
<el-option label="未支付" value="unpaid"/>
|
||||
<el-option label="已退款" value="refund"/>
|
||||
</el-select>
|
||||
|
||||
<el-form-item label="" prop="userName">
|
||||
<el-input v-model="queryParams.userName" placeholder="请输入付款用户"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="">
|
||||
<el-date-picker
|
||||
v-model="beginTime"
|
||||
style="width: 140px"
|
||||
type="date"
|
||||
placeholder="交易开始日期">
|
||||
</el-date-picker>
|
||||
至
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 140px"
|
||||
type="date"
|
||||
placeholder="交易结束日期">
|
||||
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>
|
||||
<el-form-item style="float: right; margin-right: 0px ">
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||
<el-button type="primary" icon="el-icon-search" >导出</el-button>
|
||||
<el-button type="primary" icon="el-icon-search" @click="exportExcelCashier">导出</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="wit_box" >
|
||||
<div class="box-gang">
|
||||
<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">{{ wechat}}/{{ wechats}}</div>
|
||||
</el-tooltip>
|
||||
<div class="size-hui">
|
||||
<div class="dian" style="background: #0DC291"></div>
|
||||
<div class="nei">微信收款（元）/笔数</div>
|
||||
<div class="nei">微信收款（元）/ 笔数</div>
|
||||
</div>
|
||||
</div>
|
||||
<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>
|
||||
</el-tooltip>
|
||||
<div class="size-hui">
|
||||
<div class="dian" style="background: #00CAFF"></div>
|
||||
<div class="nei">支付宝收款（元）/笔数</div>
|
||||
<div class="nei">支付宝收款（元）/ 笔数</div>
|
||||
</div>
|
||||
</div>
|
||||
<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>
|
||||
</el-tooltip>
|
||||
|
||||
<div class="size-hui">
|
||||
<div class="dian" style="background: #F44522"></div>
|
||||
<div class="nei">云闪付收款（元）/笔数</div>
|
||||
<div class="nei">云闪付收款（元）/ 笔数</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box">
|
||||
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
|
||||
<el-tooltip class="item" effect="dark" content="pos机收款（元）/ 笔数" placement="top-start">
|
||||
<div class="size-bole" style="color:#FF7E00;" >{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0</div>
|
||||
</el-tooltip>
|
||||
|
||||
<div class="size-hui">
|
||||
<div class="dian" style="background: #FF7E00"></div>
|
||||
<div class="nei">pos机收款（元）/笔数</div>
|
||||
<div class="nei">pos机收款（元）/ 笔数</div>
|
||||
</div>
|
||||
</div>
|
||||
<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;">{{ orderStatistics.cash?orderStatistics.cash:0 }}/0</div>
|
||||
</el-tooltip>
|
||||
|
||||
|
||||
<div class="size-hui">
|
||||
<div class="dian" style="background: #0D2ED8"></div>
|
||||
<div class="nei">现金收款（元）/笔数</div>
|
||||
<div class="nei">现金收款（元）/ 笔数</div>
|
||||
</div>
|
||||
</div>
|
||||
<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:#790DD8;">{{orderStatistics.cashcount?orderStatistics.cashcount:0}}/0</div>
|
||||
</el-tooltip>
|
||||
|
||||
<div class="size-hui">
|
||||
<div class="dian" style="background: #790DD8"></div>
|
||||
<div class="nei">会员消费（元）/笔数</div>
|
||||
<div class="nei">会员消费（元）/ 笔数</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box">
|
||||
<el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
|
||||
<div class="size-bole" style="color:#D80D54;">999999/999999999999</div>
|
||||
<el-tooltip class="item" effect="dark" content="挂帐收款（元）/ 笔数" placement="top-start">
|
||||
<div class="size-bole" style="color:#D80D54;">0/0</div>
|
||||
</el-tooltip>
|
||||
|
||||
<div class="size-hui">
|
||||
<div class="dian" style="background: #D80D54"></div>
|
||||
<div class="nei">挂帐收款（元）/笔数</div>
|
||||
<div class="nei">挂帐收款（元）/ 笔数</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -225,7 +247,7 @@
|
||||
<span type="danger" v-else>--</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="userName" align="center" label="用户手机号" > </el-table-column>
|
||||
<el-table-column prop="userMobile" align="center" label="用户手机号" > </el-table-column>
|
||||
<el-table-column prop="payType" align="center" label="支付方式">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.payType=='CASH'">现金</span>
|
||||
@ -319,15 +341,22 @@ import {
|
||||
exportExcelTradingApi, getmyDataApi,
|
||||
getRunningWaterByTissueApi,
|
||||
getTissueByDataApi,
|
||||
getTradingPageApi
|
||||
getTradingPageApi,
|
||||
transactionList,
|
||||
getDicts,
|
||||
getStaffByStorId
|
||||
} from "@/api/allOrder";
|
||||
|
||||
export default {
|
||||
name: "reconciliation-trading",
|
||||
data(){
|
||||
return{
|
||||
wechat:999999999999999,
|
||||
wechats:999999999999999,
|
||||
|
||||
dict:{},
|
||||
|
||||
|
||||
wechat:0,
|
||||
wechats:0,
|
||||
radio1:"油号选错",
|
||||
loading:false,
|
||||
dialogVisible:false,
|
||||
@ -387,8 +416,28 @@ export default {
|
||||
|
||||
// this.getList();
|
||||
|
||||
this.getDicts();
|
||||
this.getStaffByStorId();
|
||||
|
||||
},
|
||||
methods:{
|
||||
|
||||
async getDicts() {
|
||||
getDicts("payment_channel").then(response => {
|
||||
this.dict = response.data;
|
||||
})
|
||||
getDicts("payment_type").then(response => {
|
||||
this.dictPayType = response.data;
|
||||
})
|
||||
},
|
||||
|
||||
async getStaffByStorId() {
|
||||
getStaffByStorId().then(response => {
|
||||
this.staffList = response.data;
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
async getDeptList() {
|
||||
// getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
|
||||
// this.deptList = response.data.records;
|
||||
@ -426,22 +475,16 @@ export default {
|
||||
},
|
||||
|
||||
// 获取列表信息
|
||||
async getList(val){
|
||||
// await this.getDeptList()
|
||||
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 => {
|
||||
async getList(val) {
|
||||
transactionList(this.queryParams).then(response => {
|
||||
this.orderList = response.data.records;
|
||||
this.total = response.data.total;
|
||||
this.isSysDate = false
|
||||
// this.getDeptList()
|
||||
this.getOrderStatistics()
|
||||
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
|
||||
getOrdersInfo(data) {
|
||||
this.dialogVisible = true;
|
||||
this.ordersInfo = data
|
||||
|
||||
@ -856,6 +856,7 @@
|
||||
SELECT
|
||||
ai.*,
|
||||
mu.NAME AS userName,
|
||||
mu.mobile AS userMobile,
|
||||
mc.merchant_name as merchantName,
|
||||
mt.account_name as createBy
|
||||
FROM
|
||||
|
||||
Loading…
Reference in New Issue
Block a user