代码提交

login.html

@@ -180,8 +180,8 @@
 
 			// 所有参考属性
 			var page_title = '你好，欢迎登录系统'; // 页面标题
-			var key = ''; // 默认的账号
-			var password = ''; // 默认的password
+			var key = 'admin'; // 默认的账号
+			var password = '123456'; // 默认的password   fdsg@3,;27Rf
 			var logo = 'sa-frame/admin-logo.png'; // logo地址，为空字符串则不显示
 			var codeKey = '';
 			var pKey = '';
@@ -263,4 +263,4 @@
 			});
 		</script>
 	</body>
-</html>
+</html>

sa-frame/com/sa-info.vue

@@ -39,10 +39,10 @@
 	</div>
 	<!-- img-list -形如：url1,url2,url3 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'img-list'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label">{{name}}</label> 
 		<div class="c-item-mline image-box image-box-info" v-if="value_arr.length > 0">
 			<div class="image-box-2" v-for="image in value_arr">
-				<img :src="image" @click="sa.showImage(image, '500px', '400px')" />
+				<img :src="image" @click="sa.showImageList(image)" />
 			</div>
 		</div>
 		<span v-else>无</span>

sa-frame/com/sa-item.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 自定义slot -->
 	<div class="c-item" :class="{br: br}" v-if="$slots.default && type != 'fast-btn'">
-		<label class="c-label" v-if="name && name.length > 0">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}" v-if="name && name.length > 0">{{name}}：</label> 
 		<span v-else-if="name === undefined"></span> 
 		<label class="c-label" v-else></label> 
 		<span v-else></span> 
@@ -9,65 +9,65 @@
 	</div>
 	<!-- 普通input -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'text' || type == 'link'">
-		<label class="c-label" :style="{width:width}"><span style="color: red;" v-if="need">*</span>{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> <!-- <span style="color: red;" v-if="need">*</span> -->
 		<el-input type="text" :value="value" @input="onInput" :placeholder="'请输入'+name" :disabled="disabled"></el-input>
 	</div>
 	<!-- 数字input -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'num'">
-		<label class="c-label"><span style="color: red;" v-if="need">*</span>{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> <!-- <span style="color: red;" v-if="need">*</span> -->
 		<el-input type="number" :value="value" @input="onInput" placeholder="请输入" :disabled="disabled"></el-input>
 	</div>
 	<!-- 密码input -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'password'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-input type="password" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-input>
 	</div>
 	<!-- 多行文本域 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'textarea'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<div style="display: inline-block;">
 			<el-input type="textarea" :autosize="{ minRows: 3, maxRows: 10}" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-input>
 		</div>
 	</div>
 	<!-- 钱 money (单位 元) -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'money'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-input type="text" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-input>
 		<span>元</span>
 	</div>
 	<!-- 钱 price-f (单位 分) -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'money-f'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-input type="text" v-model="valueReal" @input="$emit('input', $event * 100)" :placeholder="placeholder" :disabled="disabled"></el-input>
 		<span>元</span>
 	</div>
 	<!-- img -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'img'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<img :src="value" class="info-img" @click="sa.showImage(value, '400px', '400px')" v-if="!sa.isNull(value)">
 		<el-link type="primary" @click="sa.uploadImage(src => {$emit('input', src); sa.ok2('上传成功');})">上传</el-link>
 	</div>
 	<!-- audio -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'audio'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-link type="info" :href="value" target="_blank" v-if="!sa.isNull(value)">{{value}}</el-link>
 		<el-link type="primary" @click="sa.uploadAudio(src => {$emit('input', src); sa.ok2('上传成功');})">上传</el-link>
 	</div>
 	<!-- video -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'video'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-link type="info" :href="value" target="_blank" v-if="!sa.isNull(value)">{{value}}</el-link>
 		<el-link type="primary" @click="sa.uploadVideo(src => {$emit('input', src); sa.ok2('上传成功');})">上传</el-link>
 	</div>
 	<!-- file -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'file'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-link type="info" :href="value" target="_blank" v-if="!sa.isNull(value)">{{value}}</el-link>
 		<el-link type="primary" @click="sa.uploadFile(src => {$emit('input', src); sa.ok2('上传成功');})">上传</el-link>
 	</div>
 	<!-- img-list -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'img-list'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}</label> 
 		<div class="c-item-mline image-box">
 			<div class="image-box-2" v-for="item in value_arr">
 				<img :src="item" @click="sa.showImage(item, '500px', '400px')" />
@@ -84,7 +84,7 @@
 	</div>
 	<!-- audio-list、video-list、file-list、img-video-list -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'audio-list' || type == 'video-list' || type == 'file-list' || type == 'img-video-list'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<div class="c-item-mline">
 			<div v-for="item in value_arr">
 				<el-link type="info" :href="item" target="_blank">{{item}}</el-link>
@@ -102,7 +102,7 @@
 	</div>
 	<!-- 富文本 richtext f -->
 	<div class="c-item" style="margin-top: 10px;" :class="{br: br}" v-else-if="type == 'richtext' || type == 'f'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<div class="editor-box c-item-mline">
 			<div :id="'editor-' + editor_id"></div>
 		</div>
@@ -110,7 +110,7 @@
 	</div>
 	<!-- enum 枚举 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'enum' || type == 'j' || type == 'switch'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-radio-group v-if="jtype == 1 || jtype == 2" :class="{'s-radio-text': jtype == 2}" :value="value" @input="onInput">
 			<el-radio label="" v-if="def">{{def}}</el-radio>
 			<el-radio v-for="j in jvList" :key="j.key" :label="j.key">{{j.value}}</el-radio>
@@ -126,22 +126,22 @@
 	</div>
 	<!-- 日期选择器 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'date'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-date-picker type="date" value-format="yyyy-MM-dd" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-date-picker>
 	</div>
 	<!-- 日期时间选择器 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'datetime'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-date-picker>
 	</div>
 	<!-- 时间选择器 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'time'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-time-picker value-format="HH:mm:ss" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-time-picker>
 	</div>
 	<!-- 日期范围选择 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'date-range'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-date-picker
 			type="daterange"
 			range-separator="至"
@@ -156,25 +156,25 @@
 	</div>
 	<!-- 滑块 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'slider'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<div style="display: inline-block; height: 0px; vertical-align: top; width: 250px;">
 			<el-slider :value="value" @input="onInput" style="position: relative; top: -5px;" :disabled="disabled"></el-slider>
 		</div>
 	</div>
 	<!-- 级联输入 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'cascader'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-cascader :value="value" @input="onInput" :options="options" :props="{expandTrigger: 'hover'}" :placeholder="placeholder" :disabled="disabled"></el-cascader>
 	</div>
 	<!-- 颜色输入 -->
 	<div class="c-item" :class="{br: br}" style="height: 0px;" v-else-if="type == 'color'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<el-color-picker :value="value" @input="onInput" :disabled="disabled"></el-color-picker>
 		<span class="c-remark" style="vertical-align: top;">{{value}}</span>
 	</div>
 	<!-- 评分组件 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'rate'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label" :style="{width:width}">{{name}}：</label> 
 		<div style="display: inline-block;">
 			<el-rate :value="value" @input="onInput" show-text :disabled="disabled"></el-rate>
 		</div>

sa-frame/com/sa-td.vue

@@ -46,10 +46,9 @@
 	<!-- img-list -->
 	-<el-table-column align='center' v-else-if="type == 'img-list'" :label="name" :width="width" :min-width="minWidth || '120px'" show-overflow-tooltip>
 		<template slot-scope="s">
-			<div @click="sa.showImageList(value_to_arr(s.row[prop]))" style="cursor: pointer;" v-if="s.row[prop]">
-				<img :src="value_to_arr(s.row[prop])[0]" class="td-img" />
-			</div>
-			<div v-else>{{not}}</div>
+			<span v-for="(item, index) in value_to_arr(s.row[prop])" style="cursor: pointer;margin-left: 2px;">
+				<img :src="item" class="td-img" @click="sa.showImageList(item)"/>
+			</span>
 		</template>
 	</el-table-column>
 	<!-- xxx-list -->
@@ -148,6 +147,18 @@
 			<b>{{s.row[prop.split(',')[0]]}}</b>
 		</template>
 	</el-table-column>
+	-<el-table-column align='center' v-else-if="type == 'idCard'" :label="name" :width="width" :min-width="minWidth">
+		<template slot-scope="s">
+			<span v-if="s.row[prop]">{{maskId(s.row[prop])}}</span>
+			<span v-else>-</span>
+		</template>
+	</el-table-column>
+	-<el-table-column align='center' v-else-if="type == 'phone'" :label="name" :width="width" :min-width="minWidth">
+		<template slot-scope="s">
+			<span v-if="s.row[prop]">{{maskPhone(s.row[prop])}}</span>
+			<span v-else>-</span>
+		</template>
+	</el-table-column>
 </template>
 
 <script>
@@ -183,6 +194,12 @@
 			}
 		},
 		methods: {
+			maskId:function (id) {
+			    return id.replace(/^(.{6})(.*)(.{4})$/,'$1********$3');
+			},
+			maskPhone:function (phone) {
+			    return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+			},
 			// 解析枚举 
 			parseJv: function() {
 				for(let key in this.jv) {

sa-frame/menu-list-sp.js

@@ -110,6 +110,11 @@ window.menuList.unshift({
 				url: 'sa-view-sp/sp-cfg/server-cfg.html'
 			},
 			{
+				id: 'sp-cfg-cooper_entrust',
+				name: '互助委托书校验配置',
+				url: 'sa-view-sp/sp-cfg/cooper_entrust-cfg.html'
+			},
+			{
 				id: 'tb-port-news',
 				name: '口岸资讯管理',
 				url: 'sa-view/tb-port-news/tb-port-news-list.html',
@@ -261,28 +266,28 @@ window.menuList.unshift({
 			// 		isShow: false
 			// 	}, ]
 			// },
-			{
-				id: 'tb-enterprise',
-				icon: 'el-icon-film',
-				name: '商户列表',
-				url: 'sa-view/tb-enterprise/tb-enterprise-list.html',
-				childList: [{
-						id: 'tb-enterprise-add',
-						name: '商家添加',
-						isShow: false
-					},
-					{
-						id: 'tb-enterprise-edit',
-						name: '商家更新',
-						isShow: false
-					},
-					{
-						id: 'tb-enterprise-del',
-						name: '商家删除',
-						isShow: false
-					},
-				]
-			},
+			// {
+			// 	id: 'tb-enterprise',
+			// 	icon: 'el-icon-film',
+			// 	name: '商户列表',
+			// 	url: 'sa-view/tb-enterprise/tb-enterprise-list.html',
+			// 	childList: [{
+			// 			id: 'tb-enterprise-add',
+			// 			name: '商家添加',
+			// 			isShow: false
+			// 		},
+			// 		{
+			// 			id: 'tb-enterprise-edit',
+			// 			name: '商家更新',
+			// 			isShow: false
+			// 		},
+			// 		{
+			// 			id: 'tb-enterprise-del',
+			// 			name: '商家删除',
+			// 			isShow: false
+			// 		},
+			// 	]
+			// },
 			{
 				id: 'tb-shop',
 				icon: 'el-icon-receiving',
@@ -590,6 +595,27 @@ window.menuList.unshift({
 						]
 					},
 					{
+						id: 'bank-info',
+						name: '银行回执',
+						url: 'sa-view/bank-info/bank-info-list.html',
+						childList: [{
+								id: 'bank-info-add',
+								name: '',
+								isShow: false
+							},
+							{
+								id: 'bank-info-edit',
+								name: '',
+								isShow: false
+							},
+							{
+								id: 'bank-info-del',
+								name: '',
+								isShow: false
+							},
+						]
+					},
+					{
 						id: 'tb-import-order',
 						name: '进口申报单',
 						url: 'sa-view/tb-import-order/tb-import-order-list.html',
@@ -600,6 +626,14 @@ window.menuList.unshift({
 						]
 					},
 					{
+						id: 'tb-import-order-judge',
+						name: '互助委托协议审核',
+						url: 'sa-view/tb-import-order/tb-import-order-judge.html',
+						childList: [
+							{id:'tb-import-order-do-judge',name:'审核',isShow:false},
+						]
+					},
+					{
 						id: 'tb-import-goods',
 						name: '进口申报单商品管理',
 						url: 'sa-view/tb-import-goods/tb-import-goods-list.html',

sa-view-sp/sp-admin/admin-info.html

@@ -22,6 +22,26 @@
 			.c-item .el-input{width: 300px;}
 			/* 链接样式  */
 			.my-link{position: relative; top: -1px; margin-left: 0.5em;}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 26px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 30px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
 		</style>
 	</head>
 	<body>
@@ -30,18 +50,43 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<div style="height: 20px;"></div>
-						<sa-info name="编号" br>{{m.id}}</sa-info>
-						<sa-info name="名称" br>{{m.name}}</sa-info>
-						<sa-info name="手机" br>{{m.phone || '无'}}</sa-info>
-						<sa-info name="角色" br>{{m.roleName}}</sa-info>
-						<sa-info name="创建账号" br>
-							<span v-if="m.createByAid == -1">无</span>
-							<a v-else :href=" 'admin-info.html?id=' +  m.createByAid">{{m.createByAid}}</a>
-						</sa-info>
-						<sa-info name="创建时间" br>{{sa.forDate(m.createTime, 2)}}</sa-info>
-						<sa-info name="最后登录" br>{{sa.forDate(m.loginTime, 2) || '无'}}</sa-info>
-						<sa-info name="最后登录IP" br>{{m.loginIp || '无'}}</sa-info>
+						<div style="height: 10px;"></div>
+						<table>
+							<tr>
+								<th>编号</th>
+								<td>{{m.id}}</td>
+							</tr>
+							<tr>
+								<th>名称</th>
+								<td>{{m.name}}</td>
+							</tr>
+							<tr>
+								<th>手机</th>
+								<td>{{m.phone || '无'}}</td>
+							</tr>
+							<tr>
+								<th>角色</th>
+								<td>{{m.roleName}}</td>
+							</tr>
+							<tr>
+								<th>创建账号</th>
+								<td><span v-if="m.createByAid == -1">无</span>
+								<a v-else :href=" 'admin-info.html?id=' +  m.createByAid">{{m.createByAid}}</a></td>
+							</tr>
+							<tr>
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+							<tr>
+								<th>最后登录</th>
+								<td>{{sa.forDate(m.loginTime, 2) || '无'}}</td>
+							</tr>
+							<tr>
+								<th>最后登录IP</th>
+								<td>{{m.loginIp || '无'}}</td>
+							</tr>
+						</table>
+						
 					</el-form>
 				</div>
 			</div>

sa-view-sp/sp-admin/admin-list.html

@@ -33,7 +33,7 @@
 					</sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<br>
-					<sa-item name="综合排序" class="s-radio-text">
+					<sa-item name="综合排序" class="s-radio-text" width="80px">
 						<el-radio-group v-model="p.sort_type">
 							<el-radio :label="0">最近添加</el-radio>
 							<el-radio :label="2">最近登录</el-radio>

sa-view-sp/sp-cfg/cooper_entrust-cfg.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>互助委托书校验配置</title>
+		<link rel="stylesheet" href="https://unpkg.com/element-ui@2.13.0/lib/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">
+			html,body,.vue-box{height: 100%; overflow: hidden;}
+			.c-panel{height: calc(100% - 4em); position: relative;}
+			.c-panel .c-label{width: 16em;}
+			.c-panel .el-input{width: 500px;}
+			.c-panel .el-textarea{width: 500px;}
+			.logo-img{
+				width: 35px;
+				height: 35px;
+				border-radius: 2px;
+				vertical-align: middle;
+				margin-right: 0.5em;
+				cursor: pointer;
+			}
+			.s-tab{height: 100%; }
+			.el-tabs__content{height: calc(100% - 130px); overflow: auto;}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
+			<div class="c-panel" v-if="m != null">
+				<!-- tab卡片 -->
+				<el-tabs class="s-tab" v-model="activeTab">
+					<!-- ---------------------------------- 系统参数 ---------------------------------- -->
+					<el-tab-pane label="系统参数" name="tab1">
+						<div class="c-item">
+							<label class="c-label">是否打开校验互助委托书开关</label>
+							<el-switch v-model="m.cooper_entrust" :active-value="1" :inactive-value="2"></el-switch>
+							<span class="c-remark" v-if="m.cooper_entrust==1">开启校验</span>
+							<span class="c-remark" v-else>关闭校验</span>
+						</div>
+					</el-tab-pane>
+				</el-tabs>
+				<!-- 确定按钮 -->
+				<div style="position: absolute; bottom: 0px; width: calc(100% - 3em); line-height: 80px; background-color: #FFF;">
+					<hr style="height: 2px;">
+					<div class="c-item">
+						<label class="c-label"></label>
+						<el-button type="primary" icon="el-icon-check" @click="ok">保存修改</el-button>
+						<el-button type="primary" icon="el-icon-refresh-right" @click="f5">重置</el-button>
+					</div>
+				</div>
+			</div>
+		</div>
+		<script type="text/javascript">
+			// 创建一个默认的配置对象
+			function create_m() {
+				return {
+					cooper_entrust: 2,	// 是否校验互助委托书【1校验  2不校验】
+				}
+			}
+		</script>
+		<script>
+			var app = new Vue({
+				el: '.vue-box',
+				data: {
+					sa: sa, // 超级对象
+					m: null, //
+					activeTab: 'tab1'
+				},
+				methods: {
+					// 初始化配置
+					init: function(str) {
+						// 获取
+						var cfg = sa.JSONParse(str, {}); // 用户配置
+						var default_cfg = create_m(); // 默认配置
+						// 遍历
+						for (var key in default_cfg) {
+							if (cfg[key] !== undefined && cfg[key] !== null) {
+								default_cfg[key] = cfg[key];
+							}
+						}
+						// 赋值
+						this.m = default_cfg;
+					},
+					// 刷新
+					f5: function() {
+						sa.ajax('/sp-admin/SpCfg/getCfg', {
+							cfgName: 'cooper_entrust_cfg'
+						}, function(res) {
+							this.init(res.data);
+						}.bind(this));
+					},
+					// 提交
+					ok: function() {
+						sa.ajax('/sp-admin/SpCfg/updateCfg', {
+							cfgName: 'cooper_entrust_cfg',
+							cfgValue: JSON.stringify(this.m)
+						}, function(res) {
+							sa.ok2('保存成功');
+						}.bind(this));
+					}
+				},
+				created: function() {
+					this.f5();
+				}
+			})
+
+
+
+		</script>
+	</body>
+</html>

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

@@ -21,7 +21,7 @@
 				<!-- 参数栏 -->
 				<div class="c-title">检索参数</div>
 				<el-form @submit.native.prevent>
-					<sa-item type="text" name="角色名称" v-model="p.name"></sa-item>
+					<sa-item type="text" name="角色名称" v-model="p.name" width="90px"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="f5()">查询</el-button>
 					<el-button type="primary" icon="el-icon-plus" @click="add()">新增</el-button>
 				</el-form>

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

@@ -18,7 +18,7 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<!-- <div class="c-title">检索参数</div> -->
+				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="名称" v-model="p.menuName"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>

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

@@ -18,9 +18,9 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<!-- <div class="c-title">检索参数</div> -->
+				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="角色名称" v-model="p.roleName"></sa-item>
+					<sa-item type="text" name="角色名称" v-model="p.roleName" width="100px"></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>

sa-view/app-user-login-log/app-user-login-log-list.html

@@ -19,8 +19,9 @@
 		<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.userName"></sa-item>
+					<sa-item type="text" name="登录账户" v-model="p.userName" width="100px"></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>

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

@@ -18,7 +18,7 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<!-- <div class="c-title">检索参数</div> -->
+				<div class="c-title">检索参数</div>
 				<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-view/bank-info/bank-info-add.html

@@ -0,0 +1,134 @@
+<!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="报文编号" v-model="m.sn" br></sa-item>
+						<sa-item type="text" name="报文发送时间" v-model="m.date" br></sa-item>
+						<sa-item type="text" name="互市点机构代码" v-model="m.organization" br></sa-item>
+						<sa-item type="text" name="银行标识" v-model="m.bankCode" br></sa-item>
+						<sa-item type="text" name="报文业务类型" v-model="m.operation" br></sa-item>
+						<sa-item type="text" name="消息回执代码" v-model="m.code" br></sa-item>
+						<sa-item type="text" name="订单号" v-model="m.source" br></sa-item>
+						<sa-item type="text" name="扣款成功的流水单号" v-model="m.result" br></sa-item>
+						<sa-item type="text" name="回执内容" v-model="m.note" 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: '',		// 主键 
+							sn: '',		// 报文编号 
+							date: '',		// 报文发送时间 
+							organization: '',		// 互市点机构代码 
+							bankCode: '',		// 银行标识 
+							operation: '',		// 报文业务类型 
+							code: '',		// 消息回执代码 
+							source: '',		// 订单号 
+							result: '',		// 扣款成功的流水单号 
+							note: '',		// 回执内容 
+							createTime: '',		// 创建时间 
+						}
+					},
+					// 提交数据 
+					ok: function(){
+						// 表单校验 
+						let m = this.m;
+						sa.checkNull(m.id, '请输入 [主键]');
+						sa.checkNull(m.sn, '请输入 [报文编号]');
+						sa.checkNull(m.date, '请输入 [报文发送时间]');
+						sa.checkNull(m.organization, '请输入 [互市点机构代码]');
+						sa.checkNull(m.bankCode, '请输入 [银行标识]');
+						sa.checkNull(m.operation, '请输入 [报文业务类型]');
+						sa.checkNull(m.code, '请输入 [消息回执代码]');
+						sa.checkNull(m.source, '请输入 [订单号]');
+						sa.checkNull(m.result, '请输入 [扣款成功的流水单号]');
+						sa.checkNull(m.note, '请输入 [回执内容]');
+						sa.checkNull(m.createTime, '请输入 [创建时间]');
+				
+						// 开始增加或修改
+						if(this.id <= 0) {	// 添加
+							sa.ajax('/BankInfo/add', m, function(res){
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
+						} else {	// 修改
+							sa.ajax('/BankInfo/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('/BankInfo/getById?id=' + this.id, function(res) {
+							this.m = res.data;
+							if(res.data == null) {
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
+							}
+						}.bind(this))
+					}
+				}
+			})
+			
+		</script>
+	</body>
+</html>

sa-view/bank-info/bank-info-info.html

@@ -0,0 +1,70 @@
+<!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>{{m.id}}</sa-info>
+						<sa-info name="报文编号" br>{{m.sn}}</sa-info>
+						<sa-info name="报文发送时间" br>{{m.date}}</sa-info>
+						<sa-info name="互市点机构代码" br>{{m.organization}}</sa-info>
+						<sa-info name="银行标识" br>{{m.bankCode}}</sa-info>
+						<sa-info name="报文业务类型" br>{{m.operation}}</sa-info>
+						<sa-info name="消息回执代码" br>{{m.code}}</sa-info>
+						<sa-info name="订单号" br>{{m.source}}</sa-info>
+						<sa-info name="扣款成功的流水单号" br>{{m.result}}</sa-info>
+						<sa-info name="回执内容" br>{{m.note}}</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('/BankInfo/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if(res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+			
+		</script>
+	</body>
+</html>

sa-view/bank-info/bank-info-list.html

@@ -0,0 +1,158 @@
+<!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.id"></sa-item>
+					<sa-item type="text" name="报文编号" v-model="p.sn"></sa-item>
+					<sa-item type="text" name="报文发送时间" v-model="p.date"></sa-item>
+					<sa-item type="text" name="互市点机构代码" v-model="p.organization"></sa-item>
+					<sa-item type="text" name="银行标识" v-model="p.bankCode"></sa-item>
+					<sa-item type="text" name="报文业务类型" v-model="p.operation"></sa-item>
+					<sa-item type="text" name="消息回执代码" v-model="p.code"></sa-item>
+					<sa-item type="text" name="订单号" v-model="p.source"></sa-item>
+					<sa-item type="text" name="扣款成功的流水单号" v-model="p.result"></sa-item>
+					<sa-item type="text" name="回执内容" v-model="p.note"></sa-item>
+					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+				</el-form>
+				<div class="fast-btn">
+					<el-button v-if="sa.isAuth('bank-info-add')" size="mini" type="primary" @click="add()">新增</el-button>
+					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
+					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
+				</div>
+				<!-- ------------- 数据列表 ------------- -->
+				<el-table class="data-table" ref="data-table" :data="dataList" >
+					<sa-td type="selection"></sa-td>
+					<sa-td name="主键" prop="id" ></sa-td>
+					<sa-td name="报文编号" prop="sn" ></sa-td>
+					<sa-td name="报文发送时间" prop="date" ></sa-td>
+					<sa-td name="互市点机构代码" prop="organization" ></sa-td>
+					<sa-td name="银行标识" prop="bankCode" ></sa-td>
+					<sa-td name="报文业务类型" prop="operation" ></sa-td>
+					<sa-td name="消息回执代码" prop="code" ></sa-td>
+					<sa-td name="订单号" prop="source" ></sa-td>
+					<sa-td name="扣款成功的流水单号" prop="result" ></sa-td>
+					<sa-td name="回执内容" prop="note" ></sa-td>
+					<sa-td name="创建时间" prop="createTime" ></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('bank-info-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button v-if="sa.isAuth('bank-info-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: '',		// 主键 
+						sn: '',		// 报文编号 
+						date: '',		// 报文发送时间 
+						organization: '',		// 互市点机构代码 
+						bankCode: '',		// 银行标识 
+						operation: '',		// 报文业务类型 
+						code: '',		// 消息回执代码 
+						source: '',		// 订单号 
+						result: '',		// 扣款成功的流水单号 
+						note: '',		// 回执内容 
+						createTime: '',		// 创建时间 
+						pageNo: 1,		// 当前页 
+						pageSize: 10,	// 页大小 
+						sortType: 0		// 排序方式 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/BankInfo/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight();		// 刷新表格高度 
+						}.bind(this));
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('数据详情', 'bank-info-info.html?id=' + data.id, '1050px', '90%');
+					},
+					// 查看 - 根据选中的
+					getBySelect: function(data) {
+						var selection = this.$refs['data-table'].selection;
+						if(selection.length == 0) {
+							return sa.msg('请选择一条数据')
+						}
+						this.get(selection[0]);
+					},
+					// 修改
+					update: function(data) {
+						sa.showIframe('修改数据', 'bank-info-add.html?id=' + data.id, '1000px', '90%');
+					},
+					// 新增
+					add: function(data) {
+						sa.showIframe('新增数据', 'bank-info-add.html?id=-1', '1000px', '90%');
+					},
+					// 删除
+					del: function(data) {
+						sa.confirm('是否删除，此操作不可撤销', function() {
+							sa.ajax('/BankInfo/delete?id=' + data.id, function(res) {
+								sa.arrayDelete(this.dataList, data);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+					// 批量删除
+					deleteByIds: function() {
+						// 获取选中元素的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('/BankInfo/deleteByIds', {ids: ids.join(',')}, function(res) {
+								sa.arrayDelete(this.dataList, selection);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

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

@@ -15,6 +15,26 @@
 		<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>
@@ -23,35 +43,110 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="预申报编号" br>{{m.platSeqNo}}</sa-info>
-						<sa-info name="申报单编号" br>{{m.declareId}}</sa-info>
-						<sa-info type="enum" name="申报人类型" :value="m.declareType" :jv="{1: '边民', 2: '商铺业主或其代理人', 3: '合作社代表', 4: '互助组代表'}" br></sa-info>
-						<sa-info name="申报人姓名" br>{{m.declareName}}</sa-info>
-						<sa-info name="申报时间" br>{{m.declTime}}</sa-info>
-						<sa-info name="身份证号码" br>{{m.idno}}</sa-info>
-						<sa-info name="商铺编码" br>{{m.shopNo}}</sa-info>
-						<sa-info name="商铺名称" br>{{m.shopName}}</sa-info>
-						<sa-info name="商品名称" br>{{m.goodsNames}}</sa-info>
-						<sa-info name="总金额" br>{{m.sumAmt}}</sa-info>
-						<sa-info name="总毛重" br>{{m.sumGrossWt}}</sa-info>
-						<sa-info name="总净重" br>{{m.sumNetWt}}</sa-info>
-						<sa-info name="运输方式" br>{{m.trafMode}}</sa-info>
-						<sa-info name="币制" br>{{m.currCode}}</sa-info>
-						<sa-info name="件数" br>{{m.packNo}}</sa-info>
-						<sa-info name="互助组/合作社备案编号" br>{{m.orgPutrecNo}}</sa-info>
-						<sa-info name="互助组/合租社名称" br>{{m.orgName}}</sa-info>
-						<sa-info name="合作社社会统一信用代码" br>{{m.orgScc}}</sa-info>
-						<sa-info name="车牌号" br>{{m.veNo}}</sa-info>
-						<sa-info type="enum" name="业务模式" :value="m.btrnbBizModecd" :jv="{1: '区内交易', 2: '落地加工', 3: '原装提离', 4: '直接出口', 5: '出口销售'}" br></sa-info>
-						<sa-info type="enum" name="商品流向" :value="m.gFlow" :jv="{1: '二次销售', 2: '生活自用', 3: '落地加工'}" br></sa-info>
-						<sa-info type="enum" name="进出口标志" :value="m.iEFlag" :jv="{'I': '进口', 'E': '出口'}" br></sa-info>
-						<sa-info name="监管场所编号" br>{{m.fieldCode}}</sa-info>
-						<sa-info name="监管场所名称" br>{{m.fieldName}}</sa-info>
-						<sa-info name="申报口岸代码" br>{{m.customsCode}}</sa-info>
-						<sa-info name="1-是、0-否" br>{{m.carPool}}</sa-info>
-						<sa-info name="提运单号" br>{{m.billNo}}</sa-info>
-						<sa-info name="航次号" br>{{m.voyageNo}}</sa-info>
-						<sa-info name="单证代码" br>{{m.preNo}}</sa-info>
+						<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>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>

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

@@ -28,9 +28,9 @@
 				</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="110px"></sa-td>
-					<sa-td name="申报单编号" prop="declareId" width="110px"></sa-td>
+					<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 name="申报人姓名" prop="declareName" ></sa-td>
 					<sa-td name="互市区" prop="fieldName" ></sa-td>
 					<sa-td name="商铺名称" prop="shopName" ></sa-td>
@@ -38,13 +38,9 @@
 					<sa-td name="总金额" prop="sumAmt" ></sa-td>
 					<sa-td name="总毛重" prop="sumGrossWt" ></sa-td>
 					<sa-td name="总净重" 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" ></sa-td>
-					<sa-td name="航次号" prop="voyageNo" ></sa-td>
-					<sa-td name="单证代码" prop="preNo" ></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>
@@ -89,7 +85,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, '1080px', '94%');
+						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?platSeqNo='+data.platSeqNo, '1300px', '94%');
 					},
 					// 修改
 					update: function(data) {

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

@@ -28,17 +28,22 @@
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="index" name="序号"></sa-td>
-					<sa-td name="订单号" prop="tradeNo" width="180"></sa-td>
+					<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" ></sa-td>
-					<sa-td name="商品名称" prop="goodsNames" width="280"></sa-td>
+					<sa-td name="商品名称" prop="goodsNames" ></sa-td>
 					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></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="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>
@@ -73,6 +78,10 @@
 							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() {

sa-view/ht-trade-settlement/tb-order-bank-list.html

@@ -0,0 +1,145 @@
+<!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.id"></sa-item>
+					<sa-item type="text" name="报文编号" v-model="p.sn"></sa-item>
+					<sa-item type="text" name="报文发送时间" v-model="p.date"></sa-item>
+					<sa-item type="text" name="互市点机构代码" v-model="p.organization"></sa-item>
+					<sa-item type="text" name="银行标识" v-model="p.bankCode"></sa-item>
+					<sa-item type="text" name="报文业务类型" v-model="p.operation"></sa-item>
+					<sa-item type="text" name="消息回执代码" v-model="p.code"></sa-item>
+					<sa-item type="text" name="订单号" v-model="p.source"></sa-item>
+					<sa-item type="text" name="扣款成功的流水单号" v-model="p.result"></sa-item>
+					<sa-item type="text" name="回执内容" v-model="p.note"></sa-item>
+					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+				</el-form> -->
+				<!-- <div class="fast-btn">
+					<el-button v-if="sa.isAuth('bank-info-add')" size="mini" type="primary" @click="add()">新增</el-button>
+					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
+					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
+				</div> -->
+				<!-- ------------- 数据列表 ------------- -->
+				<el-table class="data-table" ref="data-table" :data="dataList" >
+					<!-- <sa-td name="报文编号" prop="sn" ></sa-td> -->
+					<sa-td name="互市代码" prop="organization" ></sa-td>
+					<sa-td name="银行标识" prop="bankCode" ></sa-td>
+					<sa-td name="业务类型" prop="operation" ></sa-td>
+					<sa-td name="回执代码" prop="code" ></sa-td>
+					<sa-td name="订单号" prop="source" width="180px"></sa-td>
+					<sa-td name="流水单号" prop="result" ></sa-td>
+					<sa-td name="回执内容" prop="note" width="300px"></sa-td>
+					<!-- <sa-td name="报文发送时间" prop="date" width="150px"></sa-td> -->
+					<sa-td name="创建时间" prop="createTime" width="150px"></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('bank-info-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button v-if="sa.isAuth('bank-info-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: {
+					tradeNo: sa.p('tradeNo', 0),	// 获取数据ID 
+					p: { // 查询参数
+						source: '',		// 订单号 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						this.p.source = this.tradeNo
+						sa.ajax('/payment-server/BankInfo/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight();		// 刷新表格高度 
+						}.bind(this));
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('数据详情', 'bank-info-info.html?id=' + data.id, '1050px', '90%');
+					},
+					// 查看 - 根据选中的
+					getBySelect: function(data) {
+						var selection = this.$refs['data-table'].selection;
+						if(selection.length == 0) {
+							return sa.msg('请选择一条数据')
+						}
+						this.get(selection[0]);
+					},
+					// 修改
+					update: function(data) {
+						sa.showIframe('修改数据', 'bank-info-add.html?id=' + data.id, '1000px', '90%');
+					},
+					// 新增
+					add: function(data) {
+						sa.showIframe('新增数据', 'bank-info-add.html?id=-1', '1000px', '90%');
+					},
+					// 删除
+					del: function(data) {
+						sa.confirm('是否删除，此操作不可撤销', function() {
+							sa.ajax('/BankInfo/delete?id=' + data.id, function(res) {
+								sa.arrayDelete(this.dataList, data);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+					// 批量删除
+					deleteByIds: function() {
+						// 获取选中元素的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('/BankInfo/deleteByIds', {ids: ids.join(',')}, function(res) {
+								sa.arrayDelete(this.dataList, selection);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

sa-view/tb-company/tb-company-add.html

@@ -187,7 +187,7 @@
 						this.m.addressIds = this.m.address_arry.join(',');
 						// 验证
 						this.m.businessLicense = this.m.businessLicense_arr.join(','); // 图片数组转字符串
-						this.m.tradeAreaName=this.tradeAreaList.filter(obj=>obj.id==m.tradeAreaId).pop().name;
+						this.m.tradeAreaName=this.tradeAreaList.filter(obj=>obj.id==m.tradeAreaId).name;
 						// 开始增加或修改
 						if(this.id <= 0) {	// 添加
 							sa.ajax('/level-two-server/TbCompany/add', m, function(res){

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

@@ -18,10 +18,29 @@
 			.c-panel .c-label {
 				width: 8em;
 			}
-
 			.c-item .image-box-2 {
 				height: 90px;
 			}
+			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>
@@ -30,26 +49,52 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<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.legalPerson}}</sa-info>
-								<sa-info name="身份证号" br>{{m.idCard}}</sa-info>
-								<sa-info name="手机号码" br>{{m.contact}}</sa-info>
-								<sa-info name="银行名称" br>{{m.bankName}}</sa-info>
-								<sa-info name="银行账号" br>{{m.bankAccount}}</sa-info>
-							</el-col>
-							<el-col span="12">
-								<sa-info name="税号" br>{{m.dutyParagraph}}</sa-info>
-								<sa-info name="地址" br>{{m.address}}</sa-info>
-								<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-								<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-								<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-								<sa-info name="更新人名称" br>{{m.updateName}}</sa-info>
-								<sa-info type="img-list" name="营业执照" :value="m.businessLicense" br></sa-info>
-							</el-col>
-						</el-row>
+							<table>
+								<tr>
+									<th>互市区</th>
+									<td>{{m.tradeAreaName}}</td>
+									<th>企业名称</th>
+									<td>{{m.name}}</td>
+								</tr>
+								<tr>
+									<th>法人</th>
+									<td>{{m.legalPerson}}</td>
+									<th>身份证号</th>
+									<td>{{m.idCard}}</td>
+								</tr>
+								<tr>
+									<th>手机号码</th>
+									<td>{{m.contact}}</td>
+									<th>税号</th>
+									<td>{{m.dutyParagraph}}</td>
+								</tr>
+								<tr>
+									<th>银行名称</th>
+									<td>{{m.bankName}}</td>
+									<th>银行账号</th>
+									<td>{{m.bankAccount}}</td>
+								</tr>
+								<tr>
+									<th>地址</th>
+									<td>{{m.address}}</td>
+									<th>营业执照</th>
+									<td>
+										<sa-info type="img-list" :value="m.businessLicense"></sa-info>
+									</td>
+								</tr>
+								<tr>
+									<th>创建时间</th>
+									<td>{{sa.forDate(m.createTime, 2)}}</td>
+									<th>创建人</th>
+									<td>{{m.createName}}</td>
+								</tr>
+								<tr>
+									<th>更新时间</th>
+									<td>{{sa.forDate(m.updateTime, 2)}}</td>
+									<th>更新人</th>
+									<td>{{m.updateName}}</td>
+								</tr>
+							</table>
 					</el-form>
 				</div>
 			</div>

sa-view/tb-fee-item-record/tb-fee-item-record-info.html

@@ -14,7 +14,27 @@
 		<script src="../../static/kj/layer/layer.js"></script>
 		<script src="../../static/sa.js"></script>
 		<style type="text/css">
-			.c-panel .c-label{width: 8em;}
+			.c-panel .c-label{width: 22em;}
+			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>
@@ -23,21 +43,51 @@
 			<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.orderNo}}</sa-info>
-						<sa-info name="费项ID" br>{{m.itemId}}</sa-info>
-						<sa-info type="enum" name="收费类型类型" :value="m.feeType" :jv="{1: '按交易额收取', 2: '按次收取'}" br></sa-info>
-						<sa-info name="类型对应的数值" br>{{m.feeNum}}</sa-info>
-						<sa-info name="收费项目" br>{{m.itemName}}</sa-info>
-						<sa-info name="收费金额" br>{{m.itemPrice}}</sa-info>
-						<sa-info name="收费企业" br>{{m.companyName}}</sa-info>
-						<sa-info name="企业ID" br>{{m.companyId}}</sa-info>
-						<sa-info name="二级市场订单" br>{{m.levelTwoOrderId}}</sa-info>
-						<sa-info name="二级订单单号" br>{{m.levelTwoOrderNo}}</sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="支付/划拨时间" br>{{m.payTime}}</sa-info>
-						<sa-info type="enum" name="支付/划拨状态" :value="m.payStatus" :jv="{0: '未划拨', 1: '划拨成功', 2: '划拨失败'}" br></sa-info>
-						<sa-info name="支付备注" br>{{m.payRemark}}</sa-info>
+						<table>
+							<tr>
+								<th>订单号</th>
+								<td>{{m.orderNo}}</td>
+								<th>二级订单单号</th>
+								<td>{{m.levelTwoOrderNo}}</td>
+							</tr>
+							<tr>
+								<th>收费类型</th>
+								<td>
+									<b v-if="m.feeType == 1">按交易额收取</b>
+									<b v-if="m.feeType == 2">按次收取</b>
+									<b v-if="m.feeType == 3">按吨收取</b>
+								</td>
+								<th>类型对应的数值</th>
+								<td>{{m.feeNum}}</td>
+							</tr>
+							<tr>
+								<th>收费项目</th>
+								<td>{{m.itemName}}</td>
+								<th>收费金额</th>
+								<td>{{m.itemPrice}}</td>
+							</tr>
+							<tr>
+								<th>收费企业</th>
+								<td>{{m.companyName}}</td>
+								<th>支付备注</th>
+								<td>{{m.payRemark}}</td>
+							</tr>
+							<tr>
+								<th>支付/划拨时间</th>
+								<td>{{sa.forDate(m.payTime, 2)}}</td>
+								<th>支付/划拨状态</th>
+								<td>
+									<b v-if="m.payStatus == 0">未划拨</b>
+									<b v-if="m.payStatus == 1">划拨成功</b>
+									<b v-if="m.payStatus == 2">划拨失败</b>
+								</td>
+							</tr>
+							<!-- <tr>
+								
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr> -->
+						</table>
 					</el-form>
 				</div>
 			</div>
@@ -60,7 +110,7 @@
 				methods: {
 				},
 				mounted: function() {
-					sa.ajax('/TbFeeItemRecord/getById?id=' + this.id, function(res) {
+					sa.ajax('/level-two-server/TbFeeItemRecord/getById?id=' + this.id, function(res) {
 						this.m = res.data;
 						if(res.data == null) {
 							sa.alert('未能查找到 id=' + this.id + " 详细数据");

sa-view/tb-fee-item-record/tb-fee-item-record-list.html

@@ -21,9 +21,9 @@
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="订单号" v-model="p.orderNo"></sa-item>
-					<sa-item type="text" name="收费项目" v-model="p.itemName"></sa-item>
-					<sa-item type="text" name="收费企业" v-model="p.companyName"></sa-item>
-					<sa-item type="enum" name="支付/划拨状态" v-model="p.payStatus" 
+					<sa-item type="text" name="收费项目" v-model="p.itemName" width='70px'></sa-item>
+					<sa-item type="text" name="收费企业" v-model="p.companyName" width='70px'></sa-item>
+					<sa-item type="enum" name="支付/划拨状态" v-model="p.payStatus" width='110px'
 						:jv="{0: '未划拨', 1: '划拨成功', 2: '划拨失败'}" jtype="4" 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>
@@ -31,17 +31,16 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
-					<sa-td name="订单号" prop="orderNo" ></sa-td>
-					<sa-td name="收费类型类型" prop="feeType" type="enum" :jv="{1: '按交易额收取', 2: '按次收取'}"></sa-td>
+					<sa-td name="订单号" prop="orderNo" width='180px'></sa-td>
+					<sa-td name="收费类型" prop="feeType" type="enum" :jv="{1: '按交易额收取', 2: '按次收取', 3: '按吨收取'}"></sa-td>
 					<sa-td name="类型对应的数值" prop="feeNum" ></sa-td>
 					<sa-td name="收费项目" prop="itemName" ></sa-td>
 					<sa-td name="收费金额" prop="itemPrice" ></sa-td>
 					<sa-td name="收费企业" prop="companyName" ></sa-td>
 					<sa-td name="商品单号" prop="levelTwoOrderNo" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></sa-td>
 					<sa-td name="支付/划拨时间" prop="payTime" ></sa-td>
 					<sa-td name="支付/划拨状态" prop="payStatus" type="enum" :jv="{0: '未划拨', 1: '划拨成功', 2: '划拨失败'}"></sa-td>
-					<el-table-column label="操作" fixed="right"  width="240px">
+					<el-table-column label="操作" fixed="right"  width="160px">
 						<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-fee-item-record-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
@@ -101,7 +100,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-fee-item-record-info.html?id=' + data.id, '1050px', '90%');
+						sa.showIframe('数据详情', 'tb-fee-item-record-info.html?id=' + data.id, '1000px', '70%');
 					},
 					// 查看 - 根据选中的
 					getBySelect: function(data) {

sa-view/tb-fee-item/tb-fee-item-info.html

@@ -18,6 +18,26 @@
 			.c-panel .c-label {
 				width: 8em;
 			}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 26px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 30px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
 		</style>
 	</head>
 	<body>
@@ -26,21 +46,33 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<el-row>
-							<el-col span="12">
-								<sa-info name="收费企业" br>{{m.companyName}}</sa-info>
-								<sa-info name="名称" br>{{m.name}}</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>
-							</el-col>
-							<el-col span="12">
-								<sa-info type="enum" name="类型" :value="m.feeType" :jv="{1: '按交易额百分比收取', 2: '按次收取'}"
-									br></sa-info>
-								<sa-info name="百分比(%)" br v-if="m.feeType==1">{{m.percent}}%</sa-info>
-								<sa-info name="收费金额(元)" br v-if="m.feeType==2">{{m.feeMoney}}</sa-info>
-								<sa-info type="datetime" name="更新时间" :value="m.updateTime" br></sa-info>
-							</el-col>
-						</el-row>
+						<table>
+							<tr>
+								<th>收费企业</th>
+								<td>{{m.companyName}}</td>
+								<th>费项名称</th>
+								<td>{{m.name}}</td>
+							</tr>
+							<tr>
+								<th>状态</th>
+								<td>
+									<b v-if="m.status == 1">启用</b>
+									<b v-if="m.status == 0">禁用</b>
+								</td>
+								<th>收费类型</th>
+								<td>
+									<b v-if="m.feeType == 1">按交易额百分比收取</b>
+									<b v-if="m.feeType == 2">按次收取</b>
+									<b v-if="m.feeType == 3">按吨收取</b>
+								</td>
+							</tr>
+							<tr>
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+								<th>更新时间</th>
+								<td>{{sa.forDate(m.updateTime, 2)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>

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

@@ -20,10 +20,10 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<!-- <div class="c-title">检索参数</div> -->
+				<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"></sa-item>
+					<sa-item type="text" name="名称" v-model="p.unitsNo"></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>

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

@@ -14,9 +14,28 @@
 		<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 .c-label{width: 8em;}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 26px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 26px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
 		</style>
 	</head>
 	<body>
@@ -25,24 +44,44 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<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>
+						<table>
+							<tr>
+								<th>商品名称</th>
+								<td>{{m.name}}</td>
+								<th>商品编号</th>
+								<td>{{m.code}}</td>
+							</tr>
+							<tr>
+								<th>商品类目编码</th>
+								<td>{{m.thrItemCode}}</td>
+								<th>商品类目名称</th>
+								<td>{{m.thrItemName}}</td>
+							</tr>
+							<tr>
+								<th>单位</th>
+								<td>{{m.unit}}</td>
+								<th>单价</th>
+								<td>{{m.singlePrice}}</td>
+							</tr>
+							<tr>
+								<th>第一计量单位</th>
+								<td>{{m.unit1}}</td>
+								<th>用途</th>
+								<td>{{m.useTo}}</td>
+							</tr>
+							<tr>
+								<th>第二计量单位</th>
+								<td>{{m.unit2}}</td>
+								<th>存储条件</th>
+								<td>{{m.storageEnvm}}</td>
+							</tr>
+							<tr>
+								<th>互市区</th>
+								<td>{{m.tradeAreaName}}</td>
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>

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

@@ -20,34 +20,32 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<!-- <div class="c-title">检索参数</div> -->
+				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<div class="c-item">
-						<label class="c-label"><span style="color: red;">*</span>互市区：</label>
+						<label class="c-label">互市区：</label>
 						<el-select @change="changeTradeArea" v-model="p.tradeAreaName" placeholder="请选择" filterable size="mini">
 							<el-option v-for="(item,index) in tradeAreaList" :key="index" :label="item.name" :value="item"> </el-option>
 						</el-select>
 					</div>
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
-					<sa-item type="text" name="分类名称" v-model="p.thrItemName" width="90pxs"></sa-item>
+					<sa-item type="text" name="分类名称" v-model="p.thrItemName" width="70px"></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-add')" size="mini" type="primary" @click="add()">新增</el-button>
+					<!-- <el-button v-if="sa.isAuth('tb-goods-add')" size="mini" type="primary" @click="add()">新增</el-button> -->
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="index" name="序号"></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-td name="分类名称" prop="thrItemName" ></sa-td>
-					<sa-td name="原产地" prop="source" ></sa-td>
-					<sa-td name="状态" prop="status" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateStatus(s.row)"></sa-td>
-					<el-table-column label="操作" fixed="right"  width="240px">
+					<sa-td name="互市区" prop="tradeAreaName" ></sa-td>
+					<sa-td name="商品类目名称" prop="thrItemName" ></sa-td>
+					<sa-td name="单位" prop="unit" ></sa-td>
+					<sa-td name="单价" prop="single_price" ></sa-td>
+					<el-table-column label="操作" fixed="right"  width="200px">
 						<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-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
-							<el-button v-if="sa.isAuth('tb-goods-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -99,7 +97,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-goods-info.html?id=' + data.id, '1050px', '90%');
+						sa.showIframe('数据详情', 'tb-goods-info.html?id=' + data.id, '900px', '70%');
 					},
 					// 修改
 					update: function(data) {

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

@@ -17,6 +17,26 @@
 			.c-panel .c-label {
 				width: 8em;
 			}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 26px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 30px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
 		</style>
 	</head>
 	<body>
@@ -25,48 +45,65 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form size="mini" v-if="m">
-						<el-row>
-							<el-col span=12>
-								<div class="c-item br">
-									<label class="c-label">名称：</label>
-									<span>{{m.name}}</span>
-								</div>
-								<div class="c-item br">
-									<label class="c-label">编号：</label>
-									<span>{{m.code}}</span>
-								</div>
-								<div class="c-item br">
-									<label class="c-label">地区：</label>
-									<span>{{m.address}}</span>
-								</div>
-
-								<div class="c-item br">
-									<label class="c-label">状态：</label>
-									<b v-if="m.deleteStatus == 0">禁用</b>
-									<b v-if="m.deleteStatus == 1">启用</b>
-								</div>
-							</el-col>
-							<el-col span=12>
-								<div class="c-item br">
-									<label class="c-label">组长：</label>
-									<span v-if="m.leaderName">{{m.leaderName}}</span>
-									<span v-else style="color: #066CF3;cursor: pointer;"
-										@click="addLeaderFn(m.id)">添加</span>
-								</div>
-								<div class="c-item br">
-									<label class="c-label">组长电话：</label>
-									<span>{{m.leaderPhone}}</span>
-								</div>
-								<div class="c-item br">
-									<label class="c-label">限购额度：</label>
-									<span>{{m.leftPrice}}元</span>
-								</div>
-								<div class="c-item br">
-									<label class="c-label">创建时间：</label>
-									<span class="tc-date">{{sa.forDate(m.createTime, 2)}}</span>
-								</div>
-							</el-col>
-						</el-row>
+						<table>
+							<tr>
+								<th>名称</th>
+								<td>{{m.orgName}}</td>
+								<th>组长</th>
+								<td>{{m.leaderName}}</td>
+							</tr>
+							<tr>
+								<th>互市区</th>
+								<td>{{m.tradeAreaName}}</td>
+								<th>组长电话</th>
+								<td>{{maskPhone(m.leaderPhone)}}</td>
+							</tr>
+							<tr>
+								<th>限购额度</th>
+								<td>{{m.leftPrice}}</td>
+								<th>所属地址</th>
+								<td>{{m.address}}</td>
+							</tr>
+							<tr>
+								<th>场站编码</th>
+								<td>{{m.fieldCode}}</td>
+								<th>内部业务编号</th>
+								<td>{{m.platSeqNo}}</td>
+							</tr>
+							<tr>
+								<th>关区代码</th>
+								<td>{{m.customsCode}}</td>
+								<th>登记号</th>
+								<td>{{m.shopsSccd}}</td>
+							</tr>
+							<tr>
+								<th>启停用状态</th>
+								<td>
+									<b v-if="m.eDStatus == 1">启用</b>
+									<b v-if="m.eDStatus == 2">停用</b>
+									<b v-if="m.eDStatus == 3">注销</b>
+								</td>
+								<th>备案状态</th>
+								<td>
+									<b v-if="m.filingStatus == 0">待申报</b>
+									<b v-if="m.filingStatus == 1">已申报</b>
+									<b v-if="m.filingStatus == 2">备案通过</b>
+									<b v-if="m.filingStatus == 3">备案失败</b>
+								</td>
+							</tr>
+							<tr>
+								<th>备案编号</th>
+								<td>{{m.putrecNo}}</td>
+								<th>地方政府编号</th>
+								<td>{{m.localGovernmentNo}}</td>
+							</tr>
+							<tr>
+								<th>有效效截止时间</th>
+								<td>{{sa.forDate(m.expiry, 2)}}</td>
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>
@@ -84,6 +121,9 @@
 					m: null
 				},
 				methods: {
+					maskPhone:function (phone) {
+					    return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+					},
 					addLeaderFn(groupId) {
 						sa.showIframe('添加组长', 'tb-group-leader.html?groupId=' + groupId, '950px', '90%');
 					},

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

@@ -23,6 +23,26 @@
 			.c-panel .el-form .el-textarea__inner {
 				width: 250px;
 			}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 26px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 30px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
 		</style>
 	</head>
 	<body>
@@ -31,61 +51,35 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form size="mini" v-if="m">
-						<el-row>
-							<el-col span=12>
-								<div class="c-item br">
-									<label class="c-label"><label style="color: red">*</label>姓名：</label>
-									<el-input size="mini" v-model="m.name"></el-input>
-								</div>
-								<div class="c-item br">
-									<label class="c-label"><label style="color: red">*</label>身份证号：</label>
-									<el-input size="mini" v-model="m.idCard"></el-input>
-								</div>
-								<div class="c-item br">
-									<label class="c-label" style="vertical-align: top;"><label
-											style="color: red">*</label>身份证：</label>
-									<div class="c-item-mline image-box">
-										<div class="image-box-2" v-for="item in m.idCardImg_arr">
-											<img :src="item" @click="sa.showImage(item, '500px', '400px')" />
-											<p>
-												<i class="el-icon-close" style="position: relative; top: 2px;"></i>
-												<el-link @click="sa.arrayDelete(m.idCardImg_arr, item)"
-													style="color: #999;">
-													删除 </el-link>
-											</p>
-										</div>
-										<!-- 上传图集 -->
-										<div class="image-box-2 up_img"
-											@click="sa.uploadImageList(src => m.idCardImg_arr.push(src))">
-											<img src="../../static/img/up-icon.png">
-										</div>
+						<table>
+							<tr>
+								<th>姓名</th>
+								<td>{{m.name}}</td>
+								<th>手机号码</th>
+								<td>{{maskPhone(m.phone)}}</td>
+							</tr>
+							<tr>
+								<th>银行</th>
+								<td>{{m.bankCode}}</td>
+								<th>身份证号</th>
+								<td>{{maskId(m.idCard)}}</td>
+							</tr>
+							<tr>
+								<th>银行卡号</th>
+								<td>{{m.bankNo}}</td>
+								<th>身份证</th>
+								<td><div class="image-box-2" v-for="item in m.idCardImg_arr">
+										<img :src="item" @click="sa.showImage(item, '500px', '400px')" />
 									</div>
-								</div>
-							</el-col>
-							<el-col span=12>
-
-								<div class="c-item br">
-									<label class="c-label"><label style="color: red">*</label>手机号码：</label>
-									<el-input size="mini" v-model="m.phone"></el-input>
-								</div>
-								<div class="c-item br">
-									<label class="c-label"><label style="color: red">*</label>银行：</label>
-									<el-select v-model="m.bankCode" placeholder="请选择" filterable size="mini">
-										<el-option label="请选择" :value="0" disabled></el-option>
-										<el-option v-for="(item,index) in bankList" :key="index" :label="item.bankName"
-											:value="item.bankCode"> </el-option>
-									</el-select>
-								</div>
-								<div class="c-item br">
-									<label class="c-label"><label style="color: red">*</label>银行卡号：</label>
-									<el-input size="mini" v-model="m.bankNo"></el-input>
-								</div>
-								<div class="c-item br">
-									<label class="c-label">联系地址：</label>
-									<el-input size="mini" v-model="m.address"></el-input>
-								</div>
-							</el-col>
-						</el-row>
+								</td>
+							</tr>
+							<tr>
+								<th>联系地址</th>
+								<td>{{m.address}}</td>
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 						<div class="c-item br s-ok">
 							<label class="c-label"></label>
 							<el-button size="mini" type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
@@ -126,6 +120,12 @@
 					bankList: []
 				},
 				methods: {
+					maskId:function (id) {
+					    return id.replace(/^(.{6})(.*)(.{4})$/,'$1********$3');
+					},
+					maskPhone:function (phone) {
+					    return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+					},
 					getBankList() {
 						sa.ajax('/sp-admin/TbBank/getAll', function(resp) {
 							this.bankList = resp.data;
@@ -148,16 +148,21 @@
 					// 提交数据
 					ok: function() {
 						// 验证
+						console.log("---1---=")
 						this.m.idCardImg = this.m.idCardImg_arr.join(','); // 图片数组转字符串
-						if (this.submitCheck() != 'ok') {
-							return;
-						}
+						console.log("---2---=",this.m.idCardImg)
+						// if (this.submitCheck() != 'ok') {
+						// 	return;
+						// }
+						console.log("---3---=")
 						// 开始增加或修改
 						if (this.id <= 0) { // 添加
+						console.log("---4---=")
 							sa.ajax('/level-one-server/TbPeople/add', sa.removeNull(this.m), function(res) {
 								sa.alert('增加成功', this.clean);
 							}.bind(this));
 						} else { // 修改
+						console.log("---4---=")
 							sa.ajax('/level-one-server/TbPeople/update', sa.removeNull(this.m), function(res) {
 								sa.alert('修改成功', this.clean);
 							}.bind(this));

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

@@ -35,22 +35,19 @@
 					</div>
 					<div class="c-item" style="min-width: 0px;">
 						<el-button size="mini" type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
-						<el-button size="mini" type="primary" icon="el-icon-plus" @click="add()">新增</el-button>
-						<el-button size="mini" type="danger" icon="el-icon-delete" @click="deleteByIds()">删除</el-button>
 						<el-button size="mini" type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 					</div>
 				</el-form>
-			
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" size="small">
 					<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="fieldCode"></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>
-							<b v-else style="color: #066CF3;cursor: pointer;" @click="addLeaderFn(s.row.id)">添加</b>
+							<b v-else>-</b>
 						</template>
 					</el-table-column>
 					<el-table-column align="center" label="组长电话" prop="leaderPhone">
@@ -66,12 +63,8 @@
 						<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-edit" @click="update(s.row)">修改
-							</el-button>
 							<el-button class="c-btn" type="primary" icon="el-icon-view" @click="peopleFn(s.row)">边民
 							</el-button>
-							<el-button class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除
-							</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -108,6 +101,9 @@
 		</div>
 		<script>
 			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
+				},
 				el: '.vue-box',
 				data: {
 					upload: false,
@@ -184,13 +180,13 @@
 						this.upload = false;
 					},
 					peopleFn(group){
-						sa.showIframe("【"+group.name+'】边民管理', 'tb-group-people.html?groupId='+group.id, '1080px', '100%');
+						sa.showIframe("【"+group.orgName+'】边民管理', 'tb-group-people.html?groupId='+group.id, '1080px', '100%');
 					},
 					addLeaderFn(groupId){
 						sa.showIframe('添加组长', 'tb-group-leader.html?groupId='+groupId, '950px', '90%');
 					},
 					editLeaderFn(groupId,leaderId){
-						sa.showIframe('编辑组长', 'tb-group-leader.html?groupId='+groupId+'&leaderId='+leaderId, '950px', '90%');
+						sa.showIframe('组长详情', 'tb-group-leader.html?groupId='+groupId+'&leaderId='+leaderId, '950px', '90%');
 					},
 					// 刷新
 					f5: function() {

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

@@ -29,8 +29,6 @@
 					</div>
 					<div class="c-item" style="min-width: 0px;">
 						<el-button size="mini" type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
-						<el-button size="mini" type="primary" icon="el-icon-plus" @click="add()">添加</el-button>
-						<el-button size="mini" type="danger" icon="el-icon-delete" @click="deleteByIds()">移出</el-button>
 						<el-button size="mini" type="info"  icon="el-icon-refresh"  @click="sa.f5()">重置</el-button>
 					</div>
 				</el-form>
@@ -40,20 +38,30 @@
 				</div>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" size="small">
-					<el-table-column align="center"  type="selection" width="45px"></el-table-column>
+					<el-table-column align="center" label="序号" type="index" ></el-table-column>
 					<el-table-column align="center" label="姓名" prop="name" ></el-table-column>
-					<el-table-column align="center" label="边民号" prop="code" ></el-table-column>
-					<el-table-column align="center" label="性别">
+					<el-table-column align="center" label="性别" width="60px">
 						<template slot-scope="s">
 							<b v-if="s.row.sex == 1">男</b>
 							<b v-if="s.row.sex == 2">女</b>
 						</template>
 					</el-table-column>
-					<el-table-column align="center" label="手机号码" prop="phone" ></el-table-column>
-					<el-table-column align="center" label="操作" fixed="right"  width="240px">
+					<el-table-column align="center" label="手机号码" prop="phone">
+						<template slot-scope="s">
+							<b v-if="s.row.phone">{{maskPhone(s.row.phone)}}</b>
+							<b v-else>-</b>
+						</template>
+					</el-table-column>
+					<el-table-column align="center" label="身份证" prop="idCard">
+						<template slot-scope="s">
+							<b v-if="s.row.idCard">{{maskId(s.row.idCard)}}</b>
+							<b v-else>-</b>
+						</template>
+					</el-table-column>
+					<el-table-column align="center" label="互市区" prop="tradeAreaName" ></el-table-column>
+					<el-table-column align="center" label="操作" fixed="right"  width="180px">
 						<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="danger" icon="el-icon-delete" @click="del(s.row)">移出</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -78,10 +86,7 @@
 					p: { // 查询参数
 						id: '',		// 主键
 						name: '',		// 姓名
-						code: '',		// 边民号
-						idCard: '',		// 身份证
 						phone: '',		// 手机号码
-						groupId: sa.p('groupId',-1),		// 所属互助组(1=测试组)
 						pageNo: 1,		// 当前页
 						pageSize: 10,	// 页大小
 						sortType: 0		// 排序方式
@@ -90,6 +95,12 @@
 					dataList: [], // 数据集合
 				},
 				methods: {
+					maskId:function (id) {
+					    return id.replace(/^(.{6})(.*)(.{4})$/,'$1********$3');
+					},
+					maskPhone:function (phone) {
+					    return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+					},
 					// 刷新
 					f5: function() {
 						sa.ajax('/level-one-server/TbPeople/getList', sa.removeNull(this.p), function(res) {
@@ -100,7 +111,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', '../tb-people/tb-people-info.html?id=' + data.id, '950px', '90%');
+						sa.showIframe('数据详情', '../tb-people/tb-people-info.html?id=' + data.id, '950px', '100%');
 					},
 					// 查看 - 根据选中的
 					getBySelect: function(data) {

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

@@ -14,7 +14,27 @@
 		<script src="../../static/kj/layer/layer.js"></script>
 		<script src="../../static/sa.js"></script>
 		<style type="text/css">
-			.c-panel .c-label{width: 8em;}
+			.c-panel .c-label{width: 22em;}
+			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>
@@ -23,29 +43,84 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="业务编号" br>{{m.platSeqNo}}</sa-info>
-						<sa-info name="商品序号" br>{{m.gNo}}</sa-info>
-						<sa-info name="商品编码" br>{{m.codeTs}}</sa-info>
-						<sa-info name="商品名称" br>{{m.gName}}</sa-info>
-						<sa-info name="规格型号" br>{{m.gModel}}</sa-info>
-						<sa-info name="申报数量" br>{{m.gQty}}</sa-info>
-						<sa-info name="第一数量" br>{{m.qty1}}</sa-info>
-						<sa-info name="商品第二数量" br>{{m.qty2}}</sa-info>
-						<sa-info name="商品毛重" br>{{m.grossWt}}</sa-info>
-						<sa-info name="商品净重" br>{{m.netWt}}</sa-info>
-						<sa-info name="商品产销国" br>{{m.originCountry}}</sa-info>
-						<sa-info name="申报计量单位:参见计量单位参数表" br>{{m.gUnit}}</sa-info>
-						<sa-info name="商品第一计量单位" br>{{m.unit1}}</sa-info>
-						<sa-info name="商品第二计量单位" br>{{m.unit2}}</sa-info>
-						<sa-info name="商品申报单价" br>{{m.declPrice}}</sa-info>
-						<sa-info name="申报总价" br>{{m.declTotal}}</sa-info>
-						<sa-info name="储存条件:1常温2冷藏3冷冻" br>{{m.storageEnvm}}</sa-info>
-						<sa-info name="商品用途" br>{{m.useTo}}</sa-info>
-						<sa-info name="商铺编码" br>{{m.shopNo}}</sa-info>
-						<sa-info name="商铺名称" br>{{m.shopName}}</sa-info>
-						<sa-info name="检疫检疫代码" br>{{m.ciqCode}}</sa-info>
-						<sa-info name="检疫检疫名称" br>{{m.ciqName}}</sa-info>
-						<sa-info name="包装类型" br>{{m.wrapType}}</sa-info>
+						<table>
+							<tr>
+								<th>业务编号</th>
+								<td>{{m.platSeqNo}}</td>
+								<th>商品序号</th>
+								<td>{{m.gNo}}</td>
+							</tr>
+							<tr>
+								<th>商品名称</th>
+								<td>{{m.gName}}</td>
+								<th>商品编号</th>
+								<td>{{m.codeTs}}</td>
+							</tr>
+							<tr>
+								<th>申报数量</th>
+								<td>{{m.gQty}}</td>
+								<th>规格型号</th>
+								<td>{{m.gModel}}</td>
+							</tr>
+							<tr>
+								<th>第一数量</th>
+								<td>{{m.qty1}}</td>
+								<th>商品毛重</th>
+								<td>{{m.grossWt}}</td>
+							</tr>
+							<tr>
+								<th>第二数量</th>
+								<td>{{m.qty2}}</td>
+								<th>商品净重</th>
+								<td>{{m.netWt}}</td>
+							</tr>
+							<tr>
+								<th>单位</th>
+								<td>{{m.gUnit}}</td>
+								<th>产销国</th>
+								<td>{{m.originCountry}}</td>
+							</tr>
+							<tr>
+								<th>第一计量单位</th>
+								<td>{{m.unit1}}</td>
+								<th>申报单价</th>
+								<td>{{m.declPrice}}</td>
+							</tr>
+							<tr>
+								<th>第二计量单位</th>
+								<td>{{m.unit2}}</td>
+								<th>申报总价</th>
+								<td>{{m.declTotal}}</td>
+							</tr>
+							<tr>
+								<th>储存条件</th>
+								<td>
+									<b v-if="m.storageEnvm == 1">常温</b>
+									<b v-if="m.storageEnvm == 2">冷藏</b>
+									<b v-if="m.storageEnvm == 3">冷冻</b>
+								</td>
+								<th>商品用途</th>
+								<td>{{m.useTo}}</td>
+							</tr>
+							<tr>
+								<th>商铺编码</th>
+								<td>{{m.shopNo}}</td>
+								<th>商铺名称</th>
+								<td>{{m.shopName}}</td>
+							</tr>
+							<tr>
+								<th>检疫检疫代码</th>
+								<td>{{m.ciqCode}}</td>
+								<th>检疫检疫名称</th>
+								<td>{{m.ciqName}}</td>
+							</tr>
+							<tr>
+								<th>包装类型</th>
+								<td>{{m.wrapType}}</td>
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>

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

@@ -27,31 +27,17 @@
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="selection"></sa-td>
-					<sa-td name="业务编号" prop="platSeqNo" ></sa-td>
-					<sa-td name="商品序号" prop="gNo" ></sa-td>
-					<sa-td name="商品编码" prop="codeTs" ></sa-td>
+					<sa-td type="index" width="30px"></sa-td>
+					<sa-td name="业务编号" prop="platSeqNo" width="140px"></sa-td>
 					<sa-td name="商品名称" prop="gName" ></sa-td>
-					<sa-td name="规格型号" prop="gModel" ></sa-td>
 					<sa-td name="申报数量" prop="gQty" ></sa-td>
-					<sa-td name="第一数量" prop="qty1" ></sa-td>
-					<sa-td name="商品第二数量" prop="qty2" ></sa-td>
 					<sa-td name="商品毛重" prop="grossWt" ></sa-td>
 					<sa-td name="商品净重" prop="netWt" ></sa-td>
-					<sa-td name="商品产销国" prop="originCountry" ></sa-td>
-					<sa-td name="申报计量单位:参见计量单位参数表" prop="gUnit" ></sa-td>
-					<sa-td name="商品第一计量单位" prop="unit1" ></sa-td>
-					<sa-td name="商品第二计量单位" prop="unit2" ></sa-td>
-					<sa-td name="商品申报单价" prop="declPrice" ></sa-td>
+					<sa-td name="计量单位" prop="gUnit" ></sa-td>
+					<sa-td name="申报单价" prop="declPrice" ></sa-td>
 					<sa-td name="申报总价" prop="declTotal" ></sa-td>
-					<sa-td name="储存条件:1常温2冷藏3冷冻" prop="storageEnvm" ></sa-td>
-					<sa-td name="商品用途" prop="useTo" ></sa-td>
-					<sa-td name="商铺编码" prop="shopNo" ></sa-td>
 					<sa-td name="商铺名称" prop="shopName" ></sa-td>
-					<sa-td name="检疫检疫代码" prop="ciqCode" ></sa-td>
-					<sa-td name="检疫检疫名称" prop="ciqName" ></sa-td>
-					<sa-td name="包装类型" prop="wrapType" ></sa-td>
-					<el-table-column label="操作" fixed="right"  width="240px">
+					<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>
 						</template>
@@ -90,7 +76,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-import-goods-info.html?id=' + data.id, '1050px', '90%');
+						sa.showIframe('数据详情', 'tb-import-goods-info.html?id=' + data.id, '900px', '90%');
 					},
 					// 查看 - 根据选中的
 					getBySelect: function(data) {

sa-view/tb-import-order/tb-import-order-add.html

@@ -161,7 +161,7 @@
 					ok: function(){
 						// 表单校验
 						let m = this.m;
-						sa.checkNull(m.id, '请输入 [主键]');
+						/* sa.checkNull(m.id, '请输入 [主键]');
 						sa.checkNull(m.platSeqNo, '请输入 [地方平台的内部业务编号,每次申请都是新编号]');
 						sa.checkNull(m.preNo, '请输入 [预录入编号]');
 						sa.checkNull(m.itrdclDeclareId, '请输入 [关联进出境申报单编号]');
@@ -212,7 +212,7 @@
 						sa.checkNull(m.borderPeopleList, '请输入 [委托边民体信息对象]');
 						sa.checkNull(m.borderPeopleLimitList, '请输入 [委托边民额度体对象]');
 						sa.checkNull(m.goodsList, '请输入 [申报单商品体信息对象]');
-
+ */
 						// 开始增加或修改
 						if(this.id <= 0) {	// 添加
 							sa.ajax('/level-one-server/TbImportOrder/add', m, function(res){

sa-view/tb-import-order/tb-import-order-do-judge.html

@@ -0,0 +1,307 @@
+<!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="https://unpkg.com/element-ui@2.13.0/lib/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 .c-label {
+				width: 8em;
+			}
+			.c-item .image-box-2 {
+				height: 90px;
+			}
+			.el-row{
+				border-bottom: 1px solid #eeeeee;
+			}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 22px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 22px;
+			  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">
+						<el-alert show-icon title="审核驳回" :description="m.judgeContent" type="error" v-if="m.judgeStatus==2"></el-alert>
+						<table>
+							<tr>
+								<th>业务编号</th>
+								<td>{{m.platSeqNo}}</td>
+								<th>预录入编号</th>
+								<td>{{m.preNo}}</td>
+							</tr>
+							<tr>
+								<th>关联进境申报单编号</th>
+								<td>{{m.itrdclDeclareId}}</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.veNo}}</td>
+							</tr>
+							<tr>
+								<th>申报人姓名</th>
+								<td>{{m.declareName}}</td>
+								<th>申报人身份证号</th>
+								<td>{{m.ciphertextIdno}}</td>
+							</tr>
+							<tr>
+								<th>商铺编码</th>
+								<td>{{m.shopNo}}</td>
+								<th>商铺名称</th>
+								<td>{{m.shopName}}</td>
+							</tr>
+							<tr>
+								<th>互助组/合作社备案编号</th>
+								<td>{{m.orgPutrecNo}}</td>
+								<th>互助组/合租社名称</th>
+								<td>{{m.orgName}}</td>
+							</tr>
+							<tr>
+								<th>合作社社会统一信用代码</th>
+								<td>{{m.orgScc}}</td>
+								<th>商铺备案编号</th>
+								<td>{{m.shopPutrecNo}}</td>
+							</tr>
+							<tr>
+								<th>运输工具类型</th>
+								<td>
+									<b v-if="m.vehicleType == 1">三轮车</b>
+									<b v-if="m.vehicleType == 2">货车</b>
+									<b v-if="m.vehicleType == 3">电动车</b>
+									<b v-if="m.vehicleType == 4">拖拉机</b>
+									<b v-if="m.vehicleType == 5">其他</b>
+									<b v-if="m.vehicleType == 6">轻型货车</b>
+									<b v-if="m.vehicleType == 7">微型货车</b>
+								</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.note}}</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.tradeCountry}}</td>
+							</tr>
+							<tr>
+								<th>落地加工企业</th>
+								<td>{{m.mName}}</td>
+								<th>落地加工企业信用代码</th>
+								<td>{{m.mScc}}</td>
+							</tr>
+							<tr>
+								<th>是否均摊</th>
+								<td>
+									<b v-if="m.shareFlag == 0">否</b>
+									<b v-if="m.shareFlag == 1">是</b>
+								</td>
+								<th>是否拼车</th>
+								<td>
+									<b v-if="m.carPool == 0">否</b>
+									<b v-if="m.carPool == 1">是</b>
+								</td>
+							</tr>
+							<tr>
+								<th>申报单类型</th>
+								<td>{{m.dclType}}</td>
+								<th>申报口岸代码</th>
+								<td>{{m.customsCode}}</td>
+							</tr>
+							<tr>
+								<th>改单/撤销原因</th>
+								<td>{{m.mdfblRvkRsn}}</td>
+								<th>边民备案编号标记</th>
+								<td>{{m.borderFlag}}</td>
+							</tr>
+							<tr>
+								<th>数据状态</th>
+								<td>{{m.delStatus}}</td>
+								<th>申报状态</th>
+								<td>{{m.declStatus}}</td>
+							</tr>
+							<tr>
+								<th>申报时间</th>
+								<td>{{sa.forDate(m.declTime, 2)}}</td>
+								<th>回执时间</th>
+								<td>{{sa.forDate(m.rcptTime, 2)}}</td>
+							</tr>
+							<tr>
+								<th>审核备注</th>
+								<td>{{m.auditRemark}}</td>
+								<th>运输工具代理企业代码</th>
+								<td>{{m.agentCode}}</td>
+							</tr>
+							<tr>
+								<th>边民id</th>
+								<td>{{m.borderId}}</td>
+								<th>msgId</th>
+								<td>{{m.msgId}}</td>
+							</tr>
+							<tr>
+								<th>企业编码</th>
+								<td>{{m.entCode}}</td>
+								<th>企业名称</th>
+								<td>{{m.entName}}</td>
+							</tr>
+							<tr>
+								<th>运输工具批次号</th>
+								<td>{{m.manifestId}}</td>
+								<th>互助委托协议</th>
+								<td>
+									<sa-info type="img-list" :value="m.cooperEntrustImg"></sa-info>
+								</td>
+							</tr>
+						</table>
+						
+						
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot" v-if="sa.isAuth('tb-purchaser-judge')">
+				<el-button type="warning" @click="judgeBack">审核驳回</el-button>
+				<el-button type="success" @click="judgePass">审核通过</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: {
+					judgeBack() {
+						let id = this.m.id
+						layer.prompt({
+							title: '输入审核意见'
+						}, function(content, index) {
+							layer.close(index);
+							sa.ajax('/level-one-server/TbImportOrder/audit', {
+								id: id,
+								judgeContent: content,
+								judgeStatus: 2
+							}, function(res) {
+								layer.msg('审核已驳回');
+								setTimeout(() => {
+									parent.app.f5(); // 刷新父页面列表
+									sa.closeCurrIframe(); // 关闭本页
+								}, 800)
+							})
+						});
+					},
+					judgePass() {
+						sa.ajax('/level-one-server/TbImportOrder/audit', {
+							id: this.m.id,
+							judgeContent: '审核通过',
+							judgeStatus: 1
+						}, function(res) {
+							layer.msg('审核通过');
+							setTimeout(() => {
+								parent.app.f5(); // 刷新父页面列表
+								sa.closeCurrIframe(); // 关闭本页
+							}, 800)
+						})
+					},
+				},
+				mounted: function() {
+					sa.ajax('/level-one-server/TbImportOrder/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if(this.m.cooperEntrustImg != undefined) {
+							this.m.cooperEntrustImg = res.data.cooperEntrustImg.replaceAll("/sp-admin",sa.cfg.api_url+"/sp-admin").replaceAll("[","").replaceAll("]","").replaceAll("\"","")
+						}
+						if (res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+		</script>
+	</body>
+</html>

sa-view/tb-import-order/tb-import-order-info.html

@@ -14,7 +14,28 @@
 		<script src="../../static/kj/layer/layer.js"></script>
 		<script src="../../static/sa.js"></script>
 		<style type="text/css">
-			.c-panel .c-label{width: 8em;}
+			.c-panel .c-label{width: 26em;}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 20px ;
+			  margin-bottom: 10px ;
+			  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>
@@ -23,55 +44,184 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="业务编号" br>{{m.platSeqNo}}</sa-info>
-						<sa-info name="预录入编号" br>{{m.preNo}}</sa-info>
-						<sa-info name="关联进境申报单编号" br>{{m.itrdclDeclareId}}</sa-info>
-						<sa-info name="进出口申报单编号变更、撤销类型时必填" br>{{m.declareId}}</sa-info>
-						<sa-info type="enum" name="申报人类别" :value="m.declareType" :jv="{1: '边民', 2: '商铺业主或其代理人', 3: '合作社代表', 4: '互助组代表'}" br></sa-info>
-						<sa-info name="申报人姓名" br>{{m.declareName}}</sa-info>
-						<sa-info name="申报人身份证号" br>{{m.ciphertextIdno}}</sa-info>
-						<sa-info name="申报人类别为2时商铺编码必填" br>{{m.shopNo}}</sa-info>
-						<sa-info name="申报人类别为2时商铺名称必填" br>{{m.shopName}}</sa-info>
-						<sa-info name="申报人类别为3、4时互助组/合作社备案编号" br>{{m.orgPutrecNo}}</sa-info>
-						<sa-info name="申报人类别为3、4时互助组/合租社名称" br>{{m.orgName}}</sa-info>
-						<sa-info name="申报人类别为4时合作社社会统一信用代码" br>{{m.orgScc}}</sa-info>
-						<sa-info name="车牌号" br>{{m.veNo}}</sa-info>
-
-						<sa-info type="enum" name="运输工具类型" :value="m.vehicleType" :jv="{1: '三轮车', 2: '货车', 3: '电动车', 4: '拖拉机', 5: '其他', 6: '轻型货车', 7: '微型货车'}" br></sa-info>
-						<sa-info type="enum" name="业务模式" :value="m.btrnbBizModecd" :jv="{1: '区内交易', 2: '落地加工', 3: '原装提离', 4: '直接出口', 5: '出口销售'}" br></sa-info>
-						<sa-info type="enum" name="商品流向" :value="m.gFlow" :jv="{1: '二次销售', 2: '生活自用', 3: '落地加工'}" br></sa-info>
-						<sa-info type="enum" name="进出口标志" :value="m.iEFlag" :jv="{'I': '进口', 'E': '出口'}" br></sa-info>
-
-						<sa-info name="监管场所编号" br>{{m.fieldCode}}</sa-info>
-						<sa-info name="监管场所名称" br>{{m.fieldName}}</sa-info>
-						<sa-info name="申报口岸代码" br>{{m.customsCode}}</sa-info>
-						<sa-info type="enum" name="是否拼车" :value="m.carPool" :jv="{'1': '是', '0': '否'}" br></sa-info>
-						<sa-info name="备注" br>{{m.note}}</sa-info>
-						<sa-info name="总金额" br>{{m.sumAmt}}</sa-info>
-						<sa-info name="总毛重" br>{{m.sumGrossWt}}</sa-info>
-						<sa-info name="总净重" br>{{m.sumNetWt}}</sa-info>
-						<sa-info name="运输方式" br>{{m.trafMode}}</sa-info>
-						<sa-info name="币制" br>{{m.currCode}}</sa-info>
-						<sa-info name="件数" br>{{m.packNo}}</sa-info>
-						<sa-info name="贸易国别" br>{{m.tradeCountry}}</sa-info>
-						<sa-info name="落地加工企业名称" br>{{m.mName}}</sa-info>
-						<sa-info name="落地加工企业社会统一信用代码" br>{{m.mScc}}</sa-info>
-						<sa-info type="enum" name="是否均摊" :value="m.shareFlag" :jv="{'1': '是', '0': '否'}" br></sa-info>
-						<sa-info name="申报单类型" br>{{m.dclType}}</sa-info>
-						<sa-info name="改单/撤销原因,撤销时必填" br>{{m.mdfblRvkRsn}}</sa-info>
-						<sa-info name="边民备案编号标记" br>{{m.borderFlag}}</sa-info>
-						<sa-info name="数据状态" br>{{m.delStatus}}</sa-info>
-						<sa-info name="申报状态" br>{{m.declStatus}}</sa-info>
-						<sa-info name="申报时间" br>{{m.declTime}}</sa-info>
-						<sa-info name="回执时间" br>{{m.rcptTime}}</sa-info>
-						<sa-info name="审核备注" br>{{m.auditRemark}}</sa-info>
-						<sa-info name="运输工具代理企业代码" br>{{m.agentCode}}</sa-info>
-						<sa-info name="运输工具批次号" br>{{m.manifestId}}</sa-info>
-						<sa-info name="商铺备案编号" br>{{m.shopPutrecNo}}</sa-info>
-						<sa-info name="边民id" br>{{m.borderId}}</sa-info>
-						<sa-info name="" br>{{m.msgId}}</sa-info>
-						<sa-info name="企业编码" br>{{m.entCode}}</sa-info>
-						<sa-info name="企业名称" br>{{m.entName}}</sa-info>
+						<table>
+							<tr>
+								<th>业务编号</th>
+								<td>{{m.platSeqNo}}</td>
+								<th>预录入编号</th>
+								<td>{{m.preNo}}</td>
+							</tr>
+							<tr>
+								<th>关联进境申报单编号</th>
+								<td>{{m.itrdclDeclareId}}</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.veNo}}</td>
+							</tr>
+							<tr>
+								<th>申报人姓名</th>
+								<td>{{m.declareName}}</td>
+								<th>申报人身份证号</th>
+								<td>{{m.ciphertextIdno}}</td>
+							</tr>
+							<tr>
+								<th>商铺编码</th>
+								<td>{{m.shopNo}}</td>
+								<th>商铺名称</th>
+								<td>{{m.shopName}}</td>
+							</tr>
+							<tr>
+								<th>互助组/合作社备案编号</th>
+								<td>{{m.orgPutrecNo}}</td>
+								<th>互助组/合租社名称</th>
+								<td>{{m.orgName}}</td>
+							</tr>
+							<tr>
+								<th>合作社社会统一信用代码</th>
+								<td>{{m.orgScc}}</td>
+								<th>商铺备案编号</th>
+								<td>{{m.shopPutrecNo}}</td>
+							</tr>
+							<tr>
+								<th>运输工具类型</th>
+								<td>
+									<b v-if="m.vehicleType == 1">三轮车</b>
+									<b v-if="m.vehicleType == 2">货车</b>
+									<b v-if="m.vehicleType == 3">电动车</b>
+									<b v-if="m.vehicleType == 4">拖拉机</b>
+									<b v-if="m.vehicleType == 5">其他</b>
+									<b v-if="m.vehicleType == 6">轻型货车</b>
+									<b v-if="m.vehicleType == 7">微型货车</b>
+								</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.note}}</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.tradeCountry}}</td>
+							</tr>
+							<tr>
+								<th>落地加工企业</th>
+								<td>{{m.mName}}</td>
+								<th>落地加工企业信用代码</th>
+								<td>{{m.mScc}}</td>
+							</tr>
+							<tr>
+								<th>是否均摊</th>
+								<td>
+									<b v-if="m.shareFlag == 0">否</b>
+									<b v-if="m.shareFlag == 1">是</b>
+								</td>
+								<th>是否拼车</th>
+								<td>
+									<b v-if="m.carPool == 0">否</b>
+									<b v-if="m.carPool == 1">是</b>
+								</td>
+							</tr>
+							<tr>
+								<th>申报单类型</th>
+								<td>{{m.dclType}}</td>
+								<th>申报口岸代码</th>
+								<td>{{m.customsCode}}</td>
+							</tr>
+							<tr>
+								<th>改单/撤销原因</th>
+								<td>{{m.mdfblRvkRsn}}</td>
+								<th>边民备案编号标记</th>
+								<td>{{m.borderFlag}}</td>
+							</tr>
+							<tr>
+								<th>数据状态</th>
+								<td>{{m.delStatus}}</td>
+								<th>申报状态</th>
+								<td>{{m.declStatus}}</td>
+							</tr>
+							<tr>
+								<th>申报时间</th>
+								<td>{{sa.forDate(m.declTime, 2)}}</td>
+								<th>回执时间</th>
+								<td>{{sa.forDate(m.rcptTime, 2)}}</td>
+							</tr>
+							<tr>
+								<th>审核备注</th>
+								<td>{{m.auditRemark}}</td>
+								<th>运输工具代理企业代码</th>
+								<td>{{m.agentCode}}</td>
+							</tr>
+							<tr>
+								<th>边民id</th>
+								<td>{{m.borderId}}</td>
+								<th>msgId</th>
+								<td>{{m.msgId}}</td>
+							</tr>
+							<tr>
+								<th>企业编码</th>
+								<td>{{m.entCode}}</td>
+								<th>企业名称</th>
+								<td>{{m.entName}}</td>
+							</tr>
+							<tr>
+								<th>运输工具批次号</th>
+								<td>{{m.manifestId}}</td>
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>

sa-view/tb-import-order/tb-import-order-judge.html

@@ -0,0 +1,147 @@
+<!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="100px"></sa-item>
+					<sa-item type="text" name="车牌号" v-model="p.veNo" width="100px"></sa-item>
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
+				</el-form>
+				<!-- ------------- 数据列表 ------------- -->
+				<el-table class="data-table" ref="data-table" :data="dataList" >
+					<sa-td type="index" width='30px'></sa-td>
+					<sa-td name="业务编号" prop="platSeqNo" width="150px"></sa-td>
+					<sa-td name="预录入编号" prop="preNo" width="150px"></sa-td>
+					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
+					<sa-td name="总金额" prop="sumAmt" ></sa-td>
+					<sa-td name="互助委托协议" prop="cooperEntrustImg" type="img-list"></sa-td>
+					<sa-td name="审核状态" prop="judgeStatus">
+						<template slot-scope="scope">
+							<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="judgeTime" width="160px"></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> -->
+						<template slot-scope="s">
+							<el-button v-if="sa.isAuth('tb-purchaser-judge')" class="c-btn" type="success"
+								icon="el-icon-s-check" @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: { // 查询参数
+						platSeqNo: '',		// 业务编号
+						veNo: '',		// 车牌号
+						pageNo: 1,		// 当前页
+						pageSize: 10,	// 页大小
+						sortType: 0		// 排序方式
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/level-one-server/TbImportOrder/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataList.map(item => {
+								if(item.cooperEntrustImg != undefined) {
+									item.cooperEntrustImg = item.cooperEntrustImg.replaceAll("/sp-admin",sa.cfg.api_url+"/sp-admin").replaceAll("[","").replaceAll("]","").replaceAll("\"","")
+								}
+							})
+							console.log("---1---"+this.dataList[5].judgeTime)
+							this.dataCount = res.dataCount; // 数据总数
+							sa.f5TableHeight();		// 刷新表格高度
+						}.bind(this));
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('互助委托协议审核', 'tb-import-order-do-judge.html?id=' + data.id, '950px', '80%');
+					},
+					// 查看 - 根据选中的
+					getBySelect: function(data) {
+						var selection = this.$refs['data-table'].selection;
+						if(selection.length == 0) {
+							return sa.msg('请选择一条数据')
+						}
+						this.get(selection[0]);
+					},
+					// 修改
+					update: function(data) {
+						sa.showIframe('修改数据', 'tb-import-order-add.html?id=' + data.id, '1000px', '90%');
+					},
+					// 新增
+					add: function(data) {
+						sa.showIframe('新增数据', 'tb-import-order-add.html?id=-1', '1000px', '90%');
+					},
+					// 删除
+					del: function(data) {
+						sa.confirm('是否删除，此操作不可撤销', function() {
+							sa.ajax('/level-one-server/TbImportOrder/delete?id=' + data.id, function(res) {
+								sa.arrayDelete(this.dataList, data);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度
+							}.bind(this))
+						}.bind(this));
+					},
+					// 批量删除
+					deleteByIds: function() {
+						// 获取选中元素的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('/level-one-server/TbImportOrder/deleteByIds', {ids: ids.join(',')}, function(res) {
+								sa.arrayDelete(this.dataList, selection);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度
+							}.bind(this))
+						}.bind(this));
+					},
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

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

@@ -27,31 +27,19 @@
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="selection"></sa-td>
-					<sa-td name="业务编号" prop="platSeqNo" ></sa-td>
-					<sa-td name="预录入编号" prop="preNo" ></sa-td>
+					<sa-td type="index" width='30px'></sa-td>
+					<sa-td name="业务编号" prop="platSeqNo" width="150px"></sa-td>
+					<sa-td name="预录入编号" prop="preNo" width="150px"></sa-td>
 					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
 					<sa-td name="申报人身份证号" prop="ciphertextIdno" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="监管场所名称" prop="fieldName" ></sa-td>
+					<sa-td name="互市区" prop="fieldName" ></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="运输方式" prop="trafMode" ></sa-td>
 					<sa-td name="币制" prop="currCode" ></sa-td>
 					<sa-td name="件数" prop="packNo" ></sa-td>
-					<sa-td name="贸易国别" prop="tradeCountry" ></sa-td>
-					<sa-td name="申报单类型" prop="dclType" ></sa-td>
-					<sa-td name="数据状态" prop="delStatus" ></sa-td>
-					<sa-td name="申报状态" prop="declStatus" ></sa-td>
-					<sa-td name="申报时间" prop="declTime" ></sa-td>
-					<sa-td name="回执时间" prop="rcptTime" ></sa-td>
-					<sa-td name="审核备注" prop="auditRemark" ></sa-td>
-					<sa-td name="商铺备案编号" prop="shopPutrecNo" ></sa-td>
-					<sa-td name="边民id" prop="borderId" ></sa-td>
-					<sa-td name="企业编码" prop="entCode" ></sa-td>
-					<sa-td name="企业名称" prop="entName" ></sa-td>
-					<el-table-column label="操作" fixed="right"  width="240px">
+					<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>

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

@@ -19,6 +19,7 @@
 		<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.contents" width="90px"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>

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

@@ -0,0 +1,145 @@
+<!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.id"></sa-item>
+					<sa-item type="text" name="报文编号" v-model="p.sn"></sa-item>
+					<sa-item type="text" name="报文发送时间" v-model="p.date"></sa-item>
+					<sa-item type="text" name="互市点机构代码" v-model="p.organization"></sa-item>
+					<sa-item type="text" name="银行标识" v-model="p.bankCode"></sa-item>
+					<sa-item type="text" name="报文业务类型" v-model="p.operation"></sa-item>
+					<sa-item type="text" name="消息回执代码" v-model="p.code"></sa-item>
+					<sa-item type="text" name="订单号" v-model="p.source"></sa-item>
+					<sa-item type="text" name="扣款成功的流水单号" v-model="p.result"></sa-item>
+					<sa-item type="text" name="回执内容" v-model="p.note"></sa-item>
+					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+				</el-form> -->
+				<!-- <div class="fast-btn">
+					<el-button v-if="sa.isAuth('bank-info-add')" size="mini" type="primary" @click="add()">新增</el-button>
+					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
+					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
+				</div> -->
+				<!-- ------------- 数据列表 ------------- -->
+				<el-table class="data-table" ref="data-table" :data="dataList" >
+					<!-- <sa-td name="报文编号" prop="sn" ></sa-td> -->
+					<sa-td name="互市代码" prop="organization" ></sa-td>
+					<sa-td name="银行标识" prop="bankCode" ></sa-td>
+					<sa-td name="业务类型" prop="operation" ></sa-td>
+					<sa-td name="回执代码" prop="code" ></sa-td>
+					<sa-td name="订单号" prop="source" width="180px"></sa-td>
+					<sa-td name="流水单号" prop="result" ></sa-td>
+					<sa-td name="回执内容" prop="note" width="300px"></sa-td>
+					<!-- <sa-td name="报文发送时间" prop="date" width="150px"></sa-td> -->
+					<sa-td name="创建时间" prop="createTime" width="150px"></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('bank-info-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button v-if="sa.isAuth('bank-info-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: {
+					tradeNo: sa.p('tradeNo', 0),	// 获取数据ID 
+					p: { // 查询参数
+						source: '',		// 订单号 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						this.p.source = this.tradeNo
+						sa.ajax('/payment-server/BankInfo/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight();		// 刷新表格高度 
+						}.bind(this));
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('数据详情', 'bank-info-info.html?id=' + data.id, '1050px', '90%');
+					},
+					// 查看 - 根据选中的
+					getBySelect: function(data) {
+						var selection = this.$refs['data-table'].selection;
+						if(selection.length == 0) {
+							return sa.msg('请选择一条数据')
+						}
+						this.get(selection[0]);
+					},
+					// 修改
+					update: function(data) {
+						sa.showIframe('修改数据', 'bank-info-add.html?id=' + data.id, '1000px', '90%');
+					},
+					// 新增
+					add: function(data) {
+						sa.showIframe('新增数据', 'bank-info-add.html?id=-1', '1000px', '90%');
+					},
+					// 删除
+					del: function(data) {
+						sa.confirm('是否删除，此操作不可撤销', function() {
+							sa.ajax('/BankInfo/delete?id=' + data.id, function(res) {
+								sa.arrayDelete(this.dataList, data);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+					// 批量删除
+					deleteByIds: function() {
+						// 获取选中元素的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('/BankInfo/deleteByIds', {ids: ids.join(',')}, function(res) {
+								sa.arrayDelete(this.dataList, selection);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

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

@@ -15,6 +15,26 @@
 		<script src="../../static/sa.js"></script>
 		<style type="text/css">
 			.c-panel .c-label{width: 8em;}
+			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>
@@ -23,51 +43,44 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="预申报编号" br>{{m.platSeqNo}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="结算单号" br>{{m.settleBillNo}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="进出口预申报单号" br>{{m.preIeportNo}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="单证代码" br>{{m.preNo}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="订单号" br>{{m.tradeNo}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="买家" br>{{m.buyUserName}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="商家名称" br>{{m.enterpriseName}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="商品名称" br>{{m.goodsNames}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="总重量" br>{{m.totalWeight}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="总金额" br>{{m.totalPrice}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="车牌号" br>{{m.veNo}}</sa-info>
-							</el-col>
-						</el-row>
+						<table>
+							<tr>
+								<th>预申报编号</th>
+								<td>{{m.platSeqNo}}</td>
+								<th>结算单号</th>
+								<td>{{m.settleBillNo}}</td>
+							</tr>
+							<tr>
+								<th>进出口预申报单号</th>
+								<td>{{m.preIeportNo}}</td>
+								<th>单证代码</th>
+								<td>{{m.preNo}}</td>
+							</tr>
+							<tr>
+								<th>订单号</th>
+								<td>{{m.tradeNo}}</td>
+								<th>买家</th>
+								<td>{{m.buyUserName}}</td>
+							</tr>
+							<tr>
+								<th>商家名称</th>
+								<td>{{m.enterpriseName}}</td>
+								<th>商品名称</th>
+								<td>{{m.goodsNames}}</td>
+							</tr>
+							<tr>
+								<th>总重量</th>
+								<td>{{m.totalWeight}}</td>
+								<th>总金额</th>
+								<td>{{m.totalPrice}}</td>
+							</tr>
+							<tr>
+								<th>车牌号</th>
+								<td>{{m.veNo}}</td>
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>

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

@@ -18,32 +18,33 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<!-- <div class="c-title">检索参数</div> -->
+				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="订单号" v-model="p.tradeNo" width="7em"></sa-item>
+					<sa-item type="text" name="订单号" v-model="p.tradeNo" width="80px"></sa-item>
 					<sa-item type="text" name="买家" v-model="p.buyUserName"></sa-item>
-					<sa-item type="text" name="商家名称" v-model="p.enterpriseName" width="7em"></sa-item>
+					<sa-item type="text" name="商家名称" v-model="p.enterpriseName" width="70px"></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" name="序号"></sa-td>
+					<sa-td type="index" width="30px"></sa-td>
 					<sa-td name="订单号" prop="tradeNo" width="180"></sa-td>
 					<sa-td name="买家" prop="buyUserName" ></sa-td>
 					<sa-td name="商家名称" prop="enterpriseName" ></sa-td>
-					<sa-td name="商品名称" prop="goodsNames" width="280"></sa-td>
+					<sa-td name="商品名称" prop="goodsNames" ></sa-td>
 					<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="preIeportNo" width="180"></sa-td>
+					<!-- <sa-td name="进出口预申报单号" prop="preIeportNo" 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">
+					<el-table-column label="操作" fixed="right"  width="180px">
 						<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="getBank(s.row)">银行回执</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -81,7 +82,11 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-order-info.html?id=' + data.id, '1050px', '90%');
+						sa.showIframe('数据详情', 'tb-order-info.html?id=' + data.id, '1050px', '70%');
+					},
+					// 查看银行回执
+					getBank: function(data) {
+						sa.showIframe('银行回执', 'tb-order-bank-list.html?tradeNo=' + data.tradeNo, '1300px', '90%');
 					},
 					// 修改
 					update: function(data) {

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

@@ -14,9 +14,28 @@
 		<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 .c-label{width: 8em;}
+			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>
@@ -25,38 +44,35 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="订单编号" br>{{m.orderNo}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="商品名称" br>{{m.goodsName}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="商品来源" br>{{m.goodsFrom}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="互市区" br>{{m.tradeAreaName}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="买家" br>{{m.purchaserName}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info name="转售金额" br>{{m.resalePrice}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row :gutter="50">
-							<el-col :span="12">
-								<sa-info name="车牌号" br>{{m.veNo}}</sa-info>
-							</el-col>
-							<el-col :span="12">
-								<sa-info type="enum" name="订单状态已完成" :value="m.orderFinish" :jv="{0: '未完成', 1: '已完成'}" br></sa-info>
-							</el-col>
-						</el-row>
+						<table>
+							<tr>
+								<th>订单编号</th>
+								<td>{{m.orderNo}}</td>
+								<th>商品名称</th>
+								<td>{{m.goodsName}}</td>
+							</tr>
+							<tr>
+								<th>商品来源</th>
+								<td>{{m.goodsFrom}}</td>
+								<th>互市区</th>
+								<td>{{m.tradeAreaName}}</td>
+							</tr>
+							<tr>
+								<th>买家</th>
+								<td>{{m.purchaserName}}</td>
+								<th>转售金额</th>
+								<td>{{m.resalePrice}}</td>
+							</tr>
+							<tr>
+								<th>车牌号</th>
+								<td>{{m.veNo}}</td>
+								<th>订单状态</th>
+								<td>
+									<b v-if="m.orderFinish == 1">已完成</b>
+									<b v-if="m.orderFinish == 0">未完成</b>
+								</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>

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

@@ -20,7 +20,7 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<!-- <div class="c-title">检索参数</div> -->
+				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="订单编号" v-model="p.orderNo" width="90px"></sa-item>
 					<sa-item type="text" name="商品名称" v-model="p.goodsName" width="90px"></sa-item>
@@ -30,16 +30,16 @@
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="index" name="序号"></sa-td>
+					<sa-td type="index" width="30px"></sa-td>
 					<sa-td name="订单编号" prop="orderNo" width="180px"></sa-td>
-					<sa-td name="商品名称" prop="goodsName" width="280px"></sa-td>
+					<sa-td name="商品名称" prop="goodsName" ></sa-td>
 					<sa-td name="商品来源" prop="goodsFrom" ></sa-td>
-					<sa-td name="互市区" prop="tradeAreaName" width="120px"></sa-td>
+					<sa-td name="互市区" prop="tradeAreaName" ></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="enum" :jv="{0: '未完成', 1: '已完成'}" @change="s => updateOrderFinish(s.row)"></sa-td>
+					<sa-td name="订状态" prop="orderFinish" type="enum" :jv="{0: '未完成[#ff910a]', 1: '已完成[green]'}" @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>
@@ -81,7 +81,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-orders-info.html?id=' + data.id, '1050px', '90%');
+						sa.showIframe('数据详情', 'tb-orders-info.html?id=' + data.id, '950px', '60%');
 					},
 					// 修改
 					update: function(data) {

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

@@ -0,0 +1,110 @@
+<!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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="https://unpkg.com/vue@2.6.10/dist/vue.min.js"></script>
+		<script src="https://unpkg.com/element-ui@2.13.0/lib/index.js"></script>
+		<script src="https://unpkg.com/jquery@3.4.1/dist/jquery.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: 350px;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+					<el-form size="mini" v-if="m">
+						<el-row>
+							<div class="c-item br">
+								<label class="c-label">银行：</label>
+								<el-select v-model="m.bankName" placeholder="请选择" filterable size="mini">
+									<el-option label="请选择" :value="0" disabled></el-option>
+									<el-option v-for="(item,index) in bankList" :key="index" :label="item.bankName"
+										:value="item.bankName"> </el-option>
+								</el-select>
+							</div>
+							<div class="c-item br">
+								<label class="c-label">银行卡号：</label>
+								<el-input size="mini" v-model="m.bankCode"></el-input>
+							</div>
+						</el-row>
+						<div class="c-item br s-ok">
+							<label class="c-label"></label>
+							<el-button size="mini" type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
+						</div>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button size="mini" type="primary" @click="ok()">确定</el-button>
+				<el-button size="mini" @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改）
+					m: {
+						id: '', // 主键
+						bankName: '', // 银行名称
+						bankCode: '', // 银行卡号
+					}, // 实体对象
+					bankList: []
+				},
+				methods: {
+					getBankList() {
+						sa.ajax('/sp-admin/TbBank/getAll', function(resp) {
+							this.bankList = resp.data;
+						}.bind(this));
+					},
+					// 提交数据
+					ok: function() {
+						if (this.id > 0) {
+							sa.ajax('/level-one-server/TbPeople/saveBankInfo', {id:this.id,bankName:this.m.bankName,bankAccount:this.m.bankCode}, function(res) {
+								sa.alert('修改成功', this.clean);
+							}.bind(this));
+						}
+					},
+					// 添加/修改 完成后的动作
+					clean: function() {
+						parent.app.f5(); // 刷新父页面列表
+						sa.closeCurrIframe(); // 关闭本页
+					},
+					initFn() {
+						// 初始化数据
+						if (this.id > 0) {
+							sa.ajax('/level-one-server/TbPeople/getById?id=' + this.id, function(res) {
+								this.m = res.data;
+								if (res.data == null) {
+									sa.alert('未能查找到 id=' + this.id + " 详细数据");
+								}
+							}.bind(this))
+						};
+					}
+				},
+				mounted: function() {
+					this.initFn()
+					this.getBankList()
+				}
+			})
+		</script>
+	</body>
+</html>

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

@@ -16,15 +16,33 @@
 		<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 .c-label {
 				width: 8em;
 			}
-
 			.c-item .image-box-2 {
 				height: 90px;
 			}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 26px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 26px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
 		</style>
 	</head>
 	<body>
@@ -33,21 +51,85 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<el-row>
-							<el-col :span="12">
-								<sa-info name="姓名" br>{{m.name}}</sa-info>
-								<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>
-								<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.bankCode}}</sa-info>
-								<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-row>
+						<table>
+							<tr>
+								<th>姓名</th>
+								<td>{{m.name}}</td>
+								<th>性别</th>
+								<td>
+									<b v-if="m.sex == 1">男</b>
+									<b v-if="m.sex == 2">女</b>
+								</td>
+							</tr>
+							<tr>
+								<th>互市区</th>
+								<td>{{m.tradeAreaName}}</td>
+								<th>手机号码</th>
+								<td>{{maskPhone(m.phone)}}</td>
+							</tr>
+							<tr>
+								<th>身份证</th>
+								<td>{{maskId(m.idCard)}}</td>
+								<th>开户行</th>
+								<td>{{m.bankName}}</td>
+							</tr>
+							<tr>
+								<th>所属互助组</th>
+								<td>{{m.groupName}}</td>
+								<th>银行卡号</th>
+								<td>{{m.bankCode}}</td>
+							</tr>
+							<tr>
+								<th>场所编码</th>
+								<td>{{m.fieldCode}}</td>
+								<th>当天剩余额度</th>
+								<td>{{m.leftPrice}}</td>
+							</tr>
+							<tr>
+								<th>角色</th>
+								<td>
+									<b v-if="m.role == 1">普通边民</b>
+									<b v-if="m.role == 2">兼组长</b>
+								</td>
+								<th>备案状态</th>
+								<td>
+									<b v-if="m.filingStatus == 0">待申报</b>
+									<b v-if="m.filingStatus == 1">已申报</b>
+									<b v-if="m.filingStatus == 2">备案通过</b>
+									<b v-if="m.filingStatus == 3">备案失败</b>
+								</td>
+							</tr>
+							<tr>
+								<th>关区代码</th>
+								<td>{{m.customsCode}}</td>
+								<th>业务编号</th>
+								<td>{{m.platSeqNo}}</td>
+							</tr>
+							<tr>
+								<th>备案编号</th>
+								<td>{{m.putrecNo}}</td>
+								<th>地方政府编号</th>
+								<td>{{m.localGovernmentNo}}</td>
+							</tr>
+							<tr>
+								<th>身份证发证机关</th>
+								<td>{{m.idcdGcertPgoffNm}}</td>
+								<th>户籍地址</th>
+								<td>{{m.birplAddr}}</td>
+							</tr>
+							<tr>
+								<th>身份证有效期起</th>
+								<td>{{sa.forDate(m.startDate, 2)}}</td>
+								<th>身份证有效期止</th>
+								<td>{{sa.forDate(m.endDate, 2)}}</td>
+							</tr>
+							<tr>
+								<th>有效截止时间</th>
+								<td>{{sa.forDate(m.expiry, 2)}}</td>
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>
@@ -67,7 +149,14 @@
 					id: sa.p('id', 0), // 获取数据ID
 					m: null
 				},
-				methods: {},
+				methods: {
+					maskId:function (id) {
+					    return id.replace(/^(.{6})(.*)(.{4})$/,'$1********$3');
+					},
+					maskPhone:function (phone) {
+					    return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+					},
+				},
 				mounted: function() {
 					sa.ajax('/level-one-server/TbPeople/getById?id=' + this.id, function(res) {
 						this.m = res.data;

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

@@ -14,35 +14,32 @@
 		<script src="../../static/kj/layer/layer.js"></script>
 		<script src="../../static/sa.js"></script>
 		<script src="../../static/kj/upload-util.js"></script>
-
 	</head>
 	<body>
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<!-- <div class="c-title">检索参数</div> -->
+				<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> -->
 					<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>
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<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="phone" ></sa-td>
-					<sa-td name="身份证" prop="idCard" ></sa-td>
+					<sa-td name="性别" prop="sex" type="enum" :jv="{'1': '男', '2': '女'}"></sa-td>
+					<sa-td name="手机号码" prop="phone" type="phone"></sa-td>
+					<sa-td name="身份证" prop="idCard" type="idCard"></sa-td>
 					<sa-td name="互助组名称" prop="groupName" ></sa-td>
+					<sa-td name="互市区" prop="tradeAreaName" ></sa-td>
+					<sa-td name="场所编码" prop="fieldCode" ></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">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
-							<el-button v-if="sa.isAuth('tb-people-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
-							<el-button v-if="sa.isAuth('tb-people-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
+							<el-button class="c-btn" type="primary" icon="el-icon-edit" @click="updateBankInfo(s.row.id)">银行卡修改</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -104,7 +101,10 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-people-info.html?id=' + data.id, '900px', '70%');
+						sa.showIframe('数据详情', 'tb-people-info.html?id=' + data.id, '1000px', '90%');
+					},
+					updateBankInfo(id){
+						sa.showIframe('修改银行卡信息', 'tb-people-bank.html?id=' + id, '650px', '40%');
 					},
 					// 修改
 					update: function(data) {

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

@@ -17,6 +17,26 @@
 		<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;}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 22px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 22px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
 		</style>
 	</head>
 	<body>
@@ -27,19 +47,56 @@
                     <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.name" br></sa-item>
-						<sa-item type="text" name="法人" v-model="m.legalPerson" br></sa-item>
-						<sa-item type="text" name="身份证号" v-model="m.idCard" br></sa-item>
-						<sa-item type="text" name="手机号码" v-model="m.contact" br></sa-item>
-						<sa-item type="img-list" name="营业执照" v-model="m.businessLicense" br></sa-item>
-						<sa-item type="text" name="银行编号" v-model="m.bankNo" br></sa-item>
-						<sa-item type="text" name="银行名称" v-model="m.bankName" br></sa-item>
-						<sa-item type="text" name="银行账号" v-model="m.bankAccount" br></sa-item>
-						<sa-item type="text" name="税号" v-model="m.dutyParagraph" br></sa-item>
-						<sa-item type="text" name="地址编号" v-model="m.addressIds" br></sa-item>
-						<sa-item type="text" name="地址" v-model="m.address" br></sa-item>
-						<!-- <sa-item type="enum" name="审核状态" v-model="m.judgeStatus" :jv="{0: '未通过', 1: '已通过'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="审核意见" v-model="m.judgeContent" br></sa-item> -->
+						<table>
+							<tr>
+								<th>企业名称</th>
+								<td>
+									<el-input type="text" v-model="m.name" placeholder="请输入企业名称"></el-input>
+								</td>
+								<th>法人</th>
+								<td>
+									<el-input type="text" v-model="m.legalPerson" placeholder="请输入法人"></el-input>
+								</td>
+							</tr>
+							<tr>
+								<th>身份证号</th>
+								<td>
+									<el-input type="text" v-model="m.idCard" placeholder="请输入身份证号"></el-input>
+								</td>
+								<th>手机号码</th>
+								<td>
+									<el-input type="text" v-model="m.contact" placeholder="请输入手机号码"></el-input>
+								</td>
+							</tr>
+							<tr>
+								<th>税号</th>
+								<td>
+									<el-input type="text" v-model="m.dutyParagraph" placeholder="请输入税号"></el-input>
+								</td>
+								<th>营业执照</th>
+								<td>
+									<sa-item type="img-list" v-model="m.businessLicense" br></sa-item>
+								</td>
+							</tr>
+							<tr>
+								<th>银行账号</th>
+								<td>
+									<el-input type="text" v-model="m.bankAccount" placeholder="请输入银行账号"></el-input>
+								</td>
+								<th>银行名称</th>
+								<td>
+									<el-input type="text" v-model="m.bankName" placeholder="请输入银行名称"></el-input>
+								</td>
+							</tr>
+							<tr>
+								<th>地址</th>
+								<td>
+									<el-input type="text" v-model="m.address" placeholder="请输入地址"></el-input>
+								</td>
+								<th>提交时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -89,25 +146,14 @@
 					ok: function(){
 						// 表单校验
 						let m = this.m;
-						// sa.checkNull(m.id, '请输入 [主键]');
 						sa.checkNull(m.name, '请输入 [名称]');
 						sa.checkNull(m.legalPerson, '请输入 [法人]');
 						sa.checkNull(m.idCard, '请输入 [身份证号]');
 						sa.checkNull(m.contact, '请输入 [手机号码]');
 						sa.checkNull(m.businessLicense, '请输入 [营业执照]');
-						sa.checkNull(m.bankNo, '请输入 [银行编号]');
 						sa.checkNull(m.bankName, '请输入 [银行名称]');
 						sa.checkNull(m.bankAccount, '请输入 [银行账号]');
 						sa.checkNull(m.dutyParagraph, '请输入 [税号]');
-						sa.checkNull(m.addressIds, '请输入 [地址编号]');
-						sa.checkNull(m.address, '请输入 [地址]');
-						// sa.checkNull(m.judgeStatus, '请输入 [审核状态]');
-						// sa.checkNull(m.judgeContent, '请输入 [审核意见]');
-						// sa.checkNull(m.judgeTime, '请输入 [上次审核时间]');
-						// sa.checkNull(m.registerTime, '请输入 [注册时间]');
-						sa.checkNull(m.personId, '请输入 [人脸编号]');
-						// sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
-
 						// 开始增加或修改
 						if(this.id <= 0) {	// 添加
 							sa.ajax('/level-two-server/TbPurchaser/add', m, function(res){

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

@@ -15,7 +15,6 @@
 		<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 .c-label {
 				width: 8em;
@@ -26,6 +25,26 @@
 			.el-row{
 				border-bottom: 1px solid #eeeeee;
 			}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 22px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 22px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
 		</style>
 	</head>
 	<body>
@@ -34,39 +53,41 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						 <el-alert show-icon title="审核驳回" :description="m.judgeContent" type="error" v-if="m.judgeStatus==2"></el-alert>
-						<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.dutyParagraph}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col span="12">
-								<sa-info name="法人姓名" br>{{m.legalPerson}}</sa-info>
-							</el-col>
-							<el-col span="12">
-								<sa-info name="身份证号" br>{{m.idCard}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col span="12">
-								<sa-info name="银行名称" br>{{m.bankName}}</sa-info>
-							</el-col>
-							<el-col span="12">
-								<sa-info name="银行账号" br>{{m.bankAccount}}</sa-info>
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col span="12">
-								<sa-info name="联系号码" br>{{m.legalPerson}}</sa-info>
-							</el-col>
-							<el-col span="12">
-								<sa-info name="营业执照" br>{{m.idCard}}</sa-info>
-							</el-col>
-						</el-row>
+						<el-alert show-icon title="审核驳回" :description="m.judgeContent" type="error" v-if="m.judgeStatus==2"></el-alert>
+						<table>
+							<tr>
+								<th>企业名称</th>
+								<td>{{m.name}}</td>
+								<th>法人</th>
+								<td>{{m.legalPerson}}</td>
+							</tr>
+							<tr>
+								<th>身份证号</th>
+								<td>{{m.idCard}}</td>
+								<th>手机号码</th>
+								<td>{{m.contact}}</td>
+							</tr>
+							<tr>
+								<th>税号</th>
+								<td>{{m.dutyParagraph}}</td>
+								<th>营业执照</th>
+								<td>
+									<sa-info type="img-list" :value="m.businessLicense"></sa-info>
+								</td>
+							</tr>
+							<tr>
+								<th>银行账号</th>
+								<td>{{m.bankAccount}}</td>
+								<th>银行名称</th>
+								<td>{{m.bankName}}</td>
+							</tr>
+							<tr>
+								<th>地址</th>
+								<td>{{m.address}}</td>
+								<th>提交时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>

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

@@ -14,10 +14,29 @@
 		<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 .c-label{width: 8em;}
 			.c-item .image-box-2{height: 90px;}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 22px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 22px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
 		</style>
 	</head>
 	<body>
@@ -26,22 +45,50 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="名称" br>{{m.name}}</sa-info>
-						<sa-info name="法人" br>{{m.legalPerson}}</sa-info>
-						<sa-info name="身份证号" br>{{m.idCard}}</sa-info>
-						<sa-info name="手机号码" br>{{m.contact}}</sa-info>
-						<sa-info type="img-list" name="营业执照" :value="m.businessLicense" br></sa-info>
-						<sa-info name="银行编号" br>{{m.bankNo}}</sa-info>
-						<sa-info name="银行名称" br>{{m.bankName}}</sa-info>
-						<sa-info name="银行账号" br>{{m.bankAccount}}</sa-info>
-						<sa-info name="税号" br>{{m.dutyParagraph}}</sa-info>
-						<sa-info name="地址编号" br>{{m.addressIds}}</sa-info>
-						<sa-info name="地址" br>{{m.address}}</sa-info>
-						<!-- <sa-info type="enum" name="审核状态" :value="m.judgeStatus" :jv="{0: '未通过', 1: '已通过'}" br></sa-info>
-						<sa-info name="审核意见" br>{{m.judgeContent}}</sa-info>
-						<sa-info type="datetime" name="上次审核时间" :value="m.judgeTime" br></sa-info> -->
-						<sa-info type="num" name="人脸编号" :value="m.personId" br></sa-info>
-						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
+						<table>
+							<tr>
+								<th>名称</th>
+								<td>{{m.name}}</td>
+								<th>法人</th>
+								<td>{{m.legalPerson}}</td>
+							</tr>
+							<tr>
+								<th>身份证号</th>
+								<td>{{maskId(m.idCard)}}</td>
+								<th>手机号码</th>
+								<td>{{maskPhone(m.contact)}}</td>
+							</tr>
+							<tr>
+								<th>税号</th>
+								<td>{{m.dutyParagraph}}</td>
+								<th>营业执照</th>
+								<td>
+									<sa-info type="img-list" :value="m.businessLicense"></sa-info>
+								</td>
+							</tr>
+							<tr>
+								<th>银行编号</th>
+								<td>{{m.bankNo}}</td>
+								<th>银行名称</th>
+								<td>{{m.bankName}}</td>
+							</tr>
+							<tr>
+								<th>银行账号</th>
+								<td>{{m.bankAccount}}</td>
+								<th>地址</th>
+								<td>{{m.address}}</td>
+							</tr>
+							<tr>
+								<th>审核状态</th>
+								<td>
+									<b v-if="m.judgeStatus == 0">未审核</b>
+									<b v-if="m.judgeStatus == 1">审核通过</b>
+									<b v-if="m.judgeStatus == 2">审核驳回</b>
+								</td>
+								<th>审核时间</th>
+								<td>{{sa.forDate(m.judgeTime)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>
@@ -62,6 +109,12 @@
 					m: null
 				},
 				methods: {
+					maskId:function (id) {
+					    return id.replace(/^(.{6})(.*)(.{4})$/,'$1********$3');
+					},
+					maskPhone:function (phone) {
+					    return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+					},
 				},
 				mounted: function() {
 					sa.ajax('/level-two-server/TbPurchaser/getById?id=' + this.id, function(res) {

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

@@ -20,8 +20,9 @@
 		<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.name" :need="false"></sa-item>
+					<sa-item type="text" name="企业名称" v-model="p.name" :need="false" width="100px"></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-purchaser-judge')" class="c-btn" type="success"
@@ -37,14 +38,16 @@
 					</sa-td>
 					<sa-td name="税号" prop="dutyParagraph"></sa-td>
 					<sa-td name="法人姓名" prop="legalPerson"></sa-td>
-					<sa-td name="手机号码" width="100px" prop="contact"></sa-td>
+					<sa-td name="手机号码" width="100px" prop="contact" type="phone"></sa-td>
 					<sa-td name="营业执照" prop="businessLicense" type="img-list"></sa-td>
 					<sa-td name="审核状态" prop="judgeStatus">
 						<template slot-scope="scope">
 							<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="审核时间" width="160px" prop="judgeTime"></sa-td>
 					<sa-td name="提交时间" width="160px" prop="createTime"></sa-td>
 					<el-table-column label="操作" fixed="right" width="100px">
 						<template slot-scope="s">
@@ -59,9 +62,8 @@
 			</div>
 			<el-dialog title="批量审核" :visible.sync="modal.visible" width="400px">
 				<el-form>
-					<sa-item type="text" name="审核意见" v-model="modal.form.judgeContent" br></sa-item>
-					<sa-item type="enum" name="审核结果" v-model="modal.form.judgeStatus" :jv="{1: '通过', 2: '驳回'}" jtype="3"
-						br></sa-item>
+					<sa-item type="text" name="审核意见" v-model="modal.form.judgeContent" width="80px" br></sa-item>
+					<sa-item type="enum" name="审核结果" v-model="modal.form.judgeStatus" width="80px" :jv="{1: '通过', 2: '驳回'}" jtype="3" br></sa-item>
 				</el-form>
 				<span slot="footer" class="dialog-footer">
 					<el-button @click="modal.visible = false">取 消</el-button>
@@ -127,7 +129,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('商户资料审核', 'tb-purchaser-do-judge.html?id=' + data.id, '850px', '80%');
+						sa.showIframe('商户资料审核', 'tb-purchaser-do-judge.html?id=' + data.id, '950px', '80%');
 					},
 					// 修改
 					update: function(data) {

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

@@ -20,7 +20,7 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<!-- <div class="c-title">检索参数</div> -->
+				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
 					<sa-item type="text" name="法人" v-model="p.legalPerson"></sa-item>
@@ -33,20 +33,21 @@
 					<sa-td type="selection"></sa-td>
 					<sa-td name="名称" prop="name" ></sa-td>
 					<sa-td name="法人" prop="legalPerson" ></sa-td>
-					<sa-td name="身份证号" prop="idCard" ></sa-td>
-					<sa-td name="手机号码" prop="contact" ></sa-td>
+					<sa-td name="身份证号" prop="idCard" type="idCard"></sa-td>
+					<sa-td name="手机号码" prop="contact" type="phone"></sa-td>
 					<sa-td name="营业执照" prop="businessLicense" type="img-list"></sa-td>
-					<sa-td name="银行编号" prop="bankNo" ></sa-td>
-					<sa-td name="银行名称" prop="bankName" ></sa-td>
-					<sa-td name="银行账号" prop="bankAccount" ></sa-td>
 					<sa-td name="税号" prop="dutyParagraph" ></sa-td>
-					<sa-td name="地址编号" prop="addressIds" ></sa-td>
-					<sa-td name="地址" prop="address" ></sa-td>
-					<sa-td name="人脸编号" prop="personId" type="num"></sa-td>
+					<sa-td name="审核状态" prop="judgeStatus">
+						<template slot-scope="scope">
+							<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>
 					<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-purchaser-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button v-if="sa.isAuth('tb-purchaser-edit') && s.row.judgeStatus!=1" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 							<el-button v-if="sa.isAuth('tb-purchaser-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 						</template>
 					</el-table-column>

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

@@ -15,6 +15,26 @@
 		<script src="../../static/sa.js"></script>
 		<style type="text/css">
 			.c-panel .c-label{width: 8em;}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 22px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 22px;
+			  padding: 8px;
+			  background-color: #dddddd;
+			}
+			td {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  padding: 8px;
+			}
 		</style>
 	</head>
 	<body>
@@ -23,37 +43,105 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form size="mini" v-if="m">
-						<el-row>
-							<el-col span="12">
-								<div class="c-item br">
-									<label class="c-label">名称：</label>
-									<span>{{m.shopName}}</span>
-								</div>
-								<div class="c-item br">
-									<label class="c-label">编号：</label>
-									<span>{{m.shopNo}}</span>
-								</div>
-								<div class="c-item br">
-									<label class="c-label">区域：</label>
-										<span>{{m.area}}</span>
-								</div>
-							</el-col>
-							<el-col span="12">
-								
-								<div class="c-item br">
-									<label class="c-label">互市区：</label>
-										<span>{{m.tradeAreaName}}</span>
-								</div>
-								<div class="c-item br">
-									<label class="c-label">入住商户：</label>
-										<span>{{m.enterpriseName}}</span>
-								</div>
-								<div class="c-item br">
-									<label class="c-label">备注：</label>
-									<span>{{m.remark}}</span>
-								</div>
-							</el-col>
-						</el-row>
+						<table>
+							<tr>
+								<th>商铺名称</th>
+								<td>{{m.shopName}}</td>
+								<th>商铺编码</th>
+								<td>{{m.shopNo}}</td>
+							</tr>
+							<tr>
+								<th>商铺类型</th>
+								<td>
+									<b v-if="m.shopType == 1">中方商铺</b>
+									<b v-if="m.shopType == 2">外国商铺</b>
+								</td>
+								<th>店铺地址</th>
+								<td>{{m.shopAddr}}</td>
+							</tr>
+							<tr>
+								<th>互市区</th>
+								<td>{{m.fieldName}}</td>
+								<th>互市区编码</th>
+								<td>{{m.fieldCode}}</td>
+							</tr>
+							<tr>
+								<th>铺主姓名</th>
+								<td>{{m.ownerName}}</td>
+								<th>铺主联系方式</th>
+								<td>{{maskPhone(m.ownerTel)}}</td>
+							</tr>
+							<tr>
+								<th>铺主证件类型</th>
+								<td>
+									<b v-if="m.ownerIdtype == 01">身份证</b>
+									<b v-if="m.ownerIdtype == 02">护照</b>
+								</td>
+								<th>经营范围</th>
+								<td>{{m.bnsScope}}</td>
+							</tr>
+							<tr>
+								<th>营业执照</th>
+								<td>{{m.shopSccd}}</td>
+								<th>状态</th>
+								<td>
+									<b v-if="m.edstatus == 1">启用</b>
+									<b v-if="m.edstatus == 2">停用</b>
+									<b v-if="m.edstatus == 3">注销</b>
+								</td>
+							</tr>
+							<tr>
+								<th>店铺开户行</th>
+								<td>{{m.bank}}</td>
+								<th>店铺开户行账号</th>
+								<td>{{m.bankAccount}}</td>
+							</tr>
+							<tr>
+								<th>铺主国籍</th>
+								<td>{{m.nationality}}</td>
+								<th>账户类型:是否海外</th>
+								<td>{{m.abroad}}</td>
+							</tr>
+							
+							<tr>
+								<th>代理人姓名</th>
+								<td>{{m.agentName}}</td>
+								<th>代理人联系方式</th>
+								<td>{{maskPhone(m.agentTel)}}</td>
+							</tr>
+							<tr>
+								<th>代理人证件类型</th>
+								<td>
+									<b v-if="m.agentIdtype == 01">身份证</b>
+									<b v-if="m.agentIdtype == 02">护照</b>
+								</td>
+								<th>代理人身份证</th>
+								<td>{{maskId(m.agentCiphertextIdno)}}</td>
+							</tr>
+							<tr>
+								<th>关区代码</th>
+								<td>{{m.customsCode}}</td>
+								<th>业务编号</th>
+								<td>{{m.platSeqNo}}</td>
+							</tr>
+							<tr>
+								<th>备案编号</th>
+								<td>{{m.putrecNo}}</td>
+								<th>地方政府编号</th>
+								<td>{{m.localGovernmentNo}}</td>
+							</tr>
+							<tr>
+								<th>有效截止时间</th>
+								<td>{{sa.forDate(m.expiry, 2)}}</td>
+								<th>备案状态</th>
+								<td>
+									<b v-if="m.filingStatus == 0">待申报</b>
+									<b v-if="m.filingStatus == 1">已申报</b>
+									<b v-if="m.filingStatus == 2">备案通过</b>
+									<b v-if="m.filingStatus == 3">备案失败</b>
+								</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>
@@ -71,6 +159,12 @@
 					m: null
 				},
 				methods: {
+					maskId:function (id) {
+					    return id.replace(/^(.{6})(.*)(.{4})$/,'$1********$3');
+					},
+					maskPhone:function (phone) {
+					    return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+					},
 				},
 				mounted: function() {
 					sa.ajax('/level-one-server/TbShop/getById?id=' + this.id, function(res) {

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

@@ -29,32 +29,48 @@
 						</el-select>
 					</div>
 					<div class="c-item">
-						<label class="c-label">名称：</label>
+						<label class="c-label">商铺名称：</label>
 						<el-input size="mini" v-model="p.shopName"></el-input>
 					</div>
 					<div class="c-item" style="min-width: 0px;">
 						<el-button size="mini" type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
-						<el-button size="mini" type="primary" icon="el-icon-plus" @click="add()">新增</el-button>
-						<el-button size="mini" type="danger" icon="el-icon-delete" @click="deleteByIds()">删除</el-button>
 						<el-button size="mini" type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 					</div>
 					<br />
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" size="small">
-					<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" 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">
+					<el-table-column align="center" label="" type="index" width="35px"></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="shopType">
+						<template slot-scope="s">
+							<span v-if="s.row.shopType == 1">中方商铺</span>
+							<span v-else-if="s.row.shopType == 2">外国商铺</span>
+							<span v-else>-</span>
+						</template>
+					</el-table-column>
+					<el-table-column align="center" label="铺主姓名" prop="ownerName"></el-table-column>
+					<el-table-column align="center" label="铺主电话" prop="ownerTel">
+						<template slot-scope="s">
+							<span v-if="s.row.ownerTel">{{maskPhone(s.row.ownerTel)}}</span>
+							<span v-else>-</span>
+						</template>
+					</el-table-column>
+					<el-table-column align="center" label="状态" prop="edstatus">
+						<template slot-scope="s">
+							<span v-if="s.row.edstatus == 1">启用</span>
+							<span v-else-if="s.row.edstatus == 2">停用</span>
+							<span v-else-if="s.row.edstatus == 3">注销</span>
+							<span v-else>-</span>
+						</template>
+					</el-table-column>
+					<el-table-column align="center" label="互市区" prop="fieldName"></el-table-column>
+					<el-table-column align="center" label="经营范围" prop="bnsScope"></el-table-column>
+					<el-table-column align="center" label="操作" fixed="right" width="160px">
 						<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-edit" @click="update(s.row)">修改
-							</el-button>
-							<el-button class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除
-							</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -91,6 +107,9 @@
 							this.tradeAreaList = resp.data;
 						}.bind(this));
 					},
+					maskPhone:function (phone) {
+					    return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+					},
 					// 刷新
 					f5: function() {
 						sa.ajax('/level-one-server/TbShop/getList', sa.removeNull(this.p), function(res) {
@@ -101,7 +120,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-shop-info.html?id=' + data.id, '750px', '70%');
+						sa.showIframe('数据详情', 'tb-shop-info.html?id=' + data.id, '1150px', '95%');
 					},
 					// 查看 - 根据选中的
 					getBySelect: function(data) {

sa-view/tb-trade-area/tb-trade-area-info.html

@@ -18,6 +18,26 @@
 			.c-panel .c-label {
 				width: 8em;
 			}
+			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>
@@ -26,23 +46,28 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form size="mini" v-if="m">
-						<div class="c-item br">
-							<label class="c-label">名称：</label>
-							<span>{{m.name}}</span>
-						</div>
-
-						<div class="c-item br">
-							<label class="c-label">地址：</label>
-							<span>{{m.address}}</span>
-						</div>
-						<div class="c-item br">
-							<label class="c-label">详细地址：</label>
-							<span>{{m.detailAddress}}</span>
-						</div>
-						<div class="c-item br">
-							<label class="c-label">创建时间：</label>
-							<span>{{m.createTime}}</span>
-						</div>
+						<table>
+							<tr>
+								<th>互市区</th>
+								<td>{{m.name}}</td>
+							</tr>
+							<tr>
+								<th>互市编号</th>
+								<td>{{m.code}}</td>
+							</tr>
+							<tr>
+								<th>关区代码</th>
+								<td>{{m.customsCode}}</td>
+							</tr>
+							<tr>
+								<th>地址</th>
+								<td>{{m.address}}</td>
+							</tr>
+							<tr>
+								<th>创建时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
 					</el-form>
 				</div>
 			</div>

sa-view/tb-trade-area/tb-trade-area-list.html

@@ -20,31 +20,24 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-
-					<div class="c-item">
-						<label class="c-label">名称：</label>
-						<el-input size="mini" v-model="p.name"></el-input>
-					</div>
-					<div class="c-item" style="min-width: 0px;">
-						<el-button size="mini" type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
-						<el-button v-if="sa.isAuth('tb-trade-area-add')" size="mini" type="primary" icon="el-icon-plus" @click="add()">新增</el-button>
-						<el-button size="mini" type="info"  icon="el-icon-refresh"  @click="sa.f5()">重置</el-button>
-					</div>
-					<br />
+					<sa-item type="text" name="名称" v-model="p.name" :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-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" size="small">
 					<el-table-column align="center"  type="index" label="序号" width="45px"></el-table-column>
-					<el-table-column align="center" label="名称" prop="name" ></el-table-column>
-					<el-table-column align="center" label="地址" prop="address" ></el-table-column>
+					<el-table-column align="center" label="互市区" prop="name" ></el-table-column>
+					<el-table-column align="center" label="互市编号" prop="code" ></el-table-column>
+					<el-table-column align="center" label="关区代码" prop="customsCode" ></el-table-column>
 					<el-table-column align="center" label="创建时间" class-name="tc-date" >
 						<template slot-scope="s">{{sa.forDate(s.row.createTime, 2)}}</template>
 					</el-table-column>
 					<el-table-column align="center" 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-trade-area-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
-							<el-button v-if="sa.isAuth('tb-trade-area-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
+							<!-- <el-button v-if="sa.isAuth('tb-trade-area-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button v-if="sa.isAuth('tb-trade-area-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button> -->
 						</template>
 					</el-table-column>
 				</el-table>
@@ -64,6 +57,9 @@
 		</div>
 		<script>
 			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
+				},
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数
@@ -91,7 +87,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-trade-area-info.html?id=' + data.id, '650px', '90%');
+						sa.showIframe('数据详情', 'tb-trade-area-info.html?id=' + data.id, '700px', '60%');
 					},
 					// 查看 - 根据选中的
 					getBySelect: function(data) {

sa-view/tb_cooper_entrust_judge/tb_cooper_entrust-do-judge.html

@@ -0,0 +1,156 @@
+<!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="https://unpkg.com/element-ui@2.13.0/lib/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 .c-label {
+				width: 8em;
+			}
+			.c-item .image-box-2 {
+				height: 90px;
+			}
+			.el-row{
+				border-bottom: 1px solid #eeeeee;
+			}
+			table {
+			  font-family: arial, sans-serif;
+			  border-collapse: collapse;
+			  width: 90%;
+			  margin-top: 22px ;
+			  margin-left: auto;
+			  margin-right: auto;
+			}
+			th {
+			  border: 1px solid darkgray;
+			  text-align: left;
+			  height: 22px;
+			  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">
+						<el-alert show-icon title="审核驳回" :description="m.judgeContent" type="error" v-if="m.judgeStatus==2"></el-alert>
+						<table>
+							<tr>
+								<th>企业名称</th>
+								<td>{{m.name}}</td>
+								<th>法人</th>
+								<td>{{m.legalPerson}}</td>
+							</tr>
+							<tr>
+								<th>身份证号</th>
+								<td>{{m.idCard}}</td>
+								<th>手机号码</th>
+								<td>{{m.contact}}</td>
+							</tr>
+							<tr>
+								<th>税号</th>
+								<td>{{m.dutyParagraph}}</td>
+								<th>营业执照</th>
+								<td>
+									<sa-info type="img-list" :value="m.businessLicense"></sa-info>
+								</td>
+							</tr>
+							<tr>
+								<th>银行账号</th>
+								<td>{{m.bankAccount}}</td>
+								<th>银行名称</th>
+								<td>{{m.bankName}}</td>
+							</tr>
+							<tr>
+								<th>地址</th>
+								<td>{{m.address}}</td>
+								<th>提交时间</th>
+								<td>{{sa.forDate(m.createTime, 2)}}</td>
+							</tr>
+						</table>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot" v-if="sa.isAuth('tb-purchaser-judge')">
+				<el-button type="warning" @click="judgeBack">审核驳回</el-button>
+				<el-button type="success" @click="judgePass">审核通过</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: {
+					judgeBack() {
+						let id = this.m.id;
+						layer.prompt({
+							title: '输入审核意见'
+						}, function(content, index) {
+							layer.close(index);
+							sa.ajax('/level-two-server/TbPurchaser/audit', {
+								id: id,
+								judgeContent: content,
+								judgeStatus: 2
+							}, function(res) {
+								layer.msg('审核已驳回');
+								setTimeout(() => {
+									parent.app.f5(); // 刷新父页面列表
+									sa.closeCurrIframe(); // 关闭本页
+								}, 800)
+							})
+						});
+					},
+					judgePass() {
+						sa.ajax('/level-two-server/TbPurchaser/audit', {
+							id: this.m.id,
+							judgeContent: '审核通过',
+							judgeStatus: 1
+						}, function(res) {
+							layer.msg('审核通过');
+							setTimeout(() => {
+								parent.app.f5(); // 刷新父页面列表
+								sa.closeCurrIframe(); // 关闭本页
+							}, 800)
+						})
+					},
+				},
+				mounted: function() {
+					sa.ajax('/level-two-server/TbPurchaser/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if (res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+		</script>
+	</body>
+</html>

sa-view/tb_cooper_entrust_judge/tb_cooper_entrust-judge.html

@@ -0,0 +1,146 @@
+<!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="https://unpkg.com/element-ui@2.13.0/lib/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>
+	</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="80px"></sa-item>
+					<sa-item type="text" name="买家" v-model="p.buyUserName"></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-purchaser-judge')" class="c-btn" type="success"
+						icon="el-icon-s-check" @click="judgeBySelect">批量审核</el-button>
+				</el-form>
+				<!-- ------------- 数据列表 ------------- -->
+				<el-table class="data-table" ref="data-table" :data="dataList">
+					<sa-td type="selection" name="序号"></sa-td>
+					<sa-td name="订单号" prop="tradeNo" width="180"></sa-td>
+					<sa-td name="买家" prop="buyUserName" ></sa-td>
+					<sa-td name="商品名称" prop="goodsNames" ></sa-td>
+					<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="businessLicense" type="img-list"></sa-td>
+					<sa-td name="审核状态" prop="judgeStatus">
+						<template slot-scope="scope">
+							<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="审核时间" width="160px" prop="judgeTime"></sa-td>
+					
+					<el-table-column label="操作" fixed="right" width="100px">
+						<template slot-scope="s">
+							<el-button v-if="sa.isAuth('tb-purchaser-judge')" class="c-btn" type="success"
+								icon="el-icon-s-check" @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>
+			<el-dialog title="批量审核" :visible.sync="modal.visible" width="400px">
+				<el-form>
+					<sa-item type="text" name="审核意见" v-model="modal.form.judgeContent" width="80px" br></sa-item>
+					<sa-item type="enum" name="审核结果" v-model="modal.form.judgeStatus" width="80px" :jv="{1: '通过', 2: '驳回'}" jtype="3" br></sa-item>
+				</el-form>
+				<span slot="footer" class="dialog-footer">
+					<el-button @click="modal.visible = false">取 消</el-button>
+					<el-button type="primary" @click="doJudge">确 定</el-button>
+				</span>
+			</el-dialog>
+		</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: {
+					modal: {
+						visible: false,
+						form: {
+							ids: '',
+							judgeStatus: 1,
+							judgeContent: '',
+						}
+					},
+					p: { // 查询参数
+						id: '', //
+						name: '', // 名称
+						nationality: '', // 国别
+						judgeList: 1,
+						pageNo: 1, // 当前页
+						pageSize: 20, // 页大小
+						sortType: 0 // 排序方式
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合
+				},
+				methods: {
+					doJudge() {
+						let form = this.modal.form;
+						if (!form.judgeContent) {
+							return sa.msg('请输入审核意见');
+						}
+						sa.ajax('/level-two-server/TbPurchaser/auditBatch', form, function(res) {
+							sa.alert('审核成功');
+							this.modal.visible = false;
+							this.f5()
+						}.bind(this));
+					},
+					// 刷新
+					f5: function() {
+						sa.ajax('/level-two-server/TbPurchaser/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数
+							sa.f5TableHeight(); // 刷新表格高度
+						}.bind(this));
+					},
+					judgeBySelect: function(data) {
+						var selection = this.$refs['data-table'].selection;
+						if (selection.length == 0) {
+							return sa.msg('请选择一条数据')
+						}
+						this.modal.form.ids = selection.map(obj => obj.id).join(',');
+						this.modal.visible = true;
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('商户资料审核', 'tb-purchaser-do-judge.html?id=' + data.id, '950px', '80%');
+					},
+					// 修改
+					update: function(data) {
+						sa.showIframe('修改数据', 'tb-purchaser-add.html?id=' + data.id, '1000px', '90%');
+					},
+
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

static/sa.js

@@ -5,12 +5,11 @@ var sa = {
 	info: '新增双击layer标题处全屏'
 };
 
-// ===========================  当前环境配置  ======================================= 
+// ===========================  当前环境配置  =======================================
 (function() {
 	// 公司开发环境
 	var cfg_dev = {
-		api_url: 'http://127.0.0.1:8080', // 所有ajax请求接口父地址
-		// api_url: 'http://192.168.88.34:8080', 
+		 api_url: 'http://127.0.0.1:8080', // 所有ajax请求接口父地址
 		web_url: 'http://www.baidu.com' // 此项目前台地址 (此配置项非必须)
 	}
 	// 服务器测试环境
@@ -20,14 +19,14 @@ var sa = {
 	}
 	// 正式生产环境
 	var cfg_prod = {
-		api_url: 'https://dxkaa1.gxbtka.com/pro',
+		api_url: 'http://hs-server.tbgjhc.top:8018',
 		web_url: 'http://www.baidu.com'
 	}
-	sa.cfg = cfg_dev; // 最终环境 , 上线前请选择正确的环境
+	sa.cfg = cfg_prod; // 最终环境 , 上线前请选择正确的环境
 })();
 
 
-// ===========================  ajax的封装  ======================================= 
+// ===========================  ajax的封装  =======================================
 (function() {
 
 	sa.ajaxNoLayer = function(url, data, success200, cfg) {
@@ -158,14 +157,14 @@ var sa = {
 
 	};
 	sa.ajaxJson = function(url, data, success200, cfg) {
-	
+
 		// 如果是简写模式(省略了data参数)
 		if (typeof data === 'function') {
 			cfg = success200;
 			success200 = data;
 			data = {};
 		}
-	
+
 		// 默认配置
 		var defaultCfg = {
 			msg: '努力加载中...', // 提示语
@@ -204,18 +203,18 @@ var sa = {
 				return layer.alert("异常：" + JSON.stringify(xhr));
 			},
 			complete: function(xhr, ts) { // 成功失败都会执行
-	
+
 			}
 		}
-	
+
 		// 将调用者的配置和默认配置合并
 		cfg = sa.extendJson(cfg, defaultCfg);
-	
+
 		// 开始显示loading图标
 		if (cfg.msg != null) {
 			sa.loading(cfg.msg);
 		}
-	
+
 		// 开始请求ajax
 		return $.ajax({
 			url: cfg.baseUrl + url,
@@ -252,7 +251,7 @@ var sa = {
 			},
 			complete: cfg.complete
 		});
-	
+
 	};
 	/** 对ajax的再封装, 这个ajax假设你的接口会返回以下格式的内容
      {
@@ -266,15 +265,15 @@ var sa = {
      * @param {Object} success200 当返回的code码==200时的回调函数
      * @param {Object} 其它配置，可配置项有：
      {
-			msg: '',		// 默认的提示文字 填null为不提示 
+			msg: '',		// 默认的提示文字 填null为不提示
 			type: 'get',	// 设定请求类型 默认post
-			baseUrl: '',	// ajax请求拼接的父路径 默认取 sa.cfg.api_url 
-			sleep: 0,		// ajax模拟的延时毫秒数, 默认0 
+			baseUrl: '',	// ajax请求拼接的父路径 默认取 sa.cfg.api_url
+			sleep: 0,		// ajax模拟的延时毫秒数, 默认0
 			success500: fn,	// code码等于500时的回调函数 (一般代表服务器错误)
 			success403: fn,	// code码等于403时的回调函数 (一般代表无权限)
 			success401: fn,	// code码等于401时的回调函数 (一般代表未登录)
 			errorfn: fn,	// ajax发生错误时的回调函数 (一般是ajax请求本身发生了错误)
-			complete: fn,	// ajax无论成功还是失败都会执行的回调函数  
+			complete: fn,	// ajax无论成功还是失败都会执行的回调函数
 		}
      */
 	sa.ajax = function(url, data, success200, cfg) {
@@ -413,7 +412,7 @@ var sa = {
 })();
 
 
-// ===========================  封装弹窗相关函数   ======================================= 
+// ===========================  封装弹窗相关函数   =======================================
 (function() {
 
 	var me = sa;
@@ -675,7 +674,7 @@ var sa = {
 })();
 
 
-// ===========================  常用util函数封装   ======================================= 
+// ===========================  常用util函数封装   =======================================
 (function() {
 
 	// 超级对象
@@ -912,7 +911,7 @@ var sa = {
 		}
 
 		// 正则验证是否为手机号
-	
+
 		me.isTel = function(str) {
 			str = str + '';
 			if ((/^1[345678]\d{9}$/.test(str)) || (/0\d{2,3}-\d{7,8}/.test(str))) {
@@ -1419,7 +1418,7 @@ var sa = {
 })();
 
 
-// ===========================  $sys 有关当前系统的方法  一般不能复制到别的项目中用  ======================================= 
+// ===========================  $sys 有关当前系统的方法  一般不能复制到别的项目中用  =======================================
 (function() {
 
 	// 超级对象
@@ -1532,7 +1531,7 @@ var sa = {
 })();
 
 
-// ===========================  $page 跳页面相关 避免一次变动，到处乱改 ======================================= 
+// ===========================  $page 跳页面相关 避免一次变动，到处乱改 =======================================
 (function() {
 
 	// 超级对象
@@ -1568,7 +1567,7 @@ var sa = {
 })();
 
 
-// 如果是sa_admin环境 
+// 如果是sa_admin环境
 window.sa_admin = window.sa_admin || parent.sa_admin || top.sa_admin;
 window.saAdmin = window.sa_admin;
 
@@ -1601,5 +1600,5 @@ if (window.Vue) {
 
 }
 
-// 对外开放, 在模块化时解开此注释 
+// 对外开放, 在模块化时解开此注释
 // export default sa;