修改优化

sa-frame/com/sa-item.vue

@@ -195,7 +195,7 @@
 			:current-page.sync="curr" 
 			:page-size.sync="size" 
 			:total="parseInt(total)" 
-			:page-sizes="sizes || [1, 10, 20, 30, 40, 50, 100]" 
+			:page-sizes="sizes || [10, 20, 30, 40, 50, 100]" 
 			@current-change="changePage()" 
 			@size-change="changePage()">
 		</el-pagination>

sa-frame/menu-list-sp.js

@@ -181,21 +181,21 @@ window.menuList.unshift({
 		childList: [{
 				id: 'tb-trade-area',
 				icon: 'el-icon-s-management',
-				name: '贸易区域管理',
+				name: '场所管理',
 				url: 'sa-view/tb-trade-area/tb-trade-area-list.html',
 				childList: [{
 						id: 'tb-trade-area-add',
-						name: '贸易区域添加',
+						name: '添加场所',
 						isShow: false
 					},
 					{
 						id: 'tb-trade-area-edit',
-						name: '贸易区域更新',
+						name: '更新场所',
 						isShow: false
 					},
 					{
 						id: 'tb-trade-area-del',
-						name: '贸易区域删除',
+						name: '删除场所',
 						isShow: false
 					},
 				]
@@ -250,17 +250,17 @@ window.menuList.unshift({
 				]
 			},
 
-			{
-				id: 'tb-enterprise-judge',
-				icon: 'el-icon-s-check',
-				name: '商户审核',
-				url: 'sa-view/tb-enterprise/tb-enterprise-judge.html',
-				childList: [{
-					id: 'tb-enterprise-judge',
-					name: '商户审核',
-					isShow: false
-				}, ]
-			},
+			// {
+			// 	id: 'tb-enterprise-judge',
+			// 	icon: 'el-icon-s-check',
+			// 	name: '商户审核',
+			// 	url: 'sa-view/tb-enterprise/tb-enterprise-judge.html',
+			// 	childList: [{
+			// 		id: 'tb-enterprise-judge',
+			// 		name: '商户审核',
+			// 		isShow: false
+			// 	}, ]
+			// },
 			{
 				id: 'tb-enterprise',
 				icon: 'el-icon-film',
@@ -504,7 +504,7 @@ window.menuList.unshift({
 				childList: [
 					{
 						id: 'ht-trade-settlement',
-						name: '进境申报单',
+						name: '进境结算单',
 						url: 'sa-view/ht-trade-settlement/ht-trade-settlement-list.html',
 						childList: [{
 								id: 'ht-trade-settlement-add',
@@ -525,7 +525,7 @@ window.menuList.unshift({
 					},
 					{
 						id: 'tb-order',
-						name: '边民订单',
+						name: '边民购买订单',
 						url: 'sa-view/tb-order/tb-order-list.html',
 						childList: [{
 								id: 'tb-order-add',
@@ -685,32 +685,32 @@ window.menuList.unshift({
 					},
 				]
 			},
-			{
-				id: 'tb-people-profit-list',
-				name: '边民收益设置',
-				icon: 'el-icon-folder-opened',
-				info: '费项管理表数据的维护',
-				url: 'sa-view/tb-people-profit/tb-people-profit-set.html',
-				childList: [{
-					id: 'tb-people-profit',
-					name: '收益设置',
-					isShow: false
-				}, ]
-			},
+			// {
+			// 	id: 'tb-people-profit-list',
+			// 	name: '边民收益设置',
+			// 	icon: 'el-icon-folder-opened',
+			// 	info: '费项管理表数据的维护',
+			// 	url: 'sa-view/tb-people-profit/tb-people-profit-set.html',
+			// 	childList: [{
+			// 		id: 'tb-people-profit',
+			// 		name: '收益设置',
+			// 		isShow: false
+			// 	}, ]
+			// },
 			{
 				id: 'tb-fee-item-record',
 				name: '收费记录',
 				icon: 'el-icon-folder-opened',
 				url: 'sa-view/tb-fee-item-record/tb-fee-item-record-list.html'
 			},
-			{
-				id: 'tb-people-profit-record-list',
-				name: '边民收益记录',
-				icon: 'el-icon-folder-opened',
-				url: 'sa-view/tb-people-profit-record/tb-people-profit-record-list.html',
-				childList: [
-				]
-			}
+			// {
+			// 	id: 'tb-people-profit-record-list',
+			// 	name: '边民收益记录',
+			// 	icon: 'el-icon-folder-opened',
+			// 	url: 'sa-view/tb-people-profit-record/tb-people-profit-record-list.html',
+			// 	childList: [
+			// 	]
+			// }
 		]
 	}
 

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

@@ -32,7 +32,6 @@
 					<sa-td name="预申报编号" prop="platSeqNo" width="110px"></sa-td>
 					<sa-td name="申报单编号" prop="declareId" width="110px"></sa-td>
 					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
-					<sa-td name="身份证号码" prop="idno" ></sa-td>
 					<sa-td name="互市区" prop="fieldName" ></sa-td>
 					<sa-td name="商铺名称" prop="shopName" ></sa-td>
 					<sa-td name="商品名称" prop="goodsNames" ></sa-td>
@@ -46,10 +45,10 @@
 					<sa-td name="提运单号" prop="billNo" ></sa-td>
 					<sa-td name="航次号" prop="voyageNo" ></sa-td>
 					<sa-td name="单证代码" prop="preNo" ></sa-td>
-					<el-table-column label="操作" width="200px">
+					<el-table-column label="操作" width="140px" 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-view" @click="getOrder(s.row)">边民订单</el-button>
+							<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>
@@ -90,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, '1280px', '94%');
+						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?platSeqNo='+data.platSeqNo, '1080px', '94%');
 					},
 					// 修改
 					update: function(data) {

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

@@ -36,10 +36,9 @@
 					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="预申报编号" prop="platSeqNo" width="180"></sa-td>
-					<sa-td name="结算单号" prop="settleBillNo" width="180"></sa-td>
-					<sa-td name="进出口预申报单号" prop="preIeportNo" width="180"></sa-td>
-					<sa-td name="单证代码" prop="preNo" width="180"></sa-td>
+					<sa-td type="enum" name="交易确认" prop="peopleConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
+					<sa-td type="enum" name="委托确认" prop="cooperEntrustStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
+					<sa-td type="enum" name="进口确认" prop="applyConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
 				</el-table>
 				<!-- ------------- 分页 ------------- -->
 				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>

sa-view/tb-enterprise/tb-enterprise-list.html

@@ -40,8 +40,8 @@
 					<sa-td name="营业执照" prop="businessLicense" type="img-list"></sa-td>
 					<sa-td name="银行名称" prop="bank"></sa-td>
 					<sa-td name="银行账号" prop="bankAccount"></sa-td>
-					<sa-td name="审核时间" width="160px" prop="judgeTime"></sa-td>
-					<sa-td name="审核人" width="130px" prop="judgeBy"></sa-td>
+					<!-- <sa-td name="审核时间" width="160px" prop="judgeTime"></sa-td>
+					<sa-td name="审核人" width="130px" prop="judgeBy"></sa-td> -->
 					<el-table-column label="操作" width="240px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view"

sa-view/tb-goods-type/tb-goods-type-add.html

@@ -3,7 +3,8 @@
 	<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" />
+		<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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
 		<link rel="stylesheet" href="../../static/sa.css">
@@ -15,8 +16,14 @@
 		<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;}
+			.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>
@@ -24,22 +31,11 @@
 			<!-- ------- 内容部分 ------- -->
 			<div class="s-body">
 				<div class="c-panel">
-                    <div class="c-title" v-if="id == 0">数据添加</div>
+					<div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-item type="text" name="类别名称" v-model="m.name" br></sa-item>
-							</el-col>
-							<el-col :span="12">
-								<sa-item type="text" name="排序" v-model="m.sort" br></sa-item>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-item type="text" name="编号" v-model="m.no" br></sa-item>
-							</el-col>
-						</el-row>
+						<sa-item type="text" name="类别名称" v-model="m.name" br></sa-item>
+						<sa-item type="text" name="编号" v-model="m.no" br></sa-item>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -52,75 +48,68 @@
 				<el-button @click="sa.closeCurrIframe()">取消</el-button>
 			</div>
 		</div>
-        <script>
-			
+		<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,		// 实体对象 
+					id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改） 
+					m: null, // 实体对象 
 				},
 				methods: {
 					// 创建一个 默认Model 
 					createModel: function() {
 						return {
-							name: '',		// 类别名称 
-							sort: '',		// 排序 
-							no: '',		// 编号 
+							name: '', // 类别名称 
+							sort: '', // 排序 
+							no: '', // 编号 
 							// deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
 							// parentId: sa.p('parentId', '-1'),		// 父类型id 
 						}
 					},
 					// 提交数据 
-					ok: function(){
+					ok: function() {
 						// 表单校验 
 						let m = this.m;
-						// sa.checkNull(m.id, '请输入 [主键]');
 						sa.checkNull(m.name, '请输入 [类别名称]');
-						sa.checkNull(m.sort, '请输入 [排序]');
 						sa.checkNull(m.no, '请输入 [编号]');
-						// sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
-						// sa.checkNull(m.parentId, '请输入 [父类型id]');
-				
 						// 开始增加或修改
-						if(this.id <= 0) {	// 添加
-							sa.ajax('/level-one-server/TbGoodsType/add', m, function(res){
-								sa.alert('增加成功', this.clean); 
+						if (this.id <= 0) { // 添加
+							sa.ajax('/level-one-server/TbGoodsType/add', m, function(res) {
+								sa.alert('增加成功', this.clean);
 							}.bind(this));
-						} else {	// 修改
-							sa.ajax('/level-one-server/TbGoodsType/update', m, function(res){
+						} else { // 修改
+							sa.ajax('/level-one-server/TbGoodsType/update', m, function(res) {
 								sa.alert('修改成功', this.clean);
 							}.bind(this));
 						}
 					},
 					// 添加/修改 完成后的动作
 					clean: function() {
-						if(this.id == 0) {
+						if (this.id == 0) {
 							this.m = this.createModel();
 						} else {
-							parent.app.f5();		// 刷新父页面列表
-							sa.closeCurrIframe();	// 关闭本页 
+							parent.app.f5(); // 刷新父页面列表
+							sa.closeCurrIframe(); // 关闭本页 
 						}
 					}
 				},
-				mounted: function(){
+				mounted: function() {
 					// 初始化数据 
-					if(this.id <= 0) {	
+					if (this.id <= 0) {
 						this.m = this.createModel();
-					} else {	
+					} else {
 						sa.ajax('/level-one-server/TbGoodsType/getById?id=' + this.id, function(res) {
 							this.m = res.data;
-							if(res.data == null) {
+							if (res.data == null) {
 								sa.alert('未能查找到 id=' + this.id + " 详细数据");
 							}
 						}.bind(this))
 					}
 				}
 			})
-			
 		</script>
 	</body>
 </html>

sa-view/tb-goods-type/tb-goods-type-list.html

@@ -29,7 +29,7 @@
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList"  row-key="id" border @expand-change="sa.f5TableHeight()">
-					<sa-td type="selection"></sa-td>
+					<sa-td type="index" name="序号"></sa-td>
 					<sa-td name="类别名称" prop="name" ></sa-td>
 					<sa-td name="排序" prop="sort" ></sa-td>
 					<sa-td name="编号" prop="no" ></sa-td>
@@ -92,11 +92,11 @@
 					},
 					// 修改
 					update: function(data) {
-						sa.showIframe('修改数据', 'tb-goods-type-add.html?id=' + data.id, '1000px', '90%');
+						sa.showIframe('修改数据', 'tb-goods-type-add.html?id=' + data.id, '600px', '90%');
 					},
 					// 新增
 					add: function(data) {
-						sa.showIframe('新增数据', 'tb-goods-type-add.html?id=-1', '1000px', '90%');
+						sa.showIframe('新增数据', 'tb-goods-type-add.html?id=-1', '600px', '500px');
 					},
 					// 新增子级
 					addChildren: function(data) {

sa-view/tb-goods-units/tb-goods-units-add.html

@@ -3,9 +3,10 @@
 	<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" />
+		<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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
+		<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>
@@ -13,31 +14,32 @@
 		<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: 30em !important;}
-			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 400px;}
+			.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-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<el-row>
-							<el-col>
-								<sa-item type="text" name="商品单位编号" v-model="m.unitsNo" br></sa-item>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col>
-								<sa-item type="text" name="管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号" v-model="m.units" br></sa-item>
-							</el-col>
-						</el-row>
+						<sa-item type="text" name="编号" v-model="m.unitsNo" br :disabled="id>0"></sa-item>
+						<sa-item type="text" name="名称" v-model="m.units" 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>
@@ -47,69 +49,66 @@
 				<el-button @click="sa.closeCurrIframe()">取消</el-button>
 			</div>
 		</div>
-        <script>
-
+		<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,		// 实体对象
+					id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改）
+					m: null, // 实体对象
 				},
 				methods: {
 					// 创建一个 默认Model
 					createModel: function() {
 						return {
-							id: '',		// 商品主键
-							unitsNo: '',		// 商品单位编号
-							units: '',		// 管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号
+							id: '', // 商品主键
+							unitsNo: '', // 商品单位编号
+							units: '', // 管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号
 						}
 					},
 					// 提交数据
-					ok: function(){
+					ok: function() {
 						// 表单校验
 						let m = this.m;
-						sa.checkNull(m.unitsNo, '请输入 [商品单位编号]');
-						sa.checkNull(m.units, '请输入 [管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号]');
-
+						sa.checkNull(m.unitsNo, '请输入 [单位编号]');
+						sa.checkNull(m.units, '请输入 [单位名称]');
 						// 开始增加或修改
-						if(this.id <= 0) {	// 添加
-							sa.ajax('/level-one-server/TbGoodsUnits/add', m, function(res){
+						if (this.id <= 0) { // 添加
+							sa.ajax('/level-one-server/TbGoodsUnits/add', m, function(res) {
 								sa.alert('增加成功', this.clean);
 							}.bind(this));
-						} else {	// 修改
-							sa.ajax('/level-one-server/TbGoodsUnits/update', m, function(res){
+						} else { // 修改
+							sa.ajax('/level-one-server/TbGoodsUnits/update', m, function(res) {
 								sa.alert('修改成功', this.clean);
 							}.bind(this));
 						}
 					},
 					// 添加/修改 完成后的动作
 					clean: function() {
-						if(this.id == 0) {
+						if (this.id == 0) {
 							this.m = this.createModel();
 						} else {
-							parent.app.f5();		// 刷新父页面列表
-							sa.closeCurrIframe();	// 关闭本页
+							parent.app.f5(); // 刷新父页面列表
+							sa.closeCurrIframe(); // 关闭本页
 						}
 					}
 				},
-				mounted: function(){
+				mounted: function() {
 					// 初始化数据
-					if(this.id <= 0) {
+					if (this.id <= 0) {
 						this.m = this.createModel();
 					} else {
 						sa.ajax('/level-one-server/TbGoodsUnits/getById?id=' + this.id, function(res) {
 							this.m = res.data;
-							if(res.data == null) {
+							if (res.data == null) {
 								sa.alert('未能查找到 id=' + this.id + " 详细数据");
 							}
 						}.bind(this))
 					}
 				}
 			})
-
 		</script>
 	</body>
-</html>
+</html>

sa-view/tb-goods-units/tb-goods-units-list.html

@@ -22,19 +22,19 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="商品单位编号" v-model="p.unitsNo" width="115px"></sa-item>
+					<sa-item type="text" name="编号" v-model="p.unitsNo" width="115px"></sa-item>
+					<sa-item type="text" name="名称" v-model="p.unitsNo" width="115px"></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('tb-goods-units-add')" size="mini" type="primary" @click="add()">新增</el-button>
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="selection"></sa-td>
-					<sa-td name="商品单位编号" prop="unitsNo" ></sa-td>
-					<sa-td name="管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号" prop="units" ></sa-td>
-					<el-table-column label="操作" fixed="right"  width="240px">
+					<sa-td type="index" name="序号"></sa-td>
+					<sa-td name="单位编号" prop="unitsNo" ></sa-td>
+					<sa-td name="名称" prop="units" ></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 v-if="sa.isAuth('tb-goods-units-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 							<el-button v-if="sa.isAuth('tb-goods-units-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 						</template>
@@ -57,7 +57,7 @@
 						unitsNo: '',		// 商品单位编号
 						units: '',		// 管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号
 						pageNo: 1,		// 当前页
-						pageSize: 10,	// 页大小
+						pageSize: 20,	// 页大小
 						sortType: 0		// 排序方式
 					},
 					dataCount: 0,
@@ -86,11 +86,11 @@
 					},
 					// 修改
 					update: function(data) {
-						sa.showIframe('修改数据', 'tb-goods-units-add.html?id=' + data.id, '1000px', '90%');
+						sa.showIframe('修改数据', 'tb-goods-units-add.html?id=' + data.id, '500px', '280px');
 					},
 					// 新增
 					add: function(data) {
-						sa.showIframe('新增数据', 'tb-goods-units-add.html?id=-1', '1000px', '90%');
+						sa.showIframe('新增数据', 'tb-goods-units-add.html?id=-1', '500px', '280px');
 					},
 					// 删除
 					del: function(data) {

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

@@ -25,19 +25,24 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sainfo type="num" name="主键" :value="m.id" br></sainfo>
-						<sa-info name="互市区" br>{{m.tradeAreaName}}</sa-info>
-						<sa-info name="商品名称" br>{{m.name}}</sa-info>
-						<sa-info name="商品编号" br>{{m.code}}</sa-info>
-						<sa-info type="img" name="主图" :value="m.avatar" br></sa-info>
-						<sa-info name="分类名称" br>{{m.thrItemName}}</sa-info>
-						<sa-info name="备注" br>{{m.remark}}</sa-info>
-						<sa-info name="原产地" br>{{m.source}}</sa-info>
-						<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
-						<sa-info name="单位" br>{{m.unit}}</sa-info>
-						<sa-info name="价格" br>{{m.singlePrice}}</sa-info>
-						<sa-info name="用途" br>{{m.useTo}}</sa-info>
-						<sa-info name="存储条件" br>{{m.storageEnvm}}</sa-info>
+						<el-row>
+							<el-col span="12">
+								<sa-info name="互市区" br>{{m.tradeAreaName}}</sa-info>
+								<sa-info name="商品名称" br>{{m.name}}</sa-info>
+								<sa-info name="商品编号" br>{{m.code}}</sa-info>
+								<sa-info name="分类名称" br>{{m.thrItemName}}</sa-info>
+								<sa-info name="原产地" br>{{m.source}}</sa-info>
+								<sa-info type="img" name="主图" :value="m.avatar" br></sa-info>
+							</el-col>
+							<el-col span="12">
+								<sa-info name="单位" br>{{m.unit}}</sa-info>
+								<sa-info name="价格" br>{{m.singlePrice}}</sa-info>
+								<sa-info name="用途" br>{{m.useTo}}</sa-info>
+								<sa-info name="存储条件" br>{{m.storageEnvm}}</sa-info>
+								<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+								<sa-info name="备注" br>{{m.remark}}</sa-info>
+							</el-col>
+						</el-row>
 					</el-form>
 				</div>
 			</div>

sa-view/tb-goods/tb-goods-list.html

@@ -36,7 +36,7 @@
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="selection"></sa-td>
+					<sa-td type="index" name="序号"></sa-td>
 					<sa-td name="商品名称" prop="name" ></sa-td>
 					<sa-td name="商品编号" prop="code" ></sa-td>
 					<sa-td name="主图" prop="avatar" type="img"></sa-td>

sa-view/tb-group/tb-group-list.html

@@ -46,7 +46,7 @@
 					<el-table-column align="center" type="selection" width="45px"></el-table-column>
 					<el-table-column align="center" label="名称" prop="orgName"></el-table-column>
 					<el-table-column align="center" label="编号" prop="code"></el-table-column>
-					<el-table-column align="center" label="所属互市区" prop="tradeAreaName" width="180"></el-table-column>
+					<el-table-column align="center" label="所属场所" prop="tradeAreaName" width="180"></el-table-column>
 					<el-table-column align="center" label="组长" prop="leaderName">
 						<template slot-scope='s'>
 							<b v-if="s.row.leaderName" style="color: #066CF3;cursor: pointer;" @click="editLeaderFn(s.row.id,s.row.leaderId)">{{s.row.leaderName}}</b>
@@ -79,7 +79,7 @@
 				<div class="page-box">
 					<el-pagination background  layout="total, prev, pager, next, sizes, jumper"
 						:current-page.sync="p.pageNo" :page-size.sync="p.pageSize" :total="dataCount"
-						:page-sizes="[1, 10, 20, 30, 40, 50, 100, 1000]" @current-change="f5()" @size-change="f5()">
+						:page-sizes="[10, 20, 30, 40, 50, 100, 1000]" @current-change="f5()" @size-change="f5()">
 					</el-pagination>
 				</div>
 			</div>

sa-view/tb-order/tb-order-list.html

@@ -37,9 +37,10 @@
 					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
 					<sa-td name="预申报编号" prop="platSeqNo" width="180"></sa-td>
-					<sa-td name="结算单号" prop="settleBillNo" width="180"></sa-td>
 					<sa-td name="进出口预申报单号" prop="preIeportNo" width="180"></sa-td>
-					<sa-td name="单证代码" prop="preNo" width="180"></sa-td>
+					<sa-td type="enum" name="交易确认" prop="peopleConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
+					<sa-td type="enum" name="委托确认" prop="cooperEntrustStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
+					<sa-td type="enum" name="进口确认" prop="applyConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></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="get(s.row)">查看</el-button>

sa-view/tb-orders/tb-orders-list.html

@@ -36,11 +36,11 @@
 					<sa-td name="商品来源" prop="goodsFrom" ></sa-td>
 					<sa-td name="互市区" prop="tradeAreaName" width="120px"></sa-td>
 					<sa-td name="买家" prop="purchaserName" ></sa-td>
+					<sa-td name="卖家" prop="shipperName" ></sa-td>
 					<sa-td name="转售金额" prop="resalePrice" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="订单状态已完成" prop="orderFinish" type="switch" :jv="{0: '未完成', 1: '已完成'}" @change="s => updateOrderFinish(s.row)"></sa-td>
-					
-					<el-table-column label="操作" width="240px">
+					<sa-td name="订状态" prop="orderFinish" type="enum" :jv="{0: '未完成', 1: '已完成'}" @change="s => updateOrderFinish(s.row)"></sa-td>
+					<el-table-column label="操作" width="100px">
 						<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-orders-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>

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

@@ -3,7 +3,8 @@
 	<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" />
+		<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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
@@ -17,8 +18,13 @@
 		<script src="../../static/kj/upload-util.js"></script>
 
 		<style type="text/css">
-			.c-panel .c-label{width: 8em;}
-			.c-item .image-box-2{height: 90px;}
+			.c-panel .c-label {
+				width: 8em;
+			}
+
+			.c-item .image-box-2 {
+				height: 90px;
+			}
 		</style>
 	</head>
 	<body>
@@ -27,98 +33,21 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<el-row :gutter="50">
+						<el-row>
 							<el-col :span="12">
 								<sa-info name="姓名" br>{{m.name}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="边民号" br>{{m.code}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
+								<sa-info type="enum" name="角色" :value="m.role" :jv="{1: '普通边民', 2: '组长'}" br></sa-info>
 								<sa-info type="enum" name="性别" :value="m.sex" :jv="{1: '男', 2: '女'}" br></sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info type="num" name="年龄" :value="m.age" br></sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="身份证" br>{{m.idCard}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info type="img-list" name="身份证复印件" :value="m.idCardImg" br></sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
 								<sa-info name="手机号码" br>{{m.phone}}</sa-info>
+								<sa-info name="身份证" br>{{m.idCard}}</sa-info>
 							</el-col>
 							<el-col :span="12">
-								<sa-info name="银行编号" br>{{m.bankNo}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
 								<sa-info name="银行卡号" br>{{m.bankCode}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="银行名称" br>{{m.bankName}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info type="enum" name="所属互助组" :value="m.groupId" :jv="{1: '测试组'}" br></sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="互助组名称" br>{{m.groupName}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
+								<sa-info name="开户行" br>{{m.bankName}}</sa-info>
+								<sa-info name="所在互助组" br>{{m.groupName}}</sa-info>
 								<sa-info type="enum" name="是否可用" :value="m.status" :jv="{0: '否', 1: '是'}" br></sa-info>
 							</el-col>
-							<el-col :span="12">
-								<sa-info type="num" name="角色" :value="m.role" br></sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="经度" br>{{m.lng}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="纬度" br>{{m.lat}}</sa-info>
-							</el-col>
 						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="最后一次下单定位" br>{{m.lastLocation}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="联系地址" br>{{m.address}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="详细地址" br>{{m.detailAddress}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="是否锁定" br>{{m.isLock}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="当天剩余额度" br>{{m.leftPrice}}</sa-info>
-							</el-col>
-						</el-row>
-
-						<!-- <sa-info name="" br>{{m.judgeStatus}}</sa-info>
-						<sa-info name="" br>{{m.judgeContent}}</sa-info>
-						<sa-info name="" br>{{m.registerTime}}</sa-info>
-						<sa-info name="" br>{{m.judgeTime}}</sa-info>
-						<sa-info name="" br>{{m.personId}}</sa-info> -->
-						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
 					</el-form>
 				</div>
 			</div>
@@ -135,21 +64,19 @@
 				},
 				el: '.vue-box',
 				data: {
-					id: sa.p('id', 0),	// 获取数据ID
+					id: sa.p('id', 0), // 获取数据ID
 					m: null
 				},
-				methods: {
-				},
+				methods: {},
 				mounted: function() {
 					sa.ajax('/level-one-server/TbPeople/getById?id=' + this.id, function(res) {
 						this.m = res.data;
-						if(res.data == null) {
+						if (res.data == null) {
 							sa.alert('未能查找到 id=' + this.id + " 详细数据");
 						}
 					}.bind(this))
 				}
 			})
-
 		</script>
 	</body>
-</html>
+</html>

sa-view/tb-people/tb-people-list.html

@@ -23,7 +23,7 @@
 				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="姓名" v-model="p.name" :need="false"></sa-item>
-					<sa-item type="text" name="边民号" v-model="p.code" :need="false"></sa-item>
+					<!-- <sa-item type="text" name="边民号" v-model="p.code" :need="false"></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('tb-people-add')" size="mini" type="primary" @click="add()">新增</el-button>
@@ -32,11 +32,11 @@
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="index" name="序号"></sa-td>
 					<sa-td name="姓名" prop="name" ></sa-td>
-					<sa-td name="边民号" prop="code" ></sa-td>
+					<!-- <sa-td name="边民号" prop="code" ></sa-td> -->
 					<sa-td name="手机号码" prop="phone" ></sa-td>
+					<sa-td name="身份证" prop="idCard" ></sa-td>
 					<sa-td name="互助组名称" prop="groupName" ></sa-td>
-					<sa-td name="角色" prop="role" type="num" :jv="{'1': '普通边民', '2': '兼组长'}"></sa-td>
-					<sa-td name="联系地址" prop="address" ></sa-td>
+					<sa-td name="角色" prop="role" type="enum" :jv="{'1': '普通边民', '2': '兼组长'}"></sa-td>
 					<sa-td name="是否锁定" prop="isLock" type="enum" :jv="{1: '否', 2: '是'}"></sa-td>
 					<el-table-column label="操作"  width="240px">
 						<template slot-scope="s">
@@ -47,7 +47,12 @@
 					</el-table-column>
 				</el-table>
 				<!-- ------------- 分页 ------------- -->
-				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
+			<div class="page-box">
+				<el-pagination background  layout="total, prev, pager, next, sizes, jumper"
+					:current-page.sync="p.pageNo" :page-size.sync="p.pageSize" :total="dataCount"
+					:page-sizes="[10, 20, 30, 40, 50, 100, 1000]" @current-change="f5()" @size-change="f5()">
+				</el-pagination>
+			</div>
 			</div>
 		</div>
 		<script>
@@ -99,7 +104,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-people-info.html?id=' + data.id, '1050px', '90%');
+						sa.showIframe('数据详情', 'tb-people-info.html?id=' + data.id, '900px', '70%');
 					},
 					// 修改
 					update: function(data) {

sa-view/tb-port-news/tb-port-news-add.html

@@ -47,12 +47,12 @@
 							</el-row>
     						<el-row>
 								<el-col>
-									<sa-item type="text" name="链接地址" v-model="m.url" br></sa-item>
+									<sa-item type="text" name="链接地址" v-model="m.url" br :need="false"></sa-item>
 								</el-col>
 							</el-row>
     						<el-row>
 								<el-col>
-									<sa-item type="text" name="来源" v-model="m.source" br></sa-item>
+									<sa-item type="text" name="来源" v-model="m.source" br :need="false"></sa-item>
 								</el-col>
 							</el-row>
 							<el-row>

sa-view/tb-port-news/tb-port-news-info.html

@@ -14,11 +14,13 @@
 		<script src="../../static/kj/layer/layer.js"></script>
 		<script src="../../static/sa.js"></script>
 		<style type="text/css">
-			.c-panel .c-label{width: 8em;}
-			/* 富文本样式 */
-			.content-box{width: 800px; min-height: 100px; border: 1px #ddd solid; padding: 1em; transition: all 0.2s;overflow: hidden;}
-			.content-box img{max-width: 200px !important;}
-			.c-item-mline{width: 800px;}
+			.c-panel .c-label {
+				width: 8em;
+			}
+		
+			.c-item .image-box-2 {
+				height: 90px;
+			}
 		</style>
 	</head>
 	<body>
@@ -29,43 +31,20 @@
 					<el-form v-if="m">
 						<el-row :gutter="50">
 							<el-col :span="12">
-								<sa-info name="标题" br>{{m.title}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info type="img" name="封面图片" :value="m.cover" br></sa-info>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col>
-								<sa-info name="链接地址" br>{{m.url}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col>
-								<sa-info type="richtext" name="内容" :value="m.content" br></sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="来源" br>{{m.source}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="阅读量" br>{{m.readCount}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info type="enum" name="发布状态" :value="m.isRelease" :jv="{0: '未发布', 1: '发布'}" br></sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="发布时间" br>{{m.releaseTime}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+							<sa-info name="标题" br>{{m.title}}</sa-info>
+							<sa-info type="img" name="封面图片" :value="m.cover" br></sa-info>
+							<sa-info name="链接地址" br>{{m.url}}</sa-info>
+							<sa-info name="来源" br>{{m.source}}</sa-info>
 							</el-col>
+								<el-col :span="12">
+									<sa-info name="阅读量" br>{{m.readCount}}</sa-info>
+									<sa-info type="enum" name="发布状态" :value="m.isRelease" :jv="{0: '未发布', 1: '发布'}" br></sa-info>
+									<sa-info name="发布时间" br>{{m.releaseTime}}</sa-info>
+									<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+								</el-col>
 						</el-row>
+						<sa-info name="内容" br><div style="margin: 5px 150px;" v-html="m.content"></div></sa-info>
+						
 					</el-form>
 				</div>
 			</div>

sa-view/tb-port-news/tb-port-news-list.html

@@ -28,16 +28,14 @@
     				</el-form>
     				<!-- ------------- 数据列表 ------------- -->
     				<el-table class="data-table" ref="data-table" :data="dataList" >
-    					<sa-td type="selection"></sa-td>
+    					<sa-td type="index" name="序号"></sa-td>
     					<sa-td name="标题" prop="title" width="200px"></sa-td>
-    					<sa-td name="封面图片" prop="cover" type="img" width="80px"></sa-td>
+    					<sa-td name="封面图片" prop="cover" type="img"></sa-td>
     					<sa-td name="链接地址" prop="url" type="link" width="160px"></sa-td>
-    					<sa-td name="内容" prop="content" type="richtext" width="250px"></sa-td>
-    					<sa-td name="来源" prop="source" width="90px"></sa-td>
-    					<sa-td name="阅读量" prop="readCount" width="60px"></sa-td>
-    					<sa-td name="发布状态" prop="isRelease" type="switch" width="70px" :jv="{0: '未发布', 1: '发布'}" @change="s => updateIsRelease(s.row)"></sa-td>
+    					<sa-td name="来源" prop="source"></sa-td>
+    					<sa-td name="阅读量" prop="readCount" ></sa-td>
+    					<sa-td name="发布" prop="isRelease" type="switch" :jv="{0: '未发布[red]', 1: '发布[green]'}" @change="s => updateIsRelease(s.row)" width="150"></sa-td>
     					<sa-td name="发布时间" prop="releaseTime" width="150px"></sa-td>
-    					<sa-td name="状态" prop="status" type="switch" width="70px" :jv="{0: '禁用', 1: '启用'}" @change="s => updateStatus(s.row)"></sa-td>
     					<el-table-column label="操作" width="210px">
     						<template slot-scope="s">
     							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
@@ -130,7 +128,7 @@
     						var oldValue = data.isRelease;
     						var ajax = sa.ajax('/level-one-server/TbPortNews/updateIsRelease', {id: data.id, value: data.isRelease}, function(res) {
     							isOk = true;
-    							sa.msg('修改成功');
+    							sa.msg('已发布成功');
     						}.bind(this));
     						// 如果未能修改成功, 则回滚 
     						$.when(ajax).done(function() {

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

@@ -45,7 +45,6 @@
 					<el-table-column align="center" label="序号" type="index" width="45px"></el-table-column>
 					<el-table-column align="center" label="名称" prop="shopName"></el-table-column>
 					<el-table-column align="center" label="编号" prop="shopNo"></el-table-column>
-					<el-table-column align="center" label="区域" prop="area"></el-table-column>
 					<el-table-column align="center" prop="tradeAreaName" label="所属互市区"> </el-table-column>
 					<el-table-column align="center" prop="enterpriseName" label="入驻商家"> </el-table-column>
 					<el-table-column align="center" label="操作" fixed="right" width="240px">