Browse Source

删除无用html文件,修改商品类型页面引用本地JS文件,增加商品订单页面

loovi 1 year ago
parent
commit
e9a7deda9d

+ 14 - 14
sa-frame/menu-list-sp.js

@@ -226,32 +226,32 @@ window.menuList.unshift({
 			},
 		]
 },{
-		id: 'tb-logistics',
-		name: '物流表',
+		id: 'tb-order',
+		name: '商品订单表',
 		icon: 'el-icon-folder-opened',
 	    parent:true,
-		info: '物流表表数据的维护',
+		info: '商品订单表表数据的维护',
 		childList: [
-			{id: 'tb-logistics-list', name: '物流表-列表', url: 'sa-view/tb-logistics/tb-logistics-list.html',
+			{id: 'tb-order-list', name: '商品订单表-列表', url: 'sa-view/tb-order/tb-order-list.html',
 			childList:[
-			{id:'tb-logistics-add',name:'物流表添加',isShow:false},
-			{id:'tb-logistics-edit',name:'物流表更新',isShow:false},
-			{id:'tb-logistics-del',name:'物流表删除',isShow:false},
+			{id:'tb-order-add',name:'商品订单表添加',isShow:true},
+			{id:'tb-order-edit',name:'商品订单表更新',isShow:true},
+			{id:'tb-order-del',name:'商品订单表删除',isShow:true},
 			]
 			},
 		]
-},{
+	},{
 		id: 'tb-orders',
-		name: '订单表',
+		name: '物流订单表',
 		icon: 'el-icon-folder-opened',
 	    parent:true,
-		info: '订单表表数据的维护',
+		info: '物流订单表表数据的维护',
 		childList: [
-			{id: 'tb-orders-list', name: '订单表-列表', url: 'sa-view/tb-orders/tb-orders-list.html',
+			{id: 'tb-orders-list', name: '物流订单表-列表', url: 'sa-view/tb-orders/tb-orders-list.html',
 			childList:[
-			{id:'tb-orders-add',name:'订单表添加',isShow:false},
-			{id:'tb-orders-edit',name:'订单表更新',isShow:false},
-			{id:'tb-orders-del',name:'订单表删除',isShow:false},
+			{id:'tb-orders-add',name:'物流订单表添加',isShow:true},
+			{id:'tb-orders-edit',name:'物流订单表更新',isShow:true},
+			{id:'tb-orders-del',name:'物流订单表删除',isShow:true},
 			]
 			},
 		]

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

@@ -6,12 +6,12 @@
 		<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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
-		<link rel="stylesheet" href="../../static/sa.css"> 
-		<script src="https://unpkg.com/vue@2.6.10/dist/vue.min.js"></script>
-		<script src="https://unpkg.com/element-ui@2.13.0/lib/index.js"></script>
-		<script src="https://unpkg.com/http-vue-loader@1.4.2/src/httpVueLoader.js"></script>
-		<script src="https://unpkg.com/jquery@3.4.1/dist/jquery.min.js"></script>
-		<script src="https://www.layuicdn.com/layer-v3.1.1/layer.js"></script>
+		<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>
 		<script src="../../static/kj/upload-util.js"></script>
 		<style type="text/css">

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

@@ -6,12 +6,12 @@
 		<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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
-		<link rel="stylesheet" href="../../static/sa.css"> 
-		<script src="https://unpkg.com/vue@2.6.10/dist/vue.min.js"></script>
-		<script src="https://unpkg.com/element-ui@2.13.0/lib/index.js"></script>
-		<script src="https://unpkg.com/http-vue-loader@1.4.2/src/httpVueLoader.js"></script>
-		<script src="https://unpkg.com/jquery@3.4.1/dist/jquery.min.js"></script>
-		<script src="https://www.layuicdn.com/layer-v3.1.1/layer.js"></script>
+		<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>
 		<script src="../../static/kj/upload-util.js"></script>
 		<style type="text/css">

+ 6 - 6
sa-view/tb-goods-type/tb-goods-type-list.html

@@ -6,12 +6,12 @@
 		<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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
-		<link rel="stylesheet" href="../../static/sa.css"> 
-		<script src="https://unpkg.com/vue@2.6.10/dist/vue.min.js"></script>
-		<script src="https://unpkg.com/element-ui@2.13.0/lib/index.js"></script>
-		<script src="https://unpkg.com/http-vue-loader@1.4.2/src/httpVueLoader.js"></script>
-		<script src="https://unpkg.com/jquery@3.4.1/dist/jquery.min.js"></script>
-		<script src="https://www.layuicdn.com/layer-v3.1.1/layer.js"></script>
+		<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>
 		<script src="../../static/kj/upload-util.js"></script>
 	</head>

+ 0 - 164
sa-view/tb-logistics/tb-logistics-add.html

@@ -1,164 +0,0 @@
-<!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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
-		<link rel="stylesheet" href="../../static/sa.css">
-		<script src="../../static/kj/vue.min.js"></script>
-		<script src="../../static/kj/element-ui/index.js"></script>
-		<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>
-		<script src="../../static/kj/upload-util.js"></script>
-
-		<style type="text/css">
-			.c-panel .el-form .c-label{width: 7em !important;}
-			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
-		</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="申报订单号" v-model="m.declarationNumber" br></sa-item>
-						<sa-item type="enum" name="订单待确认" v-model="m.prepare" :jv="{0: '待确认', 1: '订单已确认', 2: '订单确认失败'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="订单确认时间" v-model="m.prepareTime" br></sa-item>
-						<sa-item type="enum" name="待装货" v-model="m.loading" :jv="{0: '待装货', 1: '已装货'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="已装货时间" v-model="m.loadingTime" br></sa-item>
-						<sa-item type="enum" name="发货" v-model="m.delivery" :jv="{0: '未发', 1: '已发'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="发货时间" v-model="m.deliveryTime" br></sa-item>
-						<sa-item type="enum" name="已出海关" v-model="m.clearedCustom" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="出海关时间" v-model="m.clearedCustomTime" br></sa-item>
-						<sa-item type="enum" name="接货人确定接货" v-model="m.makeCargo" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="接货完成时间" v-model="m.makeCargoTime" br></sa-item>
-						<sa-item type="enum" name="收购商确认" v-model="m.confirmReceipt" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="收货方确认时间" v-model="m.confirmReceiptTime" br></sa-item>
-						<sa-item type="enum" name="订单状态已完成" v-model="m.orderFinish" :jv="{0: '进行中', 1: '已完成'}" jtype="3" br></sa-item>
-						<!-- <sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item> -->
-						<sa-item name="" class="s-ok" br>
-							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
-						</sa-item>
-					</el-form>
-				</div>
-			</div>
-			<!-- ------- 底部按钮 ------- -->
-			<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: '',		// 物流表主键
-							ordersId: '',		// 订单表ID
-							declarationNumber: '',		// (预留字段) 申报订单号
-							prepare: '',		// 订单待确认(0=待确认,1=订单已确认,2=订单确认失败)
-							prepareTime: '',		// 订单确认时间
-							loading: '',		// 待装货(0=待装货,1=已装货)
-							loadingTime: '',		// 已装货时间
-							delivery: '',		// 发货(0=未发,1=已发)
-							deliveryTime: '',		// 发货时间
-							clearedCustom: '',		// 已出海关(0=禁用,1=启用)
-							clearedCustomTime: '',		// 出海关时间
-							makeCargo: '',		// 接货人确定接货(0=禁用,1=启用)
-							makeCargoTime: '',		// 接货完成时间
-							confirmReceipt: '',		// 收购商确认(0=禁用,1=启用)
-							confirmReceiptTime: '',		// 收货方确认时间(相当于订单完成时间)
-							orderFinish: '',		// 订单状态已完成(0=进行中,1=已完成)
-							createTime: '',		// 创建时间
-							createBy: '',		// 创建人编号
-							createName: '',		// 创建人名称
-							updateTime: '',		// 更新时间
-							updateBy: '',		// 更新人编号
-							updateName: '',		// 更新人名称
-							deleteStatus: '',		// 删除状态(0=禁用,1=启用)
-						}
-					},
-					// 提交数据
-					ok: function(){
-						// 表单校验
-						let m = this.m;
-						sa.checkNull(m.id, '请输入 [物流表主键]');
-						sa.checkNull(m.ordersId, '请输入 [订单表ID]');
-						sa.checkNull(m.declarationNumber, '请输入 [申报订单号]');
-						sa.checkNull(m.prepare, '请输入 [订单待确认]');
-						sa.checkNull(m.prepareTime, '请输入 [订单确认时间]');
-						sa.checkNull(m.loading, '请输入 [待装货]');
-						sa.checkNull(m.loadingTime, '请输入 [已装货时间]');
-						sa.checkNull(m.delivery, '请输入 [发货]');
-						sa.checkNull(m.deliveryTime, '请输入 [发货时间]');
-						sa.checkNull(m.clearedCustom, '请输入 [已出海关]');
-						sa.checkNull(m.clearedCustomTime, '请输入 [出海关时间]');
-						sa.checkNull(m.makeCargo, '请输入 [接货人确定接货]');
-						sa.checkNull(m.makeCargoTime, '请输入 [接货完成时间]');
-						sa.checkNull(m.confirmReceipt, '请输入 [收购商确认]');
-						sa.checkNull(m.confirmReceiptTime, '请输入 [收货方确认时间]');
-						sa.checkNull(m.orderFinish, '请输入 [订单状态已完成]');
-						sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.createBy, '请输入 [创建人编号]');
-						sa.checkNull(m.createName, '请输入 [创建人名称]');
-						sa.checkNull(m.updateTime, '请输入 [更新时间]');
-						sa.checkNull(m.updateBy, '请输入 [更新人编号]');
-						sa.checkNull(m.updateName, '请输入 [更新人名称]');
-						sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
-
-						// 开始增加或修改
-						if(this.id <= 0) {	// 添加
-							sa.ajax('/level-one-server/TbLogistics/add', m, function(res){
-								sa.alert('增加成功', this.clean);
-							}.bind(this));
-						} else {	// 修改
-							sa.ajax('/level-one-server/TbLogistics/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('/level-one-server/TbLogistics/getById?id=' + this.id, function(res) {
-							this.m = res.data;
-							if(res.data == null) {
-								sa.alert('未能查找到 id=' + this.id + " 详细数据");
-							}
-						}.bind(this))
-					}
-				}
-			})
-
-		</script>
-	</body>
-</html>

+ 0 - 76
sa-view/tb-logistics/tb-logistics-info.html

@@ -1,76 +0,0 @@
-<!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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
-		<link rel="stylesheet" href="../../static/sa.css">
-		<script src="../../static/kj/vue.min.js"></script>
-		<script src="../../static/kj/element-ui/index.js"></script>
-		<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>
-		<script src="../../static/kj/upload-util.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 name="申报订单号" br>{{m.declarationNumber}}</sa-info>
-						<sa-info type="enum" name="订单待确认" :value="m.prepare" :jv="{0: '待确认', 1: '订单已确认', 2: '订单确认失败'}" br></sa-info>
-						<sa-info name="订单确认时间" br>{{m.prepareTime}}</sa-info>
-						<sa-info type="enum" name="待装货" :value="m.loading" :jv="{0: '待装货', 1: '已装货'}" br></sa-info>
-						<sa-info name="已装货时间" br>{{m.loadingTime}}</sa-info>
-						<sa-info type="enum" name="发货" :value="m.delivery" :jv="{0: '未发', 1: '已发'}" br></sa-info>
-						<sa-info name="发货时间" br>{{m.deliveryTime}}</sa-info>
-						<sa-info type="enum" name="已出海关" :value="m.clearedCustom" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
-						<sa-info name="出海关时间" br>{{m.clearedCustomTime}}</sa-info>
-						<sa-info type="enum" name="接货人确定接货" :value="m.makeCargo" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
-						<sa-info name="接货完成时间" br>{{m.makeCargoTime}}</sa-info>
-						<sa-info type="enum" name="收购商确认" :value="m.confirmReceipt" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
-						<sa-info name="收货方确认时间" br>{{m.confirmReceiptTime}}</sa-info>
-						<sa-info type="enum" name="订单状态已完成" :value="m.orderFinish" :jv="{0: '进行中', 1: '已完成'}" br></sa-info>
-						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></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('/level-one-server/TbLogistics/getById?id=' + this.id, function(res) {
-						this.m = res.data;
-						if(res.data == null) {
-							sa.alert('未能查找到 id=' + this.id + " 详细数据");
-						}
-					}.bind(this))
-				}
-			})
-
-		</script>
-	</body>
-</html>

+ 0 - 324
sa-view/tb-logistics/tb-logistics-list.html

@@ -1,324 +0,0 @@
-<!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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
-		<link rel="stylesheet" href="../../static/sa.css">
-		<script src="../../static/kj/vue.min.js"></script>
-		<script src="../../static/kj/element-ui/index.js"></script>
-		<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>
-		<script src="../../static/kj/upload-util.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="text" name="申报订单号" v-model="p.declarationNumber"></sa-item>
-					<sa-item type="enum" name="订单待确认" v-model="p.prepare"
-						:jv="{0: '待确认', 1: '订单已确认', 2: '订单确认失败'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="订单确认时间" v-model="p.prepareTime"></sa-item>
-					<sa-item type="enum" name="待装货" v-model="p.loading"
-						:jv="{0: '待装货', 1: '已装货'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="已装货时间" v-model="p.loadingTime"></sa-item>
-					<sa-item type="enum" name="发货" v-model="p.delivery"
-						:jv="{0: '未发', 1: '已发'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="发货时间" v-model="p.deliveryTime"></sa-item>
-					<sa-item type="enum" name="已出海关" v-model="p.clearedCustom"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="出海关时间" v-model="p.clearedCustomTime"></sa-item>
-					<sa-item type="enum" name="接货人确定接货" v-model="p.makeCargo"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="接货完成时间" v-model="p.makeCargoTime"></sa-item>
-					<sa-item type="enum" name="收购商确认" v-model="p.confirmReceipt"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="收货方确认时间" v-model="p.confirmReceiptTime"></sa-item>
-					<sa-item type="enum" name="订单状态已完成" v-model="p.orderFinish"
-						:jv="{0: '进行中', 1: '已完成'}" jtype="2" def="不限"></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-form>
-				<div class="fast-btn">
-					<el-button v-if="sa.isAuth('tb-logistics-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="ordersId" ></sa-td>
-					<sa-td name="申报订单号" prop="declarationNumber" ></sa-td>
-					<sa-td name="订单待确认" prop="prepare" type="switch" :jv="{0: '待确认', 1: '订单已确认', 2: '订单确认失败'}" @change="s => updatePrepare(s.row)"></sa-td>
-					<sa-td name="订单确认时间" prop="prepareTime" ></sa-td>
-					<sa-td name="待装货" prop="loading" type="switch" :jv="{0: '待装货', 1: '已装货'}" @change="s => updateLoading(s.row)"></sa-td>
-					<sa-td name="已装货时间" prop="loadingTime" ></sa-td>
-					<sa-td name="发货" prop="delivery" type="switch" :jv="{0: '未发', 1: '已发'}" @change="s => updateDelivery(s.row)"></sa-td>
-					<sa-td name="发货时间" prop="deliveryTime" ></sa-td>
-					<sa-td name="已出海关" prop="clearedCustom" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateClearedCustom(s.row)"></sa-td>
-					<sa-td name="出海关时间" prop="clearedCustomTime" ></sa-td>
-					<sa-td name="接货人确定接货" prop="makeCargo" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateMakeCargo(s.row)"></sa-td>
-					<sa-td name="接货完成时间" prop="makeCargoTime" ></sa-td>
-					<sa-td name="收购商确认" prop="confirmReceipt" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateConfirmReceipt(s.row)"></sa-td>
-					<sa-td name="收货方确认时间" prop="confirmReceiptTime" ></sa-td>
-					<sa-td name="订单状态已完成" prop="orderFinish" type="switch" :jv="{0: '进行中', 1: '已完成'}" @change="s => updateOrderFinish(s.row)"></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>
-					<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-logistics-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
-							<el-button v-if="sa.isAuth('tb-logistics-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: '',		// 物流表主键
-						ordersId: '',		// 订单表ID
-						declarationNumber: '',		// (预留字段) 申报订单号
-						prepare: '',		// 订单待确认(0=待确认,1=订单已确认,2=订单确认失败)
-						prepareTime: '',		// 订单确认时间
-						loading: '',		// 待装货(0=待装货,1=已装货)
-						loadingTime: '',		// 已装货时间
-						delivery: '',		// 发货(0=未发,1=已发)
-						deliveryTime: '',		// 发货时间
-						clearedCustom: '',		// 已出海关(0=禁用,1=启用)
-						clearedCustomTime: '',		// 出海关时间
-						makeCargo: '',		// 接货人确定接货(0=禁用,1=启用)
-						makeCargoTime: '',		// 接货完成时间
-						confirmReceipt: '',		// 收购商确认(0=禁用,1=启用)
-						confirmReceiptTime: '',		// 收货方确认时间(相当于订单完成时间)
-						orderFinish: '',		// 订单状态已完成(0=进行中,1=已完成)
-						createTime: '',		// 创建时间
-						createBy: '',		// 创建人编号
-						createName: '',		// 创建人名称
-						updateTime: '',		// 更新时间
-						updateBy: '',		// 更新人编号
-						updateName: '',		// 更新人名称
-						deleteStatus: '',		// 删除状态(0=禁用,1=启用)
-						pageNo: 1,		// 当前页
-						pageSize: 10,	// 页大小
-						sortType: 0		// 排序方式
-					},
-					dataCount: 0,
-					dataList: [], // 数据集合
-				},
-				methods: {
-					// 刷新
-					f5: function() {
-						sa.ajax('/level-one-server/TbLogistics/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-logistics-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-logistics-add.html?id=' + data.id, '1000px', '90%');
-					},
-					// 新增
-					add: function(data) {
-						sa.showIframe('新增数据', 'tb-logistics-add.html?id=-1', '1000px', '90%');
-					},
-					// 删除
-					del: function(data) {
-						sa.confirm('是否删除,此操作不可撤销', function() {
-							sa.ajax('/level-one-server/TbLogistics/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('/level-one-server/TbLogistics/deleteByIds', {ids: ids.join(',')}, function(res) {
-								sa.arrayDelete(this.dataList, selection);
-								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度
-							}.bind(this))
-						}.bind(this));
-					},
-					// 改 - 订单待确认(0=待确认,1=订单已确认,2=订单确认失败)
-					updatePrepare: function(data) {
-						// 声明变量记录是否成功
-						var isOk = false;
-						var oldValue = data.prepare;
-						var ajax = sa.ajax('/level-one-server/TbLogistics/updatePrepare', {id: data.id, value: data.prepare}, function(res) {
-							isOk = true;
-							sa.msg('修改成功');
-						}.bind(this));
-						// 如果未能修改成功, 则回滚
-						$.when(ajax).done(function() {
-							if(isOk == false) {
-								data.status = oldValue;
-							}
-						})
-					},
-					// 改 - 待装货(0=待装货,1=已装货)
-					updateLoading: function(data) {
-						// 声明变量记录是否成功
-						var isOk = false;
-						var oldValue = data.loading;
-						var ajax = sa.ajax('/TbLogistics/updateLoading', {id: data.id, value: data.loading}, function(res) {
-							isOk = true;
-							sa.msg('修改成功');
-						}.bind(this));
-						// 如果未能修改成功, 则回滚
-						$.when(ajax).done(function() {
-							if(isOk == false) {
-								data.status = oldValue;
-							}
-						})
-					},
-					// 改 - 发货(0=未发,1=已发)
-					updateDelivery: function(data) {
-						// 声明变量记录是否成功
-						var isOk = false;
-						var oldValue = data.delivery;
-						var ajax = sa.ajax('/TbLogistics/updateDelivery', {id: data.id, value: data.delivery}, function(res) {
-							isOk = true;
-							sa.msg('修改成功');
-						}.bind(this));
-						// 如果未能修改成功, 则回滚
-						$.when(ajax).done(function() {
-							if(isOk == false) {
-								data.status = oldValue;
-							}
-						})
-					},
-					// 改 - 已出海关(0=禁用,1=启用)
-					updateClearedCustom: function(data) {
-						// 声明变量记录是否成功
-						var isOk = false;
-						var oldValue = data.clearedCustom;
-						var ajax = sa.ajax('/TbLogistics/updateClearedCustom', {id: data.id, value: data.clearedCustom}, function(res) {
-							isOk = true;
-							sa.msg('修改成功');
-						}.bind(this));
-						// 如果未能修改成功, 则回滚
-						$.when(ajax).done(function() {
-							if(isOk == false) {
-								data.status = oldValue;
-							}
-						})
-					},
-					// 改 - 接货人确定接货(0=禁用,1=启用)
-					updateMakeCargo: function(data) {
-						// 声明变量记录是否成功
-						var isOk = false;
-						var oldValue = data.makeCargo;
-						var ajax = sa.ajax('/TbLogistics/updateMakeCargo', {id: data.id, value: data.makeCargo}, function(res) {
-							isOk = true;
-							sa.msg('修改成功');
-						}.bind(this));
-						// 如果未能修改成功, 则回滚
-						$.when(ajax).done(function() {
-							if(isOk == false) {
-								data.status = oldValue;
-							}
-						})
-					},
-					// 改 - 收购商确认(0=禁用,1=启用)
-					updateConfirmReceipt: function(data) {
-						// 声明变量记录是否成功
-						var isOk = false;
-						var oldValue = data.confirmReceipt;
-						var ajax = sa.ajax('/TbLogistics/updateConfirmReceipt', {id: data.id, value: data.confirmReceipt}, function(res) {
-							isOk = true;
-							sa.msg('修改成功');
-						}.bind(this));
-						// 如果未能修改成功, 则回滚
-						$.when(ajax).done(function() {
-							if(isOk == false) {
-								data.status = oldValue;
-							}
-						})
-					},
-					// 改 - 订单状态已完成(0=进行中,1=已完成)
-					updateOrderFinish: function(data) {
-						// 声明变量记录是否成功
-						var isOk = false;
-						var oldValue = data.orderFinish;
-						var ajax = sa.ajax('/TbLogistics/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('/TbLogistics/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>

+ 248 - 0
sa-view/tb-order/tb-order-add.html

@@ -0,0 +1,248 @@
+<!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="" 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.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 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: '',		// 主键 
+							tradeAreaId: '',		//  
+							tradeAreaName: '',		//  
+							addressIds: '',		//  
+							saleMainId: '',		//  
+							tradeNo: '',		// 订单号 
+							buyUserId: '',		// 买家ID 
+							buyUserName: '',		// 买家 
+							buyUserType: '',		// 购买用户类型(3=边民,2=组长) 
+							enterpriseId: '',		// 商家ID 
+							enterpriseName: '',		// 商家名称 
+							totalWeight: '',		// 总重量 
+							totalPrice: '',		// 总金额 
+							tradeTime: '',		// 交易时间 
+							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=启用) 
+						}
+					},
+					// 提交数据 
+					ok: function(){
+						// 表单校验 
+						let m = this.m;
+						// sa.checkNull(m.id, '请输入 [主键]');
+						sa.checkNull(m.tradeAreaId, '请输入 []');
+						sa.checkNull(m.tradeAreaName, '请输入 []');
+						sa.checkNull(m.addressIds, '请输入 []');
+						sa.checkNull(m.saleMainId, '请输入 []');
+						sa.checkNull(m.tradeNo, '请输入 [订单号]');
+						// sa.checkNull(m.buyUserId, '请输入 [买家ID]');
+						sa.checkNull(m.buyUserName, '请输入 [买家]');
+						sa.checkNull(m.buyUserType, '请输入 [购买用户类型]');
+						// sa.checkNull(m.enterpriseId, '请输入 [商家ID]');
+						sa.checkNull(m.enterpriseName, '请输入 [商家名称]');
+						sa.checkNull(m.totalWeight, '请输入 [总重量]');
+						sa.checkNull(m.totalPrice, '请输入 [总金额]');
+						sa.checkNull(m.tradeTime, '请输入 [交易时间]');
+						sa.checkNull(m.tradeStatus, '请输入 [交易状态]');
+						sa.checkNull(m.payType, '请输入 [支付方式]');
+						sa.checkNull(m.settleTime, '请输入 [结算时间]');
+						sa.checkNull(m.realPrice, '请输入 [当前结算金额]');
+						sa.checkNull(m.shouldPrice, '请输入 [应结金额]');
+						sa.checkNull(m.settleUserId, '请输入 [对账人]');
+						sa.checkNull(m.recordUserId, '请输入 [对账人员]');
+						sa.checkNull(m.recordTime, '请输入 [对账时间]');
+						sa.checkNull(m.record, '请输入 [是否对账]');
+						sa.checkNull(m.refundReason, '请输入 [退款原因]');
+						sa.checkNull(m.refundTime, '请输入 [退款时间]');
+						sa.checkNull(m.receiveName, '请输入 []');
+						sa.checkNull(m.receivePhone, '请输入 []');
+						sa.checkNull(m.receiveAddress, '请输入 []');
+						sa.checkNull(m.outTime, '请输入 [出互市区时间]');
+						sa.checkNull(m.goodsNames, '请输入 [商品名称字符串]');
+						sa.checkNull(m.apply, '请输入 [是否申报]');
+						sa.checkNull(m.applyTime, '请输入 [申报时间]');
+						sa.checkNull(m.applyResult, '请输入 [申报结果]');
+						sa.checkNull(m.applyFailReason, '请输入 []');
+						sa.checkNull(m.distribution, '请输入 [分配方式]');
+						sa.checkNull(m.confirm, '请输入 [是否确认]');
+						sa.checkNull(m.pick, '请输入 [是否接单]');
+						sa.checkNull(m.pickTime, '请输入 [接单时间]');
+						sa.checkNull(m.shopId, '请输入 []');
+						sa.checkNull(m.shopName, '请输入 []');
+						sa.checkNull(m.send, '请输入 [是否发货]');
+						sa.checkNull(m.sendTime, '请输入 [发货时间]');
+						sa.checkNull(m.levelTwoOrderId, '请输入 [对应二级市场中的收购单ID]');
+						sa.checkNull(m.createTime, '请输入 [创建时间]');
+						sa.checkNull(m.createBy, '请输入 [创建人编号]');
+						sa.checkNull(m.createName, '请输入 [创建人名称]');
+						sa.checkNull(m.updateTime, '请输入 [更新时间]');
+						sa.checkNull(m.updateBy, '请输入 [更新人编号]');
+						sa.checkNull(m.updateName, '请输入 [更新人名称]');
+						sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
+				
+						// 开始增加或修改
+						if(this.id <= 0) {	// 添加
+							sa.ajax('/level-one-server/TbOrder/add', m, function(res){
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
+						} else {	// 修改
+							sa.ajax('/level-one-server/TbOrder/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('/level-one-server/TbOrder/getById?id=' + this.id, function(res) {
+							this.m = res.data;
+							if(res.data == null) {
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
+							}
+						}.bind(this))
+					}
+				}
+			})
+			
+		</script>
+	</body>
+</html>

+ 109 - 0
sa-view/tb-order/tb-order-info.html

@@ -0,0 +1,109 @@
+<!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="" 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.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>
+					</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('/level-one-server/TbOrder/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if(res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+			
+		</script>
+	</body>
+</html>

+ 293 - 0
sa-view/tb-order/tb-order-list.html

@@ -0,0 +1,293 @@
+<!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="" 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-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="tradeAreaName" ></sa-td>
+					<sa-td name="" prop="addressIds" ></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>
+					<sa-td name="交易时间" prop="tradeTime" type="datetime"></sa-td>
+					<sa-td name="交易状态" prop="tradeStatus" type="enum" :jv="{0: '未支付', 1: '已支付'}"></sa-td>
+					<sa-td name="支付方式" prop="payType" ></sa-td>
+					<sa-td name="结算时间" prop="settleTime" ></sa-td>
+					<sa-td name="当前结算金额" prop="realPrice" ></sa-td>
+					<sa-td name="应结金额" prop="shouldPrice" ></sa-td>
+					<sa-td name="对账人" prop="settleUserId" ></sa-td>
+					<sa-td name="对账人员" prop="recordUserId" ></sa-td>
+					<sa-td name="对账时间" prop="recordTime" ></sa-td>
+					<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="receivePhone" ></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="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="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>
+					<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-order-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button v-if="sa.isAuth('tb-order-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: '',		// 主键 
+						tradeAreaId: '',		//  
+						tradeAreaName: '',		//  
+						addressIds: '',		//  
+						saleMainId: '',		//  
+						tradeNo: '',		// 订单号 
+						buyUserId: '',		// 买家ID 
+						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		// 排序方式 
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合 
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/level-one-server/TbOrder/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-order-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-order-add.html?id=' + data.id, '1000px', '90%');
+					},
+					// 新增
+					add: function(data) {
+						sa.showIframe('新增数据', 'tb-order-add.html?id=-1', '1000px', '90%');
+					},
+					// 删除
+					del: function(data) {
+						sa.confirm('是否删除,此操作不可撤销', function() {
+							sa.ajax('/level-one-server/TbOrder/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('/level-one-server/TbOrder/deleteByIds', {ids: ids.join(',')}, function(res) {
+								sa.arrayDelete(this.dataList, selection);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
+						}.bind(this));
+					},
+					// 改 - 删除状态(0=禁用,1=启用)
+					updateDeleteStatus: function(data) {
+						// 声明变量记录是否成功 
+						var isOk = false;	
+						var oldValue = data.deleteStatus;
+						var ajax = sa.ajax('/level-one-server/TbOrder/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>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>订单表-添加/修改</title>
+		<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 资源 -->

+ 1 - 1
sa-view/tb-orders/tb-orders-info.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>订单表-详情</title>
+		<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 资源 -->

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>订单表-列表</title>
+		<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 资源 -->