瀏覽代碼

部分功能优化

qzy 1 月之前
父節點
當前提交
13c1f20415

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

@@ -193,6 +193,17 @@ window.menuList.unshift({
 					},
 				]
 			},
+			{
+				id: 'ht-byte',
+				name: '航通',
+				icon: 'el-icon-folder-opened',
+				parent:true,
+				info: '航通基础信息字节码表表数据的维护',
+				childList: [
+					{id: 'ht-byte-list', name: 'MQ数据-列表', url: 'sa-view/ht-byte/ht-byte-list.html',
+					},
+				]
+			},
 		]
 	}, {
 		id: 'tb-base-data',

+ 8 - 8
sa-frame/menu-list.js

@@ -1,20 +1,20 @@
-// 一个菜单可以包括的所有属性 
+// 一个菜单可以包括的所有属性
 // {
 // 	id: '12345',		// 菜单id, 必须唯一
 // 	name: '用户中心',		// 菜单名称, 同时也是tab选项卡上显示的名称
 // 	icon: 'el-icon-user',	// 菜单图标, 参考地址:  https://element.eleme.cn/#/zh-CN/component/icon
-//	info: '管理所有用户',	// 菜单介绍, 在菜单预览和分配权限时会有显示 
+//	info: '管理所有用户',	// 菜单介绍, 在菜单预览和分配权限时会有显示
 // 	url: 'sa-html/user/user-list.html',	// 菜单指向地址
-// 	parentId: 1,			// 所属父菜单id, 如果指定了一个值, sa-admin在初始化时会将此菜单转移到指定菜单上 
+// 	parentId: 1,			// 所属父菜单id, 如果指定了一个值, sa-admin在初始化时会将此菜单转移到指定菜单上
 // 	isShow: true,			// 是否显示, 默认true
-// 	isBlank: false,		// 是否属于外部链接, 如果为true, 则点击菜单时从新窗口打开 
+// 	isBlank: false,		// 是否属于外部链接, 如果为true, 则点击菜单时从新窗口打开
 // 	childList: [			// 指定这个菜单所有的子菜单, 子菜单可以继续指定子菜单, 至多支持三级菜单
-// 		// .... 
+// 		// ....
 // 	],
-//	click: function(){}		// 点击菜单执行一个函数 
+//	click: function(){}		// 点击菜单执行一个函数
 // }
 
-// 定义菜单列表 
+// 定义菜单列表
 var menuList =	[
 
-]
+]

+ 3 - 3
sa-view-sp/console/com-sta-data.vue

@@ -46,7 +46,7 @@
 				</div>
 			</div>
 		</el-col>
-		<el-col :lg="4" :sm="8" :xs="24">
+		<!-- <el-col :lg="4" :sm="8" :xs="24">
 			<div class="sa-wnk">
 				<img src="../../static/icon/jyz.png" />
 				<div class="sa-wnk-tv">
@@ -54,7 +54,7 @@
 					<p class="sa-wnk-value">{{ sta.totalMoney-sta.finishMoney }}</p>
 				</div>
 			</div>
-		</el-col>
+		</el-col> -->
 
 	</el-row>
 </template>
@@ -120,4 +120,4 @@
 		font-size: 24px;
 		padding-bottom: 20px;
 	}
-</style>
+</style>

+ 13 - 3
sa-view/app-user/app-user-list.html

@@ -22,6 +22,15 @@
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="手机号码" v-model="p.phone" width="100px"></sa-item>
 					<sa-item type="text" name="姓名" v-model="p.name"></sa-item>
+					<sa-item name="类型">
+						<el-select v-model="p.userType">
+							<el-option label="全部" value=""></el-option>
+							<el-option label="边民" value="1"></el-option>
+							<el-option label="组长" value="2"></el-option>
+							<el-option label="收购商" value="3"></el-option>
+							<el-option label="外籍商户" value="5"></el-option>
+						</el-select>
+					</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-button v-if="sa.isAuth('app-user-add')" size="mini" type="primary" @click="add()">新增</el-button>
@@ -29,7 +38,7 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="index" name="序号"></sa-td>
-					<sa-td name="手机号码" prop="phone" ></sa-td>
+					<sa-td name="手机号码" prop="phone" width="120" ></sa-td>
 					<sa-td name="姓名" prop="name" width="100"></sa-td>
 					<sa-td name="类型" prop="userType" type="enum" :jv="{1: '普通边民', 2: '边民组长', 3: '收购商', 4: '司机', 5: '外籍商户', 6: '合作社'}"></sa-td>
 					<sa-td name="状态" prop="enable" width="90" align="center">
@@ -44,9 +53,10 @@
 							<el-tag type="danger" v-if="scope.row.auth==0">未认证</el-tag>
 						</template>
 					</sa-td>
-					<sa-td name="认证时间" prop="authTime" ></sa-td>
+					<sa-td name="认证时间" prop="authTime" width="160"></sa-td>
 					<sa-td name="登录次数" prop="loginCount" width="90"></sa-td>
-					<sa-td name="上次登录时间" prop="lastLoginTime" ></sa-td>
+					<sa-td name="上次登录时间" prop="lastLoginTime" width="160" ></sa-td>
+					<sa-td name="创建时间" prop="createTime" width="160" ></sa-td>
 					<el-table-column label="操作" fixed="right"  width="270px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>

+ 122 - 0
sa-view/ht-byte/ht-byte-add.html

@@ -0,0 +1,122 @@
+<!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 .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.id" br></sa-item>
+						<sa-item type="text" name="mq消息主键" v-model="m.messageId" br></sa-item>
+						<sa-item type="text" name="**001=边民备案**002=商铺备案**003=边民互助组备案**004=边民合作社备案**005=车辆**006=进境申报单**007=进口申报单" v-model="m.dataType" br></sa-item>
+						<sa-item type="text" name="字节数据主体" v-model="m.body" br></sa-item>
+						<sa-item type="text" name="mq队列名称" v-model="m.queueName" br></sa-item>
+						<sa-item type="text" name="完成对象转换状态" v-model="m.finishStatus" br></sa-item>
+						<sa-item type="text" name="创建时间" v-model="m.createTime" 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: '',		// 字节表主键 
+							messageId: '',		// mq消息主键 
+							dataType: '',		//      *      * 001=边民备案     *      * 002=商铺备案     *      * 003=边民互助组备案     *      * 004=边民合作社备案     *      * 005=车辆     *      * 006=进境申报单     *      * 007=进口申报单 
+							body: '',		// 字节数据主体 
+							queueName: '',		// mq队列名称 
+							finishStatus: '',		// 完成对象转换状态 
+							createTime: '',		// 创建时间 
+						}
+					},
+					// 提交数据 
+					ok: function(){
+						// 表单校验 
+						let m = this.m;
+						sa.checkNull(m.id, '请输入 [字节表主键]');
+						sa.checkNull(m.messageId, '请输入 [mq消息主键]');
+						sa.checkNull(m.dataType, '请输入 [**001=边民备案**002=商铺备案**003=边民互助组备案**004=边民合作社备案**005=车辆**006=进境申报单**007=进口申报单]');
+						sa.checkNull(m.body, '请输入 [字节数据主体]');
+						sa.checkNull(m.queueName, '请输入 [mq队列名称]');
+						sa.checkNull(m.finishStatus, '请输入 [完成对象转换状态]');
+						sa.checkNull(m.createTime, '请输入 [创建时间]');
+				
+						// 开始增加或修改
+						if(this.id <= 0) {	// 添加
+							sa.ajax('/HtByte/add', m, function(res){
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
+						} else {	// 修改
+							sa.ajax('/HtByte/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('/HtByte/getById?id=' + this.id, function(res) {
+							this.m = res.data;
+							if(res.data == null) {
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
+							}
+						}.bind(this))
+					}
+				}
+			})
+			
+		</script>
+	</body>
+</html>

+ 61 - 0
sa-view/ht-byte/ht-byte-info.html

@@ -0,0 +1,61 @@
+<!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: 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><div style="line-height: 35px;">{{m.details}}</div></sa-info>
+						<sa-info name="创建时间" br>{{m.createTime}}</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('/async-server/HtByte/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if(res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+			
+		</script>
+	</body>
+</html>

+ 106 - 0
sa-view/ht-byte/ht-byte-list.html

@@ -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 name="状态">
+						<el-select v-model="p.finishStatus">
+							<el-option label="全部" value=""></el-option>
+							<el-option label="成功" :value="1"></el-option>
+							<el-option label="失败" :value="2"></el-option>
+							<el-option label="未处理" :value="0"></el-option>
+						</el-select>
+					</sa-item>
+					<sa-item type="text" name="类型" v-model="p.dataType"></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 name="序号" type="index"></sa-td>
+					<sa-td name="类型" prop="dataType"></sa-td>
+					<sa-td name="处理结果" prop="createTime">
+						<template slot-scope="s">
+							<div v-if="s.row.finishStatus==0">未处理</div>
+							<div v-if="s.row.finishStatus==1">处理成功</div>
+							<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">
+						<template slot-scope="s">
+							<el-button class="c-btn" type="success" icon="el-icon-view"
+								@click="get(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: '', // 字节表主键 
+						messageId: '', // mq消息主键 
+						dataType: '', //      *      * 001=边民备案     *      * 002=商铺备案     *      * 003=边民互助组备案     *      * 004=边民合作社备案     *      * 005=车辆     *      * 006=进境申报单     *      * 007=进口申报单 
+						body: '', // 字节数据主体 
+						queueName: '', // mq队列名称 
+						finishStatus: '', // 完成对象转换状态 
+						createTime: '', // 创建时间 
+						pageNo: 1, // 当前页 
+						pageSize: 10, // 页大小 
+						sortType: 0 // 排序方式 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/async-server/HtByte/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-byte-info.html?id=' + data.id, '900px', '800px');
+					},
+				
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

+ 157 - 88
sa-view/listing-management/listing-management-order.html

@@ -3,7 +3,8 @@
 	<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" />
+		<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">
@@ -15,13 +16,24 @@
 		<script src="../../static/sa.js"></script>
 		<style type="text/css">
 			hr {
-				border: none;          /* 移除默认边框 */
-				height: 1px;           /* 设置高度 */
-				background-color: gainsboro;/* 设置颜色 */
-				margin: 5px 0;        /* 设置上下外边距 */
+				border: none;
+				/* 移除默认边框 */
+				height: 1px;
+				/* 设置高度 */
+				background-color: gainsboro;
+				/* 设置颜色 */
+				margin: 5px 0;
+				/* 设置上下外边距 */
+			}
+
+			.c-panel .el-form .c-label {
+				width: 7em !important;
+			}
+
+			.c-panel .el-form .el-input,
+			.c-panel .el-form .el-textarea__inner {
+				width: 150px;
 			}
-			.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>
@@ -41,34 +53,58 @@
 						</el-col>
 					</el-row>
 				</el-form>
-				<hr>
+				<el-divider content-position="left">边民订单-列表</el-divider>
+				<el-form ref="form" :model='p' @submit.native.prevent>
+					<sa-item name="上架状态">
+						<el-select v-model="p.upStatus" style="width: 120px;">
+							<el-option label="全部" value=""></el-option>
+							<el-option label="未上架" value="1"></el-option>
+							<el-option label="已上架" value="2"></el-option>
+						</el-select>
+					</sa-item>
+					<sa-item name="转售状态">
+						<el-select v-model="p.resaleStatus" style="width: 120px;">
+							<el-option label="全部" value=""></el-option>
+							<el-option label="未转售" value="0"></el-option>
+							<el-option label="已转售" value="1"></el-option>
+						</el-select>
+					</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-form ref="form" :model='p' @submit.native.prevent>
-					<div style="margin: 15px 0px 15px 0px;">详情-边民订单</div>
-					<el-button v-if="sa.isAuth('tb-order-edit-price')"
-							type="primary" style="margin-bottom:10px;" @click="editPriceByIds()">批量修改总价</el-button>
-							<el-button v-if="sa.isAuth('tb-order-edit-price')"
-									type="primary" style="margin-bottom:10px;" @click="saleBatch()">批量转售</el-button>
-							<el-button
-									type="primary" style="margin-bottom:10px;" @click="f5()">刷新</el-button>
+					<el-button v-if="sa.isAuth('tb-order-edit-price')" type="primary" style="margin-bottom:10px;"
+						@click="editPriceByIds()">批量修改总价</el-button>
+					<el-button v-if="sa.isAuth('tb-order-edit-price')" type="primary" style="margin-bottom:10px;"
+						@click="saleBatch()">批量转售</el-button>
+
 				</el-form>
+				<div style="display: flex;padding: 10px;font-size: 16px;">
+					<div>订单总数:{{dataCount}};</div>
+					<div style="margin-left: 10px;">已上架:{{statics.upSize}};</div>
+					<div style="margin-left: 10px;">未上架:<span style="color:red">{{statics.notUpSize}}</span>;</div>
+					<div style="margin-left: 10px;">上架总金额:<span style="color:red;font-weight: bold;">{{statics.upTotalPrice}}元</span>;</div>
+					<div style="margin-left: 10px;">已转售:{{statics.saleSize}};</div>
+					<div style="margin-left: 10px;">未转售:<span style="color:red">{{statics.notSaleSize}}</span></div>
+				</div>
 				<!-- ------------- 数据列表 ------------- -->
-				<el-table class="data-table" ref="data-table" :data="dataList" >
+				<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="buyUserName" ></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="upStatus" >
+					<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="upStatus">
 						<template slot-scope="s">
 							<div v-if="s.row.upStatus==2">已上架</div>
 							<div v-else>未上架</div>
 						</template>
 					</sa-td>
-					<sa-td name="是否转售" prop="resaleStatus" >
+					<sa-td name="是否转售" prop="resaleStatus">
 						<template slot-scope="s">
 							<div v-if="s.row.resaleStatus==1">已转售</div>
 							<div v-else>未转售</div>
@@ -80,25 +116,30 @@
 							<div v-else>未销售</div>
 						</template>
 					</sa-td>
-					<el-table-column label="操作" fixed="right"  width="100px">
+					<el-table-column label="操作" fixed="right" width="100px">
 						<template slot-scope="s">
 							<div>
-								<el-button v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
-										   class="c-btn" type="success" icon="el-icon-view" @click="editPrice(s.row)">修改总价</el-button>
-								<el-button v-else :disabled="true"
-										   class="c-btn" type="success" icon="el-icon-view" @click="editPrice(s.row)">修改总价</el-button>
+								<el-button
+									v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
+									class="c-btn" type="success" icon="el-icon-view"
+									@click="editPrice(s.row)">修改总价</el-button>
+								<el-button v-else :disabled="true" class="c-btn" type="success" icon="el-icon-view"
+									@click="editPrice(s.row)">修改总价</el-button>
 							</div>
 							<div>
-								<el-button v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
-										   class="c-btn" type="primary" icon="el-icon-plus" @click="sel(s.row)">转售二级</el-button>
-								<el-button v-else :disabled="true"
-										   class="c-btn" type="primary" icon="el-icon-plus" @click="sel(s.row)">转售二级</el-button>
+								<el-button
+									v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
+									class="c-btn" type="primary" icon="el-icon-plus"
+									@click="sel(s.row)">转售二级</el-button>
+								<el-button v-else :disabled="true" class="c-btn" type="primary" icon="el-icon-plus"
+									@click="sel(s.row)">转售二级</el-button>
 							</div>
 						</template>
 					</el-table-column>
 				</el-table>
 				<!-- ------------- 分页 ------------- -->
-				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount"
+					@change="f5()"></sa-item>
 			</div>
 			<el-dialog :title="model.title" :visible.sync="model.visible" width="500px">
 				<div>
@@ -135,124 +176,149 @@
 						title: '修改价格',
 						visible: false,
 						form: {
-							id:'',
-							upPrice:'',
-							selPrice:0
+							id: '',
+							upPrice: '',
+							selPrice: 0
 						}
 					},
+					statics: {
+						notSaleSize: '',
+						notUpSize: '',
+						saleSize: '',
+						upSize: '',
+						upTotalPrice: ''
+					},
 					model1: {
 						title: '批量修改订单价格',
 						visible: false,
-						ids:'',
-						selPrice:0
+						ids: '',
+						selPrice: 0
 					},
 					p: { // 查询参数
-						tradeNo: '',		    // 订单号
-						buyUserName: '',		// 买家
-						enterpriseName: '',		// 商家名称
-						platSeqNo: sa.p('platSeqNo', 0),
-						pageNo: 1,		// 当前页
-						pageSize: 20,	// 页大小
-						sortType: 0		// 排序方式
+						tradeNo: '', // 订单号
+						upStatus: '', // 买家
+						resaleStatus: '', // 商家名称
+						saleMainId: sa.p('mainId', 0),
+						pageNo: 1, // 当前页
+						pageSize: 20, // 页大小
+						sortType: 0 // 排序方式
 					},
 					dataCount: 0,
 					dataList: [], // 数据集合
 				},
 				methods: {
+					getStatic() {
+						sa.ajax('/level-one-server/TbOrder/staticsStatus', {
+							saleMainId: this.p.saleMainId
+						}, function(res) {
+							this.statics=res.data;
+						}.bind(this));
+					},
 					// 批量修改总价
-					 editPriceByIds: function() {
+					editPriceByIds: function() {
 						// 获取选中元素的id列表
 						let selection = this.$refs['data-table'].selection;
 						let ids = sa.getArrayField(selection, 'id');
-						if(selection.length == 0) {
+						if (selection.length == 0) {
 							return sa.msg('请至少选择一条数据')
 						}
 						let selectList = [];
 						selectList = this.dataList.filter(item => ids.includes(item.id));
 						for (let i = 0; i < selectList.length; i++) {
-							if(selectList[i].upStatus != 2) {
+							if (selectList[i].upStatus != 2) {
 								return sa.msg('当前选中数据包含未上架订单,不可修改总价,请重新选择!');
 							}
-							if(selectList[i].resaleStatus != 0) {
+							if (selectList[i].resaleStatus != 0) {
 								return sa.msg('当前选中数据包含已转售订单,不可修改总价,请重新选择!')
 							}
 						}
-						 this.model1={
-							 title:'批量修改订单价格',
-							 visible:true,
-							 ids:ids,
-						 }
+						this.model1 = {
+							title: '批量修改订单价格',
+							visible: true,
+							ids: ids,
+						}
 					},
 					// 修改总价
-					editPrice(item){
-						this.model={
-							title:'修改订单【'+item.tradeNo+'】价格',
-							visible:true,
-							form:item
+					editPrice(item) {
+						this.model = {
+							title: '修改订单【' + item.tradeNo + '】价格',
+							visible: true,
+							form: item
 						}
 					},
 					savePriceByIds() {
-						let ids=this.model1.ids;
-						if(!ids){
+						let ids = this.model1.ids;
+						if (!ids) {
 							sa.error('当前没有选择数据,请至少选择一条数据')
 							return;
 						}
-						let price=this.model1.selPrice;
-						if(!price){
+						let price = this.model1.selPrice;
+						if (!price) {
 							sa.error('请输入金额')
 							return;
 						}
-						sa.ajax('/level-one-server/TbOrder/editUpPriceByIds', {ids:ids.toString(),price:price}, function(res) {
+						sa.ajax('/level-one-server/TbOrder/editUpPriceByIds', {
+							ids: ids.toString(),
+							price: price
+						}, function(res) {
 							this.f5();
-							this.model1.visible=false;
+							this.model1.visible = false;
 						}.bind(this));
 					},
-					save(){
-						let price=this.model.form.selPrice;
-						if(!price){
+					save() {
+						let price = this.model.form.selPrice;
+						if (!price) {
 							sa.error('请输入金额')
 							return;
 						}
-						sa.ajax('/level-one-server/TbOrder/editUpPrice', {id:this.model.form.id,price:price}, function(res) {
+						sa.ajax('/level-one-server/TbOrder/editUpPrice', {
+							id: this.model.form.id,
+							price: price
+						}, function(res) {
 							this.f5();
-							this.model.visible=false;
+							this.model.visible = false;
 						}.bind(this));
 					},
 
 					// 转售二级
-					sel(item){
-						if(!item.upPrice){
+					sel(item) {
+						if (!item.upPrice) {
 							sa.error('转售价格不能为空')
 							return;
 						}
-						sa.confirm('是否转售到二级市场?', function(){
-							sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:item.id,resalePrice:item.upPrice}, function(res) {
+						sa.confirm('是否转售到二级市场?', function() {
+							sa.ajax('/level-two-server/TbOrders/addOrderByResale', {
+								id: item.id,
+								resalePrice: item.upPrice
+							}, function(res) {
 								this.f5();
 							}.bind(this));
 						}.bind(this));
 					},
-					saleBatch(){
+					saleBatch() {
 						// 获取选中元素的id列表
 						let selection = this.$refs['data-table'].selection;
-						for(let i in selection){
-							let item=selection[i];
-							if(!item.upPrice){
-								sa.error(item.tradeNo+'转售价格不能为空')
+						for (let i in selection) {
+							let item = selection[i];
+							if (!item.upPrice) {
+								sa.error(item.tradeNo + '转售价格不能为空')
 								return;
 							}
 
-							if(item.resaleStatus==1){
-								sa.error(item.tradeNo+'已转售')
+							if (item.resaleStatus == 1) {
+								sa.error(item.tradeNo + '已转售')
 								return;
 							}
 
 						}
 						let ids = sa.getArrayField(selection, 'id');
-						if(selection.length == 0) {
+						if (selection.length == 0) {
 							return sa.msg('请至少选择一条数据')
 						}
-						sa.confirm('是否转售到二级市场?', function(){
-							sa.ajax('/level-two-server/TbOrders/addOrderByResaleBatch', {ids:ids.join(',')}, function(res) {
+						sa.confirm('是否转售到二级市场?', function() {
+							sa.ajax('/level-two-server/TbOrders/addOrderByResaleBatch', {
+								ids: ids.join(',')
+							}, function(res) {
 								this.f5();
 							}.bind(this));
 						}.bind(this));
@@ -260,10 +326,11 @@
 					},
 					// 刷新
 					f5: function() {
+						this.getStatic();
 						sa.ajax('/level-one-server/TbOrder/getList', sa.removeNull(this.p), function(res) {
 							this.dataList = res.data; // 数据
 							this.dataCount = res.dataCount; // 数据总数
-							sa.f5TableHeight();		// 刷新表格高度
+							sa.f5TableHeight(); // 刷新表格高度
 						}.bind(this));
 					},
 					// 查看银行回执
@@ -273,13 +340,15 @@
 				},
 				created: function() {
 					this.f5();
-					sa.ajax('/level-one-server/HtTradeSettlement/getById', {id : this.id}, function(res) {
+					sa.ajax('/level-one-server/HtTradeSettlement/getById', {
+						id: this.id
+					}, function(res) {
 						this.bigData = res.data; // 数据
-						sa.f5TableHeight();		// 刷新表格高度
+						sa.f5TableHeight(); // 刷新表格高度
 					}.bind(this));
 					sa.onInputEnter();
 				}
 			})
 		</script>
 	</body>
-</html>
+</html>

+ 1 - 1
sa-view/listing-management/listing-management.html

@@ -95,7 +95,7 @@
 						sa.showIframe('数据详情', 'ht-trade-settlement-info.html?id=' + data.id, '1050px', '90%');
 					},
 					getOrder(data){
-						sa.showIframe('详情', 'listing-management-order.html?platSeqNo='+data.platSeqNo+'&id='+data.id, '90%', '94%');
+						sa.showIframe('详情', 'listing-management-order.html?platSeqNo='+data.platSeqNo+'&mainId='+data.id, '90%', '94%');
 					},
 				
 				},