7.28

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

@@ -22,7 +22,7 @@
 				<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>
-					<el-button size="mini" type="info" @click="sa.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('app-menu-add')" size="mini" type="primary" @click="add()">新增</el-button>
@@ -37,13 +37,20 @@
 					<sa-td name="排序" prop="sort" ></sa-td>
 					<sa-td name="状态" prop="enable" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateEnable(s.row)"></sa-td>
 					<sa-td name="是否认证后访问" prop="auth" type="switch" :jv="{0: '否', 1: '是'}" @change="s => updateAuth(s.row)"></sa-td>
-					<el-table-column label="操作" fixed="right"  width="240px" v-if="assignAuth">
+					<!-- <el-table-column label="操作" fixed="right"  width="240px" v-if="assignAuth">
 						<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('app-menu-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 							<el-button v-if="sa.isAuth('app-menu-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 						</template>
-					</el-table-column>
+					</el-table-column> -->
+					<sa-td label="操作" fixed="right"  width="240px" v-if="assignAuth">
+						<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('app-menu-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button v-if="sa.isAuth('app-menu-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
+						</template>
+					</sa-td>
 				</el-table>
 				<!-- ------------- 分页 ------------- -->
 				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>

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

@@ -21,8 +21,8 @@
 				<!-- <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>
-					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 					<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('app-role-add')" size="mini" type="primary" @click="add()">新增</el-button>

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

@@ -27,11 +27,11 @@
 					<sa-item type="text" name="登录设备" v-model="p.deviceMode"></sa-item>
 					<sa-item type="text" name="app版本号" v-model="p.appVersion"></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('app-user-login-log-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-view/app-user/app-user-list.html

@@ -36,11 +36,11 @@
 					<sa-item type="text" name="更新者id" v-model="p.updateById"></sa-item>
 					<sa-item type="text" name="更新者名称" v-model="p.updateByName"></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('app-user-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-view/tb-agreement/tb-agreement-list.html

@@ -24,11 +24,11 @@
 					<sa-item type="num" 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>
-					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</div>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >

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

@@ -31,11 +31,11 @@
 					<sa-item type="text" name="更新者名称" v-model="p.updateName"></sa-item> -->
 					<!-- 未识别类型：删除状态: p.deleteStatus 请检查配置 -->
 					<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>
-					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</div>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >

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

@@ -26,11 +26,11 @@
 					<sa-item type="enum" name="商户分类" v-model="p.type"
 						:jv="{自营商铺: '自营商铺', 劳务商铺: '劳务商铺'}" jtype="3" def="不限"></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-enterprise-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-view/tb-favorite-contacts/tb-favorite-contacts-list.html

@@ -31,11 +31,11 @@
 					<sa-item type="text" name="更新者名称" v-model="p.updateName"></sa-item>
 					<!-- 未识别类型：删除状态: p.deleteStatus 请检查配置 -->
 					<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-favorite-contacts-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-view/tb-goods-type/tb-goods-type-list.html

@@ -25,11 +25,11 @@
 					<sa-item type="text" name="排序" v-model="p.sort"></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>
-					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</div>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList"  row-key="id" border @expand-change="sa.f5TableHeight()">

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

@@ -25,11 +25,11 @@
 					<sa-item type="text" name="商品单位编号" v-model="p.unitsNo"></sa-item>
 					<sa-item type="text" name="管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号" v-model="p.units"></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>
-					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</div>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >

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

@@ -25,11 +25,11 @@
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
 					<sa-item type="text" name="分类名称" v-model="p.typeNames"></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-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-view/tb-group/tb-group-list.html

@@ -26,8 +26,7 @@
 					<sa-item type="text" name="组长名" v-model="p.leaderName"></sa-item>
 					<sa-item type="text" name="组长电话" v-model="p.leaderPhone"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
-					<el-button size="mini" type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
-
+					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 				</el-form>
 				<div class="fast-btn">
 					<el-button size="mini" type="primary" icon="el-icon-tickets" @click="getBySelect()">批量导入</el-button>

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

@@ -74,6 +74,7 @@
 					<sa-item type="enum" name="删除状态" v-model="p.deleteStatus" 
 						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></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-order-add')" size="mini" type="primary" @click="add()">新增</el-button>

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

@@ -25,11 +25,11 @@
 					<sa-item type="text" name="订单编号" v-model="p.orderNo"></sa-item>
 					<sa-item type="text" name="商品名称" v-model="p.goodsName"></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-orders-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-view/tb-people/tb-people-list.html

@@ -27,11 +27,11 @@
 					<sa-item type="enum" name="所属互助组" v-model="p.groupId"
 						:jv="{1: '测试组'}" jtype="2" def="不限"></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-people-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-view/tb-port-news/tb-port-news-add.html

@@ -15,8 +15,6 @@
 		<script src="../../static/sa.js"></script>
 		<script src="../../static/kj/upload-util.js"></script>
 		<script src="../../static/kj/wangEditor.min.js"></script>
-	<!-- 	<link href="https://unpkg.com/@wangeditor/editor@latest/dist/css/style.css" rel="stylesheet">
-		<script src="https://unpkg.com/@wangeditor/editor@latest/dist/index.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;}
@@ -36,21 +34,25 @@
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
 						<!-- <sa-item type="num" name="主键" v-model="m.id" br></sa-item> -->
+
 						<sa-item type="text" name="标题" v-model="m.title" br></sa-item>
 						<sa-item type="img" name="封面图片" v-model="m.cover" br></sa-item>
 						<sa-item type="text" name="链接地址" v-model="m.url" br></sa-item>
 						<sa-item type="richtext" name="内容" v-model="m.content" br></sa-item>
+						<sa-item type="richtext" name="内容" v-model="m.content" br></sa-item>
 						<sa-item type="text" name="来源" v-model="m.source" br></sa-item>
 						<!-- <sa-item type="text" name="阅读量" v-model="m.readCount" br></sa-item> -->
 						<sa-item type="enum" name="发布状态" v-model="m.isRelease" :jv="{0: '未发布', 1: '发布'}" jtype="3" br></sa-item>
 						<sa-item type="text" name="发布时间" v-model="m.releaseTime" br></sa-item>
 						<sa-item type="enum" name="状态" v-model="m.status" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+
 						<!-- <sa-item type="text" name="创建者id" v-model="m.createBy" br></sa-item> -->
 						<!-- <sa-item type="text" name="创建者名称" v-model="m.createName" br></sa-item> -->
 						<!-- date-create字段： m.createTime - 创建时间 -->
 						<!-- <sa-item type="text" name="更新者id" v-model="m.updateBy" br></sa-item> -->
 						<!-- <sa-item type="text" name="更新者名称" v-model="m.updateName" br></sa-item> -->
 						<!-- date-update字段： m.updateTime - 更新时间 -->
+
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -78,7 +80,6 @@
 					// 创建一个 默认Model 
 					createModel: function() {
 						return {
-							id: '',		// 主键 
 							title: '',		// 标题 
 							cover: '',		// 封面图片 
 							url: '',		// 链接地址 
@@ -88,12 +89,6 @@
 							isRelease: '',		// 发布状态(0=未发布,1=发布) 
 							releaseTime: '',		// 发布时间 
 							status: '',		// 状态(0=禁用,1=启用) 
-							createBy: '',		// 创建者id 
-							createName: '',		// 创建者名称 
-							// createTime: '',		// 创建时间 
-							updateBy: '',		// 更新者id 
-							updateName: '',		// 更新者名称 
-							// updateTime: '',		// 更新时间 
 						}
 					},
 					// 提交数据 

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

@@ -20,6 +20,7 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
+<<<<<<< HEAD
 				<!-- 	<sa-item type="num" name="主键" v-model="p.id"></sa-item> -->
 					<sa-item type="text" name="标题" v-model="p.title"></sa-item>
 					<!-- 未识别类型：链接地址: p.url 请检查配置 -->
@@ -35,17 +36,19 @@
 					<sa-item type="text" name="创建者名称" v-model="p.createName"></sa-item>
 					<sa-item type="text" name="更新者id" v-model="p.updateBy"></sa-item>
 					<sa-item type="text" name="更新者名称" v-model="p.updateName"></sa-item> -->
+=======
+					<sa-item type="text" name="标题" v-model="p.title"></sa-item>
+>>>>>>> a082fcdfd1d171778f087c2f8149498ff709ce7a
 					<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-port-news-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" type="num"></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>
@@ -55,12 +58,6 @@
 					<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>
-					<sa-td name="创建者id" prop="createBy" ></sa-td>
-					<sa-td name="创建者名称" prop="createName" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" type="datetime"></sa-td>
-					<sa-td name="更新者id" prop="updateBy" ></sa-td>
-					<sa-td name="更新者名称" prop="updateName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" type="datetime"></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>
@@ -82,7 +79,7 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数  
-						id: '',		// 主键 
+					
 						title: '',		// 标题 
 						url: '',		// 链接地址 
 						content: '',		// 内容 
@@ -91,10 +88,6 @@
 						isRelease: '',		// 发布状态(0=未发布,1=发布) 
 						releaseTime: '',		// 发布时间 
 						status: '',		// 状态(0=禁用,1=启用) 
-						createBy: '',		// 创建者id 
-						createName: '',		// 创建者名称 
-						updateBy: '',		// 更新者id 
-						updateName: '',		// 更新者名称 
 						pageNo: 1,		// 当前页 
 						pageSize: 10,	// 页大小 
 						sortType: 0		// 排序方式 

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

@@ -30,11 +30,11 @@
 					<sa-item type="text" name="地址全称" v-model="p.addressName"></sa-item>
 					<sa-item type="text" name="邮编" v-model="p.postNum"></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-address-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-view/tb-purchaser/tb-purchaser-list.html

@@ -20,16 +20,16 @@
 		<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>
 					<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>
-					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</div>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
@@ -71,7 +71,6 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数
-						// id: '',		// 主键
 						name: '',		// 名称
 						legalPerson: '',		// 法人
 						idCard: '',		// 身份证号

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

@@ -82,14 +82,7 @@
 					// 创建一个 默认Model
 					createModel: function() {
 						return {
-							id: '',		// 主键
 							enterpriseId: '',		//
-							createBy: '',		// 创建者id
-							createName: '',		// 创建者名称
-							updateName: '',		// 更新者名称
-							// createTime: '',		// 创建时间
-							updateBy: '',		// 更新者id
-							// updateTime: '',		// 更新时间
 							tradeAreaId: '',		//
 							tradeAreaName: '',		//
 							address: '',		//

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

@@ -25,12 +25,33 @@
 			<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.no}}</sa-info>
-						<sa-info type="enum" name="区域" :value="m.area" :jv="{A区: 'A区', B区: 'B区', C区: 'C区'}" br></sa-info>
-						<sa-info type="enum" name="是否可用" :value="m.status" :jv="{0: '否', 1: '是'}" br></sa-info>
-						<sa-info name="备注" br>{{m.remark}}</sa-info>
-						<sa-info name="商家名称" br>{{m.enterpriseName}}</sa-info>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="名称" br>{{m.name}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="编号" br>{{m.no}}</sa-info>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info type="enum" name="区域" :value="m.area" :jv="{A区: 'A区', B区: 'B区', C区: 'C区'}" br></sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info type="enum" name="是否可用" :value="m.status" :jv="{0: '否', 1: '是'}" br></sa-info>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="备注" br>{{m.remark}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="商家名称" br>{{m.enterpriseName}}</sa-info>
+							</el-col>
+						</el-row>
+					
 					</el-form>
 				</div>
 			</div>

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

@@ -24,14 +24,12 @@
 				<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.no"></sa-item>
-					<sa-item type="enum" name="区域" v-model="p.area"
-						:jv="{A区: 'A区', B区: 'B区', C区: 'C区'}" jtype="3" def="不限"></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-shop-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" >