fix: 数据统计,销售统计,桌台统计更新,404页面跳转更新,三方配置更新
This commit is contained in:
@@ -67,8 +67,7 @@
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:default-time="['00:00:00', '23:59:59']"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
value-format="YYYY-MM-DD "
|
||||
v-if="timeValue == 'custom'"
|
||||
@change="summarytrade"
|
||||
></el-date-picker>
|
||||
@@ -84,12 +83,40 @@
|
||||
<el-tooltip popper-class="popper" effect="light" placement="bottom">
|
||||
<template #content>
|
||||
<div class="tips_row">
|
||||
<div class="item" v-for="(item, index) in payCount" :key="index">
|
||||
<div class="item">
|
||||
<div class="left">
|
||||
<img class="icon" :src="item.icon" />
|
||||
<span>{{ item.payType }}</span>
|
||||
<img class="icon" src="@/assets/images/data/wx.png" />
|
||||
<span>微信小程序</span>
|
||||
</div>
|
||||
<span class="num">{{ item.payAmount }}</span>
|
||||
<span class="num">{{ trade.wechatPayCount }}</span>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class="left">
|
||||
<img class="icon" src="@/assets/images/data/ali.png" />
|
||||
<span>支付宝小程序</span>
|
||||
</div>
|
||||
<span class="num">{{ trade.aliPayCount }}</span>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class="left">
|
||||
<img class="icon" src="@/assets/images/data/scan.png" />
|
||||
<span>主扫收款</span>
|
||||
</div>
|
||||
<span class="num">{{ trade.scanPayCount }}</span>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class="left">
|
||||
<img class="icon" src="@/assets/images/data/cash.png" />
|
||||
<span>现金</span>
|
||||
</div>
|
||||
<span class="num">{{ trade.cashPayCount }}</span>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class="left">
|
||||
<img class="icon" src="@/assets/images/data/cash.png" />
|
||||
<span>挂账</span>
|
||||
</div>
|
||||
<span class="num">{{ trade.creditPayCount }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -298,8 +325,8 @@
|
||||
<el-table :data="saleTable" v-loading="saleTableLoading" style="width: 100%">
|
||||
<!-- <el-table-column label="排名" prop="productId"></el-table-column> -->
|
||||
<el-table-column label="商品名称" prop="productName"></el-table-column>
|
||||
<el-table-column label="数量" prop="salesNum"></el-table-column>
|
||||
<el-table-column label="金额" prop="salesAmount"></el-table-column>
|
||||
<el-table-column label="数量" prop="number"></el-table-column>
|
||||
<el-table-column label="金额" prop="amount"></el-table-column>
|
||||
</el-table>
|
||||
<div
|
||||
class="head-container"
|
||||
@@ -308,7 +335,7 @@
|
||||
<el-pagination
|
||||
:total="saleTableTotal"
|
||||
:page-size="saleTableSize"
|
||||
:current-page="saleTablePage + 1"
|
||||
:current-page="saleTablePage"
|
||||
@current-change="paginationChange"
|
||||
layout="total, prev, pager, next, jumper"
|
||||
></el-pagination>
|
||||
@@ -405,7 +432,7 @@ export default {
|
||||
saleTableActive: "7",
|
||||
saleTable: [],
|
||||
saleTableLoading: false,
|
||||
saleTablePage: 0,
|
||||
saleTablePage: 1,
|
||||
saleTableTotal: 0,
|
||||
saleTableSize: 5,
|
||||
__resizeHandler: null,
|
||||
@@ -526,8 +553,8 @@ export default {
|
||||
try {
|
||||
this.tradeLoading = true;
|
||||
const res = await dataSummaryApi.trade({
|
||||
beginTime: this.query.createdAt[0],
|
||||
endTime: this.query.createdAt[1],
|
||||
beginDate: this.query.createdAt[0],
|
||||
endDate: this.query.createdAt[1],
|
||||
});
|
||||
this.trade = res;
|
||||
this.tradeLoading = false;
|
||||
@@ -868,23 +895,20 @@ export default {
|
||||
}
|
||||
},
|
||||
paginationChange(e) {
|
||||
this.saleTablePage = e - 1;
|
||||
this.saleTablePage = e;
|
||||
this.dateProduct();
|
||||
},
|
||||
// 获取销售额排行表格数据
|
||||
async dateProduct() {
|
||||
try {
|
||||
this.saleTableLoading = true;
|
||||
const res = await dataSummaryApi.productSaleDate(
|
||||
this.saleTableActive,
|
||||
this.saleTablePage,
|
||||
this.saleTableSize
|
||||
);
|
||||
this.saleTable = res.productList.content;
|
||||
this.saleTableTotal = res.productList.totalElements;
|
||||
this.productCount = res.productCount.payAmount;
|
||||
this.productSum = res.productSum.payAmount;
|
||||
|
||||
const res = await dataSummaryApi.productSaleDate({
|
||||
day: this.saleTableActive,
|
||||
page: this.saleTablePage,
|
||||
size: this.saleTableSize,
|
||||
});
|
||||
this.saleTable = res.records;
|
||||
this.saleTableTotal = res.totalRow * 1;
|
||||
this.summaryDateGet(res.countList);
|
||||
setTimeout(() => {
|
||||
this.saleTableLoading = false;
|
||||
|
||||
Reference in New Issue
Block a user