Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
This commit is contained in:
commit
c4a62b4549
|
|
@ -71,11 +71,11 @@
|
|||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="admin账号">
|
||||
<el-switch v-model="datas.DialogForm.isAdmin" :active-value="1" :inactive-value="0" />
|
||||
<el-switch v-model="datas.DialogForm.isAdmin" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="密码">
|
||||
<el-form-item label="密码" v-if="datas.title == '新增数据'">
|
||||
<el-input v-model="datas.DialogForm.password" placeholder="请输入密码" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
|
@ -166,6 +166,8 @@ async function handleEdit(row) {
|
|||
datas.title = '编辑数据'
|
||||
// const res = await API.getinfo(row.id)
|
||||
datas.DialogForm = row
|
||||
datas.DialogForm.password = null
|
||||
|
||||
// 有图片
|
||||
// datas.DialogForm.goodsImageUrl = res.goodsImageUrl.split(',')
|
||||
myDialogRef.value.open()
|
||||
|
|
|
|||
|
|
@ -59,11 +59,7 @@
|
|||
</el-form-item>
|
||||
<el-form-item label="显示样式">
|
||||
<div class="style_wrap">
|
||||
<div
|
||||
class="item style1"
|
||||
:class="{ active: Elform.browseMode == 'list' }"
|
||||
@click="Elform.browseMode = 'list'"
|
||||
>
|
||||
<div class="item style1" :class="{ active: Elform.browseMode == 'list' }" @click="Elform.browseMode = 'list'">
|
||||
<div class="row">
|
||||
<div class="cover"></div>
|
||||
<div class="info">
|
||||
|
|
@ -81,11 +77,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="item style2"
|
||||
:class="{ active: Elform.browseMode == 'grid' }"
|
||||
@click="Elform.browseMode = 'grid'"
|
||||
>
|
||||
<div class="item style2" :class="{ active: Elform.browseMode == 'grid' }" @click="Elform.browseMode = 'grid'">
|
||||
<div class="row">
|
||||
<div class="cover"></div>
|
||||
<div class="line"></div>
|
||||
|
|
@ -116,15 +108,15 @@ import { reactive } from "vue";
|
|||
import API from "../index";
|
||||
// do not use same name with ref
|
||||
const Elform = reactive({
|
||||
enableRewards: 1,
|
||||
enableRewards: 0,
|
||||
rewardsGroup: "all",
|
||||
consumeAmount: 0,
|
||||
enableDeduction: 1,
|
||||
enableDeduction: 0,
|
||||
deductionGroup: "all",
|
||||
minPaymentAmount: 0,
|
||||
maxDeductionRatio: 0,
|
||||
equivalentPoints: 0,
|
||||
enablePointsMall: 1,
|
||||
enablePointsMall: 0,
|
||||
browseMode: "list",
|
||||
});
|
||||
onMounted(() => {
|
||||
|
|
|
|||
|
|
@ -61,16 +61,9 @@
|
|||
<el-radio-button value="month">本月</el-radio-button>
|
||||
<el-radio-button value="custom">自定义</el-radio-button>
|
||||
</el-radio-group>
|
||||
<el-date-picker
|
||||
v-model="query.createdAt"
|
||||
type="daterange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
value-format="YYYY-MM-DD "
|
||||
v-if="timeValue == 'custom'"
|
||||
@change="summarytrade"
|
||||
></el-date-picker>
|
||||
<el-date-picker v-model="query.createdAt" type="daterange" range-separator="至" start-placeholder="开始日期"
|
||||
end-placeholder="结束日期" value-format="YYYY-MM-DD " v-if="timeValue == 'custom'"
|
||||
@change="summarytrade"></el-date-picker>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-loading="tradeLoading">
|
||||
|
|
@ -127,7 +120,9 @@
|
|||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<el-icon><QuestionFilled /></el-icon>
|
||||
<el-icon>
|
||||
<QuestionFilled />
|
||||
</el-icon>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -138,28 +133,20 @@
|
|||
<!-- <div class="t">{{ formatDecimal(tradeSale.totalSaleAmount || 0) }}</div> -->
|
||||
</div>
|
||||
<div class="line_gropress">
|
||||
<div
|
||||
class="gropress l"
|
||||
:style="{
|
||||
width: `${
|
||||
trade.saleAmount
|
||||
? (trade.saleAmount / (trade.saleAmount * 1 + trade.refundAmount * 1)) *
|
||||
100
|
||||
: 0
|
||||
<div class="gropress l" :style="{
|
||||
width: `${trade.saleAmount
|
||||
? (trade.saleAmount / (trade.saleAmount * 1 + trade.refundAmount * 1)) *
|
||||
100
|
||||
: 0
|
||||
}%`,
|
||||
}"
|
||||
></div>
|
||||
<div
|
||||
class="gropress r"
|
||||
:style="{
|
||||
width: `${
|
||||
trade.refundAmount
|
||||
? (trade.refundAmount / (trade.saleAmount * 1 + trade.refundAmount * 1)) *
|
||||
100
|
||||
: 0
|
||||
}"></div>
|
||||
<div class="gropress r" :style="{
|
||||
width: `${trade.refundAmount
|
||||
? (trade.refundAmount / (trade.saleAmount * 1 + trade.refundAmount * 1)) *
|
||||
100
|
||||
: 0
|
||||
}%`,
|
||||
}"
|
||||
></div>
|
||||
}"></div>
|
||||
</div>
|
||||
<div class="line_btm">
|
||||
<el-icon class="icon el-icon-caret-right" />
|
||||
|
|
@ -175,30 +162,22 @@
|
|||
<!-- <div class="t">{{ formatDecimal(tradeSale.totalVipAmount || 0) }}</div> -->
|
||||
</div>
|
||||
<div class="line_gropress">
|
||||
<div
|
||||
class="gropress l"
|
||||
:style="{
|
||||
width: `${
|
||||
trade.rechargeAmount
|
||||
? (trade.rechargeAmount /
|
||||
(trade.memberPayAmount + trade.rechargeRefundAmount * 1)) *
|
||||
100
|
||||
: 0
|
||||
<div class="gropress l" :style="{
|
||||
width: `${trade.rechargeAmount
|
||||
? (trade.rechargeAmount /
|
||||
(trade.memberPayAmount + trade.rechargeRefundAmount * 1)) *
|
||||
100
|
||||
: 0
|
||||
}%`,
|
||||
}"
|
||||
></div>
|
||||
<div
|
||||
class="gropress r"
|
||||
:style="{
|
||||
width: `${
|
||||
trade.rechargeRefundAmount
|
||||
? (trade.rechargeRefundAmount /
|
||||
(trade.memberPayAmount + trade.rechargeRefundAmount * 1)) *
|
||||
100
|
||||
: 0
|
||||
}"></div>
|
||||
<div class="gropress r" :style="{
|
||||
width: `${trade.rechargeRefundAmount
|
||||
? (trade.rechargeRefundAmount /
|
||||
(trade.memberPayAmount + trade.rechargeRefundAmount * 1)) *
|
||||
100
|
||||
: 0
|
||||
}%`,
|
||||
}"
|
||||
></div>
|
||||
}"></div>
|
||||
</div>
|
||||
<div class="line_btm">
|
||||
<el-icon class="icon el-icon-caret-right" />
|
||||
|
|
@ -242,12 +221,10 @@
|
|||
<div class="item item2">
|
||||
<div class="title">
|
||||
翻台率
|
||||
<el-tooltip
|
||||
effect="dark"
|
||||
content="翻台率=（客单数-桌台数）/桌台数*100%"
|
||||
placement="top"
|
||||
>
|
||||
<el-icon><QuestionFilled /></el-icon>
|
||||
<el-tooltip effect="dark" content="翻台率=（客单数-桌台数）/桌台数*100%" placement="top">
|
||||
<el-icon>
|
||||
<QuestionFilled />
|
||||
</el-icon>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<div class="icon_wrap">
|
||||
|
|
@ -277,18 +254,10 @@
|
|||
<div class="item">
|
||||
<div class="header">
|
||||
<div class="tab_wrap">
|
||||
<div
|
||||
class="item"
|
||||
:class="{ active: lineChartType == 0 }"
|
||||
@click="lineChartTypeChange(0)"
|
||||
>
|
||||
<div class="item" :class="{ active: lineChartType == 0 }" @click="lineChartTypeChange(0)">
|
||||
销售趋势
|
||||
</div>
|
||||
<div
|
||||
class="item"
|
||||
:class="{ active: lineChartType == 1 }"
|
||||
@click="lineChartTypeChange(1)"
|
||||
>
|
||||
<div class="item" :class="{ active: lineChartType == 1 }" @click="lineChartTypeChange(1)">
|
||||
支付占比
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -297,20 +266,10 @@
|
|||
<el-radio-button value="30">30天</el-radio-button>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
<div
|
||||
class="chart"
|
||||
ref="saleChart"
|
||||
v-loading="saleLoading"
|
||||
style="height: 350px"
|
||||
v-show="lineChartType == 0"
|
||||
></div>
|
||||
<div
|
||||
class="chart"
|
||||
ref="payChart"
|
||||
v-loading="payChartLoading"
|
||||
style="height: 350px"
|
||||
v-show="lineChartType == 1"
|
||||
></div>
|
||||
<div class="chart" ref="saleChart" v-loading="saleLoading" style="height: 350px" v-show="lineChartType == 0">
|
||||
</div>
|
||||
<div class="chart" ref="payChart" v-loading="payChartLoading" style="height: 350px" v-show="lineChartType == 1">
|
||||
</div>
|
||||
</div>
|
||||
<!-- 商品销售排行 -->
|
||||
<div class="item" style="margin-left: 20px">
|
||||
|
|
@ -347,17 +306,9 @@
|
|||
<el-table-column label="数量" prop="number"></el-table-column>
|
||||
<el-table-column label="金额" prop="amount"></el-table-column>
|
||||
</el-table>
|
||||
<div
|
||||
class="head-container"
|
||||
style="padding-top: 20px; display: flex; justify-content: flex-end"
|
||||
>
|
||||
<el-pagination
|
||||
:total="saleTableTotal"
|
||||
:page-size="saleTableSize"
|
||||
:current-page="saleTablePage"
|
||||
@current-change="paginationChange"
|
||||
layout="total, prev, pager, next, jumper"
|
||||
></el-pagination>
|
||||
<div class="head-container" style="padding-top: 20px; display: flex; justify-content: flex-end">
|
||||
<el-pagination :total="saleTableTotal" :page-size="saleTableSize" :current-page="saleTablePage"
|
||||
@current-change="paginationChange" layout="total, prev, pager, next, jumper"></el-pagination>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue