Merge remote-tracking branch 'origin/feature/asyncOrder' into feature/asyncOrder

# Conflicts:
#	sa-view/ht-trade-settlement/ht-trade-settlement-list.html
#	sa-view/tb-goods/tb-goods-list.html
#	sa-view/tb-import-goods/tb-import-goods-list.html
#	sa-view/tb-import-order/tb-import-order-list.html
#	sa-view/tb-orders/tb-orders-list.html
#	sa-view/tb-purchaser/tb-purchaser-judge.html
#	sa-view/tb-shop/tb-shop-info.html
#	sa-view/tb-shop/tb-shop-list.html
#	static/sa.js

sa-frame/menu-list-sp.js

@@ -99,7 +99,8 @@ window.menuList.unshift({
 		icon: 'el-icon-setting',
 		parent: true,
 		info: '有关系统的一些配置',
-		childList: [{
+		childList: [
+			{
 				id: 'sp-cfg-app',
 				name: '系统对公配置',
 				url: 'sa-view-sp/sp-cfg/app-cfg.html'

sa-view/app-role/app-role-list.html

@@ -28,7 +28,7 @@
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="index" name="序号"></sa-td>
 					<sa-td name="角色名称" prop="roleName" ></sa-td>
-					<sa-td type="switch" name="状态" prop="status" :jv="{1: '启用[green]', 0: '禁用[#ff4949]'}" @change="s => updateStatus(s.row)" width="120px"></sa-td>
+					<sa-td type="switch" name="注册" prop="status" :jv="{1: '启用[green]', 0: '禁用[#ff4949]'}" @change="s => updateStatus(s.row)" width="120px"></sa-td>
 					<sa-td name="类型" prop="userType" type="enum" :jv="{1: '普通边民', 2: '边民组长', 3: '收购商', 4: '司机', 5: '外籍商户', 6: '合作社'}"></sa-td>
 					<el-table-column label="操作" fixed="right"  width="120px">
 						<template slot-scope="s">

sa-view/app-user/app-user-pass.html

@@ -29,11 +29,9 @@
 			<!-- ------- 内容部分 ------- -->
 			<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.password" br></sa-item>
-						<sa-item type="text" name="重复密码" v-model="m.again" br></sa-item>
+					<el-form>
+						<sa-item type="password"  name="新密码" v-model="m.password" br></sa-item>
+						<sa-item type="password"  name="重复密码" v-model="m.again" br></sa-item>
 					</el-form>
 				</div>
 			</div>
@@ -51,13 +49,17 @@
 				el: '.vue-box',
 				data: {
 					id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改）
-					m: null, // 实体对象
+					m: {
+						password:'',
+						again:''
+					}, // 实体对象
 				},
 				methods: {
 					// 创建一个 默认Model
 					createModel: function() {
 						return {
-							
+							password:'',
+							again:''
 						}
 					},
 					// 提交数据
@@ -70,6 +72,10 @@
 							sa.alert('两次输入不一致');
 							return;
 						}
+						if(m.password.length<8){
+							sa.alert('密码长度不能小于8');
+							return;
+						}
 						sa.ajax('/sp-admin/AppUser/pass', m, function(res) {
 							sa.alert('修改成功', this.clean);
 						}.bind(this));
@@ -87,8 +93,7 @@
 				mounted: function() {
 					// 初始化数据
 					sa.ajax('/sp-admin/AppUser/getById?id=' + this.id, function(res) {
-						this.m = res.data;
-						this.m.password='';
+						this.m.id=res.data.id;
 					}.bind(this))
 				}
 			})

sa-view/ht-trade-settlement/ht-trade-settlement-list.html

@@ -28,19 +28,23 @@
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="index" width="30px"></sa-td>
-					<sa-td name="预申报编号" prop="platSeqNo" width="140px"></sa-td>
-					<sa-td name="申报单编号" prop="declareId" width="140px"></sa-td>
+					<sa-td type="index" name="序号"></sa-td>
+					<sa-td name="预申报编号" prop="platSeqNo" width="160px"></sa-td>
+					<sa-td name="申报单编号" prop="declareId" width="160px"></sa-td>
 					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
-					<sa-td name="互市区" prop="fieldName" ></sa-td>
-					<sa-td name="商铺名称" prop="shopName" ></sa-td>
-					<sa-td name="商品名称" prop="goodsNames" ></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="总毛重" prop="sumGrossWt" ></sa-td>
-					<sa-td name="总净重" prop="sumNetWt" ></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="preNo"  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>
@@ -55,29 +59,29 @@
 		<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: { // 查询参数  
-						platSeqNo: '',		// 预申报编号 
-						declareId: '',		// 申报单编号 
+					p: { // 查询参数
+						platSeqNo: '',		// 预申报编号
+						declareId: '',		// 申报单编号
 						goodsNames: '',		// 商品名称
-						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
-						sortType: 0		// 排序方式 
+						pageNo: 1,		// 当前页
+						pageSize: 10,	// 页大小
+						sortType: 0		// 排序方式
 					},
 					dataCount: 0,
-					dataList: [], // 数据集合 
+					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();		// 刷新表格高度 
+							this.dataCount = res.dataCount; // 数据总数
+							sa.f5TableHeight();		// 刷新表格高度
 						}.bind(this));
 					},
 					// 查看
@@ -85,7 +89,7 @@
 						sa.showIframe('数据详情', 'ht-trade-settlement-info.html?id=' + data.id, '1050px', '90%');
 					},
 					getOrder(data){
-						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?platSeqNo='+data.platSeqNo, '1300px', '94%');
+						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?platSeqNo='+data.platSeqNo, '1080px', '94%');
 					},
 					// 修改
 					update: function(data) {
@@ -101,24 +105,24 @@
 							sa.ajax('/HtTradeSettlement/delete?id=' + data.id, 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('/HtTradeSettlement/deleteByIds', {ids: ids.join(',')}, function(res) {
 								sa.arrayDelete(this.dataList, selection);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight();		// 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},

sa-view/tb-purchaser/tb-purchaser-judge.html

@@ -144,4 +144,4 @@
 			})
 		</script>
 	</body>
-</html>
+</html>

sa-view/tb-shop/tb-shop-info.html

@@ -102,7 +102,7 @@
 								<th>账户类型:是否海外</th>
 								<td>{{m.abroad}}</td>
 							</tr>
-							
+
 							<tr>
 								<th>代理人姓名</th>
 								<td>{{m.agentName}}</td>