整合新生成的代码

sa-frame/menu-list-sp.js

@@ -429,4 +429,20 @@ window.menuList.unshift({
 			},
 		]
 	},
+	{
+		id: 'tb-two-market-orders',
+		name: '订单表',
+		icon: 'el-icon-folder-opened',
+	    parent:true,
+		info: '订单表表数据的维护',
+		childList: [
+			{id: 'tb-two-market-orders-list', name: '订单表-列表', url: 'sa-view/tb-two-market-orders/tb-two-market-orders-list.html',
+			childList:[
+			{id:'tb-two-market-orders-add',name:'订单表添加',isShow:false},
+			{id:'tb-two-market-orders-edit',name:'订单表更新',isShow:false},
+			{id:'tb-two-market-orders-del',name:'订单表删除',isShow:false},
+			]
+			},
+		]
+	},
 );

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

@@ -30,14 +30,6 @@
 						<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>
-						<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="父类型id" v-model="m.parentId" v-if="sa.p('parentId', 'nof') == 'nof'" br></sa-item>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -65,18 +57,11 @@
 					// 创建一个 默认Model 
 					createModel: function() {
 						return {
-							id: '',		// 主键 
 							name: '',		// 类别名称 
 							sort: '',		// 排序 
 							no: '',		// 编号 
-							createTime: '',		// 创建时间 
-							createBy: '',		// 创建人编号 
-							createName: '',		// 创建人名称 
-							updateTime: '',		// 更新时间 
-							updateBy: '',		// 更新人编号 
-							updateName: '',		// 更新人名称 
-							deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
-							parentId: sa.p('parentId', '-1'),		// 父类型id 
+							// deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
+							// parentId: sa.p('parentId', '-1'),		// 父类型id 
 						}
 					},
 					// 提交数据 
@@ -87,14 +72,8 @@
 						sa.checkNull(m.name, '请输入 [类别名称]');
 						sa.checkNull(m.sort, '请输入 [排序]');
 						sa.checkNull(m.no, '请输入 [编号]');
-						sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.createBy, '请输入 [创建人编号]');
-						sa.checkNull(m.createName, '请输入 [创建人名称]');
-						sa.checkNull(m.updateTime, '请输入 [更新时间]');
-						sa.checkNull(m.updateBy, '请输入 [更新人编号]');
-						sa.checkNull(m.updateName, '请输入 [更新人名称]');
-						sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
-						sa.checkNull(m.parentId, '请输入 [父类型id]');
+						// sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
+						// sa.checkNull(m.parentId, '请输入 [父类型id]');
 				
 						// 开始增加或修改
 						if(this.id <= 0) {	// 添加

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

@@ -28,17 +28,42 @@
                     <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="img" name="主图" v-model="m.avatar" br></sa-item>
-						<sa-item type="text" name="分类ID字符串（可多选）" v-model="m.typeIds" br></sa-item>
-						<sa-item type="text" name="分类名称" v-model="m.typeNames" br></sa-item>
-						<sa-item type="text" name="编号" v-model="m.code" br></sa-item>
-						<sa-item type="text" name="备注" v-model="m.remark" br></sa-item>
-						<sa-item type="text" name="原产地" v-model="m.source" 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.unit" br></sa-item>
-						<sa-item type="text" name="" v-model="m.singlePrice" br></sa-item>
-						<sa-item type="text" name="" v-model="m.taxNo" 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="img" name="主图" v-model="m.avatar" br></sa-item>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="分类ID字符串（可多选）" v-model="m.typeIds" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="分类名称" v-model="m.typeNames" br></sa-item>
+							</el-col>
+						</el-row>
+					
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="编号" v-model="m.code" 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.source" 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>
@@ -66,7 +91,6 @@
 					// 创建一个 默认Model
 					createModel: function() {
 						return {
-							id: '',		// 主键
 							name: '',		// 名称
 							avatar: '',		// 主图
 							typeIds: '',		// 分类ID 字符串（可多选）
@@ -85,19 +109,14 @@
 					ok: function(){
 						// 表单校验
 						let m = this.m;
-						// sa.checkNull(m.id, '请输入 [主键]');
 						sa.checkNull(m.name, '请输入 [名称]');
-						sa.checkNull(m.avatar, '请输入 [主图]');
+						sa.checkNull(m.avatar, '请上传 [主图]');
 						sa.checkNull(m.typeIds, '请输入 [分类ID字符串（可多选）]');
 						sa.checkNull(m.typeNames, '请输入 [分类名称]');
 						sa.checkNull(m.code, '请输入 [编号]');
 						sa.checkNull(m.remark, '请输入 [备注]');
 						sa.checkNull(m.source, '请输入 [原产地]');
 						sa.checkNull(m.status, '请输入 [状态]');
-						// sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.unit, '请输入 []');
-						sa.checkNull(m.singlePrice, '请输入 []');
-						sa.checkNull(m.taxNo, '请输入 []');
 
 						// 开始增加或修改
 						if(this.id <= 0) {	// 添加

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

@@ -66,7 +66,6 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数
-						id: '',		// 主键
 						name: '',		// 名称
 						typeIds: '',		// 分类ID 字符串（可多选）
 						typeNames: '',		// 分类名称

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

@@ -0,0 +1,188 @@
+<!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="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>
+						<sa-item name="" class="s-ok" br>
+							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
+						</sa-item>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="primary" @click="ok()">确定</el-button>
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+        <script>
+			
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),		// 获取超链接中的id参数（0=添加，非0=修改） 
+					m: null,		// 实体对象 
+				},
+				methods: {
+					// 创建一个 默认Model 
+					createModel: function() {
+						return {
+							id: '',		// 货运订单管理表主键 
+							levelOneOrderId: '',		// 一级市场订单ID 
+							orderNo: '',		// 订单编号 
+							goodsId: '',		// 商品id 
+							goodsName: '',		// 商品名称 
+							goodsFrom: '',		// 商品来源(国家) 
+							shipperPhone: '',		// 发货商电话 
+							shipperName: '',		// 发货商名称 
+							driverId: '',		// 司机ID 
+							driverName: '',		// 司机名称 
+							driverPhone: '',		// 司机电话 
+							carId: '',		// 车型ID 
+							carType: '',		// 车型名称 
+							consigneeName: '',		// 收货人名称 
+							consigneePhone: '',		// 收货人电话号码 
+							declarationNumber: '',		// (预留字段) 申报订单号 
+							orderFinish: '',		// 订单状态已完成 (0=禁用,1=启用) 
+							loadingAddress: '',		// 装货地址 
+							unloadingAddress: '',		// 卸货地址 
+							comment: '',		// 备注 
+							updateTime: '',		// 更新时间 
+							createTime: '',		// 创建时间 
+							updateName: '',		// 更新人名称 
+							deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
+							updateBy: '',		// 更新人编号 
+							createBy: '',		// 创建人编号 
+							createName: '',		// 创建人名称 
+							tradeAreaId: '',		// 贸易区域id 
+							tradeAreaName: '',		// 贸易区域名称 
+						}
+					},
+					// 提交数据 
+					ok: function(){
+						// 表单校验 
+						let m = this.m;
+						sa.checkNull(m.id, '请输入 [货运订单管理表主键]');
+						sa.checkNull(m.levelOneOrderId, '请输入 [一级市场订单ID]');
+						sa.checkNull(m.orderNo, '请输入 [订单编号]');
+						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.driverName, '请输入 [司机名称]');
+						sa.checkNull(m.driverPhone, '请输入 [司机电话]');
+						sa.checkNull(m.carId, '请输入 [车型ID]');
+						sa.checkNull(m.carType, '请输入 [车型名称]');
+						sa.checkNull(m.consigneeName, '请输入 [收货人名称]');
+						sa.checkNull(m.consigneePhone, '请输入 [收货人电话号码]');
+						sa.checkNull(m.declarationNumber, '请输入 [申报订单号]');
+						sa.checkNull(m.orderFinish, '请输入 [订单状态已完成]');
+						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.tradeAreaName, '请输入 [贸易区域名称]');
+				
+						// 开始增加或修改
+						if(this.id <= 0) {	// 添加
+							sa.ajax('/TbOrders/add', m, function(res){
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
+						} else {	// 修改
+							sa.ajax('/TbOrders/update', m, function(res){
+								sa.alert('修改成功', this.clean);
+							}.bind(this));
+						}
+					},
+					// 添加/修改 完成后的动作
+					clean: function() {
+						if(this.id == 0) {
+							this.m = this.createModel();
+						} else {
+							parent.app.f5();		// 刷新父页面列表
+							sa.closeCurrIframe();	// 关闭本页 
+						}
+					}
+				},
+				mounted: function(){
+					// 初始化数据 
+					if(this.id <= 0) {	
+						this.m = this.createModel();
+					} else {	
+						sa.ajax('/TbOrders/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-two-market-orders/tb-two-market-orders-info.html

@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>订单表-详情</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .c-label{width: 8em;}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box sbot" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+					<el-form v-if="m">
+						<sa-info 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-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),	// 获取数据ID 
+					m: null
+				},
+				methods: {
+				},
+				mounted: function() {
+					sa.ajax('/TbOrders/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-two-market-orders/tb-two-market-orders-list.html

@@ -0,0 +1,246 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>订单表-列表</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css & js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+	</head>
+	<body>
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
+			<div class="c-panel">
+				<!-- ------------- 检索参数 ------------- -->
+				<div class="c-title">检索参数</div>
+				<el-form ref="form" :model='p' @submit.native.prevent>
+					<sa-item type="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-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="商品名称" 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="司机名称" prop="driverName" ></sa-td>
+					<sa-td name="司机电话" prop="driverPhone" ></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>
+					<sa-td name="申报订单号" prop="declarationNumber" ></sa-td>
+					<sa-td name="订单状态已完成" prop="orderFinish" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateOrderFinish(s.row)"></sa-td>
+					<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="贸易区域名称" prop="tradeAreaName" ></sa-td>
+					<el-table-column label="操作" fixed="right"  width="240px">
+						<template slot-scope="s">
+							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
+							<el-button v-if="sa.isAuth('tb-orders-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button v-if="sa.isAuth('tb-orders-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<!-- ------------- 分页 ------------- -->
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+				},
+				el: '.vue-box',
+				data: {
+					p: { // 查询参数  
+						id: '',		// 货运订单管理表主键 
+						levelOneOrderId: '',		// 一级市场订单ID 
+						orderNo: '',		// 订单编号 
+						goodsId: '',		// 商品id 
+						goodsName: '',		// 商品名称 
+						goodsFrom: '',		// 商品来源(国家) 
+						shipperPhone: '',		// 发货商电话 
+						shipperName: '',		// 发货商名称 
+						driverId: '',		// 司机ID 
+						driverName: '',		// 司机名称 
+						driverPhone: '',		// 司机电话 
+						carId: '',		// 车型ID 
+						carType: '',		// 车型名称 
+						consigneeName: '',		// 收货人名称 
+						consigneePhone: '',		// 收货人电话号码 
+						declarationNumber: '',		// (预留字段) 申报订单号 
+						orderFinish: '',		// 订单状态已完成 (0=禁用,1=启用) 
+						loadingAddress: '',		// 装货地址 
+						unloadingAddress: '',		// 卸货地址 
+						comment: '',		// 备注 
+						updateTime: '',		// 更新时间 
+						createTime: '',		// 创建时间 
+						updateName: '',		// 更新人名称 
+						deleteStatus: '',		// 删除状态(0=禁用,1=启用) 
+						updateBy: '',		// 更新人编号 
+						createBy: '',		// 创建人编号 
+						createName: '',		// 创建人名称 
+						tradeAreaId: '',		// 贸易区域id 
+						tradeAreaName: '',		// 贸易区域名称 
+						pageNo: 1,		// 当前页 
+						pageSize: 10,	// 页大小 
+						sortType: 0		// 排序方式 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/TbOrders/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight();		// 刷新表格高度 
+						}.bind(this));
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('数据详情', 'tb-orders-info.html?id=' + data.id, '1050px', '90%');
+					},
+					// 查看 - 根据选中的
+					getBySelect: function(data) {
+						var selection = this.$refs['data-table'].selection;
+						if(selection.length == 0) {
+							return sa.msg('请选择一条数据')
+						}
+						this.get(selection[0]);
+					},
+					// 修改
+					update: function(data) {
+						sa.showIframe('修改数据', 'tb-orders-add.html?id=' + data.id, '1000px', '90%');
+					},
+					// 新增
+					add: function(data) {
+						sa.showIframe('新增数据', 'tb-orders-add.html?id=-1', '1000px', '90%');
+					},
+					// 删除
+					del: function(data) {
+						sa.confirm('是否删除，此操作不可撤销', function() {
+							sa.ajax('/TbOrders/delete?id=' + data.id, function(res) {
+								sa.arrayDelete(this.dataList, data);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+					// 批量删除
+					deleteByIds: function() {
+						// 获取选中元素的id列表 
+						let selection = this.$refs['data-table'].selection;
+						let ids = sa.getArrayField(selection, 'id');
+						if(selection.length == 0) {
+							return sa.msg('请至少选择一条数据')
+						}
+						// 提交删除 
+						sa.confirm('是否批量删除选中数据？此操作不可撤销', function() {
+							sa.ajax('/TbOrders/deleteByIds', {ids: ids.join(',')}, function(res) {
+								sa.arrayDelete(this.dataList, selection);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+					// 改 - 订单状态已完成 (0=禁用,1=启用)
+					updateOrderFinish: function(data) {
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.orderFinish;
+						var ajax = sa.ajax('/TbOrders/updateOrderFinish', {id: data.id, value: data.orderFinish}, function(res) {
+							isOk = true;
+							sa.msg('修改成功');
+						}.bind(this));
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
+							if(isOk == false) {
+								data.status = oldValue; 
+							}
+						})
+					},
+					// 改 - 删除状态(0=禁用,1=启用)
+					updateDeleteStatus: function(data) {
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.deleteStatus;
+						var ajax = sa.ajax('/TbOrders/updateDeleteStatus', {id: data.id, value: data.deleteStatus}, function(res) {
+							isOk = true;
+							sa.msg('修改成功');
+						}.bind(this));
+						// 如果未能修改成功, 则回滚 
+						$.when(ajax).done(function() {
+							if(isOk == false) {
+								data.status = oldValue; 
+							}
+						})
+					},
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

static/sa.js

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