Home Explore Help
Register Sign In
qzyReal
/
market-admin-ui
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

退单

qzy 6 months ago
parent
75dac0b989
commit
1c615ec420
9 changed files with 838 additions and 12 deletions
Split View Show Diff Stats
  1. 108 0
      sa-view/ht-settlement-error/ht-trade-chargebacks-list.html
  2. 106 0
      sa-view/ht-settlement-error/ht-trade-returns-list.html
  3. 190 0
      sa-view/ht-settlement-error/ht-trade-settlement-info.html
  4. 111 0
      sa-view/ht-settlement-error/ht-trade-settlement-order.html
  5. 116 0
      sa-view/tb-app/tb-app-add.html
  6. 66 0
      sa-view/tb-app/tb-app-info.html
  7. 132 0
      sa-view/tb-app/tb-app-list.html
  8. 1 7
      sa-view/tb-purchaser/tb-purchaser-add.html
  9. 8 5
      sa-view/tb-purchaser/tb-purchaser-list.html

+ 108 - 0
sa-view/ht-settlement-error/ht-trade-chargebacks-list.html
View File 

@@ -0,0 +1,108 @@
 
+<!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.platSeqNo" width="8em"></sa-item>
 
+					<sa-item type="text" name="申报单编号" v-model="p.declareId" width="8em"></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>
 
+				<!-- ------------- 数据列表 ------------- -->
 
+				<el-table class="data-table" ref="data-table" :data="dataList" >
 
+					<sa-td type="index" name="序号"></sa-td>
 
+					<sa-td name="申报单编号" prop="declareId" width="220px"></sa-td>
 
+					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
 
+					<sa-td name="互市区" prop="fieldName" width="160"></sa-td>
 
+					<sa-td name="商铺名称" prop="shopName"  width="160"></sa-td>
 
+					<sa-td name="商品名称" prop="goodsNames"  width="160"></sa-td>
 
+					<sa-td name="总金额" prop="sumAmt" ></sa-td>
 
+					<sa-td name="总毛重(kg)" prop="sumGrossWt" ></sa-td>
 
+					<sa-td name="总净重(kg)" prop="sumNetWt" ></sa-td>
 
+					<sa-td name="运输方式" prop="trafMode" ></sa-td>
 
+					<sa-td name="币制" prop="currCode" ></sa-td>
 
+					<sa-td name="件数" prop="packNo" ></sa-td>
 
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
 
+					<sa-td name="提运单号" prop="billNo"  width="160"></sa-td>
 
+					<sa-td name="航次号" prop="voyageNo"  width="160"></sa-td>
 
+					<sa-td name="申报日期" prop="createTime"  width="160">
 
+						<template slot-scope="s">
 
+							{{sa.forDate(s.row.declTime, 1)}}
 
+						</template>
 
+					</sa-td>
 
+					<sa-td name="退单时间" prop="returnsTime"  width="160"></sa-td>
 
+					<el-table-column label="操作" width="140px" fixed="right" >
 
+						<template slot-scope="s">
 
+							<el-button class="c-btn" type="success" @click="get(s.row)">查看</el-button>
 
+							<el-button class="c-btn" type="primary"  @click="getOrder(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: { // 查询参数
 
+						platSeqNo: '',		// 预申报编号
 
+						declareId: '',		// 申报单编号
 
+						goodsNames: '',		// 商品名称
 
+						chargebacks:1,
 
+						pageNo: 1,		// 当前页
 
+						pageSize: 10,	// 页大小
 
+						sortType: 0		,// 排序方式
 
+					},
 
+					dataCount: 0,
 
+					dataList: [], // 数据集合
 
+				},
 
+				methods: {
 
+					// 刷新
 
+					f5: function() {
 
+						sa.ajax('/level-one-server/HtTradeSettlement/getList', sa.removeNull(this.p), function(res) {
 
+							this.dataList = res.data; // 数据
 
+							this.dataCount = res.dataCount; // 数据总数
 
+							sa.f5TableHeight();		// 刷新表格高度
 
+						}.bind(this));
 
+					},
 
+					// 查看
 
+					get: function(data) {
 
+						sa.showIframe('数据详情', 'ht-trade-settlement-info.html?id=' + data.id+'&type=chargebacks', '1050px', '90%');
 
+					},
 
+					getOrder(data){
 
+						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?mainId='+data.id, '90%', '94%');
 
+					},
 
+				
+				},
 
+				created: function() {
 
+					this.f5();
 
+					sa.onInputEnter();
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 106 - 0
sa-view/ht-settlement-error/ht-trade-returns-list.html
View File 

@@ -0,0 +1,106 @@
 
+<!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.platSeqNo" width="8em"></sa-item>
 
+					<sa-item type="text" name="申报单编号" v-model="p.declareId" width="8em"></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>
 
+				<!-- ------------- 数据列表 ------------- -->
 
+				<el-table class="data-table" ref="data-table" :data="dataList" >
 
+					<sa-td type="index" name="序号"></sa-td>
 
+					<!-- <sa-td name="预申报编号" prop="platSeqNo" width="160px"></sa-td> -->
 
+					<sa-td name="申报单编号" prop="declareId" width="220px"></sa-td>
 
+					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
 
+					<sa-td name="互市区" prop="fieldName" width="160"></sa-td>
 
+					<sa-td name="商铺名称" prop="shopName"  width="160"></sa-td>
 
+					<sa-td name="商品名称" prop="goodsNames"  width="160"></sa-td>
 
+					<sa-td name="总金额" prop="sumAmt" ></sa-td>
 
+					<sa-td name="总毛重(kg)" prop="sumGrossWt" ></sa-td>
 
+					<sa-td name="总净重(kg)" prop="sumNetWt" ></sa-td>
 
+					<sa-td name="运输方式" prop="trafMode" ></sa-td>
 
+					<sa-td name="币制" prop="currCode" ></sa-td>
 
+					<sa-td name="件数" prop="packNo" ></sa-td>
 
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
 
+					<sa-td name="提运单号" prop="billNo"  width="160"></sa-td>
 
+					<sa-td name="航次号" prop="voyageNo"  width="160"></sa-td>
 
+					<sa-td name="申报日期" prop="createTime"  width="160">
 
+						<template slot-scope="s">{{sa.forDate(s.row.declTime, 1)}}</template>
 
+					</sa-td>
 
+					<sa-td name="退运时间" prop="returnsTime"  width="160"></sa-td>
 
+					<el-table-column label="操作" width="140px" fixed="right" >
 
+						<template slot-scope="s">
 
+							<el-button class="c-btn" type="success" @click="get(s.row)">查看</el-button>
 
+							<el-button class="c-btn" type="primary"  @click="getOrder(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: { // 查询参数
 
+						platSeqNo: '',		// 预申报编号
 
+						declareId: '',		// 申报单编号
 
+						goodsNames: '',		// 商品名称
 
+						returns:1,
 
+						pageNo: 1,		// 当前页
 
+						pageSize: 10,	// 页大小
 
+						sortType: 0		// 排序方式
 
+					},
 
+					dataCount: 0,
 
+					dataList: [], // 数据集合
 
+				},
 
+				methods: {
 
+					// 刷新
 
+					f5: function() {
 
+						sa.ajax('/level-one-server/HtTradeSettlement/getList', sa.removeNull(this.p), function(res) {
 
+							this.dataList = res.data; // 数据
 
+							this.dataCount = res.dataCount; // 数据总数
 
+							sa.f5TableHeight();		// 刷新表格高度
 
+						}.bind(this));
 
+					},
 
+					// 查看
 
+					get: function(data) {
 
+						sa.showIframe('数据详情', 'ht-trade-settlement-info.html?id=' + data.id+'&type=returns', '1050px', '90%');
 
+					},
 
+					getOrder(data){
 
+						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?mainId='+data.id, '90%', '94%');
 
+					},
 
+				},
 
+				created: function() {
 
+					this.f5();
 
+					sa.onInputEnter();
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 190 - 0
sa-view/ht-settlement-error/ht-trade-settlement-info.html
View File 

@@ -0,0 +1,190 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<title>航通交易结算表-详情</title>
 
+		<meta http-equiv="Content-Type" content="text/html; 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>
 
+		<style type="text/css">
 
+			.c-panel .c-label{width: 18em;}
 
+			table {
 
+			  font-family: arial, sans-serif;
 
+			  border-collapse: collapse;
 
+			  width: 90%;
 
+			  margin-top: 20px ;
 
+			  margin-left: auto;
 
+			  margin-right: auto;
 
+			}
 
+			th {
 
+			  border: 1px solid darkgray;
 
+			  text-align: left;
 
+			  height: 24px;
 
+			  padding: 8px;
 
+			  background-color: #dddddd;
 
+			}
 
+			td {
 
+			  border: 1px solid darkgray;
 
+			  text-align: left;
 
+			  padding: 8px;
 
+			}
 
+		</style>
 
+	</head>
 
+	<body>
 
+		<div class="vue-box sbot" style="display: none;" :style="'display: block;'">
 
+			<!-- ------- 内容部分 ------- -->
 
+			<div class="s-body">
 
+				<div class="c-panel">
 
+					<el-form v-if="m">
 
+						<table>
 
+							<tr>
 
+								<th>预申报编号</th>
 
+								<td>{{m.platSeqNo}}</td>
 
+								<th>申报单编号</th>
 
+								<td>{{m.declareId}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>申报人类型</th>
 
+								<td>
 
+									<b v-if="m.declareType == 1">边民</b>
 
+									<b v-if="m.declareType == 2">商铺业主或其代理人</b>
 
+									<b v-if="m.declareType == 3">合作社代表</b>
 
+									<b v-if="m.declareType == 4">互助组代表</b>
 
+								</td>
 
+								<th>申报人姓名</th>
 
+								<td>{{m.declareName}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>申报时间</th>
 
+								<td>{{sa.forDate(m.declTime, 2)}}</td>
 
+								<th>身份证号码</th>
 
+								<td>{{m.idno}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>商铺编码</th>
 
+								<td>{{m.shopNo}}</td>
 
+								<th>商铺名称</th>
 
+								<td>{{m.shopName}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>商品名称</th>
 
+								<td>{{m.goodsNames}}</td>
 
+								<th>总金额</th>
 
+								<td>{{m.sumAmt}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>总毛重</th>
 
+								<td>{{m.sumGrossWt}}</td>
 
+								<th>总净重</th>
 
+								<td>{{m.sumNetWt}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>运输方式</th>
 
+								<td>{{m.trafMode}}</td>
 
+								<th>币制</th>
 
+								<td>{{m.currCode}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>件数</th>
 
+								<td>{{m.packNo}}</td>
 
+								<th>合作社社会统一信用代码</th>
 
+								<td>{{m.orgScc}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>互助组/合作社备案编号</th>
 
+								<td>{{m.orgPutrecNo}}</td>
 
+								<th>互助组/合租社名称</th>
 
+								<td>{{m.orgName}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>车牌号</th>
 
+								<td>{{m.veNo}}</td>
 
+								<th>业务模式</th>
 
+								<td>
 
+									<b v-if="m.btrnbBizModecd == 1">区内交易</b>
 
+									<b v-if="m.btrnbBizModecd == 2">落地加工</b>
 
+									<b v-if="m.btrnbBizModecd == 3">原装提离</b>
 
+									<b v-if="m.btrnbBizModecd == 4">直接出口</b>
 
+									<b v-if="m.btrnbBizModecd == 5">出口销售</b>
 
+								</td>
 
+							</tr>
 
+							<tr>
 
+								<th>商品流向</th>
 
+								<td>
 
+									<b v-if="m.gFlow == 1">二次销售</b>
 
+									<b v-if="m.gFlow == 2">生活自用</b>
 
+									<b v-if="m.gFlow == 3">落地加工</b>
 
+								</td>
 
+								<th>进出口标志</th>
 
+								<td>
 
+									<b v-if="m.iEFlag === 'I'">进口</b>
 
+									<b v-if="m.iEFlag === 'E'">出口</b>
 
+								</td>
 
+							</tr>
 
+							<tr>
 
+								<th>互市区编号</th>
 
+								<td>{{m.fieldCode}}</td>
 
+								<th>互市区</th>
 
+								<td>{{m.fieldName}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>提运单号</th>
 
+								<td>{{m.billNo}}</td>
 
+								<th>航次号</th>
 
+								<td>{{m.voyageNo}}</td>
 
+							</tr>
 
+							<tr>
 
+								<th>单证代码</th>
 
+								<td>{{m.preNo}}</td>
 
+								<th>
 
+									<div v-if="type=='chargebacks'">退单时间</div>
 
+									<div v-if="type=='returns'">退运时间</div>
 
+								</th>
 
+								<td>
 
+								<div v-if="type=='chargebacks'">{{sa.forDate(m.chargebacksTime, 2)}}</div>
 
+								<div v-if="type=='returns'">{{sa.forDate(m.returnsTime, 2)}}</div>
 
+								</td>
 
+							</tr>
 
+						</table>
 
+					</el-form>
 
+				</div>
 
+			</div>
 
+			<!-- ------- 底部按钮 ------- -->
 
+			<div class="s-foot">
 
+				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
 
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
 
+			</div>
 
+		</div>
 
+		<script>
 
+			var app = new Vue({
 
+				components: {
 
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
 
+				},
 
+				el: '.vue-box',
 
+				data: {
 
+					id: sa.p('id', 0),	// 获取数据ID 
+					type:sa.p('type','chargebacks'),
 
+					m: null
 
+				},
 
+				methods: {
 
+				},
 
+				mounted: function() {
 
+					sa.ajax('/level-one-server/HtTradeSettlement/getById?id=' + this.id, function(res) {
 
+						this.m = res.data;
 
+						if(res.data == null) {
 
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+						}
 
+					}.bind(this))
 
+				}
 
+			})
 
+			
+		</script>
 
+	</body>
 
+</html>

+ 111 - 0
sa-view/ht-settlement-error/ht-trade-settlement-order.html
View File 

@@ -0,0 +1,111 @@
 
+<!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>
 
+		<style type="text/css">
 
+			.c-panel .el-form .c-label{width: 7em !important;}
 
+			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
 
+		</style>
 
+	</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.tradeNo" width="5em"></sa-item>
 
+					<sa-item type="text" name="边民" v-model="p.buyUserName"></sa-item>
 
+					<sa-item type="text" name="商家名称" v-model="p.enterpriseName" width="6em"></sa-item>
 
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
+					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 
+				</el-form>
 
+				<!-- ------------- 数据列表 ------------- -->
 
+				<el-table class="data-table" ref="data-table" :data="dataList" >
 
+					<sa-td type="index" width="30px"></sa-td>
 
+					<sa-td name="订单号" prop="tradeNo" width="180px"></sa-td>
 
+					<sa-td name="边民" prop="buyUserName" ></sa-td>
 
+					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 
+					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
+					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
 
+					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 
+					<sa-td name="上架金额" prop="upPrice" >
 
+					</sa-td>
 
+					<sa-td name="订单状态" prop="upPrice" >
 
+						<template slot-scope="s">
 
+							<div v-if="s.row.upStatus==2">已上架</div>
 
+							<div v-else>未上架</div>
 
+						</template>
 
+					</sa-td>
 
+					<el-table-column label="操作" fixed="right"  width="100px">
 
+						<template slot-scope="s">
 
+							<el-button class="c-btn" type="success" icon="el-icon-view" @click="getBank(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: {
 
+					model: {
 
+						title: '修改价格',
 
+						visible: false,
 
+						form: {
 
+							id:'',
 
+							upPrice:'',
 
+							selPrice:0
 
+						}
 
+					},
 
+					p: { // 查询参数
 
+						tradeNo: '',		    // 订单号
 
+						buyUserName: '',		// 买家
 
+						enterpriseName: '',		// 商家名称
 
+						saleMainId: sa.p('mainId', 0),
 
+						pageNo: 1,		// 当前页
 
+						pageSize: 20,	// 页大小
 
+						sortType: 0		// 排序方式
 
+					},
 
+					dataCount: 0,
 
+					dataList: [], // 数据集合
 
+				},
 
+				methods: {
 
+					// 刷新
 
+					f5: function() {
 
+						sa.ajax('/level-one-server/TbOrder/getList', sa.removeNull(this.p), function(res) {
 
+							this.dataList = res.data; // 数据
 
+							this.dataCount = res.dataCount; // 数据总数
 
+							sa.f5TableHeight();		// 刷新表格高度
 
+						}.bind(this));
 
+					},
 
+					// 查看银行回执
 
+					getBank: function(data) {
 
+						sa.showIframe('银行回执', 'tb-order-bank-list.html?tradeNo=' + data.tradeNo, '1300px', '90%');
 
+					}
 
+				},
 
+				created: function() {
 
+					this.f5();
 
+					sa.onInputEnter();
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 116 - 0
sa-view/tb-app/tb-app-add.html
View File 

@@ -0,0 +1,116 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<title>APK管理-添加/修改</title>
 
+		<meta http-equiv="Content-Type" content="text/html; 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>
 
+		<script src="../../static/kj/upload-util.js"></script>
 
+		<style type="text/css">
 
+			.c-panel .el-form .c-label{width: 7em !important;}
 
+			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
 
+		</style>
 
+	</head>
 
+	<body>
 
+		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
 
+			<!-- ------- 内容部分 ------- -->
 
+			<div class="s-body">
 
+				<div class="c-panel">
 
+                    <div class="c-title" v-if="id == 0">数据添加</div>
 
+					<div class="c-title" v-else>数据修改</div>
 
+					<el-form v-if="m">
 
+						<sa-item type="text" name="版本号" v-model="m.version" br></sa-item>
 
+						<sa-item type="textarea" name="升级内容" v-model="m.content" br></sa-item>
 
+						<sa-item type="file" name="APK" v-model="m.url" br></sa-item>
 
+						<sa-item name="" class="s-ok" br>
 
+							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 
+						</sa-item>
 
+					</el-form>
 
+				</div>
 
+			</div>
 
+			<!-- ------- 底部按钮 ------- -->
 
+			<div class="s-foot">
 
+				<el-button type="primary" @click="ok()">确定</el-button>
 
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
 
+			</div>
 
+		</div>
 
+        <script>
 
+			
+			var app = new Vue({
 
+				components: {
 
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
 
+				},
 
+				el: '.vue-box',
 
+				data: {
 
+					id: sa.p('id', 0),		// 获取超链接中的id参数（0=添加，非0=修改） 
+					m: null,		// 实体对象 
+				},
 
+				methods: {
 
+					// 创建一个 默认Model 
+					createModel: function() {
 
+						return {
 
+							id: '',		//  
+							content: '',		//  
+							version: '',		//  
+							url: '',		//  
+							status: 0,		// 状态(0=下架,1=上架) 
+							// createTime: '',		// 创建时间 
+							// updateTime: '',		// 更新时间 
+						}
 
+					},
 
+					// 提交数据 
+					ok: function(){
 
+						// 表单校验 
+						let m = this.m;
 
+						sa.checkNull(m.version, '请输入 [版本号]');
 
+						sa.checkNull(m.content, '请输入 [升级内容]');
 
+						sa.checkNull(m.url, '请上传 [APK]');
 
+						// 开始增加或修改
 
+						this.m.createTime = undefined;		// 不提交属性：创建时间
 
+						this.m.updateTime = undefined;		// 不提交属性：更新时间
 
+						if(this.id <= 0) {	// 添加
 
+							sa.ajax('/sp-admin/TbApp/add', m, function(res){
 
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
 
+						} else {	// 修改
 
+							sa.ajax('/sp-admin/TbApp/update', m, function(res){
 
+								sa.alert('修改成功', this.clean);
 
+							}.bind(this));
 
+						}
 
+					},
 
+					// 添加/修改 完成后的动作
 
+					clean: function() {
 
+						if(this.id == 0) {
 
+							this.m = this.createModel();
 
+						} else {
 
+							parent.app.f5();		// 刷新父页面列表
 
+							sa.closeCurrIframe();	// 关闭本页 
+						}
 
+					}
 
+				},
 
+				mounted: function(){
 
+					// 初始化数据 
+					if(this.id <= 0) {	
+						this.m = this.createModel();
 
+					} else {	
+						sa.ajax('/sp-admin/TbApp/getById?id=' + this.id, function(res) {
 
+							this.m = res.data;
 
+							if(res.data == null) {
 
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+							}
 
+						}.bind(this))
 
+					}
 
+				}
 
+			})
 
+			
+		</script>
 
+	</body>
 
+</html>

+ 66 - 0
sa-view/tb-app/tb-app-info.html
View File 

@@ -0,0 +1,66 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<title>APK管理-详情</title>
 
+		<meta http-equiv="Content-Type" content="text/html; 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>
 
+		<style type="text/css">
 
+			.c-panel .c-label{width: 8em;}
 
+		</style>
 
+	</head>
 
+	<body>
 
+		<div class="vue-box sbot" style="display: none;" :style="'display: block;'">
 
+			<!-- ------- 内容部分 ------- -->
 
+			<div class="s-body">
 
+				<div class="c-panel">
 
+					<el-form v-if="m">
 
+						<sa-info name="" br>{{m.id}}</sa-info>
 
+						<sa-info name="" br>{{m.content}}</sa-info>
 
+						<sa-info name="" br>{{m.version}}</sa-info>
 
+						<sa-info name="" br>{{m.url}}</sa-info>
 
+						<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '下架', 1: '上架'}" br></sa-info>
 
+						<sa-info type="datetime" name="创建时间" :value="m.createTime" br></sa-info>
 
+						<sa-info type="datetime" name="更新时间" :value="m.updateTime" br></sa-info>
 
+					</el-form>
 
+				</div>
 
+			</div>
 
+			<!-- ------- 底部按钮 ------- -->
 
+			<div class="s-foot">
 
+				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
 
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
 
+			</div>
 
+		</div>
 
+		<script>
 
+			var app = new Vue({
 
+				components: {
 
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
 
+				},
 
+				el: '.vue-box',
 
+				data: {
 
+					id: sa.p('id', 0),	// 获取数据ID 
+					m: null
 
+				},
 
+				methods: {
 
+				},
 
+				mounted: function() {
 
+					sa.ajax('/TbApp/getById?id=' + this.id, function(res) {
 
+						this.m = res.data;
 
+						if(res.data == null) {
 
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+						}
 
+					}.bind(this))
 
+				}
 
+			})
 
+			
+		</script>
 
+	</body>
 
+</html>

+ 132 - 0
sa-view/tb-app/tb-app-list.html
View File 

@@ -0,0 +1,132 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<title>APK管理-列表</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="enum" name="状态" v-model="p.status" :jv="{0: '下架', 1: '上架'}" jtype="2"
 
+						def="不限"></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-button v-if="sa.isAuth('tb-app-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
+				</el-form>
 
+
 
+				<!-- ------------- 数据列表 ------------- -->
 
+				<el-table class="data-table" ref="data-table" :data="dataList">
 
+					<sa-td name="序号" type="index"></sa-td>
 
+					<sa-td name="版本号" prop="version"></sa-td>
 
+					<sa-td name="APK" prop="url">
 
+						<template slot-scope="s">
 
+							<el-link type="primary" :href="s.row.url" target="_blank">下载</el-link>
 
+						</template>
 
+					</sa-td>
 
+					<sa-td name="状态" prop="status" type="switch" :jv="{0: '下架[#aaaa7f]', 1: '上架[#005500]'}"
 
+						@change="s => updateStatus(s.row)"></sa-td>
 
+					<sa-td name="创建时间" prop="createTime" type="datetime"></sa-td>
 
+					<sa-td name="更新时间" prop="updateTime" type="datetime"></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>
 
+							<el-button v-if="sa.isAuth('tb-app-edit')" class="c-btn" type="primary" icon="el-icon-edit"
 
+								@click="update(s.row)">修改</el-button>
 
+							<el-button v-if="sa.isAuth('tb-app-del')" class="c-btn" type="danger" icon="el-icon-delete"
 
+								@click="del(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: { // 查询参数  
+						id: '', //  
+						content: '', //  
+						version: '', //  
+						url: '', //  
+						status: '', // 状态(0=下架,1=上架) 
+						pageNo: 1, // 当前页 
+						pageSize: 10, // 页大小 
+						sortType: 0 // 排序方式 
+					},
 
+					dataCount: 0,
 
+					dataList: [], // 数据集合 
+				},
 
+				methods: {
 
+					// 刷新
 
+					f5: function() {
 
+						sa.ajax('/sp-admin/TbApp/getList', sa.removeNull(this.p), function(res) {
 
+							this.dataList = res.data; // 数据
 
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight(); // 刷新表格高度 
+						}.bind(this));
 
+					},
 
+				
+					// 新增
 
+					add: function(data) {
 
+						sa.showIframe('新增数据', 'tb-app-add.html?id=-1', '700px', '400px');
 
+					},
 
+					// 删除
 
+					del: function(data) {
 
+						sa.confirm('是否删除，此操作不可撤销', function() {
 
+							sa.ajax('/sp-admin/TbApp/delete?id=' + data.id, function(res) {
 
+								sa.arrayDelete(this.dataList, data);
 
+								sa.ok('删除成功');
 
+								sa.f5TableHeight(); // 刷新表格高度 
+							}.bind(this))
 
+						}.bind(this));
 
+					},
 
+					// 改 - 状态(0=下架,1=上架)
 
+					updateStatus: function(data) {
 
+						// 声明变量记录是否成功 
+						var isOk = false;
 
+						var oldValue = data.status;
 
+						var ajax = sa.ajax('/sp-admin/TbApp/updateStatus', {
 
+							id: data.id,
 
+							value: data.status
 
+						}, function(res) {
 
+							isOk = true;
 
+							sa.msg('修改成功');
 
+						}.bind(this));
 
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
 
+							if (isOk == false) {
 
+								data.status = oldValue;
 
+							}
 
+						})
 
+					},
 
+				},
 
+				created: function() {
 
+					this.f5();
 
+					sa.onInputEnter();
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 1 - 7
sa-view/tb-purchaser/tb-purchaser-add.html
View File 

@@ -162,11 +162,6 @@
 
 							bankName: '', 			// 银行名称
 
 							bankAccount: '', 		// 银行账号
 
 							address: '', 			// 企业地址
 
-							// judgeStatus: '',		// 审核状态(0=未通过,1=已通过)
 
-							// judgeContent: '',	// 审核意见
 
-							// judgeTime: '',		// 上次审核时间
 
-							// personId: '', 		// 人脸编号
 
-							// deleteStatus: '',	// 删除状态(0=禁用,1=启用)
 
 						}
 
 					},
 
 					// 提交数据
 
@@ -176,9 +171,8 @@
 
 						sa.checkNull(m.businessName, '请输入 [企业名称]');
 
 						sa.checkNull(m.legalPerson, '请输入 [企业法人]');
 
 						sa.checkNull(m.dutyParagraph, '请输入 [统一社会信用代码]');
 
-						sa.checkNull(m.businessLicense, '请上传 [营业执照]');
 
 						sa.checkNull(m.name, '请输入 [联系人]');
 
-						sa.checkNull(m.idCard, '请输入 [身份证号]');
 
+						// sa.checkNull(m.idCard, '请输入 [身份证号]');
 
 						let contact = m.contact;
 
 						if (!sa.isPhone(contact)) {
 
 							sa.error('手机号不正确');

+ 8 - 5
sa-view/tb-purchaser/tb-purchaser-list.html
View File 

@@ -31,20 +31,23 @@
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td type="selection"></sa-td>
 
-					<sa-td name="企业名称" prop="businessName" ></sa-td>
 
+					<sa-td name="企业名称" prop="businessName" width="250"></sa-td>
 
 					<sa-td name="企业法人" prop="legalPerson" ></sa-td>
 
-					<sa-td name="统一社会信用代码" prop="dutyParagraph" ></sa-td>
 
-					<sa-td name="营业执照" prop="businessLicense" type="img-list"></sa-td>
 
+					<sa-td name="统一社会信用代码" prop="dutyParagraph" width="200"></sa-td>
 
+					<!-- <sa-td name="营业执照" prop="businessLicense" type="img-list"></sa-td> -->
 
+					<sa-td name="开户行" prop="bankName" width="230"></sa-td>
 
+					<sa-td name="开户账号" prop="bankAccount" width="200"></sa-td>
 
 					<sa-td name="联系人" prop="name" ></sa-td>
 
-					<sa-td name="邮箱" prop="email" ></sa-td>
 
+					<sa-td name="联系号码" prop="contact" width="160"></sa-td>
 
+					<!-- <sa-td name="邮箱" prop="email" ></sa-td> -->
 
 					<sa-td name="审核状态" prop="judgeStatus">
 
 						<template slot-scope="scope">
 
-							{{scope.row.judgeStatus}}
 
 							<el-tag type="danger" v-if="scope.row.judgeStatus==0">未审核</el-tag>
 
 							<el-tag type="primary" v-if="scope.row.judgeStatus==1">审核通过</el-tag>
 
 							<el-tag type="danger" v-if="scope.row.judgeStatus==2">审核驳回</el-tag>
 
 						</template>
 
 					</sa-td>
 
+					<sa-td name="创建时间" prop="createTime" 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>