Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
qzyReal
/
market-admin-ui
1
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

pc页面调整

linbl 1 gadu atpakaļ
vecāks
f714a7cfdc
revīzija
67f1bbc750
26 mainītis faili ar 134 papildinājumiem un 285 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 3 4
      sa-view/tb-agreement/tb-agreement-add.html
  2. 1 2
      sa-view/tb-agreement/tb-agreement-info.html
  3. 4 18
      sa-view/tb-agreement/tb-agreement-list.html
  4. 4 4
      sa-view/tb-banner/tb-banner-add.html
  5. 4 1
      sa-view/tb-banner/tb-banner-info.html
  6. 1 12
      sa-view/tb-banner/tb-banner-list.html
  7. 8 8
      sa-view/tb-enterprise/tb-enterprise-add.html
  8. 3 3
      sa-view/tb-enterprise/tb-enterprise-info.html
  9. 1 1
      sa-view/tb-enterprise/tb-enterprise-judge.html
  10. 6 6
      sa-view/tb-enterprise/tb-enterprise-list.html
  11. 2 6
      sa-view/tb-goods-type/tb-goods-type-list.html
  12. 7 8
      sa-view/tb-goods-units/tb-goods-units-add.html
  13. 6 4
      sa-view/tb-goods-units/tb-goods-units-info.html
  14. 2 5
      sa-view/tb-goods-units/tb-goods-units-list.html
  15. 3 3
      sa-view/tb-group/tb-group-add.html
  16. 2 12
      sa-view/tb-group/tb-group-list.html
  17. 3 12
      sa-view/tb-message/tb-message-list.html
  18. 2 31
      sa-view/tb-people/tb-people-add.html
  19. 1 10
      sa-view/tb-people/tb-people-list.html
  20. 36 52
      sa-view/tb-port-news/tb-port-news-add.html
  21. 5 3
      sa-view/tb-port-news/tb-port-news-info.html
  22. 10 19
      sa-view/tb-port-news/tb-port-news-list.html
  23. 1 18
      sa-view/tb-purchaser/tb-purchaser-list.html
  24. 9 13
      sa-view/tb-shop/tb-shop-add.html
  25. 3 3
      sa-view/tb-shop/tb-shop-info.html
  26. 7 27
      sa-view/tb-shop/tb-shop-list.html

+ 3 - 4
sa-view/tb-agreement/tb-agreement-add.html
Parādīt failu 

@@ -22,7 +22,7 @@
 
 			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 800px;}
 
 			.c-item-mline{width: 800px;}
 
 			.editor-box{display: inline-block;}
 
-			.c-item .editor-box, .editor-box #editor{width: 800px;}
 
+			.c-item .editor-box, .editor-box #editor{width: 800px;z}
 
 		</style>
 
 	</head>
 
 	<body>
 
@@ -33,10 +33,8 @@
 
                     <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.type" br></sa-item>
 
 						<sa-item type="richtext" name="内容" v-model="m.content" 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>
 
@@ -102,6 +100,7 @@
 
 					} else {	
 						sa.ajax('/level-one-server/TbAgreement/getById?id=' + this.id, function(res) {
 
 							this.m = res.data;
 
+							console.log("11111",this.m)
 
 							if(res.data == null) {
 
 								sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
 							}

+ 1 - 2
sa-view/tb-agreement/tb-agreement-info.html
Parādīt failu 

@@ -27,9 +27,8 @@
 
 			<div class="s-body">
 
 				<div class="c-panel">
 
 					<el-form v-if="m">
 
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
 
 						<sa-info type="num" name="类型" :value="m.type" br></sa-info>
 
-						<sa-info type="richtext" name="内容" :value="m.content" br></sa-info>
 
+						<sa-info type="richtext" name="内容" :value="m.content" br></sa-info></br></br>
 
 					</el-form>
 
 				</div>
 
 			</div>

+ 4 - 18
sa-view/tb-agreement/tb-agreement-list.html
Parādīt failu 

@@ -20,23 +20,18 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<div class="c-title">检索参数</div>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="num" name="主键" v-model="p.id"></sa-item>
 
-					<sa-item type="num" name="类型" v-model="p.type"></sa-item>
 
+					<sa-item type="text" name="类型" v-model="p.type"></sa-item>
 
 					<sa-item type="text" name="内容" v-model="p.content"></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>
 
-				<div class="fast-btn">
 
 					<el-button v-if="sa.isAuth('tb-agreement-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
-					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
-				</div>
 
+				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td type="selection"></sa-td>
 
-					<sa-td name="主键" prop="id" type="num"></sa-td>
 
-					<sa-td name="类型" prop="type" type="num"></sa-td>
 
+					<sa-td name="类型" prop="type" type="num" width="260px"></sa-td>
 
 					<sa-td name="内容" prop="content" type="richtext"></sa-td>
 
-					<el-table-column label="操作" fixed="right"  width="240px">
 
+					<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-agreement-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
@@ -57,7 +52,6 @@
 
 				el: '.vue-box',
 
 				data: {
 
 					p: { // 查询参数  
-						id: '',		// 主键 
 						type: '',		// 类型 
 						content: '',		// 内容 
 						pageNo: 1,		// 当前页 
@@ -80,14 +74,6 @@
 
 					get: function(data) {
 
 						sa.showIframe('数据详情', 'tb-agreement-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('修改数据', 'tb-agreement-add.html?id=' + data.id, '1000px', '90%');

+ 4 - 4
sa-view/tb-banner/tb-banner-add.html
Parādīt failu 

@@ -31,6 +31,8 @@
 
 							<el-col :span="12">
 
 								<sa-item type="text" name="标题" v-model="m.title" br></sa-item>
 
 							</el-col>
 
+						</el-row>
 
+						<el-row :gutter="50">
 
 							<el-col :span="12">
 
 								<sa-item type="img" name="轮播图片" v-model="m.image" br></sa-item>
 
 							</el-col>
 
@@ -39,14 +41,12 @@
 
 							<el-col :span="12">
 
 								<sa-item type="text" name="跳转链接" v-model="m.url" br></sa-item>
 
 							</el-col>
 
+						</el-row>
 
+						<el-row :gutter="50">
 
 							<el-col :span="12">
 
 								<sa-item type="enum" name="状态" v-model="m.status" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
 
 							</el-col>
 
 						</el-row>
 
-						
-						<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>

+ 4 - 1
sa-view/tb-banner/tb-banner-info.html
Parādīt failu 

@@ -27,6 +27,8 @@
 
 							<el-col :span="12">
 
 								<sa-info name="标题" br>{{m.title}}</sa-info>
 
 							</el-col>
 
+						</el-row>
 
+						<el-row :gutter="50">
 
 							<el-col :span="12">
 
 								<sa-info type="img" name="轮播图片" :value="m.image" br></sa-info>
 
 							</el-col>
 
@@ -35,6 +37,8 @@
 
 							<el-col :span="12">
 
 								<sa-info name="跳转链接" br>{{m.url}}</sa-info>
 
 							</el-col>
 
+						</el-row>
 
+						<el-row :gutter="50">
 
 							<el-col :span="12">
 
 								<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
 
 							</el-col>
 
@@ -69,7 +73,6 @@
 
 					}.bind(this))
 
 				}
 
 			})
 
-			
 		</script>
 
 	</body>
 
 </html>

+ 1 - 12
sa-view/tb-banner/tb-banner-list.html
Parādīt failu 

@@ -24,11 +24,8 @@
 
 				
 					<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>
 
-				<div class="fast-btn">
 
 					<el-button v-if="sa.isAuth('tb-banner-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
-					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
-				</div>
 
+				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td type="selection"></sa-td>
 
@@ -85,14 +82,6 @@
 
 					get: function(data) {
 
 						sa.showIframe('数据详情', 'tb-banner-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('修改数据', 'tb-banner-add.html?id=' + data.id, '1000px', '90%');

+ 8 - 8
sa-view/tb-enterprise/tb-enterprise-add.html
Parādīt failu 

@@ -38,7 +38,7 @@
 
 							<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>
 
+									<el-input size="mini" v-model="m.ownerName"></el-input>
 
 								</div>
 
 								<div class="c-item br">
 
 									<label class="c-label"><label style="color: red">*</label>法人：</label>
 
@@ -50,17 +50,17 @@
 
 								</div>
 
 								<div class="c-item br">
 
 									<label class="c-label"><label style="color: red">*</label>手机号码：</label>
 
-									<el-input size="mini" v-model="m.contact"></el-input>
 
+									<el-input size="mini" v-model="m.ownerTel"></el-input>
 
 								</div>
 
 
 							</el-col>
 
 							<el-col span=12>
 
 								<div class="c-item br">
 
 									<label class="c-label"><label style="color: red">*</label>银行：</label>
 
-									<el-select v-model="m.bankNo" placeholder="请选择" filterable size="mini">
 
+									<el-select v-model="m.bank" 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>
 
+											:value="item.bankName"> </el-option>
 
 									</el-select>
 
 								</div>
 
 								<div class="c-item br">
 
@@ -140,10 +140,10 @@
 
 					createModel: function() {
 
 						return {
 
 							id: '', //
 
-							name: '', // 名称
 
+							ownerName: '', // 名称
 
 							legalPerson: '', // 法人
 
 							idCard: '', // 身份证号
 
-							contact: '', // 手机号码
 
+							ownerTel: '', // 手机号码
 
 							businessLicense: '', // 营业执照
 
 							businessLicense_arr: [], // 营业执照 - 转数组
 
 							agreement: '',
 
@@ -162,10 +162,10 @@
 
 							var m = this.m; // 获取 m对象
 
 							let bankNo = m.bankNo;
 
 							let shopId = m.shopId;
 
-							sa.checkNull(m.name, '请输入 [商户名称]');
 
+							sa.checkNull(m.ownerName, '请输入 [商户名称]');
 
 							sa.checkNull(m.legalPerson, '请输入 [法人]');
 
 							sa.checkNull(m.idCard, '请输入 [身份证号]');
 
-							sa.checkPhone(m.contact, '请输入 [正确手机号码]');
 
+							sa.checkPhone(m.ownerTel, '请输入 [正确手机号码]');
 
 							sa.checkNull(m.businessLicense, '请上传 [营业执照]');
 
 							sa.checkEmptyArray(m.address_arry, '请选择 [地址]');
 
 							sa.checkNull(bankNo, '请选择 [银行]');

+ 3 - 3
sa-view/tb-enterprise/tb-enterprise-info.html
Parādīt failu 

@@ -34,14 +34,14 @@
 
 					<el-form v-if="m">
 
 						<el-row>
 
 							<el-col span="12">
 
-								<sa-info name="商户名称" br>{{m.name}}</sa-info>
 
+								<sa-info name="商户名称" br>{{m.ownerName}}</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.ownerTel}}</sa-info>
 
 								<sa-info name="地区" br>{{m.address}}</sa-info>
 
 							</el-col>
 
 							<el-col span="12">
 
-								<sa-info name="银行名称" br>{{m.bankName}}</sa-info>
 
+								<sa-info name="银行名称" br>{{m.bank}}</sa-info>
 
 								<sa-info name="银行账号" br>{{m.bankAccount}}</sa-info>
 
 								<sa-info name="税号" br>{{m.dutyParagraph}}</sa-info>
 
 								<sa-info name="详细地址" br>{{m.detail}}</sa-info>

+ 1 - 1
sa-view/tb-enterprise/tb-enterprise-judge.html
Parādīt failu 

@@ -21,7 +21,7 @@
 
 			<div class="c-panel">
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<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=90px"></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-enterprise-judge')" class="c-btn" type="success"

+ 6 - 6
sa-view/tb-enterprise/tb-enterprise-list.html
Parādīt failu 

@@ -23,7 +23,7 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<!-- <div class="c-title">检索参数</div> -->
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="名称" v-model="p.name" :need="false"></sa-item>
 
+					<sa-item type="text" name="名称" v-model="p.ownerName" :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-enterprise-add')" size="mini" type="primary"
 
@@ -33,16 +33,16 @@
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<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="ownerName"></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="ownerTel"></sa-td>
 
 					<sa-td name="营业执照" prop="businessLicense" type="img-list"></sa-td>
 
-					<sa-td name="银行名称" prop="bankName"></sa-td>
 
+					<sa-td name="银行名称" prop="bank"></sa-td>
 
 					<sa-td name="银行账号" prop="bankAccount"></sa-td>
 
 					<sa-td name="审核时间" width="160px" prop="judgeTime"></sa-td>
 
 					<sa-td name="审核人" width="130px" prop="judgeBy"></sa-td>
 
-					<el-table-column label="操作" fixed="right" width="240px">
 
+					<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>
 
@@ -68,7 +68,7 @@
 
 				data: {
 
 					p: { // 查询参数
 
 						id: '', //
 
-						name: '', // 名称
 
+						ownerName: '', // 名称
 
 						legalPerson: '', // 法人
 
 						judgeStatus: 1,
 
 						pageNo: 1, // 当前页

+ 2 - 6
sa-view/tb-goods-type/tb-goods-type-list.html
Parādīt failu 

@@ -21,16 +21,12 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<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.sort"></sa-item>
 
+					<sa-item type="text" name="类别名称" v-model="p.name" width="100px"></sa-item>
 
 					<sa-item type="text" name="编号" v-model="p.no"></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>
 
-				<div class="fast-btn">
 
 					<el-button v-if="sa.isAuth('tb-goods-type-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
-					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
-				</div>
 
+				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList"  row-key="id" border @expand-change="sa.f5TableHeight()">
 
 					<sa-td type="selection"></sa-td>

+ 7 - 8
sa-view/tb-goods-units/tb-goods-units-add.html
Parādīt failu 

@@ -16,8 +16,8 @@
 
 		<script src="../../static/kj/upload-util.js"></script>
 
 
 		<style type="text/css">
 
-			.c-panel .el-form .c-label{width: 7em !important;}
 
-			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
 
+			.c-panel .el-form .c-label{width: 30em !important;}
 
+			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 400px;}
 
 		</style>
 
 	</head>
 
 	<body>
 
@@ -28,17 +28,16 @@
 
                     <div class="c-title" v-if="id == 0">数据添加</div>
 
 					<div class="c-title" v-else>数据修改</div>
 
 					<el-form v-if="m">
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
+						<el-row>
 
+							<el-col>
 
 								<sa-item type="text" name="商品单位编号" v-model="m.unitsNo" br></sa-item>
 
 							</el-col>
 
-							<el-col :span="12">
 
+						</el-row>
 
+						<el-row>
 
+							<el-col>
 
 								<sa-item type="text" name="管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号" v-model="m.units" br></sa-item>
 
 							</el-col>
 
 						</el-row>
 
-						<sa-item name="" class="s-ok" br>
 
-							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 
-						</sa-item>
 
 					</el-form>
 
 				</div>
 
 			</div>

+ 6 - 4
sa-view/tb-goods-units/tb-goods-units-info.html
Parādīt failu 

@@ -16,7 +16,7 @@
 
 		<script src="../../static/kj/upload-util.js"></script>
 
 
 		<style type="text/css">
 
-			.c-panel .c-label{width: 8em;}
 
+			.c-panel .c-label{width: 30em;}
 
 		</style>
 
 	</head>
 
 	<body>
 
@@ -25,11 +25,13 @@
 
 			<div class="s-body">
 
 				<div class="c-panel">
 
 					<el-form v-if="m">
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
+						<el-row>
 
+							<el-col>
 
 								<sa-info name="商品单位编号" br>{{m.unitsNo}}</sa-info>
 
 							</el-col>
 
-							<el-col :span="12">
 
+						</el-row>
 
+						<el-row>
 
+							<el-col>
 
 								<sa-info name="管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号" br>{{m.units}}</sa-info>
 
 							</el-col>
 
 						</el-row>

+ 2 - 5
sa-view/tb-goods-units/tb-goods-units-list.html
Parādīt failu 

@@ -22,14 +22,11 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<!-- <div class="c-title">检索参数</div> -->
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="商品单位编号" v-model="p.unitsNo"></sa-item>
 
+					<sa-item type="text" name="商品单位编号" v-model="p.unitsNo" width="115px"></sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 
-				</el-form>
 
-				<div class="fast-btn">
 
 					<el-button v-if="sa.isAuth('tb-goods-units-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
-					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
-				</div>
 
+				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td type="selection"></sa-td>

+ 3 - 3
sa-view/tb-group/tb-group-add.html
Parādīt failu 

@@ -34,7 +34,7 @@
 
 					<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.orgName" br></sa-item>
 
 						<sa-item type="text" name="编号" v-model="m.code" br></sa-item>
 
 						<div class="c-item">
 
 							<label class="c-label"><span style="color: red;">*</span>互市区：</label>
 
@@ -101,7 +101,7 @@
 
 					// 创建一个 默认Model
 
 					createModel: function() {
 
 						return {
 
-							name: '', // 名称
 
+							orgName: '', // 名称
 
 							leaderId: '', // 组长ID
 
 							leaderName: '', // 组长名
 
 							leaderPhone: '', // 组长电话
 
@@ -113,7 +113,7 @@
 
 					ok: function() {
 
 						// 表单校验
 
 						let m = this.m;
 
-						sa.checkNull(m.name, '请输入 [名称]');
 
+						sa.checkNull(m.orgName, '请输入 [名称]');
 
 						sa.checkNull(m.code, '请输入 [编号]');
 
 						sa.checkNull(m.tradeAreaId, '请选择 [互市区]');
 
 						// 开始增加或修改

+ 2 - 12
sa-view/tb-group/tb-group-list.html
Parādīt failu 

@@ -34,10 +34,8 @@
 
 						<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 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="success" icon="el-icon-view" @click="getBySelect()">查看</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>
 
@@ -46,7 +44,7 @@
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<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="name"></el-table-column>
 
+					<el-table-column align="center" label="名称" prop="orgName"></el-table-column>
 
 					<el-table-column align="center" label="编号" prop="code"></el-table-column>
 
 					<el-table-column align="center" label="所属互市区" prop="tradeAreaName" width="180"></el-table-column>
 
 					<el-table-column align="center" label="组长" prop="leaderName">
 
@@ -206,14 +204,6 @@
 
 					get: function(data) {
 
 						sa.showIframe('数据详情', 'tb-group-info.html?id=' + data.id, '950px', '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('修改数据', 'tb-group-add.html?id=' + data.id, '550px', '90%');

+ 3 - 12
sa-view/tb-message/tb-message-list.html
Parādīt failu 

@@ -20,13 +20,11 @@
 
 			<div class="c-panel">
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="消息内容" v-model="p.contents"></sa-item>
 
+					<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>
 
-				</el-form>
 
-				<div class="fast-btn">
 
 					<el-button v-if="sa.isAuth('tb-message-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 
-				</div>
 
+				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList">
 
 					<sa-td type="selection"></sa-td>
 
@@ -82,6 +80,7 @@
 
 					f5: function() {
 
 						sa.ajax('/sp-admin/TbMessage/getList', sa.removeNull(this.p), function(res) {
 
 							this.dataList = res.data; // 数据
 
+							console.log("11111",this.dataList)
 
 							this.dataCount = res.dataCount; // 数据总数 
 							sa.f5TableHeight(); // 刷新表格高度 
 						}.bind(this));
 
@@ -90,14 +89,6 @@
 
 					get: function(data) {
 
 						sa.showIframe('数据详情', 'tb-message-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('修改数据', 'tb-message-add.html?id=' + data.id, '50%', '60%');

+ 2 - 31
sa-view/tb-people/tb-people-add.html
Parādīt failu 

@@ -72,7 +72,7 @@
 
 							<el-col :span="12">
 
 								<sa-item type="text" name="所属互助组"  br>
 
 									<el-select @change="groupChange" v-model="m.groupName" placeholder="请选择" filterable size="mini">
 
-										<el-option v-for="(item,index) in groupList" :key="index" :label="item.name" :value="item"> </el-option>
 
+										<el-option v-for="(item,index) in groupList" :key="index" :label="item.orgName" :value="item"> </el-option>
 
 									</el-select>
 
 								</sa-item>
 
 							</el-col>
 
@@ -116,21 +116,6 @@
 
 								<sa-item type="enum" name="是否可用" v-model="m.deleteStatus" :jv="{0: '否', 1: '是'}" jtype="3" br></sa-item>
 
 							</el-col>
 
 						</el-row>
 
-						
-						
-						<!-- <sa-item type="text" name="地址ID" v-model="m.addressIds" br></sa-item> -->
 
-						
-						
-						
-						<!-- <sa-item type="text" name="" v-model="m.judgeStatus" br></sa-item>
 
-						<sa-item type="text" name="" v-model="m.judgeContent" br></sa-item>
 
-						<sa-item type="text" name="" v-model="m.registerTime" br></sa-item>
 
-						<sa-item type="text" name="" v-model="m.judgeTime" br></sa-item>
 
-						<sa-item type="text" name="" v-model="m.personId" br></sa-item> -->
 
-						<!-- <sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" 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>
 
@@ -208,27 +193,13 @@
 
 						//sa.checkNull(m.groupId, '请输入 [所属互助组]');
 
 						sa.checkNull(m.groupName, '请输入 [互助组名称]');
 
 						sa.checkNull(m.deleteStatus, '请输入 [是否可用]');
 
-						// sa.checkNull(m.role, '请输入 [角色]');
 
 						sa.checkNull(m.lng, '请输入 [经度]');
 
 						sa.checkNull(m.lat, '请输入 [纬度]');
 
 						sa.checkNull(m.lastLocation, '请输入 [最后一次下单定位]');
 
 						sa.checkNull(m.address, '请输入 [联系地址]');
 
-						//sa.checkNull(m.addressIds, '请输入 [地址ID]');
 
 						sa.checkNull(m.detailAddress, '请输入 [详细地址]');
 
 						sa.checkNull(m.isLock, '请输入 [是否锁定]');
 
 						sa.checkNull(m.leftPrice, '请输入 [当天剩余额度]');
 
-						//sa.checkNull(m.judgeStatus, '请输入 []');
 
-						//sa.checkNull(m.judgeContent, '请输入 []');
 
-						//sa.checkNull(m.registerTime, '请输入 []');
 
-						//sa.checkNull(m.judgeTime, '请输入 []');
 
-						//sa.checkNull(m.personId, '请输入 []');
 
-						//sa.checkNull(m.createTime, '请输入 [创建时间]');
 
-						//sa.checkNull(m.createBy, '请输入 [创建人编号]');
 
-						//sa.checkNull(m.createName, '请输入 [创建人名称]');
 
-						//sa.checkNull(m.updateTime, '请输入 [更新时间]');
 
-						//sa.checkNull(m.updateBy, '请输入 [更新人编号]');
 
-						//sa.checkNull(m.updateName, '请输入 [更新人名称]');
 
-						//sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
 
 
 						// 开始增加或修改
 
 						if(this.id <= 0) {	// 添加
 
@@ -257,7 +228,7 @@
 
 					},
 
 					groupChange(item) {
 
 						this.m.groupId = item.id
 
-						this.m.groupName = item.name
 
+						this.m.groupName = item.orgName
 
 					},
 
 					getTradeArea: function() {
 
 						sa.ajax('/level-one-server/TbTradeArea/getList', {

+ 1 - 10
sa-view/tb-people/tb-people-list.html
Parādīt failu 

@@ -27,7 +27,6 @@
 
 					<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-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
 				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
@@ -39,7 +38,7 @@
 
 					<sa-td name="角色" prop="role" type="num" :jv="{'1': '普通边民', '2': '兼组长'}"></sa-td>
 
 					<sa-td name="联系地址" prop="address" ></sa-td>
 
 					<sa-td name="是否锁定" prop="isLock" type="enum" :jv="{1: '否', 2: '是'}"></sa-td>
 
-					<el-table-column label="操作" fixed="right"  width="240px">
 
+					<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>
 
@@ -102,14 +101,6 @@
 
 					get: function(data) {
 
 						sa.showIframe('数据详情', 'tb-people-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('修改数据', 'tb-people-add.html?id=' + data.id, '1000px', '90%');

+ 36 - 52
sa-view/tb-port-news/tb-port-news-add.html
Parādīt failu 

@@ -1,12 +1,12 @@
 
-
 
-    <!DOCTYPE html>
 
+<!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/kj/element-ui/theme-chalk/index.css"> -->
 
+			<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>
 
@@ -19,6 +19,7 @@
 
     		<style type="text/css">
 
     			.c-panel .el-form .c-label{width: 7em !important;}
 
     			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
 
+				.c-item .el-input__inner{width: 45%;}
 
     			/*  普通文本和富文本一起变长  */
 
     			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 800px;}
 
     			.c-item-mline{width: 800px;}
 
@@ -34,46 +35,32 @@
 
                         <div class="c-title" v-if="id == 0">数据添加</div>
 
     					<div class="c-title" v-else>数据修改</div>
 
     					<el-form v-if="m">
 
-							<el-row :gutter="50">
 
-								<el-col :span="12">
 
+							<el-row>
 
+								<el-col>
 
 									<sa-item type="text" name="标题" v-model="m.title" br></sa-item>
 
 								</el-col>
 
-								<el-col :span="12">
 
+							</el-row>
 
+							<el-row>
 
+								<el-col>
 
 									<sa-item type="img" name="封面图片" v-model="m.cover" br></sa-item>
 
 								</el-col>
 
 							</el-row>
 
-    						<el-row :gutter="50">
 
-								<el-col :span="12">
 
+    						<el-row>
 
+								<el-col>
 
 									<sa-item type="text" name="链接地址" v-model="m.url" br></sa-item>
 
 								</el-col>
 
-								<el-col :span="12">
 
-									<sa-item type="richtext" name="内容"  v-model="m.content" br></sa-item>
 
-								</el-col>
 
 							</el-row>
 
-    						<el-row :gutter="50">
 
-								<el-col :span="12">
 
+    						<el-row>
 
+								<el-col>
 
 									<sa-item type="text" name="来源" v-model="m.source" br></sa-item>
 
 								</el-col>
 
-								<el-col :span="12">
 
-									<sa-item type="text" name="阅读量" v-model="m.readCount" br></sa-item>
 
-								</el-col>
 
 							</el-row>
 
-							<el-row :gutter="50">
 
-								<el-col :span="12">
 
-									<sa-item type="enum" name="发布状态" v-model="m.isRelease" :jv="{0: '未发布', 1: '发布'}" jtype="3" br></sa-item>
 
-								</el-col>
 
-								<el-col :span="12">
 
-									<sa-item type="text" name="发布时间" v-model="m.releaseTime" br></sa-item>
 
-								</el-col>
 
-							</el-row>
 
-    						<el-row :gutter="50">
 
-								<el-col :span="12">
 
-									<sa-item type="enum" name="状态" v-model="m.status" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
 
+							<el-row>
 
+								<el-col>
 
+									<sa-item type="richtext" name="内容"  v-model="m.content" br></sa-item>
 
 								</el-col>
 
 							</el-row>
 
-    						<sa-item name="" class="s-ok" br>
 
-    							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 
-    						</sa-item>
 
+							</br></br>
 
     					</el-form>
 
     				</div>
 
     			</div>
 
@@ -84,43 +71,40 @@
 
     			</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,		// 实体对象 
+    					id: sa.p('id', 0),		// 获取超链接中的id参数（0=添加，非0=修改）
 
+    					m: null,		// 实体对象
 
     				},
 
     				methods: {
 
-    					// 创建一个 默认Model 
+    					// 创建一个 默认Model
 
     					createModel: function() {
 
     						return {
 
-    							title: '',		// 标题 
-    							cover: '',		// 封面图片 
-    							url: '',		// 链接地址 
-    							content: '',		// 内容 
-    							source: '',		// 来源 
-    							readCount: '',		// 阅读量 
-    							isRelease: '',		// 发布状态(0=未发布,1=发布) 
-    							releaseTime: '',		// 发布时间 
-    							status: '',		// 状态(0=禁用,1=启用) 
+    							title: '',		// 标题
 
+    							cover: '',		// 封面图片
 
+    							url: '',		// 链接地址
 
+    							content: '',		// 内容
 
+    							source: '',		// 来源
 
     						}
 
     					},
 
-    					// 提交数据 
+    					// 提交数据
 
     					ok: function(){
 
-    						// 表单校验 
+    						// 表单校验
 
     						let m = this.m;
 
     						sa.checkNull(m.title, '请输入 [标题]');
 
     						sa.checkNull(m.content, '请输入 [内容]');
 
     						// 开始增加或修改
 
     						this.m.createTime = undefined;		// 不提交属性：创建时间
 
     						this.m.updateTime = undefined;		// 不提交属性：更新时间
 
+							console.log("m",m)
 
     						if(this.id <= 0) {	// 添加
 
     							sa.ajax('/level-one-server/TbPortNews/add', m, function(res){
 
-    								sa.alert('增加成功', this.clean); 
+    								sa.alert('增加成功', this.clean);
 
     							}.bind(this));
 
     						} else {	// 修改
 
     							sa.ajax('/level-one-server/TbPortNews/update', m, function(res){
 
@@ -134,15 +118,15 @@
 
     							this.m = this.createModel();
 
     						} else {
 
     							parent.app.f5();		// 刷新父页面列表
 
-    							sa.closeCurrIframe();	// 关闭本页 
+    							sa.closeCurrIframe();	// 关闭本页
 
     						}
 
     					}
 
     				},
 
     				mounted: function(){
 
-    					// 初始化数据 
-    					if(this.id <= 0) {	
+    					// 初始化数据
 
+    					if(this.id <= 0) {
 
     						this.m = this.createModel();
 
-    					} else {	
+    					} else {
 
     						sa.ajax('/level-one-server/TbPortNews/getById?id=' + this.id, function(res) {
 
     							this.m = res.data;
 
     							if(res.data == null) {
 
@@ -152,7 +136,7 @@
 
     					}
 
     				}
 
     			})
 
-    			
+
 
     		</script>
 
     	</body>
 
-    </html>
 
+    </html>

+ 5 - 3
sa-view/tb-port-news/tb-port-news-info.html
Parādīt failu 

@@ -35,11 +35,13 @@
 
 								<sa-info type="img" name="封面图片" :value="m.cover" br></sa-info>
 
 							</el-col>
 
 						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
+						<el-row>
 
+							<el-col>
 
 								<sa-info name="链接地址" br>{{m.url}}</sa-info>
 
 							</el-col>
 
-							<el-col :span="12">
 
+						</el-row>
 
+						<el-row>
 
+							<el-col>
 
 								<sa-info type="richtext" name="内容" :value="m.content" br></sa-info>
 
 							</el-col>
 
 						</el-row>

+ 10 - 19
sa-view/tb-port-news/tb-port-news-list.html
Parādīt failu 

@@ -25,21 +25,20 @@
 
     					<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-port-news-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
-						<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
     				</el-form>
 
     				<!-- ------------- 数据列表 ------------- -->
 
     				<el-table class="data-table" ref="data-table" :data="dataList" >
 
     					<sa-td type="selection"></sa-td>
 
-    					<sa-td name="标题" prop="title" ></sa-td>
 
-    					<sa-td name="封面图片" prop="cover" type="img"></sa-td>
 
-    					<sa-td name="链接地址" prop="url" type="link"></sa-td>
 
-    					<sa-td name="内容" prop="content" type="richtext"></sa-td>
 
-    					<sa-td name="来源" prop="source" ></sa-td>
 
-    					<sa-td name="阅读量" prop="readCount" ></sa-td>
 
-    					<sa-td name="发布状态" prop="isRelease" type="switch" :jv="{0: '未发布', 1: '发布'}" @change="s => updateIsRelease(s.row)"></sa-td>
 
-    					<sa-td name="发布时间" prop="releaseTime" ></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="title" width="200px"></sa-td>
 
+    					<sa-td name="封面图片" prop="cover" type="img" width="80px"></sa-td>
 
+    					<sa-td name="链接地址" prop="url" type="link" width="160px"></sa-td>
 
+    					<sa-td name="内容" prop="content" type="richtext" width="250px"></sa-td>
 
+    					<sa-td name="来源" prop="source" width="90px"></sa-td>
 
+    					<sa-td name="阅读量" prop="readCount" width="60px"></sa-td>
 
+    					<sa-td name="发布状态" prop="isRelease" type="switch" width="70px" :jv="{0: '未发布', 1: '发布'}" @change="s => updateIsRelease(s.row)"></sa-td>
 
+    					<sa-td name="发布时间" prop="releaseTime" width="150px"></sa-td>
 
+    					<sa-td name="状态" prop="status" type="switch" width="70px" :jv="{0: '禁用', 1: '启用'}" @change="s => updateStatus(s.row)"></sa-td>
 
+    					<el-table-column label="操作" width="210px">
 
     						<template slot-scope="s">
 
     							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 
     							<el-button v-if="sa.isAuth('tb-port-news-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
@@ -89,14 +88,6 @@
 
     					get: function(data) {
 
     						sa.showIframe('数据详情', 'tb-port-news-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('修改数据', 'tb-port-news-add.html?id=' + data.id, '1000px', '90%');

+ 1 - 18
sa-view/tb-purchaser/tb-purchaser-list.html
Parādīt failu 

@@ -26,11 +26,8 @@
 
 					<sa-item type="text" name="法人" v-model="p.legalPerson"></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>
 
-				<div class="fast-btn">
 
 					<el-button v-if="sa.isAuth('tb-purchaser-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
-					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
-				</div>
 
+				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td type="selection"></sa-td>
 
@@ -45,10 +42,6 @@
 
 					<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="judgeStatus" type="enum" :jv="{0: '未通过', 1: '已通过'}"></sa-td>
 
-					<sa-td name="审核意见" prop="judgeContent" ></sa-td>
 
-					<sa-td name="上次审核时间" prop="judgeTime" type="datetime"></sa-td>
 
-					<sa-td name="注册时间" prop="registerTime" type="datetime"></sa-td> -->
 
 					<sa-td name="人脸编号" prop="personId" type="num"></sa-td>
 
 					<el-table-column label="操作" fixed="right"  width="240px">
 
 						<template slot-scope="s">
 
@@ -81,8 +74,6 @@
 
 						dutyParagraph: '',		// 税号
 
 						addressIds: '',		// 地址编号
 
 						address: '',		// 地址
 
-						// judgeStatus: '',		// 审核状态(0=未通过,1=已通过)
 
-						// judgeContent: '',		// 审核意见
 
 						personId: '',		// 人脸编号
 
 						pageNo: 1,		// 当前页
 
 						pageSize: 10,	// 页大小
 
@@ -104,14 +95,6 @@
 
 					get: function(data) {
 
 						sa.showIframe('数据详情', 'tb-purchaser-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('修改数据', 'tb-purchaser-add.html?id=' + data.id, '1000px', '90%');

+ 9 - 13
sa-view/tb-shop/tb-shop-add.html
Parādīt failu 

@@ -35,15 +35,15 @@
 
 					<el-form size="mini" v-if="m">
 
 						<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>
 
+							<el-input size="mini" v-model="m.shopName"></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.no"></el-input>
 
+							<el-input size="mini" v-model="m.shopNo"></el-input>
 
 						</div>
 
 						<div class="c-item br">
 
 							<label class="c-label">所属互市区：</label>
 
-							<el-select v-model="m.tradeAreaId" placeholder="请选择" filterable size="mini">
 
+							<el-select v-model="m.tradeAreaName" placeholder="请选择" filterable size="mini">
 
 								<el-option label="请选择" :value="0" disabled></el-option>
 
 								<el-option v-for="(item,index) in tradeAreaList" :key="index" :label="item.name"
 
 									:value="item.id"> </el-option>
 
@@ -51,11 +51,11 @@
 
 						</div>
 
 						<div class="c-item br">
 
 							<label class="c-label">入住商户：</label>
 
-							<el-select v-model="m.enterpriseId" filterable size="mini" placeholder="请选择">
 
+							<el-select v-model="m.enterpriseName" filterable size="mini" placeholder="请选择">
 
 							    <el-option
 
 							      v-for="item in enterpriseList"
 
 							      :key="item.id"
 
-							      :label="item.name"
 
+							      :label="item.ownerName"
 
 							      :value="item.id">
 
 							    </el-option>
 
 							  </el-select>
 
@@ -67,10 +67,6 @@
 
 									:autosize="{ minRows: 3, maxRows: 5}"></el-input>
 
 							</div>
 
 						</div>
 
-						<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>
 
@@ -112,8 +108,8 @@
 
 					createModel: function() {
 
 						return {
 
 							id: '', // 主键
 
-							name: '', // 名称
 
-							no: '', // 编号
 
+							shopName: '', // 名称
 
+							shopNo: '', // 编号
 
 							tradeAreaId: '', // 编号
 
 							address: '', // 编号
 
 							address_arry: [], // 编号
 
@@ -127,8 +123,8 @@
 
 						try {
 
 							var m = this.m; // 获取 m对象
 
 							let tradeAreaId=m.tradeAreaId;
 
-							sa.checkNull(m.name, '请输入 [名称]');
 
-							sa.checkNull(m.no, '请输入 [编号]');
 
+							sa.checkNull(m.shopName, '请输入 [名称]');
 
+							sa.checkNull(m.shopNo, '请输入 [编号]');
 
 							sa.checkNull(m.tradeAreaId, '请选择 [所在互市区]');
 
 							let tradeAreaList=this.tradeAreaList;
 
 							m.tradeAreaName=tradeAreaList.filter(obj=>obj.id=tradeAreaId).pop().name;

+ 3 - 3
sa-view/tb-shop/tb-shop-info.html
Parādīt failu 

@@ -27,15 +27,15 @@
 
 							<el-col span="12">
 
 								<div class="c-item br">
 
 									<label class="c-label">名称：</label>
 
-									<span>{{m.name}}</span>
 
+									<span>{{m.shopName}}</span>
 
 								</div>
 
 								<div class="c-item br">
 
 									<label class="c-label">编号：</label>
 
-									<span>{{m.no}}</span>
 
+									<span>{{m.shopNo}}</span>
 
 								</div>
 
 								<div class="c-item br">
 
 									<label class="c-label">区域：</label>
 
-										<span>{{m.address}}</span>
 
+										<span>{{m.area}}</span>
 
 								</div>
 
 							</el-col>
 
 							<el-col span="12">

+ 7 - 27
sa-view/tb-shop/tb-shop-list.html
Parādīt failu 

@@ -25,44 +25,29 @@
 
 						<label class="c-label">互市区：</label>
 
 						<el-select v-model="p.tradeAreaId" placeholder="请选择" filterable size="mini">
 
 							<el-option label="请选择" :value="0" disabled></el-option>
 
-							<el-option v-for="(item,index) in tradeAreaList" :key="index" :label="item.name"
 
-								:value="item.id"> </el-option>
 
+							<el-option v-for="(item,index) in tradeAreaList" :key="index" :label="item.name" :value="item.id"> </el-option>
 
 						</el-select>
 
 					</div>
 
 					<div class="c-item">
 
 						<label class="c-label">名称：</label>
 
-						<el-input size="mini" v-model="p.name"></el-input>
 
+						<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-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>
 
-				<!-- ------------- 快捷按钮 ------------- -->
 
-				<div class="fast-btn">
 
-				
-				</div>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<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="name"></el-table-column>
 
-					<el-table-column align="center" label="编号" prop="no"></el-table-column>
 
+					<el-table-column align="center" label="名称" prop="shopName"></el-table-column>
 
+					<el-table-column align="center" label="编号" prop="shopNo"></el-table-column>
 
+					<el-table-column align="center" label="区域" prop="area"></el-table-column>
 
 					<el-table-column align="center" prop="tradeAreaName" label="所属互市区"> </el-table-column>
 
 					<el-table-column align="center" prop="enterpriseName" label="入驻商家"> </el-table-column>
 
-				<!-- 	<el-table-column align="center" label="是否可用">
 
-						<template slot-scope="s">
 
-							<el-switch v-model="s.row.status" :active-value="1" :inactive-value="0"
 
-								@change="updateStatus(s.row)" inactive-color="#ff4949" style="vertical-align: top;">
 
-							</el-switch>
 
-							<span style="color: #999;" v-if="s.row.status == 0">否</span>
 
-							<span style="color: #999;" v-if="s.row.status == 1">是</span>
 
-						</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)">查看
 
@@ -88,13 +73,8 @@
 
 				el: '.vue-box',
 
 				data: {
 
 					p: { // 查询参数
 
-						id: '', // 主键
 
-						name: '', // 名称
 
-						no: '', // 编号
 
+						shopName: '', // 名称
 
 						tradeAreaId:'',
 
-						area: '', // 区域(A区=A区,B区=B区,C区=C区)
 
-						status: '', // 是否可用(0=否,1=是)
 
-						remark: '', //
 
 						pageNo: 1, // 当前页
 
 						pageSize: 10, // 页大小
 
 						sortType: 0 // 排序方式