页面样式修改

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

@@ -26,11 +26,28 @@
                     <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="用户ID" v-model="m.usreId" br></sa-item>
-						<sa-item type="text" name="登录时间" v-model="m.loginTime" br></sa-item>
-						<sa-item type="text" name="登录IP" v-model="m.loginIp" br></sa-item>
-						<sa-item type="text" name="登录设备" v-model="m.deviceMode" br></sa-item>
-						<sa-item type="text" name="app版本号" v-model="m.appVersion" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="用户ID" v-model="m.usreId" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="登录时间" v-model="m.loginTime" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="登录IP" v-model="m.loginIp" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="登录设备" v-model="m.deviceMode" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="app版本号" v-model="m.appVersion" 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>

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

@@ -23,12 +23,28 @@
 			<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 name="用户ID" br>{{m.usreId}}</sa-info>
-						<sa-info name="登录时间" br>{{m.loginTime}}</sa-info>
-						<sa-info name="登录IP" br>{{m.loginIp}}</sa-info>
-						<sa-info name="登录设备" br>{{m.deviceMode}}</sa-info>
-						<sa-info name="app版本号" br>{{m.appVersion}}</sa-info>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="用户ID" br>{{m.usreId}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="登录时间" br>{{m.loginTime}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="登录IP" br>{{m.loginIp}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="登录设备" br>{{m.deviceMode}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="app版本号" br>{{m.appVersion}}</sa-info>
+							</el-col>
+						</el-row>
+						<!-- <sa-info type="num" name="主键" :value="m.id" br></sa-info> -->
 					</el-form>
 				</div>
 			</div>

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

@@ -36,7 +36,7 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="id" type="num"></sa-td> -->
 					<sa-td name="用户ID" prop="usreId" ></sa-td>
 					<sa-td name="登录时间" prop="loginTime" ></sa-td>
 					<sa-td name="登录IP" prop="loginIp" ></sa-td>

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

@@ -29,16 +29,12 @@
 						<sa-item type="text" name="手机号码" v-model="m.phone" br></sa-item>
 						<sa-item type="text" name="姓名" v-model="m.name" br></sa-item>
 						<sa-item type="enum" name="类型" v-model="m.userType" :jv="{1: '边民', 2: '组长', 3: '商户', 4: '收购商', 5: '司机'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="外联id,user_type=1=>边民ID；user_type=3=>商户ID" v-model="m.fkId" br></sa-item>
+						<!-- <sa-item type="text" name="外联id,user_type=1=>边民ID；user_type=3=>商户ID" v-model="m.fkId" br></sa-item> -->
 						<sa-item type="enum" name="状态" v-model="m.status" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
 						<sa-item type="enum" name="是否认证" v-model="m.auth" :jv="{0: '未认证', 1: '已认证'}" jtype="3" br></sa-item>
 						<sa-item type="text" name="人证时间" v-model="m.authTime" br></sa-item>
 						<sa-item type="text" name="登录次数" v-model="m.loginCount" br></sa-item>
 						<sa-item type="text" name="上次登录时间" v-model="m.lastLoginTime" br></sa-item>
-						<!-- date-create字段： m.createTime - 创建时间 -->
-						<sa-item type="text" name="更新者id" v-model="m.updateById" br></sa-item>
-						<sa-item type="text" name="更新者名称" v-model="m.updateByName" 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>
@@ -66,7 +62,6 @@
 					// 创建一个 默认Model 
 					createModel: function() {
 						return {
-							id: '',		// 主键 
 							phone: '',		// 手机号码 
 							name: '',		// 姓名 
 							userType: '',		// 类型(1=边民,2=组长,3=商户,4=收购商,5=司机) 
@@ -76,10 +71,6 @@
 							authTime: '',		// 人证时间 
 							loginCount: '',		// 登录次数 
 							lastLoginTime: '',		// 上次登录时间 
-							// createTime: '',		// 创建时间 
-							updateById: '',		// 更新者id 
-							updateByName: '',		// 更新者名称 
-							// updateTime: '',		// 更新时间 
 						}
 					},
 					// 提交数据 

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

@@ -23,20 +23,40 @@
 			<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 name="手机号码" br>{{m.phone}}</sa-info>
-						<sa-info name="姓名" br>{{m.name}}</sa-info>
-						<sa-info type="enum" name="类型" :value="m.userType" :jv="{1: '边民', 2: '组长', 3: '商户', 4: '收购商', 5: '司机'}" br></sa-info>
-						<sa-info name="外联id,user_type=1=>边民ID；user_type=3=>商户ID" br>{{m.fkId}}</sa-info>
-						<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
-						<sa-info type="enum" name="是否认证" :value="m.auth" :jv="{0: '未认证', 1: '已认证'}" br></sa-info>
-						<sa-info name="人证时间" br>{{m.authTime}}</sa-info>
-						<sa-info name="登录次数" br>{{m.loginCount}}</sa-info>
-						<sa-info name="上次登录时间" br>{{m.lastLoginTime}}</sa-info>
-						<sa-info type="datetime" name="创建时间" :value="m.createTime" br></sa-info>
-						<sa-info name="更新者id" br>{{m.updateById}}</sa-info>
-						<sa-info name="更新者名称" br>{{m.updateByName}}</sa-info>
-						<sa-info type="datetime" name="更新时间" :value="m.updateTime" br></sa-info>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="手机号码" br>{{m.phone}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="姓名" br>{{m.name}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info type="enum" name="类型" :value="m.userType" :jv="{1: '边民', 2: '组长', 3: '商户', 4: '收购商', 5: '司机'}" 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 type="enum" name="是否认证" :value="m.auth" :jv="{0: '未认证', 1: '已认证'}" br></sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="人证时间" br>{{m.authTime}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="登录次数" br>{{m.loginCount}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="上次登录时间" br>{{m.lastLoginTime}}</sa-info>
+							</el-col>
+						</el-row>
+						
+						<!-- <sa-info name="外联id,user_type=1=>边民ID；user_type=3=>商户ID" br>{{m.fkId}}</sa-info> -->
 					</el-form>
 				</div>
 			</div>

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

@@ -18,23 +18,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="num" name="主键" v-model="p.id"></sa-item>
 					<sa-item type="text" name="手机号码" v-model="p.phone"></sa-item>
 					<sa-item type="text" name="姓名" v-model="p.name"></sa-item>
-					<sa-item type="enum" name="类型" v-model="p.userType" 
-						:jv="{1: '边民', 2: '组长', 3: '商户', 4: '收购商', 5: '司机'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="外联id,user_type=1=>边民ID；user_type=3=>商户ID" v-model="p.fkId"></sa-item>
-					<sa-item type="enum" name="状态" v-model="p.status" 
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="enum" name="是否认证" v-model="p.auth" 
-						:jv="{0: '未认证', 1: '已认证'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="人证时间" v-model="p.authTime"></sa-item>
-					<sa-item type="text" name="登录次数" v-model="p.loginCount"></sa-item>
-					<sa-item type="text" name="上次登录时间" v-model="p.lastLoginTime"></sa-item>
-					<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>
@@ -45,20 +32,15 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="phone" ></sa-td>
 					<sa-td name="姓名" prop="name" ></sa-td>
 					<sa-td name="类型" prop="userType" type="enum" :jv="{1: '边民', 2: '组长', 3: '商户', 4: '收购商', 5: '司机'}"></sa-td>
-					<sa-td name="外联id,user_type=1=>边民ID；user_type=3=>商户ID" prop="fkId" ></sa-td>
+					<!-- <sa-td name="外联id,user_type=1=>边民ID；user_type=3=>商户ID" prop="fkId" ></sa-td> -->
 					<sa-td name="状态" prop="status" type="enum" :jv="{0: '禁用', 1: '启用'}"></sa-td>
 					<sa-td name="是否认证" prop="auth" type="enum" :jv="{0: '未认证', 1: '已认证'}"></sa-td>
 					<sa-td name="人证时间" prop="authTime" ></sa-td>
 					<sa-td name="登录次数" prop="loginCount" ></sa-td>
 					<sa-td name="上次登录时间" prop="lastLoginTime" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" type="datetime"></sa-td>
-					<sa-td name="更新者id" prop="updateById" ></sa-td>
-					<sa-td name="更新者名称" prop="updateByName" ></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>
@@ -80,7 +62,6 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数  
-						id: '',		// 主键 
 						phone: '',		// 手机号码 
 						name: '',		// 姓名 
 						userType: '',		// 类型(1=边民,2=组长,3=商户,4=收购商,5=司机) 
@@ -90,8 +71,6 @@
 						authTime: '',		// 人证时间 
 						loginCount: '',		// 登录次数 
 						lastLoginTime: '',		// 上次登录时间 
-						updateById: '',		// 更新者id 
-						updateByName: '',		// 更新者名称 
 						pageNo: 1,		// 当前页 
 						pageSize: 10,	// 页大小 
 						sortType: 0		// 排序方式 

sa-view/tb-demand-quotation/tb-demand-quotation-add.html

@@ -1,32 +1,57 @@
 <!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="一级市场组长需求抢购表ID" v-model="m.id" br></sa-item>
+
+<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">
+					<el-row :gutter="50">
+						<el-col :span="12">
+							<sa-item type="text" name="组名称" v-model="m.groupName" br></sa-item>
+						</el-col>
+						<el-col :span="12">
+							<sa-item type="text" name="报价" v-model="m.quotation" br></sa-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="50">
+						<el-col :span="12">
+							<sa-item type="text" name="组名称" v-model="m.groupName" br></sa-item>
+						</el-col>
+						<el-col :span="12">
+							<sa-item type="text" name="报价" v-model="m.quotation" br></sa-item>
+						</el-col>
+					</el-row>
+					<!-- <sa-item type="text" name="一级市场组长需求抢购表ID" v-model="m.id" br></sa-item>
 						<sa-item type="text" name="一级市场互市组组长ID" v-model="m.leaderId" br></sa-item>
 						<sa-item type="text" name="组名称" v-model="m.groupName" br></sa-item>
 						<sa-item type="text" name="二级市场收购商需求表ID" v-model="m.demandId" br></sa-item>
@@ -34,95 +59,96 @@
 						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
 						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
 						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="删除状态" v-model="m.deleteStatus" 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>
+						<sa-item type="text" name="删除状态" v-model="m.deleteStatus" 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>
-        <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,		// 实体对象 
+		<!-- ------- 底部按钮 ------- -->
+		<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: '',		// 一级市场组长需求抢购表ID 
+						leaderId: '',		// 一级市场互市组组长ID(tb_people) 
+						groupName: '',		// 组名称 
+						demandId: '',		// 二级市场收购商需求表ID 
+						quotation: '',		// 报价(CNY) 
+						createBy: '',		// 创建人编号 
+						createName: '',		// 创建人名称(报价人) 
+						createTime: '',		// 创建时间 
+						deleteStatus: '',		// 删除状态 
+					}
 				},
-				methods: {
-					// 创建一个 默认Model 
-					createModel: function() {
-						return {
-							id: '',		// 一级市场组长需求抢购表ID 
-							leaderId: '',		// 一级市场互市组组长ID(tb_people) 
-							groupName: '',		// 组名称 
-							demandId: '',		// 二级市场收购商需求表ID 
-							quotation: '',		// 报价(CNY) 
-							createBy: '',		// 创建人编号 
-							createName: '',		// 创建人名称(报价人) 
-							createTime: '',		// 创建时间 
-							deleteStatus: '',		// 删除状态 
-						}
-					},
-					// 提交数据 
-					ok: function(){
-						// 表单校验 
-						let m = this.m;
-						sa.checkNull(m.id, '请输入 [一级市场组长需求抢购表ID]');
-						sa.checkNull(m.leaderId, '请输入 [一级市场互市组组长ID]');
-						sa.checkNull(m.groupName, '请输入 [组名称]');
-						sa.checkNull(m.demandId, '请输入 [二级市场收购商需求表ID]');
-						sa.checkNull(m.quotation, '请输入 [报价]');
-						sa.checkNull(m.createBy, '请输入 [创建人编号]');
-						sa.checkNull(m.createName, '请输入 [创建人名称]');
-						sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
-				
-						// 开始增加或修改
-						if(this.id <= 0) {	// 添加
-							sa.ajax('/TbDemandQuotation/add', m, function(res){
-								sa.alert('增加成功', this.clean); 
-							}.bind(this));
-						} else {	// 修改
-							sa.ajax('/TbDemandQuotation/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();	// 关闭本页 
-						}
+				// 提交数据 
+				ok: function () {
+					// 表单校验 
+					let m = this.m;
+					sa.checkNull(m.id, '请输入 [一级市场组长需求抢购表ID]');
+					sa.checkNull(m.leaderId, '请输入 [一级市场互市组组长ID]');
+					sa.checkNull(m.groupName, '请输入 [组名称]');
+					sa.checkNull(m.demandId, '请输入 [二级市场收购商需求表ID]');
+					sa.checkNull(m.quotation, '请输入 [报价]');
+					sa.checkNull(m.createBy, '请输入 [创建人编号]');
+					sa.checkNull(m.createName, '请输入 [创建人名称]');
+					sa.checkNull(m.createTime, '请输入 [创建时间]');
+					sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
+
+					// 开始增加或修改
+					if (this.id <= 0) {	// 添加
+						sa.ajax('/TbDemandQuotation/add', m, function (res) {
+							sa.alert('增加成功', this.clean);
+						}.bind(this));
+					} else {	// 修改
+						sa.ajax('/TbDemandQuotation/update', m, function (res) {
+							sa.alert('修改成功', this.clean);
+						}.bind(this));
 					}
 				},
-				mounted: function(){
-					// 初始化数据 
-					if(this.id <= 0) {	
+				// 添加/修改 完成后的动作
+				clean: function () {
+					if (this.id == 0) {
 						this.m = this.createModel();
-					} else {	
-						sa.ajax('/TbDemandQuotation/getById?id=' + this.id, function(res) {
-							this.m = res.data;
-							if(res.data == null) {
-								sa.alert('未能查找到 id=' + this.id + " 详细数据");
-							}
-						}.bind(this))
+					} else {
+						parent.app.f5();		// 刷新父页面列表
+						sa.closeCurrIframe();	// 关闭本页 
 					}
 				}
-			})
-			
-		</script>
-	</body>
+			},
+			mounted: function () {
+				// 初始化数据 
+				if (this.id <= 0) {
+					this.m = this.createModel();
+				} else {
+					sa.ajax('/TbDemandQuotation/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-demand-quotation/tb-demand-quotation-info.html

@@ -23,7 +23,15 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="一级市场组长需求抢购表ID" br>{{m.id}}</sa-info>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="组名称" v-model="m.groupName" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="报价" br>{{m.quotation}}</sa-info>
+							</el-col>
+						</el-row>
+						<!-- <sa-info name="一级市场组长需求抢购表ID" br>{{m.id}}</sa-info>
 						<sa-info name="一级市场互市组组长ID" br>{{m.leaderId}}</sa-info>
 						<sa-info name="组名称" br>{{m.groupName}}</sa-info>
 						<sa-info name="二级市场收购商需求表ID" br>{{m.demandId}}</sa-info>
@@ -31,7 +39,7 @@
 						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
 						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
 						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="删除状态" br>{{m.deleteStatus}}</sa-info>
+						<sa-info name="删除状态" br>{{m.deleteStatus}}</sa-info> -->
 					</el-form>
 				</div>
 			</div>

sa-view/tb-demand-quotation/tb-demand-quotation-list.html

@@ -18,36 +18,28 @@
 		<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="一级市场组长需求抢购表ID" v-model="p.id"></sa-item>
-					<sa-item type="text" name="一级市场互市组组长ID" v-model="p.leaderId"></sa-item>
 					<sa-item type="text" name="组名称" v-model="p.groupName"></sa-item>
-					<sa-item type="text" name="二级市场收购商需求表ID" v-model="p.demandId"></sa-item>
-					<sa-item type="text" name="报价" v-model="p.quotation"></sa-item>
-					<sa-item type="text" name="创建人编号" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建人名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="删除状态" v-model="p.deleteStatus"></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-demand-quotation-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="一级市场组长需求抢购表ID" prop="id" ></sa-td>
-					<sa-td name="一级市场互市组组长ID" prop="leaderId" ></sa-td>
+					<!-- <sa-td name="一级市场组长需求抢购表ID" prop="id" ></sa-td>
+					<sa-td name="一级市场互市组组长ID" prop="leaderId" ></sa-td> -->
 					<sa-td name="组名称" prop="groupName" ></sa-td>
-					<sa-td name="二级市场收购商需求表ID" prop="demandId" ></sa-td>
+					<!-- <sa-td name="二级市场收购商需求表ID" prop="demandId" ></sa-td> -->
 					<sa-td name="报价" prop="quotation" ></sa-td>
-					<sa-td name="创建人编号" prop="createBy" ></sa-td>
+					<!-- <sa-td name="创建人编号" prop="createBy" ></sa-td>
 					<sa-td name="创建人名称" prop="createName" ></sa-td>
 					<sa-td name="创建时间" prop="createTime" ></sa-td>
-					<sa-td name="删除状态" prop="deleteStatus" ></sa-td>
+					<sa-td name="删除状态" prop="deleteStatus" ></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>
@@ -69,15 +61,14 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数  
-						id: '',		// 一级市场组长需求抢购表ID 
 						leaderId: '',		// 一级市场互市组组长ID(tb_people) 
 						groupName: '',		// 组名称 
 						demandId: '',		// 二级市场收购商需求表ID 
 						quotation: '',		// 报价(CNY) 
-						createBy: '',		// 创建人编号 
-						createName: '',		// 创建人名称(报价人) 
-						createTime: '',		// 创建时间 
-						deleteStatus: '',		// 删除状态 
+						// createBy: '',		// 创建人编号 
+						// createName: '',		// 创建人名称(报价人) 
+						// createTime: '',		// 创建时间 
+						// deleteStatus: '',		// 删除状态 
 						pageNo: 1,		// 当前页 
 						pageSize: 10,	// 页大小 
 						sortType: 0		// 排序方式 

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

@@ -26,17 +26,35 @@
                     <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="二级市场商家需求发布表主键ID" v-model="m.id" br></sa-item>
-						<sa-item type="text" name="一级市场海关允许售卖商品ID" v-model="m.levelOneGoodsId" br></sa-item>
-						<sa-item type="text" name="商品名称" v-model="m.goodsName" br></sa-item>
-						<sa-item type="text" name="商品图片" v-model="m.goodsImg" br></sa-item>
-						<sa-item type="text" name="二级市场商家ID" v-model="m.purchaserId" br></sa-item>
-						<sa-item type="text" name="商家名称" v-model="m.purchaserName" br></sa-item>
-						<sa-item type="text" name="已被接单" v-model="m.isOrders" br></sa-item>
-						<sa-item type="text" name="商品量" v-model="m.goodsQuantity" br></sa-item>
-						<sa-item type="text" name="商家备注" v-model="m.remark" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="删除状态" v-model="m.deleteStatus" br></sa-item>
+						<!-- <sa-item type="text" name="二级市场商家需求发布表主键ID" v-model="m.id" br></sa-item>
+						<sa-item type="text" name="一级市场海关允许售卖商品ID" v-model="m.levelOneGoodsId" br></sa-item> -->
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="商品名称" v-model="m.goodsName" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="商品图片" v-model="m.goodsImg" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="商家名称" v-model="m.purchaserName" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="已被接单" v-model="m.isOrders" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="商品量" v-model="m.goodsQuantity" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="商家备注" v-model="m.remark" br></sa-item>
+							</el-col>
+						</el-row>
+						<!-- <sa-item type="text" name="二级市场商家ID" v-model="m.purchaserId" br></sa-item> -->
+						<!-- <sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
+						<sa-item type="text" name="删除状态" v-model="m.deleteStatus" br></sa-item> -->
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>

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

@@ -23,17 +23,35 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="二级市场商家需求发布表主键ID" br>{{m.id}}</sa-info>
-						<sa-info name="一级市场海关允许售卖商品ID" br>{{m.levelOneGoodsId}}</sa-info>
-						<sa-info name="商品名称" br>{{m.goodsName}}</sa-info>
-						<sa-info name="商品图片" br>{{m.goodsImg}}</sa-info>
-						<sa-info name="二级市场商家ID" br>{{m.purchaserId}}</sa-info>
-						<sa-info name="商家名称" br>{{m.purchaserName}}</sa-info>
-						<sa-info name="已被接单" br>{{m.isOrders}}</sa-info>
-						<sa-info name="商品量" br>{{m.goodsQuantity}}</sa-info>
-						<sa-info name="商家备注" br>{{m.remark}}</sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="删除状态" br>{{m.deleteStatus}}</sa-info>
+						<!-- <sa-info name="二级市场商家需求发布表主键ID" br>{{m.id}}</sa-info>
+						<sa-info name="一级市场海关允许售卖商品ID" br>{{m.levelOneGoodsId}}</sa-info> -->
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="商品名称" br>{{m.goodsName}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="商品图片" br>{{m.goodsImg}}</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.isOrders}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="商品量" br>{{m.goodsQuantity}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="商家备注" br>{{m.remark}}</sa-info>
+							</el-col>
+						</el-row>
+						<!-- <sa-info name="二级市场商家ID" br>{{m.purchaserId}}</sa-info> -->
+						<!-- <sa-info name="创建时间" br>{{m.createTime}}</sa-info>
+						<sa-info name="删除状态" br>{{m.deleteStatus}}</sa-info> -->
 					</el-form>
 				</div>
 			</div>

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

@@ -18,40 +18,30 @@
 		<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="二级市场商家需求发布表主键ID" v-model="p.id"></sa-item>
-					<sa-item type="text" name="一级市场海关允许售卖商品ID" v-model="p.levelOneGoodsId"></sa-item>
 					<sa-item type="text" name="商品名称" v-model="p.goodsName"></sa-item>
-					<sa-item type="text" name="商品图片" v-model="p.goodsImg"></sa-item>
-					<sa-item type="text" name="二级市场商家ID" v-model="p.purchaserId"></sa-item>
-					<sa-item type="text" name="商家名称" v-model="p.purchaserName"></sa-item>
-					<sa-item type="text" name="已被接单" v-model="p.isOrders"></sa-item>
-					<sa-item type="text" name="商品量" v-model="p.goodsQuantity"></sa-item>
-					<sa-item type="text" name="商家备注" v-model="p.remark"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="删除状态" v-model="p.deleteStatus"></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-demand-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="二级市场商家需求发布表主键ID" prop="id" ></sa-td>
-					<sa-td name="一级市场海关允许售卖商品ID" prop="levelOneGoodsId" ></sa-td>
+					<!-- <sa-td name="二级市场商家需求发布表主键ID" prop="id" ></sa-td>
+					<sa-td name="一级市场海关允许售卖商品ID" prop="levelOneGoodsId" ></sa-td> -->
 					<sa-td name="商品名称" prop="goodsName" ></sa-td>
 					<sa-td name="商品图片" prop="goodsImg" ></sa-td>
-					<sa-td name="二级市场商家ID" prop="purchaserId" ></sa-td>
+					<!-- <sa-td name="二级市场商家ID" prop="purchaserId" ></sa-td> -->
 					<sa-td name="商家名称" prop="purchaserName" ></sa-td>
 					<sa-td name="已被接单" prop="isOrders" ></sa-td>
 					<sa-td name="商品量" prop="goodsQuantity" ></sa-td>
 					<sa-td name="商家备注" prop="remark" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></sa-td>
-					<sa-td name="删除状态" prop="deleteStatus" ></sa-td>
+					<!-- <sa-td name="创建时间" prop="createTime" ></sa-td>
+					<sa-td name="删除状态" prop="deleteStatus" ></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>
@@ -73,17 +63,12 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数  
-						id: '',		// 二级市场商家需求发布表主键ID 
-						levelOneGoodsId: '',		// 一级市场海关允许售卖商品ID 
 						goodsName: '',		// 商品名称 
 						goodsImg: '',		// 商品图片 
-						purchaserId: '',		// 二级市场商家ID 
 						purchaserName: '',		// 商家名称 
 						isOrders: '',		// 已被接单 
 						goodsQuantity: '',		// 商品量(根据海关允许发布表的计量单位决定,例如:柜,KG,吨) 
 						remark: '',		// 商家备注 
-						createTime: '',		// 创建时间 
-						deleteStatus: '',		// 删除状态 
 						pageNo: 1,		// 当前页 
 						pageSize: 10,	// 页大小 
 						sortType: 0		// 排序方式 

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

@@ -27,9 +27,19 @@
                     <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.sort" br></sa-item>
-						<sa-item type="text" name="编号" v-model="m.no" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="类别名称" v-model="m.name" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="排序" v-model="m.sort" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="编号" v-model="m.no" br></sa-item>
+							</el-col>
+						</el-row>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>

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

@@ -24,18 +24,21 @@
 			<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 name="类别名称" br>{{m.name}}</sa-info>
-						<sa-info name="排序" br>{{m.sort}}</sa-info>
-						<sa-info name="编号" br>{{m.no}}</sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-						<sa-info name="更新人编号" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新人名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
-						<sa-info name="父类型id" br>{{m.parentId}}</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.sort}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="编号" br>{{m.no}}</sa-info>
+							</el-col>
+						</el-row>
+						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+						<sa-info name="父类型id" br>{{m.parentId}}</sa-info> -->
 					</el-form>
 				</div>
 			</div>

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

@@ -28,8 +28,14 @@
                     <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.unitsNo" br></sa-item>
-						<sa-item type="text" name="管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号" v-model="m.units" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="商品单位编号" v-model="m.unitsNo" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<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>

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

@@ -25,8 +25,14 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="商品单位编号" br>{{m.unitsNo}}</sa-info>
-						<sa-info name="管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号" br>{{m.units}}</sa-info>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="商品单位编号" br>{{m.unitsNo}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="管理商品的单位，比如吨、kg、个、柜；主要字段，名称，编号" br>{{m.units}}</sa-info>
+							</el-col>
+						</el-row>
 					</el-form>
 				</div>
 			</div>

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

@@ -23,7 +23,6 @@
 				<!-- <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="管理商品的单位，比如吨、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>

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

@@ -32,12 +32,24 @@
 						<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="text" name="" v-model="m.detailAddress" br></sa-item> -->
-						<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
-						<sa-item type="text" name="组长ID" v-model="m.leaderId" br></sa-item>
-						<sa-item type="text" name="组长名" v-model="m.leaderName" br></sa-item>
-						<sa-item type="text" name="组长电话" v-model="m.leaderPhone" br></sa-item>
-						<sa-item type="text" name="" v-model="m.code" br></sa-item>
-						<sa-item type="text" name="当天该组剩余额度" v-model="m.leftPrice" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="组长名" v-model="m.leaderName" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="组长电话" v-model="m.leaderPhone" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="当天该组剩余额度" v-model="m.leftPrice" br></sa-item>
+							</el-col>
+						</el-row>
+						<!-- <sa-item type="text" name="组长ID" v-model="m.leaderId" br></sa-item> -->
+						<!-- <sa-item type="text" name="" v-model="m.code" 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-view/tb-group/tb-group-info.html

@@ -28,12 +28,25 @@
 						<!-- <sa-info name="" br>{{m.addressIds}}</sa-info>
 						<sa-info name="" br>{{m.address}}</sa-info>
 						<sa-info name="" br>{{m.detailAddress}}</sa-info> -->
-						<sa-info name="名称" br>{{m.name}}</sa-info>
-						<sa-info name="组长ID" br>{{m.leaderId}}</sa-info>
-						<sa-info name="组长名" br>{{m.leaderName}}</sa-info>
-						<sa-info name="组长电话" br>{{m.leaderPhone}}</sa-info>
-						<sa-info name="" br>{{m.code}}</sa-info>
-						<sa-info name="当天该组剩余额度" br>{{m.leftPrice}}</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.leaderName}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="组长电话" br>{{m.leaderPhone}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="当天该组剩余额度" br>{{m.leftPrice}}</sa-info>
+							</el-col>
+						</el-row>
+						<!-- <sa-info name="组长ID" br>{{m.leaderId}}</sa-info> -->
+						<!-- <sa-info name="" br>{{m.code}}</sa-info> -->
+						
 						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
 					</el-form>
 				</div>

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

@@ -43,7 +43,7 @@
 					<sa-td name="纬度" prop="lat" ></sa-td>
 					<sa-td name="最后一次下单定位" prop="lastLocation" ></sa-td>
 					<sa-td name="联系地址" prop="address" ></sa-td>
-					<sa-td name="地址ID" prop="addressIds" ></sa-td>
+					<!-- <sa-td name="地址ID" prop="addressIds" ></sa-td> -->
 					<sa-td name="详细地址" prop="detailAddress" ></sa-td>
 					<sa-td name="是否锁定" prop="isLock" ></sa-td>
 					<sa-td name="当天剩余额度" prop="leftPrice" ></sa-td>

sa-view/tb-order-after-sale/tb-order-after-sale-add.html

@@ -26,17 +26,38 @@
                     <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="售后申请表主键id" v-model="m.id" br></sa-item>
-						<sa-item type="text" name="订单表主键" v-model="m.orderId" br></sa-item>
-						<sa-item type="text" name="发起售后人的ID" v-model="m.userId" br></sa-item>
-						<sa-item type="text" name="售后发起人电话" v-model="m.userPhone" br></sa-item>
-						<sa-item type="text" name="发起售后时间" v-model="m.time" br></sa-item>
-						<sa-item type="text" name="申请类型" v-model="m.applyType" br></sa-item>
-						<sa-item type="text" name="发起售后原因" v-model="m.remark" br></sa-item>
-						<sa-item type="text" name="售后状态" v-model="m.afterSaleStatus" br></sa-item>
-						<sa-item type="text" name="货物图片" v-model="m.goodsImg" br></sa-item>
-						<sa-item type="text" name="货物名称" v-model="m.goodsName" br></sa-item>
-						<sa-item type="text" name="货物数量" v-model="m.goodsNum" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="售后发起人电话" v-model="m.userPhone" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="发起售后时间" v-model="m.time" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="申请类型" v-model="m.applyType" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="发起售后原因" v-model="m.remark" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="售后状态" v-model="m.afterSaleStatus" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="货物图片" v-model="m.goodsImg" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="货物名称" v-model="m.goodsName" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="货物数量" v-model="m.goodsNum" 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>

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

@@ -23,14 +23,38 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="售后发起人电话" br>{{m.userPhone}}</sa-info>
-						<sa-info name="发起售后时间" br>{{m.time}}</sa-info>
-						<sa-info name="申请类型" br>{{m.applyType}}</sa-info>
-						<sa-info name="发起售后原因" br>{{m.remark}}</sa-info>
-						<sa-info name="售后状态" br>{{m.afterSaleStatus}}</sa-info>
-						<sa-info name="货物图片" br>{{m.goodsImg}}</sa-info>
-						<sa-info name="货物名称" br>{{m.goodsName}}</sa-info>
-						<sa-info name="货物数量" br>{{m.goodsNum}}</sa-info>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="售后发起人电话" br>{{m.userPhone}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="发起售后时间" br>{{m.time}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="申请类型" br>{{m.applyType}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="发起售后原因" br>{{m.remark}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="售后状态" br>{{m.afterSaleStatus}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="货物图片" br>{{m.goodsImg}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="货物名称" br>{{m.goodsName}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="货物数量" br>{{m.goodsNum}}</sa-info>
+							</el-col>
+						</el-row>
 					</el-form>
 				</div>
 			</div>

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

@@ -26,53 +26,135 @@
                     <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.tradeAreaId" br></sa-item>
+						<!-- <sa-item type="text" name="" v-model="m.tradeAreaId" br></sa-item>
 						<sa-item type="text" name="" v-model="m.tradeAreaName" br></sa-item>
 						<sa-item type="text" name="" v-model="m.addressIds" br></sa-item>
-						<sa-item type="text" name="" v-model="m.saleMainId" br></sa-item>
-						<sa-item type="text" name="订单号" v-model="m.tradeNo" br></sa-item>
-						<sa-item type="text" name="买家" v-model="m.buyUserName" br></sa-item>
-						<sa-item type="num" name="购买用户类型" v-model="m.buyUserType" br></sa-item>
-						<sa-item type="text" name="商家名称" v-model="m.enterpriseName" br></sa-item>
-						<sa-item type="text" name="总重量" v-model="m.totalWeight" br></sa-item>
-						<sa-item type="text" name="总金额" v-model="m.totalPrice" br></sa-item>
-						<sa-item type="datetime" name="交易时间" v-model="m.tradeTime" br></sa-item>
-						<sa-item type="enum" name="交易状态" v-model="m.tradeStatus" :jv="{0: '未支付', 1: '已支付'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="支付方式" v-model="m.payType" br></sa-item>
-						<sa-item type="text" name="结算时间" v-model="m.settleTime" br></sa-item>
-						<sa-item type="text" name="当前结算金额" v-model="m.realPrice" br></sa-item>
-						<sa-item type="text" name="应结金额" v-model="m.shouldPrice" br></sa-item>
-						<sa-item type="text" name="对账人" v-model="m.settleUserId" br></sa-item>
-						<sa-item type="text" name="对账人员" v-model="m.recordUserId" br></sa-item>
-						<sa-item type="text" name="对账时间" v-model="m.recordTime" br></sa-item>
-						<sa-item type="text" name="是否对账" v-model="m.record" br></sa-item>
-						<sa-item type="text" name="退款原因" v-model="m.refundReason" br></sa-item>
-						<sa-item type="text" name="退款时间" v-model="m.refundTime" br></sa-item>
-						<sa-item type="text" name="" v-model="m.receiveName" br></sa-item>
+						<sa-item type="text" name="" v-model="m.saleMainId" br></sa-item> -->
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="订单号" v-model="m.tradeNo" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="买家" v-model="m.buyUserName" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="num" name="购买用户类型" v-model="m.buyUserType" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="商家名称" v-model="m.enterpriseName" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="总重量" v-model="m.totalWeight" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="总金额" v-model="m.totalPrice" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="datetime" name="交易时间" v-model="m.tradeTime" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="enum" name="交易状态" v-model="m.tradeStatus" :jv="{0: '未支付', 1: '已支付'}" jtype="3" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="支付方式" v-model="m.payType" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="结算时间" v-model="m.settleTime" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="当前结算金额" v-model="m.realPrice" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="应结金额" v-model="m.shouldPrice" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="对账人" v-model="m.settleUserId" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="对账人员" v-model="m.recordUserId" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="对账时间" v-model="m.recordTime" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="是否对账" v-model="m.record" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="退款原因" v-model="m.refundReason" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="退款时间" v-model="m.refundTime" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="出互市区时间" v-model="m.outTime" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="商品名称" v-model="m.goodsNames" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="是否申报" v-model="m.apply" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="申报时间" v-model="m.applyTime" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="申报结果" v-model="m.applyResult" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="enum" name="分配方式" v-model="m.distribution" :jv="{0: '均分', 1: '自选数量'}" jtype="3" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="enum" name="是否确认" v-model="m.confirm" :jv="{0: '否', 1: '是'}" jtype="3" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="是否接单" v-model="m.pick" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="接单时间" v-model="m.pickTime" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="是否发货" v-model="m.send" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="发货时间" v-model="m.sendTime" br></sa-item>
+							</el-col>
+						</el-row>
+						<!-- <sa-item type="text" name="" v-model="m.receiveName" br></sa-item>
 						<sa-item type="text" name="" v-model="m.receivePhone" br></sa-item>
-						<sa-item type="text" name="" v-model="m.receiveAddress" br></sa-item>
-						<sa-item type="text" name="出互市区时间" v-model="m.outTime" br></sa-item>
-						<sa-item type="text" name="商品名称字符串" v-model="m.goodsNames" br></sa-item>
-						<sa-item type="text" name="是否申报" v-model="m.apply" br></sa-item>
-						<sa-item type="text" name="申报时间" v-model="m.applyTime" br></sa-item>
-						<sa-item type="text" name="申报结果" v-model="m.applyResult" br></sa-item>
-						<sa-item type="text" name="" v-model="m.applyFailReason" br></sa-item>
-						<sa-item type="enum" name="分配方式" v-model="m.distribution" :jv="{0: '均分', 1: '自选数量'}" jtype="3" br></sa-item>
-						<sa-item type="enum" name="是否确认" v-model="m.confirm" :jv="{0: '否', 1: '是'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="是否接单" v-model="m.pick" br></sa-item>
-						<sa-item type="text" name="接单时间" v-model="m.pickTime" br></sa-item>
-						<sa-item type="text" name="" v-model="m.shopId" br></sa-item>
-						<sa-item type="text" name="" v-model="m.shopName" br></sa-item>
-						<sa-item type="text" name="是否发货" v-model="m.send" br></sa-item>
-						<sa-item type="text" name="发货时间" v-model="m.sendTime" br></sa-item>
-						<sa-item type="text" name="对应二级市场中的收购单ID" v-model="m.levelTwoOrderId" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
-						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
-						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
-						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<sa-item type="text" name="" v-model="m.receiveAddress" br></sa-item> -->
+						<!-- <sa-item type="text" name="" v-model="m.applyFailReason" br></sa-item> -->
+						<!-- <sa-item type="text" name="" v-model="m.shopId" br></sa-item>
+						<sa-item type="text" name="" v-model="m.shopName" br></sa-item> -->
+						<!-- <sa-item type="text" name="对应二级市场中的收购单ID" v-model="m.levelTwoOrderId" 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>

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

@@ -23,56 +23,134 @@
 			<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 name="" br>{{m.tradeAreaId}}</sa-info>
+						<!-- <sa-info name="" br>{{m.tradeAreaId}}</sa-info>
 						<sa-info name="" br>{{m.tradeAreaName}}</sa-info>
 						<sa-info name="" br>{{m.addressIds}}</sa-info>
-						<sa-info name="" br>{{m.saleMainId}}</sa-info>
-						<sa-info name="订单号" br>{{m.tradeNo}}</sa-info>
-						<sa-info type="num" name="买家ID" :value="m.buyUserId" br></sa-info>
-						<sa-info name="买家" br>{{m.buyUserName}}</sa-info>
-						<sa-info type="num" name="购买用户类型" :value="m.buyUserType" br></sa-info>
-						<sa-info type="num" name="商家ID" :value="m.enterpriseId" br></sa-info>
-						<sa-info name="商家名称" br>{{m.enterpriseName}}</sa-info>
-						<sa-info name="总重量" br>{{m.totalWeight}}</sa-info>
-						<sa-info name="总金额" br>{{m.totalPrice}}</sa-info>
-						<sa-info type="datetime" name="交易时间" :value="m.tradeTime" br></sa-info>
-						<sa-info type="enum" name="交易状态" :value="m.tradeStatus" :jv="{0: '未支付', 1: '已支付'}" br></sa-info>
-						<sa-info name="支付方式" br>{{m.payType}}</sa-info>
-						<sa-info name="结算时间" br>{{m.settleTime}}</sa-info>
-						<sa-info name="当前结算金额" br>{{m.realPrice}}</sa-info>
-						<sa-info name="应结金额" br>{{m.shouldPrice}}</sa-info>
-						<sa-info name="对账人" br>{{m.settleUserId}}</sa-info>
-						<sa-info name="对账人员" br>{{m.recordUserId}}</sa-info>
-						<sa-info name="对账时间" br>{{m.recordTime}}</sa-info>
-						<sa-info name="是否对账" br>{{m.record}}</sa-info>
-						<sa-info name="退款原因" br>{{m.refundReason}}</sa-info>
-						<sa-info name="退款时间" br>{{m.refundTime}}</sa-info>
-						<sa-info name="" br>{{m.receiveName}}</sa-info>
+						<sa-info name="" br>{{m.saleMainId}}</sa-info> -->
+						<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 type="num" name="购买用户类型" :value="m.buyUserType" br></sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="商家名称" br>{{m.enterpriseName}}</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 type="datetime" name="交易时间" :value="m.tradeTime" br></sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info type="enum" name="交易状态" :value="m.tradeStatus" :jv="{0: '未支付', 1: '已支付'}" br></sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="支付方式" br>{{m.payType}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="结算时间" br>{{m.settleTime}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="当前结算金额" br>{{m.realPrice}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="应结金额" br>{{m.shouldPrice}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="对账人" br>{{m.settleUserId}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="对账人员" br>{{m.recordUserId}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="对账时间" br>{{m.recordTime}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="是否对账" br>{{m.record}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="退款原因" br>{{m.refundReason}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="退款时间" br>{{m.refundTime}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="出互市区时间" br>{{m.outTime}}</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.apply}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="申报时间" br>{{m.applyTime}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="申报结果" br>{{m.applyResult}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info type="enum" name="分配方式" :value="m.distribution" :jv="{0: '均分', 1: '自选数量'}" br></sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info type="enum" name="是否确认" :value="m.confirm" :jv="{0: '否', 1: '是'}" br></sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="是否接单" br>{{m.pick}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="接单时间" br>{{m.pickTime}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="店铺名称" br>{{m.shopName}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="是否发货" br>{{m.send}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="发货时间" br>{{m.sendTime}}</sa-info>
+							</el-col>
+						</el-row>
+						<!-- <sa-info name="" br>{{m.receiveName}}</sa-info>
 						<sa-info name="" br>{{m.receivePhone}}</sa-info>
-						<sa-info name="" br>{{m.receiveAddress}}</sa-info>
-						<sa-info name="出互市区时间" br>{{m.outTime}}</sa-info>
-						<sa-info name="商品名称字符串" br>{{m.goodsNames}}</sa-info>
-						<sa-info name="是否申报" br>{{m.apply}}</sa-info>
-						<sa-info name="申报时间" br>{{m.applyTime}}</sa-info>
-						<sa-info name="申报结果" br>{{m.applyResult}}</sa-info>
-						<sa-info name="" br>{{m.applyFailReason}}</sa-info>
-						<sa-info type="enum" name="分配方式" :value="m.distribution" :jv="{0: '均分', 1: '自选数量'}" br></sa-info>
-						<sa-info type="enum" name="是否确认" :value="m.confirm" :jv="{0: '否', 1: '是'}" br></sa-info>
-						<sa-info name="是否接单" br>{{m.pick}}</sa-info>
-						<sa-info name="接单时间" br>{{m.pickTime}}</sa-info>
-						<sa-info name="" br>{{m.shopId}}</sa-info>
-						<sa-info name="" br>{{m.shopName}}</sa-info>
-						<sa-info name="是否发货" br>{{m.send}}</sa-info>
-						<sa-info name="发货时间" br>{{m.sendTime}}</sa-info>
-						<sa-info name="对应二级市场中的收购单ID" br>{{m.levelTwoOrderId}}</sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-						<sa-info name="更新人编号" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新人名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+						<sa-info name="" br>{{m.receiveAddress}}</sa-info> -->
+						<!-- <sa-info name="" br>{{m.applyFailReason}}</sa-info> -->
 					</el-form>
 				</div>
 			</div>

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

@@ -18,82 +18,29 @@
 		<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="num" name="主键" v-model="p.id"></sa-item>
-					<sa-item type="text" name="" v-model="p.tradeAreaId"></sa-item>
-					<sa-item type="text" name="" v-model="p.tradeAreaName"></sa-item>
-					<sa-item type="text" name="" v-model="p.addressIds"></sa-item>
-					<sa-item type="text" name="" v-model="p.saleMainId"></sa-item>
 					<sa-item type="text" name="订单号" v-model="p.tradeNo"></sa-item>
-					<sa-item type="num" name="买家ID" v-model="p.buyUserId"></sa-item>
 					<sa-item type="text" name="买家" v-model="p.buyUserName"></sa-item>
-					<sa-item type="num" name="购买用户类型" v-model="p.buyUserType"></sa-item>
-					<sa-item type="num" name="商家ID" v-model="p.enterpriseId"></sa-item>
 					<sa-item type="text" name="商家名称" v-model="p.enterpriseName"></sa-item>
-					<sa-item type="text" name="总重量" v-model="p.totalWeight"></sa-item>
-					<sa-item type="text" name="总金额" v-model="p.totalPrice"></sa-item>
-					<sa-item type="enum" name="交易状态" v-model="p.tradeStatus" 
-						:jv="{0: '未支付', 1: '已支付'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="支付方式" v-model="p.payType"></sa-item>
-					<sa-item type="text" name="结算时间" v-model="p.settleTime"></sa-item>
-					<sa-item type="text" name="当前结算金额" v-model="p.realPrice"></sa-item>
-					<sa-item type="text" name="应结金额" v-model="p.shouldPrice"></sa-item>
-					<sa-item type="text" name="对账人" v-model="p.settleUserId"></sa-item>
-					<sa-item type="text" name="对账人员" v-model="p.recordUserId"></sa-item>
-					<sa-item type="text" name="对账时间" v-model="p.recordTime"></sa-item>
-					<sa-item type="text" name="是否对账" v-model="p.record"></sa-item>
-					<sa-item type="text" name="退款原因" v-model="p.refundReason"></sa-item>
-					<sa-item type="text" name="退款时间" v-model="p.refundTime"></sa-item>
-					<sa-item type="text" name="" v-model="p.receiveName"></sa-item>
-					<sa-item type="text" name="" v-model="p.receivePhone"></sa-item>
-					<sa-item type="text" name="" v-model="p.receiveAddress"></sa-item>
-					<sa-item type="text" name="出互市区时间" v-model="p.outTime"></sa-item>
-					<sa-item type="text" name="商品名称字符串" v-model="p.goodsNames"></sa-item>
-					<sa-item type="text" name="是否申报" v-model="p.apply"></sa-item>
-					<sa-item type="text" name="申报时间" v-model="p.applyTime"></sa-item>
-					<sa-item type="text" name="申报结果" v-model="p.applyResult"></sa-item>
-					<sa-item type="text" name="" v-model="p.applyFailReason"></sa-item>
-					<sa-item type="enum" name="分配方式" v-model="p.distribution" 
-						:jv="{0: '均分', 1: '自选数量'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="enum" name="是否确认" v-model="p.confirm" 
-						:jv="{0: '否', 1: '是'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="是否接单" v-model="p.pick"></sa-item>
-					<sa-item type="text" name="接单时间" v-model="p.pickTime"></sa-item>
-					<sa-item type="text" name="" v-model="p.shopId"></sa-item>
-					<sa-item type="text" name="" v-model="p.shopName"></sa-item>
-					<sa-item type="text" name="是否发货" v-model="p.send"></sa-item>
-					<sa-item type="text" name="发货时间" v-model="p.sendTime"></sa-item>
-					<sa-item type="text" name="对应二级市场中的收购单ID" v-model="p.levelTwoOrderId"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="创建人编号" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建人名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>
-					<sa-item type="text" name="更新人编号" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新人名称" v-model="p.updateName"></sa-item>
-					<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-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-order-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="tradeAreaId" ></sa-td>
+					<!-- <sa-td name="" prop="tradeAreaId" ></sa-td>
 					<sa-td name="" prop="tradeAreaName" ></sa-td>
 					<sa-td name="" prop="addressIds" ></sa-td>
-					<sa-td name="" prop="saleMainId" ></sa-td>
+					<sa-td name="" prop="saleMainId" ></sa-td> -->
 					<sa-td name="订单号" prop="tradeNo" ></sa-td>
 					<sa-td name="买家ID" prop="buyUserId" type="num"></sa-td>
 					<sa-td name="买家" prop="buyUserName" ></sa-td>
 					<sa-td name="购买用户类型" prop="buyUserType" type="num"></sa-td>
-					<sa-td name="商家ID" prop="enterpriseId" type="num"></sa-td>
 					<sa-td name="商家名称" prop="enterpriseName" ></sa-td>
 					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 					<sa-td name="总金额" prop="totalPrice" ></sa-td>
@@ -109,31 +56,23 @@
 					<sa-td name="是否对账" prop="record" ></sa-td>
 					<sa-td name="退款原因" prop="refundReason" ></sa-td>
 					<sa-td name="退款时间" prop="refundTime" ></sa-td>
-					<sa-td name="" prop="receiveName" ></sa-td>
+					<!-- <sa-td name="" prop="receiveName" ></sa-td>
 					<sa-td name="" prop="receivePhone" ></sa-td>
-					<sa-td name="" prop="receiveAddress" ></sa-td>
+					<sa-td name="" prop="receiveAddress" ></sa-td> -->
 					<sa-td name="出互市区时间" prop="outTime" ></sa-td>
 					<sa-td name="商品名称字符串" prop="goodsNames" ></sa-td>
 					<sa-td name="是否申报" prop="apply" ></sa-td>
 					<sa-td name="申报时间" prop="applyTime" ></sa-td>
 					<sa-td name="申报结果" prop="applyResult" ></sa-td>
-					<sa-td name="" prop="applyFailReason" ></sa-td>
+					<!-- <sa-td name="" prop="applyFailReason" ></sa-td> -->
 					<sa-td name="分配方式" prop="distribution" type="enum" :jv="{0: '均分', 1: '自选数量'}"></sa-td>
 					<sa-td name="是否确认" prop="confirm" type="enum" :jv="{0: '否', 1: '是'}"></sa-td>
 					<sa-td name="是否接单" prop="pick" ></sa-td>
 					<sa-td name="接单时间" prop="pickTime" ></sa-td>
-					<sa-td name="" prop="shopId" ></sa-td>
-					<sa-td name="" prop="shopName" ></sa-td>
+					<sa-td name="店铺名称" prop="shopName" ></sa-td>
 					<sa-td name="是否发货" prop="send" ></sa-td>
 					<sa-td name="发货时间" prop="sendTime" ></sa-td>
-					<sa-td name="对应二级市场中的收购单ID" prop="levelTwoOrderId" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></sa-td>
-					<sa-td name="创建人编号" prop="createBy" ></sa-td>
-					<sa-td name="创建人名称" prop="createName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" ></sa-td>
-					<sa-td name="更新人编号" prop="updateBy" ></sa-td>
-					<sa-td name="更新人名称" prop="updateName" ></sa-td>
-					<sa-td name="删除状态" prop="deleteStatus" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateDeleteStatus(s.row)"></sa-td>
+					<!-- <sa-td name="删除状态" prop="deleteStatus" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateDeleteStatus(s.row)"></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>
@@ -155,55 +94,9 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数  
-						id: '',		// 主键 
-						tradeAreaId: '',		//  
-						tradeAreaName: '',		//  
-						addressIds: '',		//  
-						saleMainId: '',		//  
-						tradeNo: '',		// 订单号 
-						buyUserId: '',		// 买家ID 
+						tradeNo: '',		    // 订单号 
 						buyUserName: '',		// 买家 
-						buyUserType: '',		// 购买用户类型(3=边民,2=组长) 
-						enterpriseId: '',		// 商家ID 
 						enterpriseName: '',		// 商家名称 
-						totalWeight: '',		// 总重量 
-						totalPrice: '',		// 总金额 
-						tradeStatus: '',		// 交易状态(0=未支付,1=已支付) 
-						payType: '',		// 支付方式(0=金融互助,1=现金刷卡) 
-						settleTime: '',		// 结算时间 
-						realPrice: '',		// 当前结算金额 
-						shouldPrice: '',		// 应结金额 
-						settleUserId: '',		// 对账人 
-						recordUserId: '',		// 对账人员 
-						recordTime: '',		// 对账时间 
-						record: '',		// 是否对账(0=否,) 
-						refundReason: '',		// 退款原因 
-						refundTime: '',		// 退款时间 
-						receiveName: '',		//  
-						receivePhone: '',		//  
-						receiveAddress: '',		//  
-						outTime: '',		// 出互市区时间 
-						goodsNames: '',		// 商品名称字符串 
-						apply: '',		// 是否申报 
-						applyTime: '',		// 申报时间 
-						applyResult: '',		// 申报结果 
-						applyFailReason: '',		//  
-						distribution: '',		// 分配方式(0=均分,1=自选数量) 
-						confirm: '',		// 是否确认(0=否,1=是) 
-						pick: '',		// 是否接单 
-						pickTime: '',		// 接单时间 
-						shopId: '',		//  
-						shopName: '',		//  
-						send: '',		// 是否发货 
-						sendTime: '',		// 发货时间 
-						levelTwoOrderId: '',		// 对应二级市场中的收购单ID 
-						createTime: '',		// 创建时间 
-						createBy: '',		// 创建人编号 
-						createName: '',		// 创建人名称 
-						updateTime: '',		// 更新时间 
-						updateBy: '',		// 更新人编号 
-						updateName: '',		// 更新人名称 
-						deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
 						pageNo: 1,		// 当前页 
 						pageSize: 10,	// 页大小 
 						sortType: 0		// 排序方式 

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

@@ -28,20 +28,54 @@
                     <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.orderNo" br></sa-item>
-						<sa-item type="text" name="商品名称" v-model="m.goodsName" br></sa-item>
-						<sa-item type="text" name="商品来源" v-model="m.goodsFrom" br></sa-item>
-						<sa-item type="text" name="发货商电话" v-model="m.shipperPhone" br></sa-item>
-						<sa-item type="text" name="发货商名称" v-model="m.shipperName" br></sa-item>
-						<sa-item type="text" name="司机ID" v-model="m.driverId" br></sa-item>
-						<sa-item type="text" name="司机名称" v-model="m.driverName" br></sa-item>
-						<sa-item type="text" name="司机电话" v-model="m.driverPhone" br></sa-item>
-						<sa-item type="text" name="车型ID" v-model="m.carId" br></sa-item>
-						<sa-item type="text" name="车型名称" v-model="m.carType" br></sa-item>
-						<sa-item type="text" name="收货人名称" v-model="m.consigneeName" br></sa-item>
-						<sa-item type="text" name="收货人电话号码" v-model="m.consigneePhone" br></sa-item>
-						<sa-item type="text" name="申报订单号" v-model="m.declarationNumber" br></sa-item>
-						<sa-item type="enum" name="订单状态已完成" v-model="m.orderFinish" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="订单编号" v-model="m.orderNo" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="商品名称" v-model="m.goodsName" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="商品来源" v-model="m.goodsFrom" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="发货商电话" v-model="m.shipperPhone" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="发货商名称" v-model="m.shipperName" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="司机名称" v-model="m.driverName" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="司机电话" v-model="m.driverPhone" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="车型名称" v-model="m.carType" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="收货人名称" v-model="m.consigneeName" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="收货人电话号码" v-model="m.consigneePhone" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="申报订单号" v-model="m.declarationNumber" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="enum" name="订单状态已完成" v-model="m.orderFinish" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+							</el-col>
+						</el-row>
 						<!-- <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-view/tb-orders/tb-orders-info.html

@@ -25,21 +25,54 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="订单编号" br>{{m.orderNo}}</sa-info>
-						<sa-info name="商品id" br>{{m.goodsId}}</sa-info>
-						<sa-info name="商品名称" br>{{m.goodsName}}</sa-info>
-						<sa-info name="商品来源" br>{{m.goodsFrom}}</sa-info>
-						<sa-info name="发货商电话" br>{{m.shipperPhone}}</sa-info>
-						<sa-info name="发货商名称" br>{{m.shipperName}}</sa-info>
-						<sa-info name="司机ID" br>{{m.driverId}}</sa-info>
-						<sa-info name="司机名称" br>{{m.driverName}}</sa-info>
-						<sa-info name="司机电话" br>{{m.driverPhone}}</sa-info>
-						<sa-info name="车型ID" br>{{m.carId}}</sa-info>
-						<sa-info name="车型名称" br>{{m.carType}}</sa-info>
-						<sa-info name="收货人名称" br>{{m.consigneeName}}</sa-info>
-						<sa-info name="收货人电话号码" br>{{m.consigneePhone}}</sa-info>
-						<sa-info name="申报订单号" br>{{m.declarationNumber}}</sa-info>
-						<sa-info type="enum" name="订单状态已完成" :value="m.orderFinish" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+						<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.shipperPhone}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="发货商名称" br>{{m.shipperName}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="司机名称" br>{{m.driverName}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="司机电话" br>{{m.driverPhone}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="车型名称" br>{{m.carType}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="收货人名称" br>{{m.consigneeName}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="收货人电话号码" br>{{m.consigneePhone}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="申报订单号" br>{{m.declarationNumber}}</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>
 						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
 					</el-form>
 				</div>

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

@@ -28,27 +28,92 @@
                     <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.code" br></sa-item>
-						<sa-item type="enum" name="性别" v-model="m.sex" :jv="{1: '男', 2: '女'}" jtype="3" br></sa-item>
-						<sa-item type="num" name="年龄" v-model="m.age" br></sa-item>
-						<sa-item type="text" name="身份证" v-model="m.idCard" br></sa-item>
-						<sa-item type="img-list" name="身份证复印件" v-model="m.idCardImg" br></sa-item>
-						<sa-item type="text" name="手机号码" v-model="m.phone" br></sa-item>
-						<sa-item type="text" name="银行编号" v-model="m.bankNo" br></sa-item>
-						<sa-item type="text" name="银行卡号" v-model="m.bankCode" br></sa-item>
-						<sa-item type="text" name="银行名称" v-model="m.bankName" br></sa-item>
-						<sa-item type="enum" name="所属互助组" v-model="m.groupId" :jv="{1: '测试组'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="互助组名称" v-model="m.groupName" 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="经度" v-model="m.lng" br></sa-item>
-						<sa-item type="text" name="纬度" v-model="m.lat" br></sa-item>
-						<sa-item type="text" name="最后一次下单定位" v-model="m.lastLocation" br></sa-item>
-						<sa-item type="text" name="联系地址" v-model="m.address" br></sa-item>
-						<sa-item type="text" name="地址ID" v-model="m.addressIds" br></sa-item>
-						<sa-item type="text" name="详细地址" v-model="m.detailAddress" br></sa-item>
-						<sa-item type="text" name="是否锁定" v-model="m.isLock" br></sa-item>
-						<sa-item type="text" name="当天剩余额度" v-model="m.leftPrice" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="姓名" v-model="m.name" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="边民号" v-model="m.code" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="enum" name="性别" v-model="m.sex" :jv="{1: '男', 2: '女'}" jtype="3" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="num" name="年龄" v-model="m.age" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="身份证" v-model="m.idCard" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="img-list" name="身份证复印件" v-model="m.idCardImg" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="手机号码" v-model="m.phone" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="银行编号" v-model="m.bankNo" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="银行卡号" v-model="m.bankCode" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="银行名称" v-model="m.bankName" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="enum" name="所属互助组" v-model="m.groupId" :jv="{1: '测试组'}" jtype="3" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="互助组名称" v-model="m.groupName" 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-col :span="12">
+								<sa-item type="text" name="经度" v-model="m.lng" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="纬度" v-model="m.lat" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="最后一次下单定位" v-model="m.lastLocation" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="联系地址" v-model="m.address" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="详细地址" v-model="m.detailAddress" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="是否锁定" v-model="m.isLock" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="当天剩余额度" v-model="m.leftPrice" 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-view/tb-people/tb-people-info.html

@@ -27,28 +27,92 @@
 			<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.code}}</sa-info>
-						<sa-info type="enum" name="性别" :value="m.sex" :jv="{1: '男', 2: '女'}" br></sa-info>
-						<sa-info type="num" name="年龄" :value="m.age" br></sa-info>
-						<sa-info name="身份证" br>{{m.idCard}}</sa-info>
-						<sa-info type="img-list" name="身份证复印件" :value="m.idCardImg" br></sa-info>
-						<sa-info name="手机号码" br>{{m.phone}}</sa-info>
-						<sa-info name="银行编号" br>{{m.bankNo}}</sa-info>
-						<sa-info name="银行卡号" br>{{m.bankCode}}</sa-info>
-						<sa-info name="银行名称" br>{{m.bankName}}</sa-info>
-						<sa-info type="enum" name="所属互助组" :value="m.groupId" :jv="{1: '测试组'}" br></sa-info>
-						<sa-info name="互助组名称" br>{{m.groupName}}</sa-info>
-						<sa-info type="enum" name="是否可用" :value="m.status" :jv="{0: '否', 1: '是'}" br></sa-info>
-						<sa-info type="num" name="角色" :value="m.role" br></sa-info>
-						<sa-info name="经度" br>{{m.lng}}</sa-info>
-						<sa-info name="纬度" br>{{m.lat}}</sa-info>
-						<sa-info name="最后一次下单定位" br>{{m.lastLocation}}</sa-info>
-						<sa-info name="联系地址" br>{{m.address}}</sa-info>
-						<sa-info name="地址ID" br>{{m.addressIds}}</sa-info>
-						<sa-info name="详细地址" br>{{m.detailAddress}}</sa-info>
-						<sa-info name="是否锁定" br>{{m.isLock}}</sa-info>
-						<sa-info name="当天剩余额度" br>{{m.leftPrice}}</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.code}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info type="enum" name="性别" :value="m.sex" :jv="{1: '男', 2: '女'}" br></sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info type="num" name="年龄" :value="m.age" br></sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="身份证" br>{{m.idCard}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info type="img-list" name="身份证复印件" :value="m.idCardImg" br></sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="手机号码" br>{{m.phone}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="银行编号" br>{{m.bankNo}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="银行卡号" br>{{m.bankCode}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="银行名称" br>{{m.bankName}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info type="enum" name="所属互助组" :value="m.groupId" :jv="{1: '测试组'}" br></sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="互助组名称" br>{{m.groupName}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info type="enum" name="是否可用" :value="m.status" :jv="{0: '否', 1: '是'}" br></sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info type="num" name="角色" :value="m.role" br></sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="经度" br>{{m.lng}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="纬度" br>{{m.lat}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="最后一次下单定位" br>{{m.lastLocation}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="联系地址" br>{{m.address}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="详细地址" br>{{m.detailAddress}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="是否锁定" br>{{m.isLock}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="当天剩余额度" br>{{m.leftPrice}}</sa-info>
+							</el-col>
+						</el-row>
+
 						<!-- <sa-info name="" br>{{m.judgeStatus}}</sa-info>
 						<sa-info name="" br>{{m.judgeContent}}</sa-info>
 						<sa-info name="" br>{{m.registerTime}}</sa-info>

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

@@ -54,7 +54,7 @@
 					<sa-td name="纬度" prop="lat" ></sa-td>
 					<sa-td name="最后一次下单定位" prop="lastLocation" ></sa-td>
 					<sa-td name="联系地址" prop="address" ></sa-td>
-					<sa-td name="地址ID" prop="addressIds" ></sa-td>
+					<!-- <sa-td name="地址ID" prop="addressIds" ></sa-td> -->
 					<sa-td name="详细地址" prop="detailAddress" ></sa-td>
 					<sa-td name="是否锁定" prop="isLock" ></sa-td>
 					<sa-td name="当天剩余额度" prop="leftPrice" ></sa-td>

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

@@ -39,15 +39,43 @@ tb-port-news-add.html 5.7 KB
                         <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.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="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>
+							<el-row :gutter="50">
+								<el-col :span="12">
+									<sa-item type="text" name="标题" v-model="m.title" br></sa-item>
+								</el-col>
+								<el-col :span="12">
+									<sa-item type="img" name="封面图片" v-model="m.cover" br></sa-item>
+								</el-col>
+							</el-row>
+    						<el-row :gutter="50">
+								<el-col :span="12">
+									<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">
+									<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-col>
+							</el-row>
     						<sa-item name="" class="s-ok" br>
     							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
     						</sa-item>

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

@@ -27,22 +27,43 @@
 			<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 name="标题" br>{{m.title}}</sa-info>
-						<sa-info type="img" name="封面图片" :value="m.cover" br></sa-info>
-						<sa-info name="链接地址" br>{{m.url}}</sa-info>
-						<sa-info type="richtext" name="内容" :value="m.content" br></sa-info>
-						<sa-info name="来源" br>{{m.source}}</sa-info>
-						<sa-info name="阅读量" br>{{m.readCount}}</sa-info>
-						<sa-info type="enum" name="发布状态" :value="m.isRelease" :jv="{0: '未发布', 1: '发布'}" br></sa-info>
-						<sa-info name="发布时间" br>{{m.releaseTime}}</sa-info>
-						<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
-						<sa-info name="创建者id" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建者名称" br>{{m.createName}}</sa-info>
-						<sa-info type="datetime" name="创建时间" :value="m.createTime" br></sa-info>
-						<sa-info name="更新者id" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新者名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="datetime" name="更新时间" :value="m.updateTime" br></sa-info>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="标题" br>{{m.title}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info type="img" name="封面图片" :value="m.cover" br></sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="链接地址" br>{{m.url}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info type="richtext" name="内容" :value="m.content" br></sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="来源" br>{{m.source}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="阅读量" br>{{m.readCount}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info type="enum" name="发布状态" :value="m.isRelease" :jv="{0: '未发布', 1: '发布'}" br></sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="发布时间" br>{{m.releaseTime}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+							</el-col>
+						</el-row>
 					</el-form>
 				</div>
 			</div>

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

@@ -24,7 +24,7 @@ tb-port-news-list.html 6.9 KB
     		<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.title"></sa-item>
     					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>

static/sa.js

@@ -9,13 +9,9 @@ var sa = {
 (function() {
 	// 公司开发环境
 	var cfg_dev = {
-<<<<<<< HEAD
-		api_url: 'http://127.0.0.1:8080',	// 所有ajax请求接口父地址
-		web_url: 'http://www.baidu.com'		// 此项目前台地址 (此配置项非必须)
-=======
-		api_url: 'http://127.0.0.1:8080', // 所有ajax请求接口父地址
+		// api_url: 'http://127.0.0.1:8080', // 所有ajax请求接口父地址
+		api_url: 'http://192.168.88.34:8080', 
 		web_url: 'http://www.baidu.com' // 此项目前台地址 (此配置项非必须)
->>>>>>> d18a8230950303f464cae1101cbfe13b72b6404c
 	}
 	// 服务器测试环境
 	var cfg_test = {