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

10.8

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-10-08 15:48:58 +08:00
parent 6fdb9d2012
commit e199d1f848
2 changed files with 129 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

288
fuintCashierWeb/src/views/details/index.vue
View File

@ -2,137 +2,86 @@
<div class="app-container">
<div class="wit_box">
<el-button type="primary" plain round @click="subCard">子卡管理<i
class="el-icon-bank-card el-icon--right"></i></el-button>
<div class="user-box">
<div class="d-s">
<img v-if="form.avatar" :src="baseUrl+form.avatar" style="width: 40px;height: 40px;border-radius: 50%">
<img v-else src="@/assets/images/avatar.png" style="width: 40px;height: 40px">
<div style="color: #000;font-size: 18px;margin-left: 10px;cursor: pointer" @click="changeName">{{ form.name ? form.name : "--" }}</div>
<div class="sm-box">
<div class="s-size">会员手机号 {{ form.mobile }}</div>
<div class="s-size">创建时间 {{ form.createTime }}</div>
</div>
<div class="sm-box">
<div class="s-size">身份证号 {{form.idcard || 'xxxxxxxxxxx'}}</div>
<div class="s-size">生日 {{form.birthday || 'xxxxxxxxxxx'}}</div>
</div>
</div>
<el-button type="primary" plain round @click="subCard">子卡管理<i
class="el-icon-bank-card el-icon--right"></i></el-button>
</div>
</div>
<el-card>
<div slot="header" style="display: flex;justify-content: space-between;padding-right: 0px">
<div>
<el-page-header @back="goBack" content="详情页面"></el-page-header>
</div>
<div>
<!-- <el-button type="primary" plain round>会员码</el-button>-->
</div>
</div>
<div>基础资料</div>
<div style="display: flex;margin-top: 20px">
<div class="left">
<div>
<img v-if="form.avatar" :src="baseUrl+form.avatar" style="width: 80px;height: 80px;border-radius: 50%">
<img v-else src="@/assets/images/avatar.png" style="width: 80px;height: 80px">
</div>
<!-- <el-button type="warning" plain round size="mini" style="margin: 10px" @click="bindIdCard">绑定实体卡</el-button><br>-->
<el-button type="primary" icon="el-icon-bank-card" round style="margin: 10px;width: 50%;height: 40px"
@click="userRecharge">会员充值
</el-button>
</div>
<div class="right">
<el-descriptions>
<el-descriptions-item label="手机号">{{ form.mobile }}
<el-tag size="mini" @click="replaceMobile">更换</el-tag>
</el-descriptions-item>
<el-descriptions-item label="会员昵称">
<span style="color: #00afff" @click="changeName">{{ form.name ? form.name : "--" }}</span>
</el-descriptions-item>
<!-- <el-descriptions-item label="实体卡号">{{form.idcard ? form.idcard : "&#45;&#45;"}}</el-descriptions-item>-->
<!-- <el-descriptions-item label="绑定信息">&#45;&#45;</el-descriptions-item>-->
<el-descriptions-item label="会员状态">
<el-tag v-if="form.status == 'qy'">启用</el-tag>
<el-tag v-else type="danger">禁用</el-tag>
</el-descriptions-item>
<el-descriptions-item label="加油次数">{{ form.consumeNum }}</el-descriptions-item>
<el-descriptions-item label="加油总金额">{{ allAmount || 0 }}
</el-descriptions-item>
<!-- <el-descriptions-item label="所属油站">{{ store.name }}</el-descriptions-item>-->
<el-descriptions-item label="注册时间">{{ form.createTime }}</el-descriptions-item>
<el-descriptions-item label="关联子卡">
<span style="color: #00afff" @click="subCard">子卡管理</span>
</el-descriptions-item>
<el-descriptions-item label="会员等级">
{{ grade ? grade.name : "--" }}
</el-descriptions-item>
<!-- <el-descriptions-item label="储值优惠">&#45;&#45;</el-descriptions-item>-->
<!-- <el-descriptions-item label="每日笔数">-->
<!-- <span style="color: #00afff" @click="configuration">跟随全局总配置</span>-->
<!-- </el-descriptions-item>-->
<el-descriptions-item label="固定等级">
<span style="color: #00afff" @click="level">
{{ form.fixingLevel ? fixingLevelinfo(fixingLevelList, form.fixingLevel) : "--" }}
<!-- <dict-tag :options="dict.type.zcrzdj" :value="form.fixingLevel"/>-->
</span>
</el-descriptions-item>
<el-descriptions-item label="备注信息">{{
form.description ? form.description : "--"
}}
</el-descriptions-item>
</el-descriptions>
</div>
</div>
</el-card>
<el-card style="margin: 20px 0">
<div>会员资产</div>
<div>
<template>
<div>
<el-row :gutter="20">
<el-col :span="4">
<div class="sta">
<el-statistic
group-separator=","
:value="form.points"
title="累计积分"
></el-statistic>
</div>
</el-col>
<el-col :span="4">
<div class="sta">
<el-statistic
group-separator=","
:value="form.growthValue"
title="成长值">
</el-statistic>
</div>
</el-col>
<el-col :span="4">
<div class="sta">
<el-statistic
group-separator=","
:precision="2"
:value="form.cardBalance"
title="账户余额"
></el-statistic>
</div>
</el-col>
<!-- <el-col :span="4">-->
<!-- <div class="sta" v-if="!refuelMoney">-->
<!-- <el-statistic-->
<!-- group-separator=","-->
<!-- :precision="2"-->
<!-- :value="0"-->
<!-- title="囤油卡余额"-->
<!-- >-->
<!-- </el-statistic>-->
<!-- </div>-->
<!-- <div v-if="refuelMoney && refuelMoney.length>0" style="display: flex;align-items: center;margin-top: 25px">-->
<!-- <div class="size-hui">囤油卡余额</div>-->
<!-- <div v-for="(item,index) in refuelMoney"-->
<!-- :key="index" style="margin-left: 20px;text-align: center">-->
<!-- <div class="size-hui">{{ item.oilName ? item.type + item.oilName : item.type }}</div>-->
<!-- <div class="size-bole">{{ item.refuelMoney || 0.00 }}</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-col>-->
</el-row>
</div>
</template>
</div>
</el-card>
<el-card :key="childComponentKey" class="_l">
<div class="wit_boxs" :key="childComponentKey" >
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="会员信息" name="userinfo">
<div>
<div class="d-s" style="margin-bottom: 10px">
<div class="gang"></div>
<div class="g-class">会员资产</div>
</div>
<div class="info-box" >
<div class="rsw" style="margin-left: 5px" >
<div class="s-size">会员总余额：￥5623.65</div>
<div class="s-size">累计消费金额：￥18626.35</div>
</div>
<div class="rsw">
<div class="s-size">累计充值本金：￥23650.00</div>
<div class="s-size">累计赠送金额：￥600.00</div>
</div>
<div class="rsw">
<div class="s-size">累计积分：2365</div>
<div class="s-size">累计经验值：230</div>
</div>
<div class="rsw">
<div class="s-size">剩余优惠券：2</div>
<div class="s-size">累计已用优惠券：23</div>
</div>
</div>
<div class="d-s" style="margin-bottom: 10px">
<div class="gang"></div>
<div class="g-class">基础信息</div>
</div>
<div class="info-box" >
<div class="rsw" style="margin-left: 5px" >
<div class="s-size">会员卡号：xxxxxxxxxxxxxxx</div>
<div class="s-size">性别：男</div>
<div class="s-size">消费次数：18</div>
<div class="s-size">邀请人：xxx</div>
</div>
<div class="rsw">
<div class="s-size">会员等级：xxxxxxxx</div>
<div class="s-size">会员状态：使用中</div>
<div class="s-size">储值卡余额：xxxxxxx</div>
<div class="s-size">邀请人手机号：156xxxxxxxx</div>
</div>
<div class="rsw">
<div class="s-size">会员标签：xxxxxxxx</div>
<div class="s-size">充值次数：5</div>
<div class="s-size">囤油卡余额：xxxxxx</div>
<div class="s-size">备注：xxx</div>
</div>
<div class="rsw">
<div class="s-size">车牌号：xxxxxxxx</div>
<div class="s-size">已兑换积分：0</div>
<div class="s-size">创建时间：2024-05-06 09:1</div>
</div>
</div>
<div style="width: 100%; display: flex; ">
<el-button type="primary" >会员注销</el-button>
<el-button type="primary" >会员充值</el-button>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="油品订单" name="refuelOrder">
<oilOrder :key="childComponentKey" :pUserId="form.id"></oilOrder>
</el-tab-pane>
@ -156,7 +105,7 @@
<!-- </el-tab-pane> -->
</el-tabs>
</el-card>
</div>
<!-- 会员充值-->
<el-dialog :close-on-click-modal="false" width="60%" :title="title" :visible.sync="openRecharge" append-to-body>
@ -897,8 +846,6 @@
</template>
<script>
import SelectStaff from "@/components/local/selectStaff.vue";
import balanceRecord from "@/views/details/userInfoOrder/balanceRecord.vue";
import pointsRecord from "@/views/details/userInfoOrder/pointsRecord.vue";
@ -1077,7 +1024,7 @@ export default {
store: '',
// 会员等级信息
grade: '',
activeName: 'refuelOrder',
activeName: 'userinfo',
subCardActive: 'subCardManage',
activeRecharge: 'balance',
tableData: [],
@ -1293,10 +1240,7 @@ export default {
await getCardValueListApi(quy).then(res => {
this.cardValueList = res.data.records;
this.cardValueList.sort((a, b) => a.rechargeBalance - b.rechargeBalance);
// console.log("this.grade.name",this.grade)
})
// console.log("this.cardValueList", this.grade)
if (this.cardValueList.length > 0) {
// 过滤
if (this.grade && this.grade.name) {
@ -1315,20 +1259,13 @@ export default {
}
this.$forceUpdate();
},
valueAmoutChange(data) {
// this.cardValueForm.amount = null
this.$set(this.cardValueForm, 'amount', data);
// console.log("data17.16", this.cardValueForm.amount)
if (!data) {
this.cardValueForm.amount = ''
} else {
this.cardValueForm.amount = data
}
this.cardValueForm.points = ''
this.cardValueForm.bidBalance = ''
this.cardValueForm.giftBalance = ''
@ -1406,19 +1343,6 @@ export default {
},
handleDataFromChild(data) {
this.openStaff = false
// this.cardFuelDieselForm= {
// mtStaffId: data.mtStaffId,
// realName: data.realName,
// staffMobile: data.staffMobile,
// },
// this.cardValueForm= {
// mtStaffId: data.mtStaffId,
// realName: data.realName,
// staffMobile: data.staffMobile,
// },
// console.log('Received data in parent:', data);
this.cardFuelDieselForm.mtStaffId = data.mtStaffId,
this.cardFuelDieselForm.realName = data.realName,
this.cardFuelDieselForm.staffMobile = data.staffMobile,
@ -2253,10 +2177,6 @@ export default {
width: 100%;
height: 100%;
background: #f6f8f9;
}
._l{
}
.left {
width: 20%;
@ -2386,5 +2306,53 @@ export default {
border-radius: 8px;
box-sizing: border-box;
padding: 10px;
margin-bottom: 5px;
}
.wit_boxs{
width: 100%;
background: #fff;
border-radius: 8px;
box-sizing: border-box;
padding: 10px;
height: 85vh;
}
.user-box{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
}
.d-s{
display: flex;
align-items: center;
}
.sm-box{
font-size: 14px;
color: #333333;
margin-left: 80px;
}
.s-size{
margin: 12px 0px;
font-size: 14px;
color: #333333;
}
.rsw{
width: 25%;
}
.gang{
width: 2px;
height: 14px;
background: #FF9655;
}
.g-class{
font-size: 14px;
margin-left: 6px;
}
.info-box{
display: flex;
width: 100%;
align-items: center;
justify-content: space-between;
margin-bottom: 20px;
}
</style>

2
fuintCashierWeb/src/views/details/userInfoOrder/oilOrder.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<el-table ref="tables" v-loading="loading" :data="list">
<el-table ref="tables" border v-loading="loading" :data="list">
<el-table-column label="所属油站" prop="storeName" align="center"/>
<el-table-column label="订单时间" align="center" prop="createTime"/>
<el-table-column label="交易终端" align="center" prop="payType">