修改了页面样式

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

@@ -27,17 +27,23 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-					<!-- 	<sa-item type="num" name="主键" v-model="m.id" br></sa-item> -->
-						<sa-item type="text" name="标题" v-model="m.title" br></sa-item>
-						<sa-item type="img" name="轮播图片" v-model="m.image" br></sa-item>
-						<sa-item type="text" name="跳转链接" v-model="m.url" br></sa-item>
-						<sa-item type="enum" name="状态" v-model="m.status" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
-					<!-- 	<sa-item type="text" name="创建者id" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建者名称" v-model="m.createName" br></sa-item> -->
-						<!-- date-create字段： m.createTime - 创建时间 -->
-	<!-- 					<sa-item type="text" name="更新者id" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新者名称" v-model="m.updateName" br></sa-item> -->
-						<!-- date-update字段： m.updateTime - 更新时间 -->
+						<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.image" 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="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>
@@ -65,36 +71,20 @@
 					// 创建一个 默认Model 
 					createModel: function() {
 						return {
-							id: '',		// 主键 
 							title: '',		// 标题 
 							image: '',		// 轮播图片 
 							url: '',		// 跳转链接 
 							status: '',		// 状态(0=禁用,1=启用) 
-							createBy: '',		// 创建者id 
-							createName: '',		// 创建者名称 
-							// createTime: '',		// 创建时间 
-							updateBy: '',		// 更新者id 
-							updateName: '',		// 更新者名称 
-							// updateTime: '',		// 更新时间 
-							// deleteStatus: '',		// 删除状态 
 						}
 					},
 					// 提交数据 
 					ok: function(){
 						// 表单校验 
 						let m = this.m;
-						// sa.checkNull(m.id, '请输入 [主键]');
 						sa.checkNull(m.title, '请输入 [标题]');
 						sa.checkNull(m.image, '请输入 [轮播图片]');
 						sa.checkNull(m.url, '请输入 [跳转链接]');
 						sa.checkNull(m.status, '请输入 [状态]');
-						// sa.checkNull(m.createBy, '请输入 [创建者id]');
-						// sa.checkNull(m.createName, '请输入 [创建者名称]');
-						// sa.checkNull(m.createTime, '请输入 [创建时间]');
-						// sa.checkNull(m.updateBy, '请输入 [更新者id]');
-						// sa.checkNull(m.updateName, '请输入 [更新者名称]');
-						// sa.checkNull(m.updateTime, '请输入 [更新时间]');
-						// sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
 				
 						// 开始增加或修改
 						this.m.createTime = undefined;		// 不提交属性：创建时间

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

@@ -23,17 +23,22 @@
 			<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.image" br></sa-info>
-						<sa-info name="跳转链接" br>{{m.url}}</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.image" 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="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+							</el-col>
+						</el-row>
 					</el-form>
 				</div>
 			</div>

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

@@ -20,16 +20,8 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<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.title"></sa-item>
-					<!-- 未识别类型：跳转链接: p.url 请检查配置 -->
-					<!-- <sa-item type="enum" name="状态" v-model="p.status" 
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="创建者id" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建者名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新者id" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新者名称" v-model="p.updateName"></sa-item> -->
-					<!-- 未识别类型：删除状态: p.deleteStatus 请检查配置 -->
+				
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 				</el-form>
@@ -40,17 +32,10 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
-					<sa-td name="主键" prop="id" type="num"></sa-td>
 					<sa-td name="标题" prop="title" ></sa-td>
 					<sa-td name="轮播图片" prop="image" type="img"></sa-td>
 					<sa-td name="跳转链接" prop="url" type="link"></sa-td>
 					<sa-td name="状态" prop="status" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateStatus(s.row)"></sa-td>
-					<sa-td name="创建者id" prop="createBy" ></sa-td>
-					<sa-td name="创建者名称" prop="createName" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" type="datetime"></sa-td>
-					<sa-td name="更新者id" prop="updateBy" ></sa-td>
-					<sa-td name="更新者名称" prop="updateName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" type="datetime"></sa-td>
 					<el-table-column label="操作" fixed="right"  width="240px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>

sa-view/tb-favorite-contacts/tb-favorite-contacts-add.html

@@ -26,17 +26,22 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item type="num" name="主键" v-model="m.id" br></sa-item>
-						<sa-item type="text" name="姓名" v-model="m.name" br></sa-item>
-						<sa-item type="text" name="手机号" v-model="m.phone" br></sa-item>
-						<sa-item type="text" name="联系地址" v-model="m.address" br></sa-item>
-						<sa-item type="text" name="管理人" v-model="m.fkAppUserId" br></sa-item>
-						<!-- date-create字段： m.createTime - 创建时间 -->
-						<sa-item type="text" name="创建者id" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建者名称" v-model="m.createName" br></sa-item>
-						<!-- date-update字段： m.updateTime - 更新时间 -->
-						<sa-item type="text" name="更新者id" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新者名称" v-model="m.updateName" br></sa-item>
+						<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.phone" 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.fkAppUserId" 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>
@@ -64,17 +69,10 @@
 					// 创建一个 默认Model 
 					createModel: function() {
 						return {
-							id: '',		// 主键 
 							name: '',		// 姓名 
 							phone: '',		// 手机号 
 							address: '',		// 联系地址 
 							fkAppUserId: '',		// 管理人(外联id,与app_user表的id相等) 
-							// createTime: '',		// 创建时间 
-							createBy: '',		// 创建者id 
-							createName: '',		// 创建者名称 
-							// updateTime: '',		// 更新时间 
-							updateBy: '',		// 更新者id 
-							updateName: '',		// 更新者名称 
 							// deleteStatus: '',		// 删除状态 
 						}
 					},

sa-view/tb-favorite-contacts/tb-favorite-contacts-info.html

@@ -23,17 +23,22 @@
 			<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.phone}}</sa-info>
-						<sa-info name="联系地址" br>{{m.address}}</sa-info>
-						<sa-info name="管理人" br>{{m.fkAppUserId}}</sa-info>
-						<sa-info type="datetime" name="创建时间" :value="m.createTime" 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.updateTime" br></sa-info>
-						<sa-info name="更新者id" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新者名称" br>{{m.updateName}}</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.phone}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="联系地址" br>{{m.address}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="管理人" br>{{m.fkAppUserId}}</sa-info>
+							</el-col>
+						</el-row>
 					</el-form>
 				</div>
 			</div>

sa-view/tb-favorite-contacts/tb-favorite-contacts-list.html

@@ -20,16 +20,8 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<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.name"></sa-item>
 					<sa-item type="text" name="手机号" v-model="p.phone"></sa-item>
-					<sa-item type="text" name="联系地址" v-model="p.address"></sa-item>
-					<sa-item type="text" name="管理人" v-model="p.fkAppUserId"></sa-item>
-					<sa-item type="text" name="创建者id" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建者名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新者id" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新者名称" v-model="p.updateName"></sa-item>
-					<!-- 未识别类型：删除状态: p.deleteStatus 请检查配置 -->
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 				</el-form>
@@ -40,17 +32,11 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="name" ></sa-td>
 					<sa-td name="手机号" prop="phone" ></sa-td>
 					<sa-td name="联系地址" prop="address" ></sa-td>
 					<sa-td name="管理人" prop="fkAppUserId" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" type="datetime"></sa-td>
-					<sa-td name="创建者id" prop="createBy" ></sa-td>
-					<sa-td name="创建者名称" prop="createName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" type="datetime"></sa-td>
-					<sa-td name="更新者id" prop="updateBy" ></sa-td>
-					<sa-td name="更新者名称" prop="updateName" ></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>
@@ -72,15 +58,8 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数  
-						id: '',		// 主键 
 						name: '',		// 姓名 
-						phone: '',		// 手机号 
-						address: '',		// 联系地址 
-						fkAppUserId: '',		// 管理人(外联id,与app_user表的id相等) 
-						createBy: '',		// 创建者id 
-						createName: '',		// 创建者名称 
-						updateBy: '',		// 更新者id 
-						updateName: '',		// 更新者名称 
+						phone: '',		// 手机号
 						pageNo: 1,		// 当前页 
 						pageSize: 10,	// 页大小 
 						sortType: 0		// 排序方式 

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

@@ -26,15 +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="该地址拥有者主键" v-model="m.owner" br></sa-item>
-						<sa-item type="text" name="省" v-model="m.province" br></sa-item>
-						<sa-item type="text" name="市" v-model="m.city" br></sa-item>
-						<sa-item type="text" name="镇/区" v-model="m.town" br></sa-item>
-						<sa-item type="text" name="街道" v-model="m.street" br></sa-item>
-						<sa-item type="text" name="楼号" v-model="m.buildingNo" br></sa-item>
-						<sa-item type="text" name="地址全称" v-model="m.addressName" br></sa-item>
-						<sa-item type="text" name="邮编" v-model="m.postNum" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="省" v-model="m.province" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="市" v-model="m.city" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="镇/区" v-model="m.town" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="街道" v-model="m.street" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="楼号" v-model="m.buildingNo" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="地址全称" v-model="m.addressName" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="邮编" v-model="m.postNum" 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-purchaser-address/tb-purchaser-address-info.html

@@ -23,15 +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="该地址拥有者主键" br>{{m.owner}}</sa-info>
-						<sa-info name="省" br>{{m.province}}</sa-info>
-						<sa-info name="市" br>{{m.city}}</sa-info>
-						<sa-info name="镇/区" br>{{m.town}}</sa-info>
-						<sa-info name="街道" br>{{m.street}}</sa-info>
-						<sa-info name="楼号" br>{{m.buildingNo}}</sa-info>
-						<sa-info name="地址全称" br>{{m.addressName}}</sa-info>
-						<sa-info name="邮编" br>{{m.postNum}}</sa-info>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="省" br>{{m.province}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="市" br>{{m.city}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="镇/区" br>{{m.town}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="街道" br>{{m.street}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="楼号" br>{{m.buildingNo}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="地址全称" br>{{m.addressName}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="邮编" br>{{m.postNum}}</sa-info>
+							</el-col>
+						</el-row>		
 					</el-form>
 				</div>
 			</div>

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

@@ -20,17 +20,12 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<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="该地址拥有者主键" v-model="p.owner"></sa-item>
 					<sa-item type="text" name="省" v-model="p.province"></sa-item>
 					<sa-item type="text" name="市" v-model="p.city"></sa-item>
 					<sa-item type="text" name="镇/区" v-model="p.town"></sa-item>
 					<sa-item type="text" name="街道" v-model="p.street"></sa-item>
-					<sa-item type="text" name="楼号" v-model="p.buildingNo"></sa-item>
-					<sa-item type="text" name="地址全称" v-model="p.addressName"></sa-item>
-					<sa-item type="text" name="邮编" v-model="p.postNum"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
-					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
+					
 				</el-form>
 				<div class="fast-btn">
 					<el-button v-if="sa.isAuth('tb-purchaser-address-add')" size="mini" type="primary" @click="add()">新增</el-button>
@@ -39,8 +34,6 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="该地址拥有者主键" prop="owner" ></sa-td>
 					<sa-td name="省" prop="province" ></sa-td>
 					<sa-td name="市" prop="city" ></sa-td>
 					<sa-td name="镇/区" prop="town" ></sa-td>
@@ -69,8 +62,6 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数  
-						id: '',		// 收购商地址表主键ID 
-						owner: '',		// 该地址拥有者主键 
 						province: '',		// 省 
 						city: '',		// 市 
 						town: '',		// 镇/区 

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

@@ -26,35 +26,76 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item type="num" name="货运订单管理表主键" v-model="m.id" br></sa-item>
-						<sa-item type="text" name="一级市场订单ID" v-model="m.levelOneOrderId" br></sa-item>
-						<sa-item type="text" name="订单编号" v-model="m.orderNo" br></sa-item>
-						<sa-item type="text" name="商品id" v-model="m.goodsId" 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>
-						<sa-item type="text" name="装货地址" v-model="m.loadingAddress" br></sa-item>
-						<sa-item type="text" name="卸货地址" v-model="m.unloadingAddress" br></sa-item>
-						<sa-item type="text" name="备注" v-model="m.comment" br></sa-item>
-						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" 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.updateBy" 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="贸易区域id" v-model="m.tradeAreaId" br></sa-item>
-						<sa-item type="text" name="贸易区域名称" v-model="m.tradeAreaName" 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>
+						
+						<!-- <sa-item type="text" name="商品id" v-model="m.goodsId" br></sa-item> -->
+						<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>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="装货地址" v-model="m.loadingAddress" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="卸货地址" v-model="m.unloadingAddress" br></sa-item>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="备注" v-model="m.comment" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="贸易区域名称" v-model="m.tradeAreaName" br></sa-item>
+							</el-col>
+						</el-row>
+						<!-- <sa-item type="text" name="司机ID" v-model="m.driverId" br></sa-item> -->
+						<!-- <sa-item type="text" name="车型ID" v-model="m.carId" br></sa-item> -->
+						<!-- <sa-item type="text" name="贸易区域id" v-model="m.tradeAreaId" br></sa-item> -->
+						
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -82,18 +123,18 @@
 					// 创建一个 默认Model 
 					createModel: function() {
 						return {
-							id: '',		// 货运订单管理表主键 
-							levelOneOrderId: '',		// 一级市场订单ID 
+							// id: '',		// 货运订单管理表主键 
+							// levelOneOrderId: '',		// 一级市场订单ID 
 							orderNo: '',		// 订单编号 
-							goodsId: '',		// 商品id 
+							// goodsId: '',		// 商品id 
 							goodsName: '',		// 商品名称 
 							goodsFrom: '',		// 商品来源(国家) 
 							shipperPhone: '',		// 发货商电话 
 							shipperName: '',		// 发货商名称 
-							driverId: '',		// 司机ID 
+							// driverId: '',		// 司机ID 
 							driverName: '',		// 司机名称 
 							driverPhone: '',		// 司机电话 
-							carId: '',		// 车型ID 
+							// carId: '',		// 车型ID 
 							carType: '',		// 车型名称 
 							consigneeName: '',		// 收货人名称 
 							consigneePhone: '',		// 收货人电话号码 
@@ -102,14 +143,7 @@
 							loadingAddress: '',		// 装货地址 
 							unloadingAddress: '',		// 卸货地址 
 							comment: '',		// 备注 
-							updateTime: '',		// 更新时间 
-							createTime: '',		// 创建时间 
-							updateName: '',		// 更新人名称 
-							deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
-							updateBy: '',		// 更新人编号 
-							createBy: '',		// 创建人编号 
-							createName: '',		// 创建人名称 
-							tradeAreaId: '',		// 贸易区域id 
+							// tradeAreaId: '',		// 贸易区域id 
 							tradeAreaName: '',		// 贸易区域名称 
 						}
 					},
@@ -117,18 +151,18 @@
 					ok: function(){
 						// 表单校验 
 						let m = this.m;
-						sa.checkNull(m.id, '请输入 [货运订单管理表主键]');
-						sa.checkNull(m.levelOneOrderId, '请输入 [一级市场订单ID]');
+						// sa.checkNull(m.id, '请输入 [货运订单管理表主键]');
+						// sa.checkNull(m.levelOneOrderId, '请输入 [一级市场订单ID]');
 						sa.checkNull(m.orderNo, '请输入 [订单编号]');
-						sa.checkNull(m.goodsId, '请输入 [商品id]');
+						// sa.checkNull(m.goodsId, '请输入 [商品id]');
 						sa.checkNull(m.goodsName, '请输入 [商品名称]');
 						sa.checkNull(m.goodsFrom, '请输入 [商品来源]');
 						sa.checkNull(m.shipperPhone, '请输入 [发货商电话]');
 						sa.checkNull(m.shipperName, '请输入 [发货商名称]');
-						sa.checkNull(m.driverId, '请输入 [司机ID]');
+						// sa.checkNull(m.driverId, '请输入 [司机ID]');
 						sa.checkNull(m.driverName, '请输入 [司机名称]');
 						sa.checkNull(m.driverPhone, '请输入 [司机电话]');
-						sa.checkNull(m.carId, '请输入 [车型ID]');
+						// sa.checkNull(m.carId, '请输入 [车型ID]');
 						sa.checkNull(m.carType, '请输入 [车型名称]');
 						sa.checkNull(m.consigneeName, '请输入 [收货人名称]');
 						sa.checkNull(m.consigneePhone, '请输入 [收货人电话号码]');
@@ -137,14 +171,7 @@
 						sa.checkNull(m.loadingAddress, '请输入 [装货地址]');
 						sa.checkNull(m.unloadingAddress, '请输入 [卸货地址]');
 						sa.checkNull(m.comment, '请输入 [备注]');
-						sa.checkNull(m.updateTime, '请输入 [更新时间]');
-						sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.updateName, '请输入 [更新人名称]');
-						sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
-						sa.checkNull(m.updateBy, '请输入 [更新人编号]');
-						sa.checkNull(m.createBy, '请输入 [创建人编号]');
-						sa.checkNull(m.createName, '请输入 [创建人名称]');
-						sa.checkNull(m.tradeAreaId, '请输入 [贸易区域id]');
+						// sa.checkNull(m.tradeAreaId, '请输入 [贸易区域id]');
 						sa.checkNull(m.tradeAreaName, '请输入 [贸易区域名称]');
 				
 						// 开始增加或修改

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

@@ -23,35 +23,75 @@
 			<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.levelOneOrderId}}</sa-info>
-						<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>
-						<sa-info name="装货地址" br>{{m.loadingAddress}}</sa-info>
-						<sa-info name="卸货地址" br>{{m.unloadingAddress}}</sa-info>
-						<sa-info name="备注" br>{{m.comment}}</sa-info>
-						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</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.updateBy}}</sa-info>
-						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-						<sa-info name="贸易区域id" br>{{m.tradeAreaId}}</sa-info>
-						<sa-info name="贸易区域名称" br>{{m.tradeAreaName}}</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>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="装货地址" br>{{m.loadingAddress}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="卸货地址" br>{{m.unloadingAddress}}</sa-info>
+							</el-col>
+						</el-row>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-info name="备注" br>{{m.comment}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="贸易区域名称" br>{{m.tradeAreaName}}</sa-info>
+							</el-col>
+						</el-row>
+						<!-- <sa-info name="商品id" br>{{m.goodsId}}</sa-info> -->
+						<!-- <sa-info name="司机ID" br>{{m.driverId}}</sa-info> -->
+						<!-- <sa-info name="车型ID" br>{{m.carId}}</sa-info> -->
+						<!-- <sa-info name="贸易区域id" br>{{m.tradeAreaId}}</sa-info> -->
+						
 					</el-form>
 				</div>
 			</div>

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

@@ -20,59 +20,28 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<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="一级市场订单ID" v-model="p.levelOneOrderId"></sa-item>
 					<sa-item type="text" name="订单编号" v-model="p.orderNo"></sa-item>
-					<sa-item type="text" name="商品id" v-model="p.goodsId"></sa-item>
 					<sa-item type="text" name="商品名称" v-model="p.goodsName"></sa-item>
-					<sa-item type="text" name="商品来源" v-model="p.goodsFrom"></sa-item>
-					<sa-item type="text" name="发货商电话" v-model="p.shipperPhone"></sa-item>
-					<sa-item type="text" name="发货商名称" v-model="p.shipperName"></sa-item>
-					<sa-item type="text" name="司机ID" v-model="p.driverId"></sa-item>
-					<sa-item type="text" name="司机名称" v-model="p.driverName"></sa-item>
-					<sa-item type="text" name="司机电话" v-model="p.driverPhone"></sa-item>
-					<sa-item type="text" name="车型ID" v-model="p.carId"></sa-item>
-					<sa-item type="text" name="车型名称" v-model="p.carType"></sa-item>
-					<sa-item type="text" name="收货人名称" v-model="p.consigneeName"></sa-item>
-					<sa-item type="text" name="收货人电话号码" v-model="p.consigneePhone"></sa-item>
-					<sa-item type="text" name="申报订单号" v-model="p.declarationNumber"></sa-item>
-					<sa-item type="enum" name="订单状态已完成" v-model="p.orderFinish" 
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="装货地址" v-model="p.loadingAddress"></sa-item>
-					<sa-item type="text" name="卸货地址" v-model="p.unloadingAddress"></sa-item>
-					<sa-item type="text" name="备注" v-model="p.comment"></sa-item>
-					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></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>
-					<sa-item type="text" name="更新人编号" v-model="p.updateBy"></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="贸易区域id" v-model="p.tradeAreaId"></sa-item>
-					<sa-item type="text" name="贸易区域名称" v-model="p.tradeAreaName"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 				</el-form>
 				<div class="fast-btn">
 					<el-button v-if="sa.isAuth('tb-orders-add')" size="mini" type="primary" @click="add()">新增</el-button>
 					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
-					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</div>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
-					<sa-td name="货运订单管理表主键" prop="id" type="num"></sa-td>
-					<sa-td name="一级市场订单ID" prop="levelOneOrderId" ></sa-td>
 					<sa-td name="订单编号" prop="orderNo" ></sa-td>
-					<sa-td name="商品id" prop="goodsId" ></sa-td>
+					<!-- <sa-td name="商品id" prop="goodsId" ></sa-td> -->
 					<sa-td name="商品名称" prop="goodsName" ></sa-td>
 					<sa-td name="商品来源" prop="goodsFrom" ></sa-td>
 					<sa-td name="发货商电话" prop="shipperPhone" ></sa-td>
 					<sa-td name="发货商名称" prop="shipperName" ></sa-td>
-					<sa-td name="司机ID" prop="driverId" ></sa-td>
+					<!-- <sa-td name="司机ID" prop="driverId" ></sa-td> -->
 					<sa-td name="司机名称" prop="driverName" ></sa-td>
 					<sa-td name="司机电话" prop="driverPhone" ></sa-td>
-					<sa-td name="车型ID" prop="carId" ></sa-td>
+					<!-- <sa-td name="车型ID" prop="carId" ></sa-td> -->
 					<sa-td name="车型名称" prop="carType" ></sa-td>
 					<sa-td name="收货人名称" prop="consigneeName" ></sa-td>
 					<sa-td name="收货人电话号码" prop="consigneePhone" ></sa-td>
@@ -81,14 +50,7 @@
 					<sa-td name="装货地址" prop="loadingAddress" ></sa-td>
 					<sa-td name="卸货地址" prop="unloadingAddress" ></sa-td>
 					<sa-td name="备注" prop="comment" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></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="updateBy" ></sa-td>
-					<sa-td name="创建人编号" prop="createBy" ></sa-td>
-					<sa-td name="创建人名称" prop="createName" ></sa-td>
-					<sa-td name="贸易区域id" prop="tradeAreaId" ></sa-td>
+					<!-- <sa-td name="贸易区域id" prop="tradeAreaId" ></sa-td> -->
 					<sa-td name="贸易区域名称" prop="tradeAreaName" ></sa-td>
 					<el-table-column label="操作" fixed="right"  width="240px">
 						<template slot-scope="s">
@@ -111,18 +73,16 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数  
-						id: '',		// 货运订单管理表主键 
-						levelOneOrderId: '',		// 一级市场订单ID 
 						orderNo: '',		// 订单编号 
-						goodsId: '',		// 商品id 
+						// goodsId: '',		// 商品id 
 						goodsName: '',		// 商品名称 
 						goodsFrom: '',		// 商品来源(国家) 
 						shipperPhone: '',		// 发货商电话 
 						shipperName: '',		// 发货商名称 
-						driverId: '',		// 司机ID 
+						// driverId: '',		// 司机ID 
 						driverName: '',		// 司机名称 
 						driverPhone: '',		// 司机电话 
-						carId: '',		// 车型ID 
+						// carId: '',		// 车型ID 
 						carType: '',		// 车型名称 
 						consigneeName: '',		// 收货人名称 
 						consigneePhone: '',		// 收货人电话号码 
@@ -131,14 +91,7 @@
 						loadingAddress: '',		// 装货地址 
 						unloadingAddress: '',		// 卸货地址 
 						comment: '',		// 备注 
-						updateTime: '',		// 更新时间 
-						createTime: '',		// 创建时间 
-						updateName: '',		// 更新人名称 
-						deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
-						updateBy: '',		// 更新人编号 
-						createBy: '',		// 创建人编号 
-						createName: '',		// 创建人名称 
-						tradeAreaId: '',		// 贸易区域id 
+						// tradeAreaId: '',		// 贸易区域id 
 						tradeAreaName: '',		// 贸易区域名称 
 						pageNo: 1,		// 当前页 
 						pageSize: 10,	// 页大小