10.8
This commit is contained in:
DESKTOP-369JRHT\12997
parent
3997cb795d
commit
23e9d78e8c
@ -1,4 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
|
<!-- 积分商城订单-->
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-card >
|
<el-card >
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
|
||||||
@ -12,7 +13,7 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="">
|
<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="unpaid">未支付</el-option>
|
||||||
<el-option label="付款成功" value="paid">付款成功</el-option>
|
<el-option label="付款成功" value="paid">付款成功</el-option>
|
||||||
<el-option label="付款失败" value="payFail">付款失败</el-option>
|
<el-option label="付款失败" value="payFail">付款失败</el-option>
|
||||||
@ -23,7 +24,7 @@
|
|||||||
v-model="queryParams.mobile"
|
v-model="queryParams.mobile"
|
||||||
placeholder="手机号码"
|
placeholder="手机号码"
|
||||||
clearable
|
clearable
|
||||||
style="width: 160px;"
|
style="width: 220px;"
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -41,14 +42,14 @@
|
|||||||
<!-- ></el-date-picker>-->
|
<!-- ></el-date-picker>-->
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="beginTime"
|
v-model="beginTime"
|
||||||
style="width: 160px"
|
style="width: 220px"
|
||||||
type="date"
|
type="date"
|
||||||
placeholder="开始日期">
|
placeholder="开始日期">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
至
|
至
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="endTime"
|
v-model="endTime"
|
||||||
style="width: 160px"
|
style="width: 220px"
|
||||||
type="date"
|
type="date"
|
||||||
placeholder="结束日期">
|
placeholder="结束日期">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
@ -115,45 +116,48 @@
|
|||||||
</el-card>
|
</el-card>
|
||||||
|
|
||||||
<el-card style="margin-top: 20px;" >
|
<el-card style="margin-top: 20px;" >
|
||||||
<el-table ref="tables"
|
<div class="table-box">
|
||||||
v-loading="loading"
|
<el-table ref="tables"
|
||||||
:data="dataList"
|
v-loading="loading"
|
||||||
:default-sort="defaultSort"
|
: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="mobile"/>
|
||||||
<el-table-column label="商品信息" align="center" prop="" >
|
<el-table-column label="订单号" align="center" prop="orderNumber"/>
|
||||||
<el-table-column label="简述" align="center" prop="categoryName" />
|
<el-table-column label="商品信息" align="center" prop="" >
|
||||||
<el-table-column label="商品名称" align="center" prop="giftName" />
|
<el-table-column label="简述" align="center" prop="categoryName" />
|
||||||
</el-table-column>
|
<el-table-column label="商品名称" align="center" prop="giftName" />
|
||||||
<el-table-column label="实付信息" align="center" >
|
</el-table-column>
|
||||||
<el-table-column label="积分" align="center" prop="integral" width=""/>
|
<el-table-column label="实付信息" align="center" >
|
||||||
<el-table-column label="支付金额" align="center" prop="amount" width="">
|
<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">
|
<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>
|
</template>
|
||||||
</el-table-column>
|
</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" prop="createTime" width=""/>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
@click="handleDetail(scope.row)"
|
@click="handleDetail(scope.row)"
|
||||||
>订单详情</el-button>
|
>订单详情</el-button>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</div>
|
||||||
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
<pagination
|
<pagination
|
||||||
v-show="total>0"
|
v-show="total>0"
|
||||||
:total="total"
|
:total="total"
|
||||||
@ -308,8 +312,13 @@ export default {
|
|||||||
border-radius: 6px 6px 6px 6px;
|
border-radius: 6px 6px 6px 6px;
|
||||||
border: 1px solid #fe8c4a;
|
border: 1px solid #fe8c4a;
|
||||||
}
|
}
|
||||||
|
.table-box {
|
||||||
|
width: 100%;
|
||||||
|
height: 66vh;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
.el-form--inline .el-form-item {
|
.el-form--inline .el-form-item {
|
||||||
margin-right: 44px;
|
margin-right: 20px;
|
||||||
}
|
}
|
||||||
.size-hui{
|
.size-hui{
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -323,9 +332,7 @@ export default {
|
|||||||
text-align: left;
|
text-align: left;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
text-transform: none;
|
text-transform: none;
|
||||||
.nei {
|
|
||||||
width: 150px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.size-bole{
|
.size-bole{
|
||||||
//font-weight: bold;
|
//font-weight: bold;
|
||||||
@ -343,6 +350,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.font-chinese {
|
.font-chinese {
|
||||||
|
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
font-family:Microsoft YaHei;
|
font-family:Microsoft YaHei;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|||||||
@ -44,7 +44,6 @@
|
|||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-plus"
|
icon="el-icon-plus"
|
||||||
@click="handleAdd"
|
@click="handleAdd"
|
||||||
v-hasPermi="['setting:banner:add']"
|
|
||||||
>新增banner图</el-button>
|
>新增banner图</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
@ -119,14 +118,14 @@
|
|||||||
@close="close()"
|
@close="close()"
|
||||||
:title="title"
|
:title="title"
|
||||||
:close-on-click-modal="false"
|
:close-on-click-modal="false"
|
||||||
:visible.sync="open" width="28%"
|
:visible.sync="open" width="26%"
|
||||||
append-to-body>
|
append-to-body>
|
||||||
<el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules">
|
<el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules">
|
||||||
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
|
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
|
||||||
<el-form-item label="banner名称" prop="bannerName">
|
<el-form-item label="banner名称" prop="bannerName">
|
||||||
<el-input v-model="deviceInfo.bannerName" style="width: 300px"></el-input>
|
<el-input v-model="deviceInfo.bannerName" style="width: 300px"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="图片" prop="uploadAction">
|
<el-form-item label="图片" prop="productImage">
|
||||||
<el-upload
|
<el-upload
|
||||||
:action="uploadAction"
|
:action="uploadAction"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
@ -158,7 +157,7 @@
|
|||||||
<el-form-item label="排序号" prop="sortOrder">
|
<el-form-item label="排序号" prop="sortOrder">
|
||||||
<el-input v-model="deviceInfo.sortOrder" style="width: 300px"></el-input>
|
<el-input v-model="deviceInfo.sortOrder" style="width: 300px"></el-input>
|
||||||
</el-form-item>
|
</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-input v-model="deviceInfo.bannerLink" style="width: 300px"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="Banner状态" prop="bannerStatus">
|
<el-form-item label="Banner状态" prop="bannerStatus">
|
||||||
@ -168,15 +167,16 @@
|
|||||||
inactive-color="#ff4949">
|
inactive-color="#ff4949">
|
||||||
</el-switch>
|
</el-switch>
|
||||||
</el-form-item>
|
</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-input v-model="deviceInfo.note" style="width: 300px" ></el-input>
|
||||||
</el-form-item>
|
</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>
|
||||||
</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>
|
</el-dialog>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -225,6 +225,9 @@ export default {
|
|||||||
bannerName:[
|
bannerName:[
|
||||||
{required: true, message: '请填写banner名称', trigger: 'blur'},
|
{required: true, message: '请填写banner名称', trigger: 'blur'},
|
||||||
],
|
],
|
||||||
|
productImage:[
|
||||||
|
{required: true, message: '请填写banner图片', trigger: 'blur'},
|
||||||
|
],
|
||||||
systemPosition:[
|
systemPosition:[
|
||||||
{required: true, message: '请填写系统位置', trigger: ''},
|
{required: true, message: '请填写系统位置', trigger: ''},
|
||||||
],
|
],
|
||||||
|
|||||||
@ -32,7 +32,7 @@ module.exports = {
|
|||||||
productionSourceMap: false,
|
productionSourceMap: false,
|
||||||
// webpack-dev-server 相关配置
|
// webpack-dev-server 相关配置
|
||||||
devServer: {
|
devServer: {
|
||||||
host: '0.0.0.0',
|
host: '192.168.31.178',
|
||||||
port: port,
|
port: port,
|
||||||
open: true,
|
open: true,
|
||||||
proxy: {
|
proxy: {
|
||||||
|
|||||||
@ -101,7 +101,7 @@ export default {
|
|||||||
background: #fff;
|
background: #fff;
|
||||||
display: flex;
|
display: flex;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
margin-bottom: 25px;
|
margin-bottom: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tab_ {
|
.tab_ {
|
||||||
|
|||||||
@ -1,24 +1,16 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<div class="tab-box">
|
<!-- <div class="tab-box">-->
|
||||||
<div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in tabs"
|
<!-- <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in tabs"-->
|
||||||
:key="index">
|
<!-- :key="index">-->
|
||||||
{{ item.name }}
|
<!-- {{ item.name }}-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
|
<div style="width: 100%;height: 15px"></div>
|
||||||
<div class="cot-box" v-if="tabindex==0">
|
<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="display: flex;align-items: center;justify-content: space-between">
|
<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 :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-form-item label="" prop="userNo">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.userNo"
|
v-model="queryParams.userNo"
|
||||||
@ -75,32 +67,25 @@
|
|||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</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>
|
</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>
|
||||||
|
<div class="cot-box" style="margin-top: 5px" v-if="tabindex==0">
|
||||||
|
|
||||||
<!-- </el-card>-->
|
<!-- </el-card>-->
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
@ -111,7 +96,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="size-hui">
|
<div class="size-hui">
|
||||||
<div style="width: 8px;height: 8px;border-radius: 4px;background: #0DC291"></div>
|
<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>
|
</div>
|
||||||
<div class="box2">
|
<div class="box2">
|
||||||
@ -156,7 +141,7 @@
|
|||||||
|
|
||||||
<!-- <el-card style="margin-top: 20px">-->
|
<!-- <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
|
<el-table ref="tables" v-loading="loading" :data="list" border
|
||||||
@selection-change="handleSelectionChange" :default-sort="defaultSort"
|
@selection-change="handleSelectionChange" :default-sort="defaultSort"
|
||||||
@sort-change="handleSortChange">
|
@sort-change="handleSortChange">
|
||||||
@ -204,7 +189,7 @@
|
|||||||
<div>{{ scope.row.rechargeNum || 0 }}</div>
|
<div>{{ scope.row.rechargeNum || 0 }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="余额（元）" align="center" prop="cardBalance">
|
<el-table-column label="会员总余额（元）" align="center" prop="cardBalance">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div>{{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : 0 }}</div>
|
<div>{{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : 0 }}</div>
|
||||||
</template>
|
</template>
|
||||||
@ -417,156 +402,92 @@
|
|||||||
<!-- 添加或修改对话框 -->
|
<!-- 添加或修改对话框 -->
|
||||||
<el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
|
<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-form ref="form" :model="form" :rules="rules" label-width="90px">
|
||||||
<el-row>
|
<el-form-item label="会员名称" prop="name">
|
||||||
<el-col :span="24">
|
<el-input v-model="form.name" placeholder="请输入会员名称" maxlength="30"/>
|
||||||
<el-form-item label="会员名称" prop="name">
|
</el-form-item>
|
||||||
<el-input v-model="form.name" placeholder="请输入会员名称" maxlength="30"/>
|
<el-form-item label="手机号" prop="mobile">
|
||||||
</el-form-item>
|
<el-input v-model="form.mobile" placeholder="请输入手机号" maxlength="30"/>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
</el-row>
|
<el-form-item label="性别" prop="sex">
|
||||||
<el-row>
|
<div class="d-s">
|
||||||
<el-col :span="24">
|
<div class="icon-type" v-for="(item,index) in sexTypelist" :key="index"
|
||||||
<el-form-item label="手机号" prop="mobile">
|
:class="{ 'acvtive1' : index === tindex }" @click="Typeindex(index)">
|
||||||
<el-input v-model="form.mobile" placeholder="请输入手机号" maxlength="30"/>
|
<img src="@/assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex">
|
||||||
</el-form-item>
|
<img src="@/assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex">
|
||||||
</el-col>
|
{{ item }}
|
||||||
</el-row>
|
</div>
|
||||||
<el-row>
|
</div>
|
||||||
<el-col :span="24">
|
</el-form-item>
|
||||||
<el-form-item label="性别" prop="sex">
|
<el-form-item label="会员号" prop="userNo">
|
||||||
<div class="d-s">
|
<el-input v-model="form.userNo" :disabled="form.id" placeholder="请输入会员号，为空系统将自动分配" maxlength="30"/>
|
||||||
<div class="icon-type" v-for="(item,index) in sexTypelist" :key="index"
|
</el-form-item>
|
||||||
:class="{ 'acvtive1' : index === tindex }" @click="Typeindex(index)">
|
<el-form-item label="会员等级" prop="gradeId">
|
||||||
<img src="@/assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex">
|
<el-select
|
||||||
<img src="@/assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex">
|
v-model="form.gradeId"
|
||||||
{{ item }}
|
placeholder="请选择会员等级"
|
||||||
</div>
|
style="width: 100%"
|
||||||
</div>
|
>
|
||||||
</el-form-item>
|
<el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id"/>
|
||||||
</el-col>
|
</el-select>
|
||||||
</el-row>
|
</el-form-item>
|
||||||
<el-row>
|
<el-form-item label="会员标签" prop="userLabelId">
|
||||||
<el-col :span="24">
|
<el-select
|
||||||
<el-form-item label="会员号" prop="userNo">
|
multiple
|
||||||
<el-input v-model="form.userNo" :disabled="form.id" placeholder="请输入会员号，为空系统将自动分配" maxlength="30"/>
|
v-model="form.userLabelId"
|
||||||
</el-form-item>
|
placeholder="请选择会员标签（多选）"
|
||||||
</el-col>
|
style="width: 100%"
|
||||||
</el-row>
|
>
|
||||||
<el-row>
|
<el-option v-for="(item,index) in userLabelList" :key="index" :label="item.labelName"
|
||||||
<el-col :span="24">
|
:value="item.id+''"></el-option>
|
||||||
<el-form-item label="会员等级" prop="gradeId">
|
</el-select>
|
||||||
<el-select
|
</el-form-item>
|
||||||
v-model="form.gradeId"
|
<el-form-item label="车牌号" prop="carNo">
|
||||||
placeholder="请选择会员等级"
|
<el-input v-model="form.carNo" placeholder="请输入车牌号" maxlength="30"/>
|
||||||
style="width: 100%"
|
</el-form-item>
|
||||||
>
|
<el-form-item label="所属机构" prop="storeId" v-if="form.id">
|
||||||
<el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id"/>
|
<el-select
|
||||||
</el-select>
|
v-model="form.mubStoreId"
|
||||||
</el-form-item>
|
placeholder="请选择所属机构"
|
||||||
</el-col>
|
style="width: 100%"
|
||||||
</el-row>
|
>
|
||||||
<el-row>
|
<el-option v-for="(item,index) in storeList" :key="index" :label="item.name" :value="item.id"/>
|
||||||
<el-col :span="24">
|
</el-select>
|
||||||
<el-form-item label="会员标签" prop="userLabelId">
|
</el-form-item>
|
||||||
<el-select
|
<el-form-item label="身份证号" prop="idcard">
|
||||||
multiple
|
<el-input v-model="form.idcard" placeholder="请输入身份证号" maxlength="30"/>
|
||||||
v-model="form.userLabelId"
|
</el-form-item>
|
||||||
placeholder="请选择会员标签（多选）"
|
<el-form-item label="初始积分" prop="points" v-if="!form.id">
|
||||||
style="width: 100%"
|
<el-input v-model="form.points" placeholder="请输入会员初始积分"
|
||||||
>
|
maxlength="30"/>
|
||||||
<el-option v-for="(item,index) in userLabelList" :key="index" :label="item.labelName"
|
</el-form-item>
|
||||||
:value="item.id+''"></el-option>
|
<el-form-item label="初始成长值" prop="growthValue" v-if="!form.id">
|
||||||
</el-select>
|
<el-input v-model="form.growthValue" placeholder="请输入会员初始成长值"
|
||||||
</el-form-item>
|
maxlength="30"/>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
</el-row>
|
<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-form-item label="备注" prop="remark">
|
||||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div style="display: flex;justify-content: center">
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<!-- 添加或修改对话框 -->
|
<!-- 添加或修改对话框 -->
|
||||||
@ -878,7 +799,7 @@ export default {
|
|||||||
// 跳转详情页
|
// 跳转详情页
|
||||||
goDedi(id) {
|
goDedi(id) {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
path: "/member/userInfo",
|
path: "/details",
|
||||||
query: {
|
query: {
|
||||||
id: id
|
id: id
|
||||||
}
|
}
|
||||||
@ -1264,7 +1185,8 @@ export default {
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 15px;
|
|
||||||
|
padding-left: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.k-one {
|
.k-one {
|
||||||
@ -1380,6 +1302,7 @@ export default {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
|
height: 97vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
.d-s {
|
.d-s {
|
||||||
@ -1403,7 +1326,7 @@ export default {
|
|||||||
.box2 {
|
.box2 {
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
margin-bottom: 20px;
|
|
||||||
padding-left: 20px;
|
padding-left: 20px;
|
||||||
width: 211px;
|
width: 211px;
|
||||||
height: 70px;
|
height: 70px;
|
||||||
|
|||||||
@ -1,18 +1,19 @@
|
|||||||
<template>
|
<template>
|
||||||
|
<!-- 积分商城订单-->
|
||||||
<div class="app-containers">
|
<div class="app-containers">
|
||||||
<div class="top_new">
|
<div class="top_new">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
|
||||||
<el-form-item label="" prop="giftName">
|
<el-form-item label="" prop="giftName">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.orderNumber"
|
v-model="queryParams.orderNumber"
|
||||||
placeholder="交易单号"
|
placeholder="交易单号1"
|
||||||
clearable
|
clearable
|
||||||
style="width: 220px;"
|
style="width: 220px;"
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="">
|
<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="unpaid">未支付</el-option>
|
||||||
<el-option label="付款成功" value="paid">付款成功</el-option>
|
<el-option label="付款成功" value="paid">付款成功</el-option>
|
||||||
<el-option label="付款失败" value="payFail">付款失败</el-option>
|
<el-option label="付款失败" value="payFail">付款失败</el-option>
|
||||||
@ -23,43 +24,31 @@
|
|||||||
v-model="queryParams.mobile"
|
v-model="queryParams.mobile"
|
||||||
placeholder="手机号码"
|
placeholder="手机号码"
|
||||||
clearable
|
clearable
|
||||||
style="width: 160px;"
|
style="width: 220px;"
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="">
|
<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
|
<el-date-picker
|
||||||
v-model="beginTime"
|
v-model="beginTime"
|
||||||
style="width: 160px"
|
style="width: 220px"
|
||||||
type="date"
|
type="date"
|
||||||
placeholder="开始日期">
|
placeholder="开始日期">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
至
|
至
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="endTime"
|
v-model="endTime"
|
||||||
style="width: 160px"
|
style="width: 220px"
|
||||||
type="date"
|
type="date"
|
||||||
placeholder="结束日期">
|
placeholder="结束日期">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</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>
|
</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>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@ -102,6 +91,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="table-box">
|
||||||
<el-table ref="tables"
|
<el-table ref="tables"
|
||||||
v-loading="loading"
|
v-loading="loading"
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
@ -138,6 +128,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
</div>
|
||||||
<pagination
|
<pagination
|
||||||
v-show="total>0"
|
v-show="total>0"
|
||||||
:total="total"
|
:total="total"
|
||||||
@ -306,6 +297,11 @@ export default {
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.table-box {
|
||||||
|
width: 100%;
|
||||||
|
height: 66vh;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
.box{
|
.box{
|
||||||
//box-sizing: border-box;
|
//box-sizing: border-box;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
@ -321,7 +317,7 @@ export default {
|
|||||||
border: 1px solid #fe8c4a;
|
border: 1px solid #fe8c4a;
|
||||||
}
|
}
|
||||||
.el-form--inline .el-form-item {
|
.el-form--inline .el-form-item {
|
||||||
margin-right: 44px;
|
margin-right: 15px;
|
||||||
}
|
}
|
||||||
.size-hui{
|
.size-hui{
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -375,32 +371,34 @@ export default {
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
width: 98%;
|
width: 98%;
|
||||||
margin: 10px auto;
|
margin: 5px auto;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 15px
|
padding: 15px;
|
||||||
|
height: 64px;
|
||||||
}
|
}
|
||||||
.cont_box{
|
.cont_box{
|
||||||
background: #fff;
|
background: #fff;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
padding-left: 0px;
|
||||||
}
|
}
|
||||||
.cont_box_b{
|
.cont_box_b{
|
||||||
background: #fff;
|
background: #fff;
|
||||||
width: 98%;
|
width: 98%;
|
||||||
margin: 10px auto;
|
margin: 5px auto;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
min-height: 80vh;
|
padding-top: 0px;
|
||||||
|
min-height: 85vh;
|
||||||
}
|
}
|
||||||
.box2 {
|
.box2 {
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
margin-bottom: 20px;
|
|
||||||
padding-left: 20px;
|
padding-left: 20px;
|
||||||
width: 211px;
|
width: 211px;
|
||||||
height: 70px;
|
height: 70px;
|
||||||
|
|||||||
@ -116,7 +116,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="er-box"></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 }"
|
<div class="f-box" v-for="(item,index) in payList" :class="{'f-acvite' : item.dictValue == payWay }"
|
||||||
@click="setindex(item.dictValue)" :key="item.dictValue"
|
@click="setindex(item.dictValue)" :key="item.dictValue"
|
||||||
>{{ item.dictLabel }}
|
>{{ item.dictLabel }}
|
||||||
@ -1698,7 +1698,6 @@ input {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.wrap-box {
|
.wrap-box {
|
||||||
height: 190px;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
|
|||||||
@ -14,17 +14,7 @@
|
|||||||
<el-option label="归还" value="1"></el-option>
|
<el-option label="归还" value="1"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</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-form-item label="" prop="unitName">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.unitName"
|
v-model="queryParams.unitName"
|
||||||
@ -49,14 +39,7 @@
|
|||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</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-form-item label="">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="beginTime"
|
v-model="beginTime"
|
||||||
@ -72,12 +55,13 @@
|
|||||||
placeholder="结束日期">
|
placeholder="结束日期">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</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>
|
</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>
|
</div>
|
||||||
<!-- 统计-->
|
<!-- 统计-->
|
||||||
|
|
||||||
@ -164,15 +148,15 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<div class="pagination-box">
|
<div class="pagination-box">
|
||||||
<el-pagination
|
|
||||||
background
|
<pagination
|
||||||
v-show="total>0"
|
v-show="total>0"
|
||||||
layout="prev, pager, next"
|
:total="total"
|
||||||
:total="total"
|
:page.sync="queryParams.page"
|
||||||
:page.sync="queryParams.page"
|
:limit.sync="queryParams.pageSize"
|
||||||
:limit.sync="queryParams.pageSize"
|
@pagination="getList"
|
||||||
@current-change="getList">
|
/>
|
||||||
</el-pagination>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- 归还记录信息-->
|
<!-- 归还记录信息-->
|
||||||
@ -245,15 +229,16 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<div class="pagination-box">
|
<div class="pagination-box">
|
||||||
<el-pagination
|
|
||||||
background
|
<pagination
|
||||||
layout="prev, pager, next"
|
v-show="total2>0"
|
||||||
v-show="total2>0"
|
:total="total2"
|
||||||
:total="total2"
|
:page.sync="queryParams1.page"
|
||||||
:page.sync="queryParams1.page"
|
:limit.sync="queryParams1.pageSize"
|
||||||
:limit.sync="queryParams1.pageSize"
|
@pagination="getRecordList"
|
||||||
@current-change="getRecordList">
|
/>
|
||||||
</el-pagination>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
</div>
|
</div>
|
||||||
@ -526,16 +511,17 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
|
|||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
|
|
||||||
}
|
}
|
||||||
.table-box{
|
.table-box {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 60vh;
|
height: 65vh;
|
||||||
|
overflow: auto;
|
||||||
}
|
}
|
||||||
.pagination-box{
|
.pagination-box{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin: 10px auto;
|
margin: 10px auto;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: flex-end;
|
||||||
}
|
}
|
||||||
.top-app-sou{
|
.top-app-sou{
|
||||||
width: 20%;
|
width: 20%;
|
||||||
@ -568,10 +554,11 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
width: 98%;
|
width: 98%;
|
||||||
margin: 10px auto;
|
margin: 5px auto;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 15px
|
padding: 15px;
|
||||||
|
height: 64px;
|
||||||
}
|
}
|
||||||
.cont_new{
|
.cont_new{
|
||||||
background: #fff;
|
background: #fff;
|
||||||
@ -584,9 +571,10 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
|
|||||||
.bottom_new{
|
.bottom_new{
|
||||||
background: #fff;
|
background: #fff;
|
||||||
width: 98%;
|
width: 98%;
|
||||||
margin: 10px auto;
|
margin: 5px auto;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 15px
|
padding: 15px;
|
||||||
|
height: 85vh;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -204,14 +204,13 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<div class="pagination-box">
|
<div class="pagination-box">
|
||||||
<el-pagination
|
<pagination
|
||||||
v-show="total>0"
|
v-show="total>0"
|
||||||
layout="prev, pager, next, jumper"
|
|
||||||
:total="total"
|
:total="total"
|
||||||
:page.sync="queryParams.page"
|
:page.sync="queryParams.page"
|
||||||
:limit.sync="queryParams.pageSize"
|
:limit.sync="queryParams.pageSize"
|
||||||
@current-change="getList">
|
@pagination="getList"
|
||||||
</el-pagination>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -394,12 +393,7 @@
|
|||||||
label="地址">
|
label="地址">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
|
|
||||||
<!-- 订单详情-->
|
<!-- 订单详情-->
|
||||||
@ -489,18 +483,6 @@
|
|||||||
<span>{{ scope.row.oilPrice }}/L</span>
|
<span>{{ scope.row.oilPrice }}/L</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</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-table>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="商品详情">
|
<el-descriptions-item label="商品详情">
|
||||||
@ -1565,7 +1547,8 @@ export default {
|
|||||||
|
|
||||||
.table-box {
|
.table-box {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
height: 65vh;
|
||||||
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pagination-box {
|
.pagination-box {
|
||||||
@ -1592,7 +1575,7 @@ export default {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
min-height: 84vh;
|
height: 85vh;
|
||||||
}
|
}
|
||||||
.top_new{
|
.top_new{
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -136,6 +136,7 @@
|
|||||||
<div class="table-box">
|
<div class="table-box">
|
||||||
<el-table
|
<el-table
|
||||||
:data="list"
|
:data="list"
|
||||||
|
border
|
||||||
style="width: 100%">
|
style="width: 100%">
|
||||||
<el-table-column type="index" width="50" align="center" label="序号"/>
|
<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="orderNo" width="220"/>
|
||||||
@ -871,7 +872,7 @@ export default {
|
|||||||
|
|
||||||
.table-box {
|
.table-box {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 70vh;
|
min-height: 69vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pagination-box {
|
.pagination-box {
|
||||||
@ -930,12 +931,13 @@ export default {
|
|||||||
.top_new{
|
.top_new{
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
background: #fff;
|
background: #fff;
|
||||||
width: 100%;
|
width: 98%;
|
||||||
margin: 10px auto;
|
margin: 5px auto;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 15px
|
padding: 15px;
|
||||||
|
height: 64px;
|
||||||
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -181,7 +181,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="new_bottom">
|
<div class="new_bottom">
|
||||||
<div>
|
|
||||||
<el-table
|
<el-table
|
||||||
v-loading="loading"
|
v-loading="loading"
|
||||||
border
|
border
|
||||||
@ -253,17 +253,17 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
|
||||||
<div class="pagination-box">
|
|
||||||
<el-pagination
|
</div>
|
||||||
v-show="total>0"
|
<div class="pagination-box">
|
||||||
layout="prev, pager, next, jumper"
|
<pagination
|
||||||
:total="total"
|
v-show="total>0"
|
||||||
:page.sync="queryParams.page"
|
:total="total"
|
||||||
:limit.sync="queryParams.pageSize"
|
:page.sync="queryParams.page"
|
||||||
@current-change="getList">
|
:limit.sync="queryParams.pageSize"
|
||||||
</el-pagination>
|
@pagination="getList"
|
||||||
</div>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- 订单退款 密码 -->
|
<!-- 订单退款 密码 -->
|
||||||
@ -1040,6 +1040,7 @@ export default {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
|
height: 79vh;
|
||||||
}
|
}
|
||||||
.top_new{
|
.top_new{
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -1053,6 +1054,12 @@ export default {
|
|||||||
padding: 15px;
|
padding: 15px;
|
||||||
}
|
}
|
||||||
.new_bottom{
|
.new_bottom{
|
||||||
min-height: 65vh;
|
height: 59vh;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
.table-box {
|
||||||
|
width: 100%;
|
||||||
|
height: 66vh;
|
||||||
|
overflow: auto;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -63,7 +63,7 @@
|
|||||||
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</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 type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||||
<el-button type="primary" @click="exportExcelVip()">导出</el-button>
|
<el-button type="primary" @click="exportExcelVip()">导出</el-button>
|
||||||
@ -133,6 +133,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<div class="table-box">
|
<div class="table-box">
|
||||||
<el-table
|
<el-table
|
||||||
|
border
|
||||||
:data="list"
|
:data="list"
|
||||||
style="width: 100%">
|
style="width: 100%">
|
||||||
<el-table-column type="index" width="50" align="center" label="序号"/>
|
<el-table-column type="index" width="50" align="center" label="序号"/>
|
||||||
@ -185,15 +186,13 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<div class="pagination-box">
|
<div class="pagination-box">
|
||||||
<el-pagination
|
<pagination
|
||||||
background
|
|
||||||
v-show="total>0"
|
v-show="total>0"
|
||||||
layout="prev, pager, next"
|
|
||||||
:total="total"
|
:total="total"
|
||||||
:page.sync="queryParams.pageNo"
|
:page.sync="queryParams.page"
|
||||||
:limit.sync="queryParams.pageSize"
|
:limit.sync="queryParams.pageSize"
|
||||||
@current-change="getList">
|
@pagination="getList"
|
||||||
</el-pagination>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@ -654,6 +653,8 @@ export default {
|
|||||||
|
|
||||||
.table-box {
|
.table-box {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
height: 65vh;
|
||||||
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pagination-box {
|
.pagination-box {
|
||||||
@ -661,7 +662,7 @@ export default {
|
|||||||
margin: 10px auto;
|
margin: 10px auto;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: flex-end;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tk {
|
.tk {
|
||||||
@ -702,15 +703,21 @@ export default {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
|
height: 85vh;
|
||||||
|
|
||||||
}
|
}
|
||||||
.top_new{
|
.top_new{
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
width: 98%;
|
width: 98%;
|
||||||
margin: 10px auto;
|
margin: 5px auto;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 15px
|
padding: 15px;
|
||||||
|
height: 64px;
|
||||||
|
}
|
||||||
|
.el-form--inline .el-form-item {
|
||||||
|
margin-right: 20px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -1,13 +1,17 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<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>
|
<el-card>
|
||||||
<div slot="header" style="display: flex;justify-content: space-between;padding-right: 0px">
|
<div slot="header" style="display: flex;justify-content: space-between;padding-right: 0px">
|
||||||
<div>
|
<div>
|
||||||
<el-page-header @back="goBack" content="详情页面"></el-page-header>
|
<el-page-header @back="goBack" content="详情页面"></el-page-header>
|
||||||
</div>
|
</div>
|
||||||
<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>-->
|
<!-- <el-button type="primary" plain round>会员码</el-button>-->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -2376,4 +2380,11 @@ export default {
|
|||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
}
|
}
|
||||||
|
.wit_box{
|
||||||
|
width: 100%;
|
||||||
|
background: #fff;
|
||||||
|
border-radius: 8px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user