linbl před 1 dnem
rodič
revize
b3d6b10783

+ 24 - 24
sa-view/tb-transport-fundflow-bill/tb-transport-fundflow-bill-list.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>平台与微信资金对账表-列表</title>
+		<title>日资金对账</title>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<!-- 所有的 css & js 资源 -->
@@ -62,36 +62,36 @@
 		<script>
 			var app = new Vue({
 				components: {
-					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
-					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),
 				},
 				el: '.vue-box',
 				data: {
-					p: { // 查询参数  
-						billId: '',		// 账单ID 
-						billDate: '',		// 账单日期 
-						inCountPlatform: '',		// 平台收入笔数 
-						inAmountPlatform: '',		// 平台收入金额 
-						outCountPlatform: '',		// 平台支出笔数 
-						outAmountPlatform: '',		// 平台支出金额 
-						inCountWechat: '',		// 微信收入笔数 
-						inAmountWechat: '',		// 微信收入金额 
-						outCountWechat: '',		// 微信支出笔数 
-						outAmountWechat: '',		// 微信支出金额 
-						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
-						sortType: 0		// 排序方式 
+					p: { // 查询参数
+						billId: '',		// 账单ID
+						billDate: '',		// 账单日期
+						inCountPlatform: '',		// 平台收入笔数
+						inAmountPlatform: '',		// 平台收入金额
+						outCountPlatform: '',		// 平台支出笔数
+						outAmountPlatform: '',		// 平台支出金额
+						inCountWechat: '',		// 微信收入笔数
+						inAmountWechat: '',		// 微信收入金额
+						outCountWechat: '',		// 微信支出笔数
+						outAmountWechat: '',		// 微信支出金额
+						pageNo: 1,		// 当前页
+						pageSize: 10,	// 页大小
+						sortType: 0		// 排序方式
 					},
 					dataCount: 0,
-					dataList: [], // 数据集合 
+					dataList: [], // 数据集合
 				},
 				methods: {
 					// 刷新
 					f5: function() {
 						sa.ajax('/transport-server/TbTransportFundflowBill/getList', sa.removeNull(this.p), function(res) {
 							this.dataList = res.data; // 数据
-							this.dataCount = res.dataCount; // 数据总数 
-							sa.f5TableHeight();		// 刷新表格高度 
+							this.dataCount = res.dataCount; // 数据总数
+							sa.f5TableHeight();		// 刷新表格高度
 						}.bind(this));
 					},
 					// 查看
@@ -120,24 +120,24 @@
 							sa.ajax('/TbTransportFundflowBill/delete?id=' + data.billId, function(res) {
 								sa.arrayDelete(this.dataList, data);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight();		// 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
 					// 批量删除
 					deleteByIds: function() {
-						// 获取选中元素的id列表 
+						// 获取选中元素的id列表
 						let selection = this.$refs['data-table'].selection;
 						let ids = sa.getArrayField(selection, 'id');
 						if(selection.length == 0) {
 							return sa.msg('请至少选择一条数据')
 						}
-						// 提交删除 
+						// 提交删除
 						sa.confirm('是否批量删除选中数据?此操作不可撤销', function() {
 							sa.ajax('/TbTransportFundflowBill/deleteByIds', {ids: ids.join(',')}, function(res) {
 								sa.arrayDelete(this.dataList, selection);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight();		// 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},

+ 28 - 28
sa-view/tb-transport-trade-bill/tb-transport-trade-bill-list.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>平台与微信交易对账信息表-列表</title>
+		<title>日交易对账</title>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<!-- 所有的 css & js 资源 -->
@@ -66,40 +66,40 @@
 		<script>
 			var app = new Vue({
 				components: {
-					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
-					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),
 				},
 				el: '.vue-box',
 				data: {
-					p: { // 查询参数  
-						billId: '',		// 账单ID 
-						billDate: '',		// 账单日期 
-						receiveCountPlatform: '',		// 平台收款笔数 
-						receiveAmountPlatform: '',		// 平台收款金额 
-						transferCountPlatform: '',		// 平台转账笔数 
-						transferAmountPlatform: '',		// 平台转账金额 
-						refundCountPlatform: '',		// 平台退款笔数 
-						refundAmountPlatform: '',		// 平台退款金额 
-						receiveCountWechat: '',		// 微信收款笔数 
-						receiveAmountWechat: '',		// 微信收款金额 
-						transferCountWechat: '',		// 微信转账笔数 
-						transferAmountWechat: '',		// 微信转账金额 
-						refundCountWechat: '',		// 微信退款笔数 
-						refundAmountWechat: '',		// 微信退款金额 
-						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
-						sortType: 0		// 排序方式 
+					p: { // 查询参数
+						billId: '',		// 账单ID
+						billDate: '',		// 账单日期
+						receiveCountPlatform: '',		// 平台收款笔数
+						receiveAmountPlatform: '',		// 平台收款金额
+						transferCountPlatform: '',		// 平台转账笔数
+						transferAmountPlatform: '',		// 平台转账金额
+						refundCountPlatform: '',		// 平台退款笔数
+						refundAmountPlatform: '',		// 平台退款金额
+						receiveCountWechat: '',		// 微信收款笔数
+						receiveAmountWechat: '',		// 微信收款金额
+						transferCountWechat: '',		// 微信转账笔数
+						transferAmountWechat: '',		// 微信转账金额
+						refundCountWechat: '',		// 微信退款笔数
+						refundAmountWechat: '',		// 微信退款金额
+						pageNo: 1,		// 当前页
+						pageSize: 10,	// 页大小
+						sortType: 0		// 排序方式
 					},
 					dataCount: 0,
-					dataList: [], // 数据集合 
+					dataList: [], // 数据集合
 				},
 				methods: {
 					// 刷新
 					f5: function() {
 						sa.ajax('/transport-server/TbTransportTradeBill/getList', sa.removeNull(this.p), function(res) {
 							this.dataList = res.data; // 数据
-							this.dataCount = res.dataCount; // 数据总数 
-							sa.f5TableHeight();		// 刷新表格高度 
+							this.dataCount = res.dataCount; // 数据总数
+							sa.f5TableHeight();		// 刷新表格高度
 						}.bind(this));
 					},
 					// 查看
@@ -128,24 +128,24 @@
 							sa.ajax('/TbTransportTradeBill/delete?id=' + data.billId, function(res) {
 								sa.arrayDelete(this.dataList, data);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight();		// 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
 					// 批量删除
 					deleteByIds: function() {
-						// 获取选中元素的id列表 
+						// 获取选中元素的id列表
 						let selection = this.$refs['data-table'].selection;
 						let ids = sa.getArrayField(selection, 'id');
 						if(selection.length == 0) {
 							return sa.msg('请至少选择一条数据')
 						}
-						// 提交删除 
+						// 提交删除
 						sa.confirm('是否批量删除选中数据?此操作不可撤销', function() {
 							sa.ajax('/TbTransportTradeBill/deleteByIds', {ids: ids.join(',')}, function(res) {
 								sa.arrayDelete(this.dataList, selection);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight();		// 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},

+ 8 - 11
sa-view/tb-wechat-pay/tb-wechat-pay-list.html

@@ -33,7 +33,7 @@
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" width="100px" name="业务订单号" v-model="p.tradeNo"></sa-item>
-					<sa-item type="text" width="100px" name="商品名称" v-model="p.goodsName"></sa-item>
+					<sa-item type="text" width="90px" name="商品名称" v-model="p.goodsName"></sa-item>
 					<!--<sa-item type="text" width="100px" name="微信支付订单号" v-model="p.transactionId"></sa-item>-->
 					<sa-item type="text" width="100px" name="是否已支付" v-model="p.isPaid">
 						<el-select v-model="p.isPaid">
@@ -42,7 +42,7 @@
 							<el-option label="未支付" value="0"></el-option>
 						</el-select>
 					</sa-item>
-					<sa-item type="text" width="100px"  name="交易状态" v-model="p.tradeState">
+					<sa-item type="text" width="90px"  name="交易状态" v-model="p.tradeState">
 						<el-select v-model="p.isPaid">
 							<el-option label="全部" value=""></el-option>
 							<el-option label="支付成功" value="SUCCESS"></el-option>
@@ -57,28 +57,24 @@
 					<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 class="fast-btn">
-
-				</div>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
 					<sa-td name="业务订单号" prop="tradeNo" width="180px"></sa-td>
-					<sa-td name="商品名称" prop="goodsName" width="200px"></sa-td>
+					<sa-td name="商品名称" prop="goodsName" width="260px"></sa-td>
 					<sa-td name="应付金额(分)" prop="amount" width="120px"></sa-td>
 					<sa-td name="创建时间" prop="createTime" width="150px"></sa-td>
-					<sa-td name="微信支付订单号" prop="transactionId" width="200px"></sa-td>
+					<sa-td name="微信支付订单号" prop="transactionId" width="240px"></sa-td>
 					<sa-td name="是否已支付" prop="isPaid" type="enum" :jv="{0: '未支付', 1: '已支付'}" width="120px"></sa-td>
 					<sa-td name="交易状态" prop="tradeState" width="120px" ></sa-td>
 					<sa-td name="完成时间" prop="successTime" width="150px"></sa-td>
 					<sa-td name="实付金额(分)" prop="payAmount" width="120px"></sa-td>
-
-					<sa-td label="操作" fixed="right"  width="150px">
+					<el-table-column label="操作" fixed="right">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 							<el-button class="c-btn" type="primary" icon="el-icon-edit" @click="syn(s.row)">同步</el-button>
 						</template>
-					</sa-td>
+					</el-table-column>
 
 
 				</el-table>
@@ -141,7 +137,8 @@
 					},
 					syn: function(data) {
 						sa.ajax('/transport-server/TbWechatPay/syn?tradeNo=' + data.tradeNo, function(res) {
-							sa.arrayDelete(this.dataList, data);
+							this.dataList == data;
+							//sa.arrayDelete(this.dataList, data);
 							sa.ok('同步刷新成功');
 							sa.f5TableHeight();		// 刷新表格高度
 						}.bind(this))

+ 7 - 9
sa-view/tb-wechat-refund/tb-wechat-refund-list.html

@@ -32,7 +32,7 @@
 				<!-- ------------- 检索参数 ------------- -->
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" width="100px" name="业务退款编号" v-model="p.refundNo"></sa-item>
+					<sa-item type="text" width="100px"  name="业务退款编号" v-model="p.refundNo"></sa-item>
 					<sa-item type="text" width="100px"  name="业务订单号" v-model="p.outTradeNo"></sa-item>
 					<sa-item type="text" width="100px"  name="是否已退款" v-model="p.isRefunded">
 						<el-select v-model="p.isRefunded">
@@ -41,7 +41,7 @@
 							<el-option label="未退款" value="0"></el-option>
 						</el-select>
 					</sa-item>
-					<sa-item type="text" width="100px"  name="退款状态" v-model="p.refundStatus">
+					<sa-item type="text" width="90px"   name="退款状态" v-model="p.refundStatus">
 						<el-select v-model="p.refundStatus">
 							<el-option label="全部" value=""></el-option>
 							<el-option label="退款成功" value="SUCCESS"></el-option>
@@ -50,18 +50,16 @@
 							<el-option label="退款异常" value="ABNORMAL"></el-option>
 						</el-select>
 					</sa-item>
-				</el-form>
-				<div class="fast-btn" style="margin-left: 110px;">
 					<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>
-				</div>
+				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
 					<!--<sa-td name="微信退款编号" prop="refundId" ></sa-td>-->
-					<sa-td name="业务退款编号" prop="refundNo" ></sa-td>
+					<sa-td name="业务退款编号" prop="refundNo" width="160px"></sa-td>
 					<!--<sa-td name="微信支付订单号" prop="transactionId" ></sa-td>-->
-					<sa-td name="业务订单号" prop="outTradeNo" ></sa-td>
+					<sa-td name="业务订单号" prop="outTradeNo" width="160px"></sa-td>
 					<sa-td name="订单金额(分)" prop="tradeAmount" ></sa-td>
 					<sa-td name="退款金额(分)" prop="refundAmount" ></sa-td>
 					<sa-td name="退款原因" prop="refundReason" ></sa-td>
@@ -69,11 +67,11 @@
 					<sa-td name="是否已退款" prop="isRefunded" type="enum" :jv="{0: '未退款', 1: '已退款'}"></sa-td>
 					<sa-td name="退款状态" prop="refundStatus" type="enum"  :jv="{'': '未完成退款', 'SUCCESS':'退款成功', 'CLOSED':'退款关闭', 'PROCESSING':'退款处理中', 'ABNORMAL':'退款异常'}"></sa-td>
 					<sa-td name="退款成功时间" prop="successTime" ></sa-td>
-					<sa-td label="操作" fixed="right" >
+					<el-table-column label="操作" fixed="right">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 						</template>
-					</sa-td>
+					</el-table-column>
 				</el-table>
 				<!-- ------------- 分页 ------------- -->
 				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>

+ 4 - 4
sa-view/tb-wechat-transfer/tb-wechat-transfer-list.html

@@ -18,7 +18,7 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!--<div class="c-title">检索参数</div>-->
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<!--<sa-item type="text"  width="100px"name="转账单号" v-model="p.transferId"></sa-item>-->
 					<sa-item type="text"  width="100px" name="业务订单号" v-model="p.outTradeNo"></sa-item>
@@ -37,11 +37,11 @@
 					<!--<sa-td name="微信openid" prop="openId" ></sa-td>-->
 					<sa-td name="用户姓名" prop="userName" ></sa-td>
 					<sa-td name="转账金额(分)" prop="transferAmount" ></sa-td>
-					<sa-td name="微信业务单号" prop="transferBillNo" width="200px"></sa-td>
+					<sa-td name="微信业务单号" prop="transferBillNo" width="260px"></sa-td>
 					<sa-td name="状态" prop="state" ></sa-td>
 					<sa-td name="转账状态" prop="isTransfer" ></sa-td>
 					<sa-td name="创建时间" prop="createTime" width="150px"></sa-td>
-					<el-table-column label="操作" fixed="right"  width="150px">
+					<el-table-column label="操作" fixed="right">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 							<el-button class="c-btn" type="primary" icon="el-icon-edit" @click="syn(s.row)">同步</el-button>
@@ -99,7 +99,7 @@
 					},
 					syn: function(data) {
 						sa.ajax('/transport-server/TbWechatTransfer/syn?tradeNo=' + data.outTradeNo, function(res) {
-							sa.arrayDelete(this.dataList, data);
+							this.dataList == data;//sa.arrayDelete(this.dataList, data);
 							sa.ok('同步刷新成功');
 							sa.f5TableHeight();		// 刷新表格高度
 						}.bind(this))