服务点管理

sa-frame/menu-list-sp.js

@@ -745,22 +745,26 @@ window.menuList.unshift({
 					id: 'tb-wallet-manager',
 					name: '服务点管理',
 					parent: true,
+					icon:'el-icon-s-operation',
 					childList: [
 						{
 							id: 'tb-wallet-topup',
-							name: '服务点充值记录',
+							name: '充值记录',
 							url: 'sa-view/tb-wallet-topup/tb-wallet-topup-list.html',
+							icon:'el-icon-collection'
+						},
+						{
+							id: 'tb-wallet-record',
+							name: '扣除记录',
+							url: 'sa-view/tb-wallet-record/tb-wallet-record-list.html',
+							icon:'el-icon-notebook-1'
 						},
 						{
 							id: 'tb-wallet-topdown',
-							name: '服务点提现记录',
+							name: '提现记录',
 							url: 'sa-view/tb-wallet-topdown/tb-wallet-topdown-list.html',
+							icon:'el-icon-files'
 						},
-						{
-							id: 'tb-wallet-record',
-							name: '服务掉扣除记录',
-							url: 'sa-view/tb-wallet-record/tb-wallet-record-list.html',
-						}
 					]
 				},
 				{

sa-view/tb-people/tb-people-list.html

@@ -49,11 +49,12 @@
 					<sa-td name="姓名" prop="name"></sa-td>
 					<sa-td name="性别" prop="sex" type="enum" :jv="{'1': '男', '2': '女'}"></sa-td>
 					<sa-td name="手机号码" prop="phone" type="phone"></sa-td>
-					<sa-td name="身份证" prop="idCard" type="idCard"></sa-td>
+					<sa-td name="身份证" prop="idCard" type="idCard" width="200"></sa-td>
 					<sa-td name="互助组" prop="groupName"></sa-td>
 					<sa-td name="银行" prop="bankName" width="160"></sa-td>
 					<sa-td name="银行卡" prop="bankCode" width="200"></sa-td>
-					<sa-td name="创建时间" prop="createTime"></sa-td>
+					<sa-td name="剩余点数" prop="wallet" width="200"></sa-td>
+					<sa-td name="创建时间" prop="createTime" width="160"></sa-td>
 					<el-table-column label="操作" width="280px" fixed="right">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view"

sa-view/tb-wallet-record/tb-wallet-record-info.html

@@ -69,6 +69,10 @@
 								<td>{{m.goodsNames}}</td>
 							</tr>
 							<tr>
+								<th>车牌号</th>
+								<td>{{m.veNo}}</td>
+							</tr>
+							<tr>
 								<th>扣除时间</th>
 								<td>{{m.recordTime}}</td>
 							</tr>

sa-view/tb-wallet-record/tb-wallet-record-list.html

@@ -21,7 +21,9 @@
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="边民姓名" v-model="p.peopleName" width="8em"></sa-item>
-					<sa-item type="text" name="关联订单号" v-model="p.tradeNo" width="7em"></sa-item>
+					<sa-item type="text" name="订单号" v-model="p.tradeNo" width="7em"></sa-item>
+					<sa-item type="text" name="车牌号" v-model="p.veNo" width="7em"></sa-item>
+					<sa-item type="text" name="商品名称" v-model="p.goodsNames" width="7em"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</el-form>
@@ -30,12 +32,12 @@
 					<sa-td type="index" name="序号"></sa-td>
 					<sa-td name="边民姓名" prop="peopleName" ></sa-td>
 					<sa-td name="交易前点数" prop="beforeAmount" ></sa-td>
+					<sa-td name="扣除点数" prop="amount" ></sa-td>
 					<sa-td name="交易后点数" prop="afterAmount" ></sa-td>
-					<sa-td name="交易扣除点数" prop="amount" ></sa-td>
-					<sa-td name="关联订单号" prop="tradeNo" ></sa-td>
-					<sa-td name="关联商品id" prop="goodsId" ></sa-td>
-					<sa-td name="关联商品名称" prop="goodsNames" ></sa-td>
-					<sa-td name="扣除时间" prop="recordTime" ></sa-td>
+					<sa-td name="订单号" prop="tradeNo" width="200"></sa-td>
+					<sa-td name="商品名称" prop="goodsNames" width="250"></sa-td>
+					<sa-td name="车牌号" prop="veNo" width="150"></sa-td>
+					<sa-td name="扣除时间" prop="recordTime" width="160"></sa-td>
 					<el-table-column label="操作" fixed="right"  width="240px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
@@ -77,7 +79,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-wallet-record-info.html?id=' + data.id, '1050px', '90%');
+						sa.showIframe('数据详情', 'tb-wallet-record-info.html?id=' + data.id, '800px', '70%');
 					},
 					// 查看 - 关联边民
 					getPeople(data){

sa-view/tb-wallet-topup/tb-wallet-topup-info.html

@@ -49,22 +49,26 @@
 								<td>{{m.peopleName}}</td>
 							</tr>
 							<tr>
-								<th>商户号</th>
-								<td>{{m.mchid}}</td>
-							</tr>
-							<tr>
-								<th>商户系统内部订单号</th>
+								<th>订单号</th>
 								<td>{{m.outTradeNo}}</td>
 							</tr>
 							<tr>
-								<th>微信支付系统生成的订单号</th>
+								<th>微信订单号</th>
 								<td>{{m.transactionId}}</td>
 							</tr>
 							<tr>
-								<th>充值金额</th>
+								<th>充值前点数</th>
+								<td>{{m.beforeAmount}}</td>
+							</tr>
+							<tr>
+								<th>充值点数</th>
 								<td>{{m.amount}}</td>
 							</tr>
 							<tr>
+								<th>充值后点数</th>
+								<td>{{m.afterAmount}}</td>
+							</tr>
+							<tr>
 								<th>充值时间</th>
 								<td>{{m.topupTime}}</td>
 							</tr>

sa-view/tb-wallet-topup/tb-wallet-topup-list.html

@@ -21,19 +21,20 @@
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="边民姓名" v-model="p.peopleName" width="8em"></sa-item>
-					<sa-item type="text" name="商户号" v-model="p.mchid" width="7em"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
+				<div style="padding: 10px 15px;font-weight: bold;">总充值数：<span>{{sum}}</span></div>
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="index" name="序号"></sa-td>
 					<sa-td name="边民姓名" prop="peopleName" ></sa-td>
-					<sa-td name="商户号" prop="mchid" ></sa-td>
-					<sa-td name="商户系统内部订单号" prop="outTradeNo" ></sa-td>
-					<sa-td name="微信支付系统生成的订单号" prop="transactionId" ></sa-td>
-					<sa-td name="充值金额" prop="amount" ></sa-td>
-					<sa-td name="充值时间" prop="topupTime" ></sa-td>
+					<sa-td name="订单号" prop="outTradeNo" width="200"></sa-td>
+					<sa-td name="微信订单号" prop="transactionId" width="250"></sa-td>
+					<sa-td name="充值前点数" prop="beforeAmount" ></sa-td>
+					<sa-td name="充值点数" prop="amount" ></sa-td>
+					<sa-td name="充值后点数" prop="afterAmount" ></sa-td>
+					<sa-td name="充值时间" prop="topupTime" width="160"></sa-td>
 
 					<el-table-column label="操作" fixed="right"  width="160px">
 						<template slot-scope="s">
@@ -57,12 +58,14 @@
 					p: { // 查询参数  
 						peopleName: '',		// 边民姓名 
 						mchid: '',		// 商户号 
+						payStatus:2,
 						pageNo: 1,		// 当前页 
 						pageSize: 10,	// 页大小 
 						sortType: 0		// 排序方式 
 					},
 					dataCount: 0,
 					dataList: [], // 数据集合 
+					sum:0
 				},
 				methods: {
 					// 刷新
@@ -70,12 +73,18 @@
 						sa.ajax('/level-one-server/TbWalletTopup/getList', sa.removeNull(this.p), function(res) {
 							this.dataList = res.data; // 数据
 							this.dataCount = res.dataCount; // 数据总数 
+							this.getSum()
 							sa.f5TableHeight();		// 刷新表格高度 
 						}.bind(this));
 					},
+					getSum: function() {
+						sa.ajax('/level-one-server/TbWalletTopup/getSum', sa.removeNull(this.p), function(res) {
+							this.sum = res.data; // 数据
+						}.bind(this));
+					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-wallet-topup-info.html?id=' + data.id, '1050px', '90%');
+						sa.showIframe('数据详情', 'tb-wallet-topup-info.html?id=' + data.id, '800px', '70%');
 					},
 					// 查看 - 根据选中的边民
 					getPeople(data){