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

10.9

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-10-09 15:24:15 +08:00
parent 4686e8b5f1
commit d1cd87e387
12 changed files with 263 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue
View File

@ -6,37 +6,41 @@
{{ item.name }}
</div>
</div>
<div class="w_box" style="margin-bottom: 20px">
<div class="w_box" v-if="tabindex == 1" >
<writeList></writeList>
</div>
<div class="w_box" v-if="tabindex == 0" >
<div class="title_" >通过手机号查询会员可以核销的卡券或扫码核销（扫码时，请保证输入框有光标闪烁）</div>
<div class="input_box" >
<div style="width: 40%;margin-right: 15px">
<el-input v-model="queryParams.mobile" placeholder="请输入会员手机号码"></el-input>
<el-input v-model="queryParams.mobile" placeholder="请输入会员手机号码或卡券核销码"></el-input>
</div>
<div >
<el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
</div>
<el-button type="primary" @click="getList">搜索 / 核销</el-button>
</div>+
</div>
<div class="wrap-box">
<div class="coupon-box" @click="getcardExchangeRecord(item.id)" v-for="(item,index) in couponList" :key="index">
<div class="box-hei">{{item.exchangeName}} </div>
<div class="box-hui"><span>券码:</span> <span>{{item.ticketCode}}</span> </div>
<div class="box-hui"><span>有效期:</span> <span>{{item.outTime}}</span> </div>
<div class="box-hui"><span>获得方式:</span> <span>{{item.exchangeFrom}}</span> </div>
<!-- <div class="anniu" >-->
<!-- <span>立即核销</span>-->
<!-- </div>-->
<div style="margin-left: 30%;width: 57%">
<div class="box-hei">{{item.exchangeName}} </div>
<div class="box-hui"><span>领取人：</span> <span>{{item.mobile || '匿名'}}</span> </div>
<div class="box-hui"><span>核销码：</span> <span>{{item.ticketCode}}</span> </div>
<div class="box-hui"><span>有效期：</span> <span>{{item.exchangeFrom}}</span> </div>
</div>
<div class="hx_">
立即核销
</div>->
</div>
</div>
<el-empty :image-size="300" v-if="total == 0"></el-empty>
</div>
</div>
</template>
<script>
import { listRecord,cardExchangeRecord } from "@/api/online";
import writeList from "@/views/cashier/NewComponents/writeList.vue";
export default {
name: 'index',
data(){
@ -50,6 +54,7 @@ export default {
name: "核销记录",
},
],
num:13964068390,
queryParams : {
pageNum: 1,
pageSize: 999,
@ -75,6 +80,9 @@ export default {
total:0,
}
},
components:{
writeList
},
methods:{
getindex(index) {
this.tabindex = index
@ -149,11 +157,12 @@ export default {
width: 335px;
height: 100px;
background: #ffffff;
border: 1px solid #eef1f6;
border-radius: 2px;
margin: 10px;
background: url("./imgs/qname.png") no-repeat;
background-size: 100% 100%;
display: flex;
align-items: center;
}
.box-top{
width: 100%;
@ -176,16 +185,16 @@ export default {
color: #999999;
display: flex;
font-size: 12px;
margin-left: 30%;
align-items: center;
}
.box-hei{
box-sizing: border-box;
padding: 0px 15px;
color: #333;
display: flex;
font-size: 14px;
margin-left: 30%;
margin-top: 15px;
font-size: 14px;font-weight: 600;
margin-bottom: 5px;
}
.anniu{
box-sizing: border-box;
@ -208,8 +217,8 @@ export default {
box-sizing: border-box;
padding: 15px;
border-radius: 8px;
min-height: 80vh;
margin: 15px auto;
min-height: 92vh;
margin: 10px auto;
}
.tab-box {
width: 100%;
@ -217,7 +226,7 @@ export default {
background: #fff;
display: flex;
box-sizing: border-box;
margin-bottom: 25px;
margin-bottom: 15px;
}
@ -257,4 +266,10 @@ export default {
justify-content: center;
}
.hx_{
background: #ff9655;
color: #fff;
width: 14px;
margin-left: 12px;
}
</style>

110
fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
View File

@ -1,6 +1,6 @@
<!--挂账管理1new-->
<template>
<div class="app-center">
<div class="app-centser">
<!-- 查询-->
<div class="top_new">
<el-form :model="queryParams2" ref="queryForm" size="small" :inline="true" label-width="80px">
@ -60,7 +60,7 @@
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery1">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery1">重置</el-button>
<el-button type="primary" size="mini" @click="addUnit">新增挂账单位</el-button>
<el-button type="primary" @click="addUnit">新增挂账单位</el-button>
</el-form-item>
</el-form>
</div>
@ -203,18 +203,16 @@
</el-table-column>
</el-table>
<div class="pagination-box">
<pagination
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</div>
<div class="pagination-box">
<el-pagination
background
layout="prev, pager, next"
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
</div>
</div>
@ -603,16 +601,6 @@
<!-- 批量挂账归还-->
<el-dialog title="批量挂账归还" :visible.sync="open3" append-to-body>
<!-- <el-form ref="form3" :model="form3">-->
<!-- <el-form-item>-->
<!-- <el-input placeholder="请输入挂账单位、挂账人、挂账人手机号检索"-->
<!-- v-model="unitName"-->
<!-- @keyup.enter.native="getRepayList"-->
<!-- clearable class="input-with-select">-->
<!-- <el-button slot="append" icon="el-icon-search" @click="getRepayList">查询</el-button>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<div>
<el-table
ref="multipleTable"
@ -1585,99 +1573,47 @@ import {getLodop} from "@/api/LodopFuncs";
.size-hui{
display: flex;
align-items: center;
//width: 200px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 13px;
color: #888888;
//line-height: 0px;
text-align: left;
font-style: normal;
text-transform: none;
.nei {
width: 200px;
}
}
.size-bole{
//font-weight: bold;
//width: 53px;
height: 31px;
font-family: YouSheBiaoTiHei;
font-weight: 400;
font-size: 24px;
color: #555555;
//line-height: 0px;
text-align: left;
font-style: normal;
text-transform: none;
}
.icon-img{
//margin-left: 110px;
width: 100%;
height: 20px;
margin-right: 5px;
img{
float: right;
//width: 100%;
width: 20px;
height: 100%;
}
}
.wgang{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 20px;
}
.table-box{
width: 100%;
height: 75vh;
overflow: auto;
}
.pagination-box{
width: 100%;
margin: 10px auto;
display: flex;
align-items: center;
justify-content: center;
}
.top-app-sou{
width: 20%;
}
.box1{
padding: 5px;
margin-right: 20px;
margin-bottom: 20px;
padding-left: 20px;
width: 211px;
height: 60px;
background: rgba(255,150,85,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #FF9655;
justify-content: flex-end;
}
.top_new{
display: flex;
justify-content: space-between;
height: 64px;
background: #fff;
width: 98%;
margin: 10px auto;
width: 100%;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
margin-bottom: 10px;
margin-bottom: 5px;
}
.top_news{
background: #fff;
width: 98%;
margin: 10px auto;
width: 100%;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
margin-bottom: 10px;
margin-bottom: 5px;
}
.box2 {
padding: 5px;
@ -1689,4 +1625,8 @@ import {getLodop} from "@/api/LodopFuncs";
border-radius: 6px 6px 6px 6px;
border: 1px solid #FF9655;
}
.app-centser{
padding: 10px;
box-sizing: border-box;
}
</style>

124
fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue Normal file
View File

@ -0,0 +1,124 @@
<template>
<div>
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" style="width: 100%" :inline="true" >
<el-form-item label="" prop="payUser">
<el-input
v-model="queryParams.payUser"
placeholder="请选择优惠券名称"
clearable
/>
</el-form-item>
<el-form-item label="" prop="payUser">
<el-input
v-model="queryParams.payUser"
placeholder="请输入用户手机号"
clearable
/>
</el-form-item>
<el-form-item label="">
<el-date-picker
v-model="beginTime"
style="width: 160px"
type="date"
placeholder="交易开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 160px"
type="date"
placeholder="交易结束日期">
</el-date-picker>
</el-form-item>
<el-form-item >
</el-form-item>
</el-form>
<div style="height: 32px;width: 20%;display: flex;justify-content: flex-end">
<el-button type="primary" icon="el-icon-search" @click="">查询</el-button>
<el-button icon="el-icon-refresh" @click="">重置</el-button>
</div>
</div>
<div class="table-box">
<el-table
:data="list"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column label="优惠券名称" align="center" prop="orderNo" width="220"/>
<el-table-column label="优惠券类型" align="center" prop="terminal"/>
<el-table-column label="用户手机号" align="center" prop="terminal"/>
<el-table-column label="有效日期" align="center" prop="terminal"/>
<el-table-column label="可用时间" align="center" prop="terminal"/>
<el-table-column label="兑换内容" align="center" prop="terminal"/>
<el-table-column label="使用条件" align="center" prop="terminal"/>
<el-table-column label="核销人" align="center" prop="terminal"/>
<el-table-column label="核销时间" align="center" prop="terminal"/>
<el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button style="color: #fe8c4a" @click="patchwork(scope.row)"
type="text" >补打
</el-button>
<el-button style="color: #fe8c4a"
v-if="scope.row.status === 'paid'"
@click="refHandleRefund(scope.row.id)"
type="text">退款
</el-button>
</template>
</el-table-column>
</el-table>
<div class="pagination-box">
<el-pagination
background
layout="prev, pager, next"
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
</div>
</div>
</div>
</template>
<script>
export default {
name: "order_Goods",
data() {
return {
List:[],
beginTime:'',
endTime:'',
queryParams: {
page: 1,
pageSize: 10,
},
total:0
}
},
methods:{
getList(){
}
}
}
</script>
<style scoped lang="scss">
.top_new{
display: flex;
justify-content: space-between;
background: #fff;
width: 100%;
border-radius: 8px;
box-sizing: border-box;
height: 64px;
}
</style>

1
fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
View File

@ -938,6 +938,5 @@ export default {
box-sizing: border-box;
padding: 15px;
height: 64px;
}
</style>

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

@ -1,8 +1,12 @@
<template>
<div class="app-container">
<div>
<div class="breadcrumb" >
<span style="cursor: pointer" @click="goBack">当前位置：会员--会员详情</span>
</div>
<div class="app-cont">
<div class="wit_box">
<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%">
@ -621,6 +625,7 @@
</div>
</div>
</div>
</template>
<script>
@ -876,6 +881,7 @@ export default {
this.getAllAmount()
},
methods: {
// 计算找零金额
changeSeekZero(){
if (this.flag === 1) {
@ -1829,7 +1835,7 @@ export default {
},
// 返回
goBack() {
this.$router.back(-1);
this.$router.go(-1);
},
// 积分表、电子储值卡详情表、积分详情表、电子储值卡表、电子储值卡模板表、用户电子储值卡关联表、
@ -2099,8 +2105,8 @@ export default {
background: #fff;
border-radius: 8px;
box-sizing: border-box;
padding: 10px;
height: 85vh;
padding: 10px 15px ;
height: 82vh;
}
.user-box{
width: 100%;
@ -2142,4 +2148,19 @@ export default {
justify-content: space-between;
margin-bottom: 20px;
}
.breadcrumb{
width: 100%;
height: 40px;
background: #fff;
box-sizing: border-box;
padding: 15px;
font-weight: 400;
font-size: 12px;
color: #666666;
margin-bottom: 5px;
}
.app-cont{
box-sizing: border-box;
padding: 10px;
}
</style>

7
fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue
View File

@ -6,7 +6,7 @@
<el-radio-button label="expired">已过期</el-radio-button>
<el-radio-button label="whole">全部</el-radio-button>
</el-radio-group>
<div>
<div class="table-box">
<el-table ref="tables" border v-loading="loading" :data="list">
<el-table-column label="序号" type="index"/>
<el-table-column align="center" prop="storeName" label="所属油站">
@ -166,4 +166,9 @@ export default {
box-sizing: border-box;
padding: 10px 0;
}
.table-box{
width: 100%;
height: 60vh;
overflow: auto;
}
</style>

8
fuintCashierWeb/src/views/details/userInfoOrder/goodsOrder.vue
View File

@ -4,6 +4,7 @@
<div class="gang"></div>
<div class="g-class">商品消费记录</div>
</div>
<div class="table-box">
<el-table ref="tables" border v-loading="loading" :data="list">
<el-table-column label="序号" type="index"/>
<el-table-column label="所属油站" prop="storeName" align="center">
@ -35,7 +36,7 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
:total="total"
:page.sync="queryParams.page"
@ -112,4 +113,9 @@ export default {
box-sizing: border-box;
padding: 10px 0;
}
.table-box{
width: 100%;
height: 60vh;
overflow: auto;
}
</style>

8
fuintCashierWeb/src/views/details/userInfoOrder/growthValueRecord.vue
View File

@ -4,6 +4,7 @@
<div class="gang"></div>
<div class="g-class">成长值记录</div>
</div>
<div class="table-box">
<el-table ref="tables" border v-loading="loading" :data="list">
<el-table-column label="序号" type="index"/>
<el-table-column label="所属油站" prop="storeName" align="center">
@ -24,7 +25,7 @@
<el-table-column label="变动后成长值" align="center" prop="afterTheChange" />
<el-table-column label="描述" align="center" prop="fromType" />
</el-table>
</div>
<pagination
:total="total"
:page.sync="queryParams.page"
@ -97,4 +98,9 @@ export default {
box-sizing: border-box;
padding: 10px 0;
}
.table-box{
width: 100%;
height: 60vh;
overflow: auto;
}
</style>

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

@ -4,6 +4,7 @@
<div class="gang"></div>
<div class="g-class">油品消费记录</div>
</div>
<div class="table-box">
<el-table ref="tables" border v-loading="loading" :data="list">
<el-table-column label="序号" type="index"/>
<el-table-column label="所属油站" prop="storeName" align="center"/>
@ -49,7 +50,7 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
:total="total"
:page.sync="queryParams.page"
@ -162,4 +163,9 @@ export default {
box-sizing: border-box;
padding: 10px 0;
}
.table-box{
width: 100%;
height: 60vh;
overflow: auto;
}
</style>

8
fuintCashierWeb/src/views/details/userInfoOrder/oilStorageCard.vue
View File

@ -4,6 +4,7 @@
<div class="gang"></div>
<div class="g-class">囤油卡记录</div>
</div>
<div class="table-box">
<el-table ref="tables2" border key="2" v-loading="loading" :data="fuelList">
<el-table-column label="序号" type="index"/>
<el-table-column align="center" label="所属油站" prop="storeName">
@ -37,7 +38,7 @@
<el-table-column label="描述" align="center" prop="fromType"/>
<el-table-column label="变动时间" align="center" prop="createTime"/>
</el-table>
</div>
<pagination
:total="fuelTotal"
:page.sync="queryFuelParams.page"
@ -147,4 +148,9 @@ export default {
box-sizing: border-box;
padding: 10px 0;
}
.table-box{
width: 100%;
height: 60vh;
overflow: auto;
}
</style>

10
fuintCashierWeb/src/views/details/userInfoOrder/pointsRecord.vue
View File

@ -4,6 +4,9 @@
<div class="gang"></div>
<div class="g-class">会员资产</div>
</div>
<div class="table-box">
<el-table ref="tables" border v-loading="loading" :data="list">
<el-table-column label="序号" type="index"/>
<el-table-column label="所属油站" prop="storeName" align="center"/>
@ -20,7 +23,7 @@
<el-table-column label="变动后积分" align="center" prop="currentPoints" />
<el-table-column label="描述" align="center" prop="changeReason"/>
</el-table>
</div>
<pagination
:total="total"
:page.sync="queryParams.page"
@ -86,4 +89,9 @@ export default {
box-sizing: border-box;
padding: 10px 0;
}
.table-box{
width: 100%;
height: 60vh;
overflow: auto;
}
</style>

10
fuintCashierWeb/src/views/details/userInfoOrder/storedCard.vue
View File

@ -4,6 +4,7 @@
<div class="gang"></div>
<div class="g-class">储值卡记录</div>
</div>
<div class="table-box">
<el-table key="1" ref="tables" v-loading="loading" :data="cardList">
<el-table-column label="序号" type="index"/>
<el-table-column align="center" prop="storeName" label="所属油站"/>
@ -24,7 +25,7 @@
</el-table-column>
<el-table-column align="center" prop="afterTheChange" label="变动后余额">
<template slot-scope="scope">
<span>{{ scope.row.afterTheChange?scope.row.afterTheChange : '/'}}</span>
<span>{{ scope.row.afterTheChange?(scope.row.afterTheChange).toFixed(2) : '/'}}</span>
</template>
</el-table-column>
@ -33,7 +34,7 @@
<el-table-column align="center" prop="fromType" label="描述"/>
<el-table-column align="center" prop="createTime" label="变动时间"/>
</el-table>
</div>
<pagination
:total="cardTotal"
:page.sync="queryCardParams.page"
@ -144,4 +145,9 @@ export default {
box-sizing: border-box;
padding: 10px 0;
}
.table-box{
width: 100%;
height: 60vh;
overflow: auto;
}
</style>