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 13:57:18 +08:00
parent 3997cb795d
commit 23e9d78e8c
13 changed files with 303 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
fuintAdmin/src/views/integral/order/pointsCashier.vue
View File

@ -1,4 +1,5 @@
<template>
<!-- 积分商城订单-->
<div class="app-container">
<el-card >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
@ -12,7 +13,7 @@
/>
</el-form-item>
<el-form-item label="">
<el-select v-model="queryParams.status" style="width: 150px" placeholder="兑换状态" clearable>
<el-select v-model="queryParams.status" style="width: 220px" placeholder="兑换状态" clearable>
<el-option label="未支付" value="unpaid">未支付</el-option>
<el-option label="付款成功" value="paid">付款成功</el-option>
<el-option label="付款失败" value="payFail">付款失败</el-option>
@ -23,7 +24,7 @@
v-model="queryParams.mobile"
placeholder="手机号码"
clearable
style="width: 160px;"
style="width: 220px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@ -41,14 +42,14 @@
<!-- ></el-date-picker>-->
<el-date-picker
v-model="beginTime"
style="width: 160px"
style="width: 220px"
type="date"
placeholder="开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 160px"
style="width: 220px"
type="date"
placeholder="结束日期">
</el-date-picker>
@ -115,45 +116,48 @@
</el-card>
<el-card style="margin-top: 20px;" >
<el-table ref="tables"
v-loading="loading"
:data="dataList"
:default-sort="defaultSort"
>
<el-table-column label="用户手机号" align="center" prop="mobile"/>
<el-table-column label="订单号" align="center" prop="orderNumber"/>
<el-table-column label="商品信息" align="center" prop="" >
<el-table-column label="简述" align="center" prop="categoryName" />
<el-table-column label="商品名称" align="center" prop="giftName" />
</el-table-column>
<el-table-column label="实付信息" align="center" >
<el-table-column label="积分" align="center" prop="integral" width=""/>
<el-table-column label="支付金额" align="center" prop="amount" width="">
<div class="table-box">
<el-table ref="tables"
v-loading="loading"
:data="dataList"
:default-sort="defaultSort"
>
<el-table-column label="用户手机号" align="center" prop="mobile"/>
<el-table-column label="订单号" align="center" prop="orderNumber"/>
<el-table-column label="商品信息" align="center" prop="" >
<el-table-column label="简述" align="center" prop="categoryName" />
<el-table-column label="商品名称" align="center" prop="giftName" />
</el-table-column>
<el-table-column label="实付信息" align="center" >
<el-table-column label="积分" align="center" prop="integral" width=""/>
<el-table-column label="支付金额" align="center" prop="amount" width="">
<template slot-scope="scope">
{{ scope.row.amount?scope.row.amount:"--" }}
</template>
</el-table-column>
</el-table-column>
<el-table-column label="支付状态" align="center" prop="status" width="">
<template slot-scope="scope">
{{ scope.row.amount?scope.row.amount:"--" }}
<el-tag effect="plain" v-if="scope.row.status =='unpaid'"> 待支付</el-tag>
<el-tag type="success" effect="plain" v-else-if="scope.row.status =='paid'">支付成功</el-tag>
<el-tag type="warning" effect="plain" v-else>支付失败</el-tag>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="支付状态" align="center" prop="status" width="">
<template slot-scope="scope">
<el-tag effect="plain" v-if="scope.row.status =='unpaid'"> 待支付</el-tag>
<el-tag type="success" effect="plain" v-else-if="scope.row.status =='paid'">支付成功</el-tag>
<el-tag type="warning" effect="plain" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width=""/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleDetail(scope.row)"
>订单详情</el-button>
<el-table-column label="创建时间" align="center" prop="createTime" width=""/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleDetail(scope.row)"
>订单详情</el-button>
</template>
</el-table-column>
</el-table>
</div>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -308,8 +312,13 @@ export default {
border-radius: 6px 6px 6px 6px;
border: 1px solid #fe8c4a;
}
.table-box {
width: 100%;
height: 66vh;
overflow: auto;
}
.el-form--inline .el-form-item {
margin-right: 44px;
margin-right: 20px;
}
.size-hui{
display: flex;
@ -323,9 +332,7 @@ export default {
text-align: left;
font-style: normal;
text-transform: none;
.nei {
width: 150px;
}
}
.size-bole{
//font-weight: bold;
@ -343,6 +350,7 @@ export default {
}
.font-chinese {
font-size: 15px;
font-family:Microsoft YaHei;
font-weight: bold;

21
fuintAdmin/src/views/power/banner.vue
View File

@ -44,7 +44,6 @@
type="primary"
icon="el-icon-plus"
@click="handleAdd"
v-hasPermi="['setting:banner:add']"
>新增banner图</el-button>
</el-form-item>
</el-form>
@ -119,14 +118,14 @@
@close="close()"
:title="title"
:close-on-click-modal="false"
:visible.sync="open" width="28%"
:visible.sync="open" width="26%"
append-to-body>
<el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules">
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
<el-form-item label="banner名称" prop="bannerName">
<el-input v-model="deviceInfo.bannerName" style="width: 300px"></el-input>
</el-form-item>
<el-form-item label="图片" prop="uploadAction">
<el-form-item label="图片" prop="productImage">
<el-upload
:action="uploadAction"
list-type="picture-card"
@ -158,7 +157,7 @@
<el-form-item label="排序号" prop="sortOrder">
<el-input v-model="deviceInfo.sortOrder" style="width: 300px"></el-input>
</el-form-item>
<el-form-item label="Banner链接" prop="bannerLink">
<el-form-item label="Banner链接" prop="">
<el-input v-model="deviceInfo.bannerLink" style="width: 300px"></el-input>
</el-form-item>
<el-form-item label="Banner状态" prop="bannerStatus">
@ -168,15 +167,16 @@
inactive-color="#ff4949">
</el-switch>
</el-form-item>
<el-form-item label="备注" prop="note">
<el-form-item label="备注" prop="">
<el-input v-model="deviceInfo.note" style="width: 300px" ></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
<el-button @click="open=false">取消</el-button>
</el-form-item>
</el-form>
</el-form>
<div style="display: flex;align-items: center;justify-content: center">
<el-button @click="open=false">取消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
</div>
</el-dialog>
</div>
@ -225,6 +225,9 @@ export default {
bannerName:[
{required: true, message: '请填写banner名称', trigger: 'blur'},
],
productImage:[
{required: true, message: '请填写banner图片', trigger: 'blur'},
],
systemPosition:[
{required: true, message: '请填写系统位置', trigger: ''},
],

2
fuintAdmin/vue.config.js
View File

@ -32,7 +32,7 @@ module.exports = {
productionSourceMap: false,
// webpack-dev-server 相关配置
devServer: {
host: '0.0.0.0',
host: '192.168.31.178',
port: port,
open: true,
proxy: {

2
fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
View File

@ -101,7 +101,7 @@ export default {
background: #fff;
display: flex;
box-sizing: border-box;
margin-bottom: 25px;
margin-bottom: 15px;
}
.tab_ {

299
fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue
View File

@ -1,24 +1,16 @@
<template>
<div class="app-container">
<div class="tab-box">
<div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in tabs"
:key="index">
{{ item.name }}
</div>
</div>
<div class="cot-box" v-if="tabindex==0">
<div style="display: flex;align-items: center;justify-content: space-between">
<!-- <div class="tab-box">-->
<!-- <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in tabs"-->
<!-- :key="index">-->
<!-- {{ item.name }}-->
<!-- </div>-->
<!-- </div>-->
<div style="width: 100%;height: 15px"></div>
<div style=" width: 100%; display: flex;justify-content: space-between; height: 56px; border-radius: 8px; background: #fff;box-sizing: border-box;padding: 10px;width: 98%;margin: 0 auto;margin-bottom: 5px;">
<div style=" width: 100%;display: flex;justify-content: space-between;margin-left: 10px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="" prop="userNo">
<el-input
v-model="queryParams.name"
placeholder="请输入会员昵称"
clearable
style="width: 180px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="userNo">
<el-input
v-model="queryParams.userNo"
@ -75,32 +67,25 @@
</el-date-picker>
</el-form-item>
<div style="float: right">
<el-button style="background: linear-gradient( 180deg, #FF8646 0%, #FFA360 100%); border: transparent "
type="primary" @click="handleQuery">搜索
</el-button>
<el-button @click="resetQuery">重置</el-button>
<!-- <el-button type="primary" @click="handleAdd" v-hasPermi="['member:index:add']" >新增</el-button>-->
<el-button type="primary" @click="addOne"
v-hasPermi="['member:index:add']"
>新增会员
</el-button>
<el-button type="primary" @click="addMult"
v-hasPermi="['member:index:add']"
>批量新增
</el-button>
<el-button type="primary" @click="handleMassSend"
v-hasPermi="['member:index:add']"
>会员群发
</el-button>
</div>
</el-form>
<div style="margin-right: 10px">
<el-button style="background: linear-gradient( 180deg, #FF8646 0%, #FFA360 100%); border: transparent "
type="primary" @click="handleQuery">搜索
</el-button>
<el-button @click="resetQuery">重置</el-button>
<!-- <el-button type="primary" @click="handleAdd" v-hasPermi="['member:index:add']" >新增</el-button>-->
<el-button type="primary" @click="addOne"
v-hasPermi="['member:index:add']">新增会员
</el-button>
</div>
</div>
</div>
<div class="cot-box" style="margin-top: 5px" v-if="tabindex==0">
<!-- </el-card>-->
<div>
@ -111,7 +96,7 @@
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #0DC291"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">激活会员总数</div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">注册会员总数</div>
</div>
</div>
<div class="box2">
@ -156,7 +141,7 @@
<!-- <el-card style="margin-top: 20px">-->
<div style="height: 58vh;overflow: auto;margin-top: 15px">
<div style="height: 72vh;overflow: auto;margin-top: 15px">
<el-table ref="tables" v-loading="loading" :data="list" border
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
@ -204,7 +189,7 @@
<div>{{ scope.row.rechargeNum || 0 }}</div>
</template>
</el-table-column>
<el-table-column label="余额（元）" align="center" prop="cardBalance">
<el-table-column label="会员总余额（元）" align="center" prop="cardBalance">
<template slot-scope="scope">
<div>{{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : 0 }}</div>
</template>
@ -417,156 +402,92 @@
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-row>
<el-col :span="24">
<el-form-item label="会员名称" prop="name">
<el-input v-model="form.name" placeholder="请输入会员名称" maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="手机号" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入手机号" maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="性别" prop="sex">
<div class="d-s">
<div class="icon-type" v-for="(item,index) in sexTypelist" :key="index"
:class="{ 'acvtive1' : index === tindex }" @click="Typeindex(index)">
<img src="@/assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex">
<img src="@/assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex">
{{ item }}
</div>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="会员号" prop="userNo">
<el-input v-model="form.userNo" :disabled="form.id" placeholder="请输入会员号，为空系统将自动分配" maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="会员等级" prop="gradeId">
<el-select
v-model="form.gradeId"
placeholder="请选择会员等级"
style="width: 100%"
>
<el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="会员标签" prop="userLabelId">
<el-select
multiple
v-model="form.userLabelId"
placeholder="请选择会员标签（多选）"
style="width: 100%"
>
<el-option v-for="(item,index) in userLabelList" :key="index" :label="item.labelName"
:value="item.id+''"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="会员名称" prop="name">
<el-input v-model="form.name" placeholder="请输入会员名称" maxlength="30"/>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入手机号" maxlength="30"/>
</el-form-item>
<el-form-item label="性别" prop="sex">
<div class="d-s">
<div class="icon-type" v-for="(item,index) in sexTypelist" :key="index"
:class="{ 'acvtive1' : index === tindex }" @click="Typeindex(index)">
<img src="@/assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex">
<img src="@/assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex">
{{ item }}
</div>
</div>
</el-form-item>
<el-form-item label="会员号" prop="userNo">
<el-input v-model="form.userNo" :disabled="form.id" placeholder="请输入会员号，为空系统将自动分配" maxlength="30"/>
</el-form-item>
<el-form-item label="会员等级" prop="gradeId">
<el-select
v-model="form.gradeId"
placeholder="请选择会员等级"
style="width: 100%"
>
<el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id"/>
</el-select>
</el-form-item>
<el-form-item label="会员标签" prop="userLabelId">
<el-select
multiple
v-model="form.userLabelId"
placeholder="请选择会员标签（多选）"
style="width: 100%"
>
<el-option v-for="(item,index) in userLabelList" :key="index" :label="item.labelName"
:value="item.id+''"></el-option>
</el-select>
</el-form-item>
<el-form-item label="车牌号" prop="carNo">
<el-input v-model="form.carNo" placeholder="请输入车牌号" maxlength="30"/>
</el-form-item>
<el-form-item label="所属机构" prop="storeId" v-if="form.id">
<el-select
v-model="form.mubStoreId"
placeholder="请选择所属机构"
style="width: 100%"
>
<el-option v-for="(item,index) in storeList" :key="index" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
<el-form-item label="身份证号" prop="idcard">
<el-input v-model="form.idcard" placeholder="请输入身份证号" maxlength="30"/>
</el-form-item>
<el-form-item label="初始积分" prop="points" v-if="!form.id">
<el-input v-model="form.points" placeholder="请输入会员初始积分"
maxlength="30"/>
</el-form-item>
<el-form-item label="初始成长值" prop="growthValue" v-if="!form.id">
<el-input v-model="form.growthValue" placeholder="请输入会员初始成长值"
maxlength="30"/>
</el-form-item>
<el-form-item label="储值余额" prop="cardBalance" v-if="!form.id">
<el-input v-model="form.cardBalance" placeholder="请输入储值卡初始余额"
maxlength="30"/>
</el-form-item>
<el-form-item label="会员状态" prop="userStatus">
<el-switch
v-model="form.userStatus"
active-value="0"
inactive-value="1"
active-color="#13ce66"
inactive-color="#ff4949">
</el-switch>
</el-form-item>
<el-row>
<el-col :span="24">
<el-form-item label="会员生日" prop="birthday">
<el-date-picker
v-model="form.birthday"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="车牌号" prop="carNo">
<el-input v-model="form.carNo" placeholder="请输入车牌号" maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="所属机构" prop="storeId" v-if="form.id">
<el-select
v-model="form.mubStoreId"
placeholder="请选择所属机构"
style="width: 100%"
>
<el-option v-for="(item,index) in storeList" :key="index" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="身份证号" prop="idcard">
<el-input v-model="form.idcard" placeholder="请输入身份证号" maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="初始积分" prop="points" v-if="!form.id">
<el-input v-model="form.points" placeholder="请输入会员初始积分"
maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="初始成长值" prop="growthValue" v-if="!form.id">
<el-input v-model="form.growthValue" placeholder="请输入会员初始成长值"
maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="储值余额" prop="cardBalance" v-if="!form.id">
<el-input v-model="form.cardBalance" placeholder="请输入储值卡初始余额"
maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="会员状态" prop="userStatus">
<el-switch
v-model="form.userStatus"
active-value="0"
inactive-value="1"
active-color="#13ce66"
inactive-color="#ff4949">
</el-switch>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<div style="display: flex;justify-content: center">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 添加或修改对话框 -->
@ -878,7 +799,7 @@ export default {
// 跳转详情页
goDedi(id) {
this.$router.push({
path: "/member/userInfo",
path: "/details",
query: {
id: id
}
@ -1264,7 +1185,8 @@ export default {
display: flex;
align-items: center;
box-sizing: border-box;
padding: 15px;
padding-left: 0px;
}
.k-one {
@ -1380,6 +1302,7 @@ export default {
box-sizing: border-box;
padding: 20px;
margin: 0 auto;
height: 97vh;
}
.d-s {
@ -1403,7 +1326,7 @@ export default {
.box2 {
padding: 5px;
margin-right: 20px;
margin-bottom: 20px;
padding-left: 20px;
width: 211px;
height: 70px;

56
fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue
View File

@ -1,18 +1,19 @@
<template>
<!-- 积分商城订单-->
<div class="app-containers">
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="giftName">
<el-input
v-model="queryParams.orderNumber"
placeholder="交易单号"
placeholder="交易单号1"
clearable
style="width: 220px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="">
<el-select v-model="queryParams.status" style="width: 150px" placeholder="兑换状态" clearable>
<el-select v-model="queryParams.status" style="width: 220px" placeholder="兑换状态" clearable>
<el-option label="未支付" value="unpaid">未支付</el-option>
<el-option label="付款成功" value="paid">付款成功</el-option>
<el-option label="付款失败" value="payFail">付款失败</el-option>
@ -23,43 +24,31 @@
v-model="queryParams.mobile"
placeholder="手机号码"
clearable
style="width: 160px;"
style="width: 220px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="">
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- style="width: 240px"-->
<!-- size="medium"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- type="daterange"-->
<!-- range-separator="-"-->
<!-- clearable-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- ></el-date-picker>-->
<el-date-picker
v-model="beginTime"
style="width: 160px"
style="width: 220px"
type="date"
placeholder="开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 160px"
style="width: 220px"
type="date"
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item style="float: right">
<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" @click="exportExcelVip()">导出</el-button>
</el-form-item>
</el-form>
<div style="display: flex;align-items: center;">
<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" @click="exportExcelVip()">导出</el-button>
</div>
</div>
@ -102,6 +91,7 @@
</div>
</div>
</div>
<div class="table-box">
<el-table ref="tables"
v-loading="loading"
:data="dataList"
@ -138,6 +128,7 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"
@ -306,6 +297,11 @@ export default {
height: 100%;
}
}
.table-box {
width: 100%;
height: 66vh;
overflow: auto;
}
.box{
//box-sizing: border-box;
padding: 5px;
@ -321,7 +317,7 @@ export default {
border: 1px solid #fe8c4a;
}
.el-form--inline .el-form-item {
margin-right: 44px;
margin-right: 15px;
}
.size-hui{
display: flex;
@ -375,32 +371,34 @@ export default {
justify-content: space-between;
background: #fff;
width: 98%;
margin: 10px auto;
margin: 5px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
padding: 15px;
height: 64px;
}
.cont_box{
background: #fff;
width: 100%;
box-sizing: border-box;
padding: 15px;
display: flex;
padding-left: 0px;
}
.cont_box_b{
background: #fff;
width: 98%;
margin: 10px auto;
margin: 5px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
min-height: 80vh;
padding-top: 0px;
min-height: 85vh;
}
.box2 {
padding: 5px;
margin-right: 20px;
margin-bottom: 20px;
padding-left: 20px;
width: 211px;
height: 70px;

3
fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
View File

@ -116,7 +116,7 @@
</div>
<div class="er-box"></div>
<div class="wrap-box">
<div class="wrap-box" style="position: absolute;bottom: 0;">
<div class="f-box" v-for="(item,index) in payList" :class="{'f-acvite' : item.dictValue == payWay }"
@click="setindex(item.dictValue)" :key="item.dictValue"
>{{ item.dictLabel }}
@ -1698,7 +1698,6 @@ input {
}
.wrap-box {
height: 190px;
display: flex;
position: absolute;
bottom: 0px;

86
fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue
View File

@ -14,17 +14,7 @@
<el-option label="归还" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="status">
<el-select
v-model="queryParams.status"
placeholder="订单状态"
clearable
>
<el-option label="未归还" value="0"></el-option>
<el-option label="已归还" value="1"></el-option>
<el-option label="部分归还" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="unitName">
<el-input
v-model="queryParams.unitName"
@ -49,14 +39,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="mobile">
<el-input
v-model="queryParams.mobile"
placeholder="操作人手机号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="">
<el-date-picker
v-model="beginTime"
@ -72,12 +55,13 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item >
<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" size="mini" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>
</el-form-item>
</el-form>
<div style="display: flex;align-items: center;height: 32px">
<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" @click = "exportExcelCashier()">导出</el-button>
</div>
</div>
<!-- 统计-->
@ -164,15 +148,15 @@
</el-table>
</div>
<div class="pagination-box">
<el-pagination
background
v-show="total>0"
layout="prev, pager, next"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</div>
<!-- 归还记录信息-->
@ -245,15 +229,16 @@
</el-table>
<div class="pagination-box">
<el-pagination
background
layout="prev, pager, next"
v-show="total2>0"
:total="total2"
:page.sync="queryParams1.page"
:limit.sync="queryParams1.pageSize"
@current-change="getRecordList">
</el-pagination>
<pagination
v-show="total2>0"
:total="total2"
:page.sync="queryParams1.page"
:limit.sync="queryParams1.pageSize"
@pagination="getRecordList"
/>
</div>
</el-card>
</div>
@ -526,16 +511,17 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
margin-bottom: 20px;
}
.table-box{
.table-box {
width: 100%;
min-height: 60vh;
height: 65vh;
overflow: auto;
}
.pagination-box{
width: 100%;
margin: 10px auto;
display: flex;
align-items: center;
justify-content: center;
justify-content: flex-end;
}
.top-app-sou{
width: 20%;
@ -568,10 +554,11 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
justify-content: space-between;
background: #fff;
width: 98%;
margin: 10px auto;
margin: 5px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
padding: 15px;
height: 64px;
}
.cont_new{
background: #fff;
@ -584,9 +571,10 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
.bottom_new{
background: #fff;
width: 98%;
margin: 10px auto;
margin: 5px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
padding: 15px;
height: 85vh;
}
</style>

29
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

@ -204,14 +204,13 @@
</el-table>
</div>
<div class="pagination-box">
<el-pagination
<pagination
v-show="total>0"
layout="prev, pager, next, jumper"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
@pagination="getList"
/>
</div>
</div>
@ -394,12 +393,7 @@
label="地址">
</el-table-column>
</el-table>
</div>
</el-drawer>
<!-- 订单详情-->
@ -489,18 +483,6 @@
<span>{{ scope.row.oilPrice }}/L</span>
</template>
</el-table-column>
<!-- <el-table-column label="满减活动优惠" align="center" prop="activeId">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.activeType==1">{{ scope.row.deductionAmount }}</span>-->
<!-- <span v-else>0</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="折扣活动优惠" align="center" prop="activeId">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.activeType==2">{{ scope.row.deductionAmount }}</span>-->
<!-- <span v-else>0</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-descriptions-item>
<el-descriptions-item label="商品详情">
@ -1565,7 +1547,8 @@ export default {
.table-box {
width: 100%;
height: 65vh;
overflow: auto;
}
.pagination-box {
@ -1592,7 +1575,7 @@ export default {
box-sizing: border-box;
padding: 20px;
margin: 0 auto;
min-height: 84vh;
height: 85vh;
}
.top_new{
display: flex;

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

@ -136,6 +136,7 @@
<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"/>
@ -871,7 +872,7 @@ export default {
.table-box {
width: 100%;
min-height: 70vh;
min-height: 69vh;
}
.pagination-box {
@ -930,12 +931,13 @@ export default {
.top_new{
display: flex;
justify-content: space-between;
background: #fff;
width: 100%;
margin: 10px auto;
width: 98%;
margin: 5px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
padding: 15px;
height: 64px;
}
</style>

33
fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
View File

@ -181,7 +181,7 @@
</div>
</div>
<div class="new_bottom">
<div>
<el-table
v-loading="loading"
border
@ -253,17 +253,17 @@
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination-box">
<el-pagination
v-show="total>0"
layout="prev, pager, next, jumper"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
</div>
</div>
<div class="pagination-box">
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</div>
<!-- 订单退款 密码 -->
@ -1040,6 +1040,7 @@ export default {
box-sizing: border-box;
padding: 20px;
margin: 0 auto;
height: 79vh;
}
.top_new{
display: flex;
@ -1053,6 +1054,12 @@ export default {
padding: 15px;
}
.new_bottom{
min-height: 65vh;
height: 59vh;
overflow: auto;
}
.table-box {
width: 100%;
height: 66vh;
overflow: auto;
}
</style>

27
fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
View File

@ -63,7 +63,7 @@
</el-form-item>
</el-form>
<div style="height: 32px;width: 16%">
<div style="height: 32px;width: 20%;text-align: right">
<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" @click="exportExcelVip()">导出</el-button>
@ -133,6 +133,7 @@
<div>
<div class="table-box">
<el-table
border
:data="list"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
@ -185,15 +186,13 @@
</el-table>
</div>
<div class="pagination-box">
<el-pagination
background
<pagination
v-show="total>0"
layout="prev, pager, next"
:total="total"
:page.sync="queryParams.pageNo"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
@pagination="getList"
/>
</div>
@ -654,6 +653,8 @@ export default {
.table-box {
width: 100%;
height: 65vh;
overflow: auto;
}
.pagination-box {
@ -661,7 +662,7 @@ export default {
margin: 10px auto;
display: flex;
align-items: center;
justify-content: center;
justify-content: flex-end;
}
.tk {
@ -702,15 +703,21 @@ export default {
box-sizing: border-box;
padding: 20px;
margin: 0 auto;
height: 85vh;
}
.top_new{
display: flex;
justify-content: space-between;
background: #fff;
width: 98%;
margin: 10px auto;
margin: 5px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
padding: 15px;
height: 64px;
}
.el-form--inline .el-form-item {
margin-right: 20px;
}
</style>

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

@ -1,13 +1,17 @@
<template>
<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>
<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 @click="subCard">子卡管理<i
class="el-icon-bank-card el-icon--right"></i></el-button>
<!-- <el-button type="primary" plain round>会员码</el-button>-->
</div>
</div>
@ -2376,4 +2380,11 @@ export default {
font-weight: 400;
font-size: 20px;
}
.wit_box{
width: 100%;
background: #fff;
border-radius: 8px;
box-sizing: border-box;
padding: 10px;
}
</style>