qzy 4 mēneši atpakaļ
vecāks
revīzija
71133a7a91

+ 1 - 1
login.html

@@ -189,7 +189,7 @@
 			// 你所有要改的代码全在这里   ↓↓↓↓↓
 
 			// 所有参考属性
-			var page_title = '你好,欢迎登录系统'; // 页面标题
+			var page_title = '智慧边民互市交易服务平台'; // 页面标题
 			var key = 'admin'; // 默认的账号
 			var password = 'admin123'; // 默认的password   fdsg@3,;27Rf
 			var logo = 'sa-frame/admin-logo.png'; // logo地址,为空字符串则不显示

+ 6 - 0
sa-frame/menu-list-sp.js

@@ -754,6 +754,12 @@ window.menuList.unshift({
 							icon:'el-icon-collection'
 						},
 						{
+							id: 'tb-wallet-topup-fail',
+							name: '未支付记录',
+							url: 'sa-view/tb-wallet-topup/tb-wallet-topup-fail.html',
+							icon:'el-icon-collection'
+						},
+						{
 							id: 'tb-wallet-record',
 							name: '扣除记录',
 							url: 'sa-view/tb-wallet-record/tb-wallet-record-list.html',

+ 21 - 5
sa-view/ht-byte/ht-byte-list.html

@@ -44,6 +44,8 @@
 							<el-option label="退单" value="010"></el-option>
 						</el-select>
 					</sa-item>
+					<sa-item type="date" name="日期" v-model="p.createTime" width="90px"></sa-item>
+					<sa-item type="text" name="车牌" v-model="p.veNo" width="90px"></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>
@@ -59,11 +61,14 @@
 							<div v-if="s.row.finishStatus==2">处理失败</div>
 						</template>
 					</sa-td>
-					<sa-td name="时间" prop="createTime"></sa-td>
-					<el-table-column label="操作" fixed="right" width="120px">
+					<sa-td name="车牌" prop="veNo"></sa-td>
+					<sa-td name="创建时间" prop="createTime"></sa-td>
+					<sa-td name="完成时间" prop="finishTime"></sa-td>
+					<el-table-column label="操作" fixed="right" width="140px">
 						<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="success" @click="get(s.row)">查看</el-button>
+							<el-button v-if="s.row.dataType==007||s.row.dataType==008" class="c-btn" type="primary"
+								@click="doExec(s.row)">执行</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -87,6 +92,7 @@
 						body: '', // 字节数据主体 
 						queueName: '', // mq队列名称 
 						finishStatus: '', // 完成对象转换状态 
+						searchDate: '',
 						createTime: '', // 创建时间 
 						pageNo: 1, // 当前页 
 						pageSize: 10, // 页大小 
@@ -96,6 +102,16 @@
 					dataList: [], // 数据集合 
 				},
 				methods: {
+					doExec(data) {
+						sa.confirm('是否再次执行?', function() {
+							sa.ajax('/async-server/HtByte/updateStatus?id=' + data.id, function(res) {
+								sa.ok('操作成功');
+								sa.f5TableHeight(); // 刷新表格高度
+								this.f5();
+							}.bind(this))
+						}.bind(this));
+					},
+
 					// 刷新
 					f5: function() {
 						sa.ajax('/async-server/HtByte/getList', sa.removeNull(this.p), function(res) {
@@ -108,7 +124,7 @@
 					get: function(data) {
 						sa.showIframe('数据详情', 'ht-byte-info.html?id=' + data.id, '900px', '800px');
 					},
-				
+
 				},
 				created: function() {
 					this.f5();

+ 1 - 0
sa-view/tb-import-order/tb-import-order-list.html

@@ -22,6 +22,7 @@
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="业务编号" v-model="p.platSeqNo" width="100px"></sa-item>
 					<sa-item type="text" name="车牌号" v-model="p.veNo" width="100px"></sa-item>
+					<sa-item type="text" name="申报人" v-model="p.declareName" width="100px"></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>

+ 90 - 0
sa-view/tb-wallet-topup/tb-wallet-topup-fail.html

@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<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 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+	</head>
+	<body>
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
+			<div class="c-panel">
+				<!-- ------------- 检索参数 ------------- -->
+				<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>
+					<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="outTradeNo" width="200"></sa-td>
+					<sa-td name="充值点数" prop="amount"></sa-td>
+					<sa-td name="充值时间" prop="topupTime" width="160"></sa-td>
+					<el-table-column label="操作" fixed="right" width="160px">
+						<template slot-scope="s">
+							<el-button class="c-btn" type="success" icon="el-icon-view"
+								@click="check(s.row)">查询状态</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<!-- ------------- 分页 ------------- -->
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount"
+					@change="f5()"></sa-item>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),
+				},
+				el: '.vue-box',
+				data: {
+					p: { // 查询参数  
+						peopleName: '', // 边民姓名 
+						mchid: '', // 商户号 
+						payStatus: 3,
+						pageNo: 1, // 当前页 
+						pageSize: 10, // 页大小 
+						sortType: 0 // 排序方式 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+					sum: 0
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/level-one-server/TbWalletTopup/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight(); // 刷新表格高度 
+						}.bind(this));
+					},
+					check: function(data) {
+						sa.ajax('/level-one-server/TbWalletTopup/checkStatus?id=' + data.id, function(res) {
+							sa.alert(res.data)
+						}.bind(this));
+					},
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>