Home Explore Help
Register Sign In
qzyReal
/
market-admin-ui
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

pc修改

linbl 1 year ago
parent
67f1bbc750
commit
fc1655189a
20 changed files with 710 additions and 1279 deletions
Split View Show Diff Stats
  1. 60 61
      sa-frame/menu-list-sp.js
  2. 206 0
      sa-view/ht-trade-settlement/ht-trade-settlement-add.html
  3. 88 0
      sa-view/ht-trade-settlement/ht-trade-settlement-info.html
  4. 138 0
      sa-view/ht-trade-settlement/ht-trade-settlement-list.html
  5. 86 0
      sa-view/ht-trade-settlement/ht-trade-settlement-order.html
  6. 53 29
      sa-view/tb-goods/tb-goods-add.html
  7. 8 7
      sa-view/tb-goods/tb-goods-info.html
  8. 6 31
      sa-view/tb-goods/tb-goods-list.html
  9. 0 137
      sa-view/tb-iport-order/tb-iport-order-add.html
  10. 0 71
      sa-view/tb-iport-order/tb-iport-order-info.html
  11. 0 161
      sa-view/tb-iport-order/tb-iport-order-list.html
  12. 1 1
      sa-view/tb-order/tb-order-add.html
  13. 11 94
      sa-view/tb-order/tb-order-info.html
  14. 9 31
      sa-view/tb-order/tb-order-list.html
  15. 17 60
      sa-view/tb-orders/tb-orders-add.html
  16. 7 24
      sa-view/tb-orders/tb-orders-info.html
  17. 20 74
      sa-view/tb-orders/tb-orders-list.html
  18. 0 215
      sa-view/tb-two-market-orders/tb-two-market-orders-add.html
  19. 0 128
      sa-view/tb-two-market-orders/tb-two-market-orders-info.html
  20. 0 155
      sa-view/tb-two-market-orders/tb-two-market-orders-list.html

+ 60 - 61
sa-frame/menu-list-sp.js
View File 

@@ -497,40 +497,73 @@ window.menuList.unshift({
 
 				]
 
 			},
 
 			{
 
-				id: 'tb-goods-demand',
 
-				name: '收购需求',
 
-				url: 'sa-view/tb-goods-demand/tb-goods-demand-list.html',
 
-				childList: [{
 
-						id: 'tb-goods-demand-add',
 
-						name: '二级收购商需求发布表添加',
 
-						isShow: false
 
-					},
 
-					{
 
-						id: 'tb-goods-demand-edit',
 
-						name: '二级收购商需求发布表更新',
 
-						isShow: false
 
-					},
 
-					{
 
-						id: 'tb-goods-demand-del',
 
-						name: '二级收购商需求发布表删除',
 
-						isShow: false
 
-					},
 
-				]
 
-			},
 
-			{
 
 				id: 'order-list',
 
 				name: '订单管理',
 
 				parent: true,
 
 				icon: 'el-icon-s-grid',
 
-				childList: [{
 
+				childList: [
 
+					{
 
+						id: 'ht-trade-settlement',
 
+						name: '进境申报单',
 
+						url: 'sa-view/ht-trade-settlement/ht-trade-settlement-list.html',
 
+						childList: [{
 
+								id: 'ht-trade-settlement-add',
 
+								name: '添加订单',
 
+								isShow: false
 
+							},
 
+							{
 
+								id: 'ht-trade-settlement-edit',
 
+								name: '修改订单',
 
+								isShow: false
 
+							},
 
+							{
 
+								id: 'ht-trade-settlement-del',
 
+								name: '删除订单',
 
+								isShow: false
 
+							},
 
+						]
 
+					},
 
+					{
 
 						id: 'tb-order',
 
-						name: '一级市场订单',
 
-						url: 'sa-view/tb-order/tb-order-list.html'
 
+						name: '边民订单',
 
+						url: 'sa-view/tb-order/tb-order-list.html',
 
+						childList: [{
 
+								id: 'tb-order-add',
 
+								name: '添加订单',
 
+								isShow: false
 
+							},
 
+							{
 
+								id: 'tb-order-edit',
 
+								name: '修改订单',
 
+								isShow: false
 
+							},
 
+							{
 
+								id: 'tb-order-del',
 
+								name: '删除订单',
 
+								isShow: false
 
+							},
 
+						]
 
 					},
 
 					{
 
-						id: 'tb-two-market-orders',
 
+						id: 'tb-orders',
 
 						name: '二级市场订单',
 
-						url: 'sa-view/tb-two-market-orders/tb-two-market-orders-list.html'
 
+						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
 
+							},
 
+						]
 
 					}
 
 				]
 
 			},
 
@@ -550,27 +583,6 @@ window.menuList.unshift({
 
 					},
 
 				]
 
 			},
 
-			{
 
-					id: 'tb-iport-order',
 
-					name: '进口申报单',
 
-					icon: 'el-icon-folder-opened',
 
-				    parent:true,
 
-					info: '进口申报单表数据的维护',
 
-					childList: [
 
-						{id: 'tb-iport-order-list', name: '进口申报单-列表', url: 'sa-view/tb-iport-order/tb-iport-order-list.html',
 
-						childList:[
 
-						{id:'tb-iport-order-add',name:'进口申报单添加',isShow:false},
 
-						{id:'tb-iport-order-edit',name:'进口申报单更新',isShow:false},
 
-						{id:'tb-iport-order-del',name:'进口申报单删除',isShow:false},
 
-						]
 
-						},
 
-					]
 
-				},
 
-			{
 
-				id: 'tb-order-after-sale-list',
 
-				name: '售后管理',
 
-				url: 'sa-view/tb-order-after-sale/tb-order-after-sale-list.html',
 
-			},
 
 		]
 
 	}, {
 
 		id: 'transport-sys',
 
@@ -620,20 +632,7 @@ window.menuList.unshift({
 
 						isShow: true
 
 					},
 
 				]
 
-			},
 
-			{
 
-				id: 'tb-orders',
 
-				name: '物流订单表',
 
-				icon: 'el-icon-folder-opened',
 
-				parent: true,
 
-				info: '物流订单表表数据的维护',
 
-				childList: [{
 
-					id: 'tb-orders',
 
-					name: '物流订单表-列表',
 
-					url: 'sa-view/tb-orders/tb-orders-list.html'
 
-
 
-				}, ]
 
-			},
 
+			}
 
 		]
 
 	}, {
 
 		id: 'tb-fee-manager',

+ 206 - 0
sa-view/ht-trade-settlement/ht-trade-settlement-add.html
View File 

@@ -0,0 +1,206 @@
 
+<!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.id" br></sa-item>
 
+						<sa-item type="text" name="预申报编号" v-model="m.platSeqNo" br></sa-item>
 
+						<sa-item type="text" name="申报单编号" v-model="m.declareId" br></sa-item>
 
+						<sa-item type="text" name="1-边民，2-商铺业主或其代理人，3-合作社代表，4-互助组代表" v-model="m.declareType" br></sa-item>
 
+						<sa-item type="text" name="申报人姓名" v-model="m.declareName" br></sa-item>
 
+						<sa-item type="text" name="身份证号码" v-model="m.idno" br></sa-item>
 
+						<sa-item type="text" name="商铺编码" v-model="m.shopNo" br></sa-item>
 
+						<sa-item type="text" name="商铺名称" v-model="m.shopName" br></sa-item>
 
+						<sa-item type="text" name="申报人类别为3、4时互助组/合作社备案编号" v-model="m.orgPutrecNo" br></sa-item>
 
+						<sa-item type="text" name="申报人类别为3、4时互助组/合租社名称" v-model="m.orgName" br></sa-item>
 
+						<sa-item type="text" name="申报人类别为4时边民合作社社会统一信用代码" v-model="m.orgScc" br></sa-item>
 
+						<sa-item type="text" name="运输工具名称" v-model="m.veNo" br></sa-item>
 
+						<sa-item type="text" name="业务模式,进出口标志为进口时，01区内交易、02落地加工、03原装提离。进出口标志为出口时，04：直接出口，05：出口销售。" v-model="m.btrnbBizModecd" br></sa-item>
 
+						<sa-item type="text" name="商品流向,进出口标志为进口时，必填，01-二次销售；02-生活自用；03-落地加工；" v-model="m.gFlow" br></sa-item>
 
+						<sa-item type="text" name="进出口标志：I进口E出口" v-model="m.iEFlag" br></sa-item>
 
+						<sa-item type="text" name="监管场所编号" v-model="m.fieldCode" br></sa-item>
 
+						<sa-item type="text" name="监管场所名称" v-model="m.fieldName" br></sa-item>
 
+						<sa-item type="text" name="申报口岸代码" v-model="m.customsCode" br></sa-item>
 
+						<sa-item type="text" name="1-是、0-否" v-model="m.carPool" br></sa-item>
 
+						<sa-item type="text" name="总金额" v-model="m.sumAmt" br></sa-item>
 
+						<sa-item type="text" name="总毛重" v-model="m.sumGrossWt" br></sa-item>
 
+						<sa-item type="text" name="总净重" v-model="m.sumNetWt" br></sa-item>
 
+						<sa-item type="text" name="运输方式" v-model="m.trafMode" br></sa-item>
 
+						<sa-item type="text" name="币制" v-model="m.currCode" br></sa-item>
 
+						<sa-item type="text" name="件数，正整数" v-model="m.packNo" br></sa-item>
 
+						<sa-item type="text" name="申报时间：yyyy-MM-ddHH:mm:ss" v-model="m.declTime" br></sa-item>
 
+						<sa-item type="text" name="提运单号" v-model="m.billNo" br></sa-item>
 
+						<sa-item type="text" name="运输工具航次号" v-model="m.voyageNo" br></sa-item>
 
+						<sa-item type="text" name="商品名称，多个用英文逗号分割" v-model="m.goodsNames" br></sa-item>
 
+						<sa-item type="text" name="购买边民列表[{"platSeqNo":"进出境申报单预申报编号","borderName":"边民姓名","idno":"身份证号","borderPutrecNo":"边民备案编号","settleBillNo":"结算单号","buyAmount":"申报金额","netWt":"净重","grossWt":"毛重","buyQty":"申报数量","buyQty1":"第一数量","buyQty2":"第二数量","preIeportNo":"进出口预申报单号"}]" v-model="m.bordersList" br></sa-item>
 
+						<sa-item type="text" name="边民购买商品列表[{"platSeqNo":"进出境申报单预申报编号","borderName":"边民姓名","idno":"身份证号","borderPutrecNo":"边民备案编号","buyAmount":"申报金额","netWt":"净重","grossWt":"毛重","buyQty":"申报数量","buyQty1":"第一数量","buyQty2":"第二数量","preIeportNo":"进出口预申报单号","codeTs":"商品编码","goodsName":"商品名称"}]" v-model="m.borderBuyGoodsList" br></sa-item>
 
+						<sa-item type="text" name="商铺卖货物列表[{"platSeqNo":"进出境申报单预申报编号","gNo":"预申报编号","codeTs":"商品编码","gName":"商品名称","gModel":"规格型号","storageEnvm":"储存条件：常温1：冷藏，2：冷冻：3","useTo":"用途：01食用、02工业用、03药用、04种用、05饲用、06其他","grossWt":"毛重","netWt":"净重","originCountry":"产销国","gQty":"货物数量","qty1":"第一数量","qty2":"第二数量","gUnit":"计量单位","unit1":"第一计量单位","unit2":"第二计量单位","declPrice":"单价","declTotal":"总价"}]" v-model="m.sellGoodsList" br></sa-item>
 
+						<sa-item type="text" name="完成状态" v-model="m.finishStatus" br></sa-item>
 
+						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
 
+						<sa-item type="text" name="" v-model="m.preNo" 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: '',		// 主键 
+							platSeqNo: '',		// 预申报编号 
+							declareId: '',		// 申报单编号 
+							declareType: '',		// 1-边民，2-商铺业主或其代理人，3-合作社代表，4-互助组代表 
+							declareName: '',		// 申报人姓名 
+							idno: '',		// 身份证号码 
+							shopNo: '',		// 商铺编码 
+							shopName: '',		// 商铺名称 
+							orgPutrecNo: '',		// 申报人类别为3、4 时互助组/合作社备案编号 
+							orgName: '',		// 申报人类别为3、4 时互助组/合租社名称 
+							orgScc: '',		// 申报人类别为4 时边民合作社社会统一信用代码 
+							veNo: '',		//  运输工具名称 
+							btrnbBizModecd: '',		// 业务模式, 进出口标志为进口时，01 区内交易、02 落地加工、03 原装提离。进出口标 志 为 出 口时，04：直接出口，05：出口销售。 
+							gFlow: '',		// 商品流向, 进出口标志为进口时，必填，01-二次销售；02-生活自用；03-落地加工； 
+							iEFlag: '',		// 进出口标志：I进口 E 出口 
+							fieldCode: '',		// 监管场所编号 
+							fieldName: '',		// 监管场所名称 
+							customsCode: '',		// 申报口岸代码 
+							carPool: '',		// 1-是、0-否 
+							sumAmt: '',		// 总金额 
+							sumGrossWt: '',		// 总毛重 
+							sumNetWt: '',		// 总净重 
+							trafMode: '',		// 运输方式 
+							currCode: '',		// 币制 
+							packNo: '',		// 件数，正整数 
+							declTime: '',		// 申 报 时 间 ：yyyy-MM-dd HH:mm:ss 
+							billNo: '',		// 提运单号 
+							voyageNo: '',		// 运输工具航次(班)号 
+							goodsNames: '',		// 商品名称，多个用英文逗号分割 
+							bordersList: '',		// 购买边民列表[     { "platSeqNo": "进出境申报单预申报编号",        "borderName": "边民姓名", "idno": "身份证号",        "borderPutrecNo": "边民备案编号",        "settleBillNo": "结算单号", "buyAmount": "申报金额", "netWt": "净重", "grossWt": "毛重",        "buyQty": "申报数量", "buyQty1": "第一数量",        "buyQty2": "第二数量", "preIeportNo": "进出口预申报单号"     }] 
+							borderBuyGoodsList: '',		// 边民购买商品列表[     { "platSeqNo": "进出境申报单预申报编号",        "borderName": "边民姓名",        "idno": "身份证号",           "borderPutrecNo": "边民备案编号",        "buyAmount": "申报金额",        "netWt": "净重",          "grossWt": "毛重",        "buyQty": "申报数量",        "buyQty1": "第一数量",        "buyQty2": "第二数量",        "preIeportNo": "进出口预申报单号",        "codeTs": "商品编码",        "goodsName": "商品名称"      }] 
+							sellGoodsList: '',		// 商铺卖货物列表[       { "platSeqNo": "进出境申报单预申报编号",           "gNo": "预申报编号", "codeTs": "商品编码",           "gName": "商品名称", "gModel": "规格型号",           "storageEnvm": "储存条件：常温 1：冷藏，2：冷冻：3",            "useTo": "用途：01 食用、02 工业用、03 药用、04 种用、05 饲用、06 其他",           "grossWt": "毛重",            "netWt": "净重",            "originCountry": "产销国",            "gQty": "货物数量",            "qty1": "第一数量",            "qty2": "第二数量",            "gUnit": "计量单位",            "unit1": "第一计量单位",            "unit2": "第二计量单位",            "declPrice": "单价",            "declTotal": "总价"       }] 
+							finishStatus: '',		// 完成状态 
+							createTime: '',		// 创建时间 
+							preNo: '',		//  
+						}
 
+					},
 
+					// 提交数据 
+					ok: function(){
 
+						// 表单校验 
+						let m = this.m;
 
+						sa.checkNull(m.id, '请输入 [主键]');
 
+						sa.checkNull(m.platSeqNo, '请输入 [预申报编号]');
 
+						sa.checkNull(m.declareId, '请输入 [申报单编号]');
 
+						sa.checkNull(m.declareType, '请输入 [1-边民，2-商铺业主或其代理人，3-合作社代表，4-互助组代表]');
 
+						sa.checkNull(m.declareName, '请输入 [申报人姓名]');
 
+						sa.checkNull(m.idno, '请输入 [身份证号码]');
 
+						sa.checkNull(m.shopNo, '请输入 [商铺编码]');
 
+						sa.checkNull(m.shopName, '请输入 [商铺名称]');
 
+						sa.checkNull(m.orgPutrecNo, '请输入 [申报人类别为3、4时互助组/合作社备案编号]');
 
+						sa.checkNull(m.orgName, '请输入 [申报人类别为3、4时互助组/合租社名称]');
 
+						sa.checkNull(m.orgScc, '请输入 [申报人类别为4时边民合作社社会统一信用代码]');
 
+						sa.checkNull(m.veNo, '请输入 [运输工具名称]');
 
+						sa.checkNull(m.btrnbBizModecd, '请输入 [业务模式,进出口标志为进口时，01区内交易、02落地加工、03原装提离。进出口标志为出口时，04：直接出口，05：出口销售。]');
 
+						sa.checkNull(m.gFlow, '请输入 [商品流向,进出口标志为进口时，必填，01-二次销售；02-生活自用；03-落地加工；]');
 
+						sa.checkNull(m.iEFlag, '请输入 [进出口标志：I进口E出口]');
 
+						sa.checkNull(m.fieldCode, '请输入 [监管场所编号]');
 
+						sa.checkNull(m.fieldName, '请输入 [监管场所名称]');
 
+						sa.checkNull(m.customsCode, '请输入 [申报口岸代码]');
 
+						sa.checkNull(m.carPool, '请输入 [1-是、0-否]');
 
+						sa.checkNull(m.sumAmt, '请输入 [总金额]');
 
+						sa.checkNull(m.sumGrossWt, '请输入 [总毛重]');
 
+						sa.checkNull(m.sumNetWt, '请输入 [总净重]');
 
+						sa.checkNull(m.trafMode, '请输入 [运输方式]');
 
+						sa.checkNull(m.currCode, '请输入 [币制]');
 
+						sa.checkNull(m.packNo, '请输入 [件数，正整数]');
 
+						sa.checkNull(m.declTime, '请输入 [申报时间：yyyy-MM-ddHH:mm:ss]');
 
+						sa.checkNull(m.billNo, '请输入 [提运单号]');
 
+						sa.checkNull(m.voyageNo, '请输入 [运输工具航次号]');
 
+						sa.checkNull(m.goodsNames, '请输入 [商品名称，多个用英文逗号分割]');
 
+						sa.checkNull(m.bordersList, '请输入 [购买边民列表[{"platSeqNo":"进出境申报单预申报编号","borderName":"边民姓名","idno":"身份证号","borderPutrecNo":"边民备案编号","settleBillNo":"结算单号","buyAmount":"申报金额","netWt":"净重","grossWt":"毛重","buyQty":"申报数量","buyQty1":"第一数量","buyQty2":"第二数量","preIeportNo":"进出口预申报单号"}]]');
 
+						sa.checkNull(m.borderBuyGoodsList, '请输入 [边民购买商品列表[{"platSeqNo":"进出境申报单预申报编号","borderName":"边民姓名","idno":"身份证号","borderPutrecNo":"边民备案编号","buyAmount":"申报金额","netWt":"净重","grossWt":"毛重","buyQty":"申报数量","buyQty1":"第一数量","buyQty2":"第二数量","preIeportNo":"进出口预申报单号","codeTs":"商品编码","goodsName":"商品名称"}]]');
 
+						sa.checkNull(m.sellGoodsList, '请输入 [商铺卖货物列表[{"platSeqNo":"进出境申报单预申报编号","gNo":"预申报编号","codeTs":"商品编码","gName":"商品名称","gModel":"规格型号","storageEnvm":"储存条件：常温1：冷藏，2：冷冻：3","useTo":"用途：01食用、02工业用、03药用、04种用、05饲用、06其他","grossWt":"毛重","netWt":"净重","originCountry":"产销国","gQty":"货物数量","qty1":"第一数量","qty2":"第二数量","gUnit":"计量单位","unit1":"第一计量单位","unit2":"第二计量单位","declPrice":"单价","declTotal":"总价"}]]');
 
+						sa.checkNull(m.finishStatus, '请输入 [完成状态]');
 
+						sa.checkNull(m.createTime, '请输入 [创建时间]');
 
+						sa.checkNull(m.preNo, '请输入 []');
 
+				
+						// 开始增加或修改
 
+						if(this.id <= 0) {	// 添加
 
+							sa.ajax('/HtTradeSettlement/add', m, function(res){
 
+								sa.alert('增加成功', this.clean); 
+							}.bind(this));
 
+						} else {	// 修改
 
+							sa.ajax('/HtTradeSettlement/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('/HtTradeSettlement/getById?id=' + this.id, function(res) {
 
+							this.m = res.data;
 
+							if(res.data == null) {
 
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+							}
 
+						}.bind(this))
 
+					}
 
+				}
 
+			})
 
+			
+		</script>
 
+	</body>
 
+</html>

+ 88 - 0
sa-view/ht-trade-settlement/ht-trade-settlement-info.html
View File 

@@ -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: 18em;}
 
+		</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.platSeqNo}}</sa-info>
 
+						<sa-info name="申报单编号" br>{{m.declareId}}</sa-info>
 
+						<sa-info type="enum" name="申报人类型" :value="m.declareType" :jv="{1: '边民', 2: '商铺业主或其代理人', 3: '合作社代表', 4: '互助组代表'}" br></sa-info>
 
+						<sa-info name="申报人姓名" br>{{m.declareName}}</sa-info>
 
+						<sa-info name="申报时间" br>{{m.declTime}}</sa-info>
 
+						<sa-info name="身份证号码" br>{{m.idno}}</sa-info>
 
+						<sa-info name="商铺编码" br>{{m.shopNo}}</sa-info>
 
+						<sa-info name="商铺名称" br>{{m.shopName}}</sa-info>
 
+						<sa-info name="商品名称" br>{{m.goodsNames}}</sa-info>
 
+						<sa-info name="总金额" br>{{m.sumAmt}}</sa-info>
 
+						<sa-info name="总毛重" br>{{m.sumGrossWt}}</sa-info>
 
+						<sa-info name="总净重" br>{{m.sumNetWt}}</sa-info>
 
+						<sa-info name="运输方式" br>{{m.trafMode}}</sa-info>
 
+						<sa-info name="币制" br>{{m.currCode}}</sa-info>
 
+						<sa-info name="件数" br>{{m.packNo}}</sa-info>
 
+						<sa-info name="互助组/合作社备案编号" br>{{m.orgPutrecNo}}</sa-info>
 
+						<sa-info name="互助组/合租社名称" br>{{m.orgName}}</sa-info>
 
+						<sa-info name="合作社社会统一信用代码" br>{{m.orgScc}}</sa-info>
 
+						<sa-info name="车牌号" br>{{m.veNo}}</sa-info>
 
+						<sa-info type="enum" name="业务模式" :value="m.btrnbBizModecd" :jv="{1: '区内交易', 2: '落地加工', 3: '原装提离', 4: '直接出口', 5: '出口销售'}" br></sa-info>
 
+						<sa-info type="enum" name="商品流向" :value="m.gFlow" :jv="{1: '二次销售', 2: '生活自用', 3: '落地加工'}" br></sa-info>
 
+						<sa-info type="enum" name="进出口标志" :value="m.iEFlag" :jv="{'I': '进口', 'E': '出口'}" br></sa-info>
 
+						<sa-info name="监管场所编号" br>{{m.fieldCode}}</sa-info>
 
+						<sa-info name="监管场所名称" br>{{m.fieldName}}</sa-info>
 
+						<sa-info name="申报口岸代码" br>{{m.customsCode}}</sa-info>
 
+						<sa-info name="1-是、0-否" br>{{m.carPool}}</sa-info>
 
+						<sa-info name="提运单号" br>{{m.billNo}}</sa-info>
 
+						<sa-info name="航次号" br>{{m.voyageNo}}</sa-info>
 
+						<sa-info name="单证代码" br>{{m.preNo}}</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/HtTradeSettlement/getById?id=' + this.id, function(res) {
 
+						this.m = res.data;
 
+						if(res.data == null) {
 
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+						}
 
+					}.bind(this))
 
+				}
 
+			})
 
+			
+		</script>
 
+	</body>
 
+</html>

+ 138 - 0
sa-view/ht-trade-settlement/ht-trade-settlement-list.html
View File 

@@ -0,0 +1,138 @@
 
+<!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="text" name="预申报编号" v-model="p.platSeqNo" width="8em"></sa-item>
 
+					<sa-item type="text" name="申报单编号" v-model="p.declareId" width="8em"></sa-item>
 
+					<sa-item type="text" name="商品名称" v-model="p.goodsNames" width="7em"></sa-item>
 
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
+					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 
+				</el-form>
 
+				<!-- ------------- 数据列表 ------------- -->
 
+				<el-table class="data-table" ref="data-table" :data="dataList" >
 
+					<sa-td type="selection"></sa-td>
 
+					<sa-td name="预申报编号" prop="platSeqNo" width="110px"></sa-td>
 
+					<sa-td name="申报单编号" prop="declareId" width="110px"></sa-td>
 
+					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
 
+					<sa-td name="身份证号码" prop="idno" ></sa-td>
 
+					<sa-td name="互市区" prop="fieldName" ></sa-td>
 
+					<sa-td name="商铺名称" prop="shopName" ></sa-td>
 
+					<sa-td name="商品名称" prop="goodsNames" ></sa-td>
 
+					<sa-td name="总金额" prop="sumAmt" ></sa-td>
 
+					<sa-td name="总毛重" prop="sumGrossWt" ></sa-td>
 
+					<sa-td name="总净重" prop="sumNetWt" ></sa-td>
 
+					<sa-td name="运输方式" prop="trafMode" ></sa-td>
 
+					<sa-td name="币制" prop="currCode" ></sa-td>
 
+					<sa-td name="件数" prop="packNo" ></sa-td>
 
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
 
+					<sa-td name="提运单号" prop="billNo" ></sa-td>
 
+					<sa-td name="航次号" prop="voyageNo" ></sa-td>
 
+					<sa-td name="单证代码" prop="preNo" ></sa-td>
 
+					<el-table-column label="操作" width="200px">
 
+						<template slot-scope="s">
 
+							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 
+							<el-button class="c-btn" type="primary" icon="el-icon-view" @click="getOrder(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: { // 查询参数  
+						platSeqNo: '',		// 预申报编号 
+						declareId: '',		// 申报单编号 
+						goodsNames: '',		// 商品名称
 
+						pageNo: 1,		// 当前页 
+						pageSize: 10,	// 页大小 
+						sortType: 0		// 排序方式 
+					},
 
+					dataCount: 0,
 
+					dataList: [], // 数据集合 
+				},
 
+				methods: {
 
+					// 刷新
 
+					f5: function() {
 
+						sa.ajax('/level-one-server/HtTradeSettlement/getList', sa.removeNull(this.p), function(res) {
 
+							this.dataList = res.data; // 数据
 
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight();		// 刷新表格高度 
+						}.bind(this));
 
+					},
 
+					// 查看
 
+					get: function(data) {
 
+						sa.showIframe('数据详情', 'ht-trade-settlement-info.html?id=' + data.id, '1050px', '90%');
 
+					},
 
+					getOrder(data){
 
+						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?platSeqNo='+data.platSeqNo, '1280px', '94%');
 
+					},
 
+					// 修改
 
+					update: function(data) {
 
+						sa.showIframe('修改数据', 'ht-trade-settlement-add.html?id=' + data.id, '1000px', '90%');
 
+					},
 
+					// 新增
 
+					add: function(data) {
 
+						sa.showIframe('新增数据', 'ht-trade-settlement-add.html?id=-1', '1000px', '90%');
 
+					},
 
+					// 删除
 
+					del: function(data) {
 
+						sa.confirm('是否删除，此操作不可撤销', function() {
 
+							sa.ajax('/HtTradeSettlement/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('/HtTradeSettlement/deleteByIds', {ids: ids.join(',')}, function(res) {
 
+								sa.arrayDelete(this.dataList, selection);
 
+								sa.ok('删除成功');
 
+								sa.f5TableHeight();		// 刷新表格高度 
+							}.bind(this))
 
+						}.bind(this));
 
+					},
 
+				},
 
+				created: function() {
 
+					this.f5();
 
+					sa.onInputEnter();
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 86 - 0
sa-view/ht-trade-settlement/ht-trade-settlement-order.html
View File 

@@ -0,0 +1,86 @@
 
+<!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="text" name="订单号" v-model="p.tradeNo" width="5em"></sa-item>
 
+					<sa-item type="text" name="买家" v-model="p.buyUserName"></sa-item>
 
+					<sa-item type="text" name="商家名称" v-model="p.enterpriseName" width="6em"></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>
 
+				<!-- ------------- 数据列表 ------------- -->
 
+				<el-table class="data-table" ref="data-table" :data="dataList" >
 
+					<sa-td type="index" name="序号"></sa-td>
 
+					<sa-td name="订单号" prop="tradeNo" width="180"></sa-td>
 
+					<sa-td name="买家" prop="buyUserName" ></sa-td>
 
+					<sa-td name="商家名称" prop="enterpriseName" ></sa-td>
 
+					<sa-td name="商品名称" prop="goodsNames" width="280"></sa-td>
 
+					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 
+					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
 
+					<sa-td name="预申报编号" prop="platSeqNo" width="180"></sa-td>
 
+					<sa-td name="结算单号" prop="settleBillNo" width="180"></sa-td>
 
+					<sa-td name="进出口预申报单号" prop="preIeportNo" width="180"></sa-td>
 
+					<sa-td name="单证代码" prop="preNo" width="180"></sa-td>
 
+				</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: { // 查询参数  
+						tradeNo: '',		    // 订单号 
+						buyUserName: '',		// 买家 
+						enterpriseName: '',		// 商家名称 
+						platSeqNo: sa.p('platSeqNo', 0),
 
+						pageNo: 1,		// 当前页 
+						pageSize: 20,	// 页大小 
+						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));
 
+					}
 
+				},
 
+				created: function() {
 
+					this.f5();
 
+					sa.onInputEnter();
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 53 - 29
sa-view/tb-goods/tb-goods-add.html
View File 

@@ -30,43 +30,57 @@
 
 					<el-form v-if="m">
 
 						<el-row :gutter="50">
 
 							<el-col :span="12">
 
-								<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
 
+								<div class="c-item">
 
+									<label class="c-label"><span style="color: red;">*</span>互市区：</label>
 
+									<el-select @change="changeTradeArea" v-model="m.tradeAreaName" placeholder="请选择" filterable size="mini">
 
+										<el-option v-for="(item,index) in tradeAreaList" :key="index" :label="item.name" :value="item"> </el-option>
 
+									</el-select>
 
+								</div>
 
 							</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>
 
+								<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.typeNames" br></sa-item>
 
+								<sa-item type="text" name="商品编号" v-model="m.code" br></sa-item>
 
 							</el-col>
 
 						</el-row>
 
-					
 						<el-row :gutter="50">
 
 							<el-col :span="12">
 
-								<sa-item type="text" name="编号" v-model="m.code" br></sa-item>
 
+								<sa-item type="text" name="原产地" v-model="m.source" br></sa-item>
 
 							</el-col>
 
 							<el-col :span="12">
 
-								<sa-item type="text" name="备注" v-model="m.remark" br></sa-item>
 
+								<sa-item type="text" name="分类名称" v-model="m.thrItemName" 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>
 
+								<sa-item type="text" name="单位" v-model="m.unit" br></sa-item>
 
 							</el-col>
 
 							<el-col :span="12">
 
+								<sa-item type="text" name="价格" v-model="m.singlePrice" br></sa-item>
 
+							</el-col>
 
+						</el-row>
 
+						<el-row :gutter="50">
 
+							<el-col :span="12">
 
 								<sa-item type="enum" name="状态" v-model="m.status" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
 
 							</el-col>
 
+							<el-col :span="12">
 
+								<sa-item type="text" name="备注" v-model="m.remark" :need="false" br></sa-item>
 
+							</el-col>
 
+						</el-row>
 
+						<el-row :gutter="50">
 
+							<el-col :span="12">
 
+								<sa-item type="text" name="用途" v-model="m.useTo" :need="false" br></sa-item>
 
+							</el-col>
 
+							<el-col :span="12">
 
+								<sa-item type="text" name="存储条件" v-model="m.storageEnvm" :need="false" 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>
 
 					</el-form>
 
 				</div>
 
 			</div>
 
@@ -77,7 +91,6 @@
 
 			</div>
 
 		</div>
 
         <script>
 
-
 
 			var app = new Vue({
 
 				components: {
 
 					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
 
@@ -86,38 +99,36 @@
 
 				data: {
 
 					id: sa.p('id', 0),		// 获取超链接中的id参数（0=添加，非0=修改）
 
 					m: null,		// 实体对象
 
+					tradeAreaList: [],
 
 				},
 
 				methods: {
 
 					// 创建一个 默认Model
 
 					createModel: function() {
 
 						return {
 
 							name: '',		// 名称
 
-							avatar: '',		// 主图
 
-							typeIds: '',		// 分类ID 字符串（可多选）
 
-							typeNames: '',		// 分类名称
 
 							code: '',		// 编号
 
+							avatar: '',		// 主图
 
+							thrItemName: '',		// 分类名称
 
 							remark: '',		// 备注
 
 							source: '',		// 原产地
 
 							status: '',		// 状态(0=禁用,1=启用)
 
-							createTime: '',		// 创建时间
 
-							unit: '',		//
 
-							singlePrice: '',		//
 
-							taxNo: '',		//
 
+							useTo: '',		// 用途
 
+							unit: '',		// 单位
 
+							singlePrice: '',// 价格
 
+							storageEnvm: '',// storageEnvm
 
 						}
 
 					},
 
 					// 提交数据
 
 					ok: function(){
 
 						// 表单校验
 
 						let m = this.m;
 
-						sa.checkNull(m.name, '请输入 [名称]');
 
-						sa.checkNull(m.avatar, '请上传 [主图]');
 
-						sa.checkNull(m.typeIds, '请输入 [分类ID字符串（可多选）]');
 
-						sa.checkNull(m.typeNames, '请输入 [分类名称]');
 
-						sa.checkNull(m.code, '请输入 [编号]');
 
-						sa.checkNull(m.remark, '请输入 [备注]');
 
+						sa.checkNull(m.name, '请输入 [商品名称]');
 
+						sa.checkNull(m.thrItemName, '请输入 [分类名称]');
 
+						sa.checkNull(m.code, '请输入 [商品编号]');
 
 						sa.checkNull(m.source, '请输入 [原产地]');
 
 						sa.checkNull(m.status, '请输入 [状态]');
 
-
 
+						sa.checkNull(m.unit, '请输入 [单位]');
 
+						sa.checkNull(m.singlePrice, '请输入 [i价格]');
 
 						// 开始增加或修改
 
 						if(this.id <= 0) {	// 添加
 
 							sa.ajax('/level-one-server/TbGoods/add', m, function(res){
 
@@ -129,6 +140,18 @@
 
 							}.bind(this));
 
 						}
 
 					},
 
+					getTradeArea() {
 
+						sa.ajax('/level-one-server/TbTradeArea/getList', {
 
+							pageSize: 100,
 
+							pageNo: 1
 
+						}, function(resp) {
 
+							this.tradeAreaList = resp.data;
 
+						}.bind(this));
 
+					},
 
+					changeTradeArea(item){
 
+						this.m.tradeAreaId = item.id
 
+						this.m.tradeAreaName = item.name
 
+					},
 
 					// 添加/修改 完成后的动作
 
 					clean: function() {
 
 						if(this.id == 0) {
 
@@ -151,7 +174,8 @@
 
 							}
 
 						}.bind(this))
 
 					}
 
-				}
 
+				this.getTradeArea();
 
+				},
 
 			})
 
 
 		</script>

+ 8 - 7
sa-view/tb-goods/tb-goods-info.html
View File 

@@ -26,17 +26,18 @@
 
 				<div class="c-panel">
 
 					<el-form v-if="m">
 
 						<sainfo type="num" name="主键" :value="m.id" br></sainfo>
 
-						<sa-info name="名称" br>{{m.name}}</sa-info>
 
+						<sa-info name="互市区" br>{{m.tradeAreaName}}</sa-info>
 
+						<sa-info name="商品名称" br>{{m.name}}</sa-info>
 
+						<sa-info name="商品编号" br>{{m.code}}</sa-info>
 
 						<sa-info type="img" name="主图" :value="m.avatar" br></sa-info>
 
-						<sa-info name="分类ID字符串（可多选）" br>{{m.typeIds}}</sa-info>
 
-						<sa-info name="分类名称" br>{{m.typeNames}}</sa-info>
 
-						<sa-info name="编号" br>{{m.code}}</sa-info>
 
+						<sa-info name="分类名称" br>{{m.thrItemName}}</sa-info>
 
 						<sa-info name="备注" br>{{m.remark}}</sa-info>
 
 						<sa-info name="原产地" br>{{m.source}}</sa-info>
 
 						<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
 
-						<!-- <sa-info name="" br>{{m.unit}}</sa-info>
 
-						<sa-info name="" br>{{m.singlePrice}}</sa-info>
 
-						<sa-info name="" br>{{m.taxNo}}</sa-info> -->
 
+						<sa-info name="单位" br>{{m.unit}}</sa-info>
 
+						<sa-info name="价格" br>{{m.singlePrice}}</sa-info>
 
+						<sa-info name="用途" br>{{m.useTo}}</sa-info>
 
+						<sa-info name="存储条件" br>{{m.storageEnvm}}</sa-info>
 
 					</el-form>
 
 				</div>
 
 			</div>

+ 6 - 31
sa-view/tb-goods/tb-goods-list.html
View File 

@@ -29,28 +29,20 @@
 
 						</el-select>
 
 					</div>
 
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
 
-					<sa-item type="text" name="分类名称" v-model="p.typeNames"></sa-item>
 
+					<sa-item type="text" name="分类名称" v-model="p.thrItemName" width="90pxs"></sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 
-				</el-form>
 
-				<div class="fast-btn">
 
 					<el-button v-if="sa.isAuth('tb-goods-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
-					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
-				</div>
 
+				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td type="selection"></sa-td>
 
-					<sa-td name="名称" prop="name" ></sa-td>
 
+					<sa-td name="商品名称" prop="name" ></sa-td>
 
+					<sa-td name="商品编号" prop="code" ></sa-td>
 
 					<sa-td name="主图" prop="avatar" type="img"></sa-td>
 
-					<sa-td name="分类ID字符串（可多选）" prop="typeIds" ></sa-td>
 
-					<sa-td name="分类名称" prop="typeNames" ></sa-td>
 
-					<sa-td name="编号" prop="code" ></sa-td>
 
-					<sa-td name="备注" prop="remark" ></sa-td>
 
+					<sa-td name="分类名称" prop="thrItemName" ></sa-td>
 
 					<sa-td name="原产地" prop="source" ></sa-td>
 
 					<sa-td name="状态" prop="status" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateStatus(s.row)"></sa-td>
 
-					<!-- <sa-td name="" prop="unit" ></sa-td>
 
-					<sa-td name="" prop="singlePrice" ></sa-td>
 
-					<sa-td name="" prop="taxNo" ></sa-td> -->
 
 					<el-table-column label="操作" fixed="right"  width="240px">
 
 						<template slot-scope="s">
 
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 
@@ -73,16 +65,7 @@
 
 				data: {
 
 					p: { // 查询参数
 
 						name: '',		// 名称
 
-						typeIds: '',		// 分类ID 字符串（可多选）
 
-						typeNames: '',		// 分类名称
 
-						code: '',		// 编号
 
-						remark: '',		// 备注
 
-						source: '',		// 原产地
 
-						status: '',		// 状态(0=禁用,1=启用)
 
-						createTime: '',		// 创建时间
 
-						unit: '',		//
 
-						singlePrice: '',		//
 
-						taxNo: '',		//
 
+						thrItemName: '',		// 分类名称
 
 						pageNo: 1,		// 当前页
 
 						pageSize: 10,	// 页大小
 
 						sortType: 0,		// 排序方式
 
@@ -118,14 +101,6 @@
 
 					get: function(data) {
 
 						sa.showIframe('数据详情', 'tb-goods-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-goods-add.html?id=' + data.id, '1000px', '90%');

+ 0 - 137
sa-view/tb-iport-order/tb-iport-order-add.html
View File 

@@ -1,137 +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="../../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.id" br></sa-item>
 
-						<sa-item type="text" name="身份证号" v-model="m.idno" br></sa-item>
 
-						<sa-item type="text" name="边民备案编号" v-model="m.borderPutrecNo" br></sa-item>
 
-						<sa-item type="text" name="边民姓名不能为空" v-model="m.borderName" br></sa-item>
 
-						<sa-item type="text" name="结算单号" v-model="m.settleBillNo" br></sa-item>
 
-						<sa-item type="text" name="进出口预申报单号" v-model="m.preIeportNo" br></sa-item>
 
-						<sa-item type="text" name="购买申报确认状态：Y->确认购买申报，N->不购买申报" v-model="m.buyConfirmStatus" br></sa-item>
 
-						<sa-item type="text" name="支付状态：01->未支付，02->已支付" v-model="m.payStatus" br></sa-item>
 
-						<sa-item type="text" name="互助委托申报确认状态" v-model="m.cooperEntrustStatus" br></sa-item>
 
-						<sa-item type="text" name="互助委托申报确认时间" v-model="m.cooperEntrustTime" br></sa-item>
 
-						<sa-item type="text" name="边民进口申报确认状态" v-model="m.applyConfirmStatus" br></sa-item>
 
-						<sa-item type="text" name="边民进口申报确认时间" v-model="m.applyConfirmTime" 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: '',		// 主键 
-							idno: '',		// 身份证号 
-							borderPutrecNo: '',		// 边民备案编号(可选) 
-							borderName: '',		// 边民姓名不能为空 
-							settleBillNo: '',		// 结算单号 
-							preIeportNo: '',		// 进出口预申报单号 
-							buyConfirmStatus: '',		// 购买申报确认状态：Y->确认购买申报，N->不购买申报 
-							payStatus: '',		// 支付状态：01->未支付，02->已支付 
-							cooperEntrustStatus: '',		// 互助委托申报确认状态 
-							cooperEntrustTime: '',		// 互助委托申报确认时间 
-							applyConfirmStatus: '',		// 边民进口申报确认状态 
-							applyConfirmTime: '',		// 边民进口申报确认时间 
-						}
 
-					},
 
-					// 提交数据 
-					ok: function(){
 
-						// 表单校验 
-						let m = this.m;
 
-						sa.checkNull(m.id, '请输入 [主键]');
 
-						sa.checkNull(m.idno, '请输入 [身份证号]');
 
-						sa.checkNull(m.borderPutrecNo, '请输入 [边民备案编号]');
 
-						sa.checkNull(m.borderName, '请输入 [边民姓名不能为空]');
 
-						sa.checkNull(m.settleBillNo, '请输入 [结算单号]');
 
-						sa.checkNull(m.preIeportNo, '请输入 [进出口预申报单号]');
 
-						sa.checkNull(m.buyConfirmStatus, '请输入 [购买申报确认状态：Y->确认购买申报，N->不购买申报]');
 
-						sa.checkNull(m.payStatus, '请输入 [支付状态：01->未支付，02->已支付]');
 
-						sa.checkNull(m.cooperEntrustStatus, '请输入 [互助委托申报确认状态]');
 
-						sa.checkNull(m.cooperEntrustTime, '请输入 [互助委托申报确认时间]');
 
-						sa.checkNull(m.applyConfirmStatus, '请输入 [边民进口申报确认状态]');
 
-						sa.checkNull(m.applyConfirmTime, '请输入 [边民进口申报确认时间]');
 
-				
-						// 开始增加或修改
 
-						if(this.id <= 0) {	// 添加
 
-							sa.ajax('/TbIportOrder/add', m, function(res){
 
-								sa.alert('增加成功', this.clean); 
-							}.bind(this));
 
-						} else {	// 修改
 
-							sa.ajax('/TbIportOrder/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('/TbIportOrder/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 - 71
sa-view/tb-iport-order/tb-iport-order-info.html
View File 

@@ -1,71 +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="../../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 name="主键" br>{{m.id}}</sa-info>
 
-						<sa-info name="身份证号" br>{{m.idno}}</sa-info>
 
-						<sa-info name="边民备案编号" br>{{m.borderPutrecNo}}</sa-info>
 
-						<sa-info name="边民姓名不能为空" br>{{m.borderName}}</sa-info>
 
-						<sa-info name="结算单号" br>{{m.settleBillNo}}</sa-info>
 
-						<sa-info name="进出口预申报单号" br>{{m.preIeportNo}}</sa-info>
 
-						<sa-info name="购买申报确认状态：Y->确认购买申报，N->不购买申报" br>{{m.buyConfirmStatus}}</sa-info>
 
-						<sa-info name="支付状态：01->未支付，02->已支付" br>{{m.payStatus}}</sa-info>
 
-						<sa-info name="互助委托申报确认状态" br>{{m.cooperEntrustStatus}}</sa-info>
 
-						<sa-info name="互助委托申报确认时间" br>{{m.cooperEntrustTime}}</sa-info>
 
-						<sa-info name="边民进口申报确认状态" br>{{m.applyConfirmStatus}}</sa-info>
 
-						<sa-info name="边民进口申报确认时间" br>{{m.applyConfirmTime}}</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('/TbIportOrder/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 - 161
sa-view/tb-iport-order/tb-iport-order-list.html
View File 

@@ -1,161 +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="../../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="text" name="主键" v-model="p.id"></sa-item>
 
-					<sa-item type="text" name="身份证号" v-model="p.idno"></sa-item>
 
-					<sa-item type="text" name="边民备案编号" v-model="p.borderPutrecNo"></sa-item>
 
-					<sa-item type="text" name="边民姓名不能为空" v-model="p.borderName"></sa-item>
 
-					<sa-item type="text" name="结算单号" v-model="p.settleBillNo"></sa-item>
 
-					<sa-item type="text" name="进出口预申报单号" v-model="p.preIeportNo"></sa-item>
 
-					<sa-item type="text" name="购买申报确认状态：Y->确认购买申报，N->不购买申报" v-model="p.buyConfirmStatus"></sa-item>
 
-					<sa-item type="text" name="支付状态：01->未支付，02->已支付" v-model="p.payStatus"></sa-item>
 
-					<sa-item type="text" name="互助委托申报确认状态" v-model="p.cooperEntrustStatus"></sa-item>
 
-					<sa-item type="text" name="互助委托申报确认时间" v-model="p.cooperEntrustTime"></sa-item>
 
-					<sa-item type="text" name="边民进口申报确认状态" v-model="p.applyConfirmStatus"></sa-item>
 
-					<sa-item type="text" name="边民进口申报确认时间" v-model="p.applyConfirmTime"></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-iport-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" ></sa-td>
 
-					<sa-td name="身份证号" prop="idno" ></sa-td>
 
-					<sa-td name="边民备案编号" prop="borderPutrecNo" ></sa-td>
 
-					<sa-td name="边民姓名不能为空" prop="borderName" ></sa-td>
 
-					<sa-td name="结算单号" prop="settleBillNo" ></sa-td>
 
-					<sa-td name="进出口预申报单号" prop="preIeportNo" ></sa-td>
 
-					<sa-td name="购买申报确认状态：Y->确认购买申报，N->不购买申报" prop="buyConfirmStatus" ></sa-td>
 
-					<sa-td name="支付状态：01->未支付，02->已支付" prop="payStatus" ></sa-td>
 
-					<sa-td name="互助委托申报确认状态" prop="cooperEntrustStatus" ></sa-td>
 
-					<sa-td name="互助委托申报确认时间" prop="cooperEntrustTime" ></sa-td>
 
-					<sa-td name="边民进口申报确认状态" prop="applyConfirmStatus" ></sa-td>
 
-					<sa-td name="边民进口申报确认时间" prop="applyConfirmTime" ></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-iport-order-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
-							<el-button v-if="sa.isAuth('tb-iport-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: '',		// 主键 
-						idno: '',		// 身份证号 
-						borderPutrecNo: '',		// 边民备案编号(可选) 
-						borderName: '',		// 边民姓名不能为空 
-						settleBillNo: '',		// 结算单号 
-						preIeportNo: '',		// 进出口预申报单号 
-						buyConfirmStatus: '',		// 购买申报确认状态：Y->确认购买申报，N->不购买申报 
-						payStatus: '',		// 支付状态：01->未支付，02->已支付 
-						cooperEntrustStatus: '',		// 互助委托申报确认状态 
-						cooperEntrustTime: '',		// 互助委托申报确认时间 
-						applyConfirmStatus: '',		// 边民进口申报确认状态 
-						applyConfirmTime: '',		// 边民进口申报确认时间 
-						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
-						sortType: 0		// 排序方式 
-					},
 
-					dataCount: 0,
 
-					dataList: [], // 数据集合 
-				},
 
-				methods: {
 
-					// 刷新
 
-					f5: function() {
 
-						sa.ajax('/TbIportOrder/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-iport-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-iport-order-add.html?id=' + data.id, '1000px', '90%');
 
-					},
 
-					// 新增
 
-					add: function(data) {
 
-						sa.showIframe('新增数据', 'tb-iport-order-add.html?id=-1', '1000px', '90%');
 
-					},
 
-					// 删除
 
-					del: function(data) {
 
-						sa.confirm('是否删除，此操作不可撤销', function() {
 
-							sa.ajax('/TbIportOrder/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('/TbIportOrder/deleteByIds', {ids: ids.join(',')}, function(res) {
 
-								sa.arrayDelete(this.dataList, selection);
 
-								sa.ok('删除成功');
 
-								sa.f5TableHeight();		// 刷新表格高度 
-							}.bind(this))
 
-						}.bind(this));
 
-					},
 
-				},
 
-				created: function() {
 
-					this.f5();
 
-					sa.onInputEnter();
 
-				}
 
-			})
 
-		</script>
 
-	</body>
 
-</html>

+ 1 - 1
sa-view/tb-order/tb-order-add.html
View File 

@@ -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 资源 -->

+ 11 - 94
sa-view/tb-order/tb-order-info.html
View File 

@@ -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 资源 -->
 
@@ -23,85 +23,33 @@
 
 			<div class="s-body">
 
 				<div class="c-panel">
 
 					<el-form v-if="m">
 
-						<!-- <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> -->
 
 						<el-row :gutter="50">
 
 							<el-col :span="12">
 
-								<sa-info name="订单号" br>{{m.tradeNo}}</sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info name="买家" br>{{m.buyUserName}}</sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-info type="num" name="购买用户类型" :value="m.buyUserType" br></sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info name="商家名称" br>{{m.enterpriseName}}</sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-info name="总重量" br>{{m.totalWeight}}</sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info name="总金额" br>{{m.totalPrice}}</sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-info type="datetime" name="交易时间" :value="m.tradeTime" br></sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info type="enum" name="交易状态" :value="m.tradeStatus" :jv="{0: '未支付', 1: '已支付'}" br></sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-info name="支付方式" br>{{m.payType}}</sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info name="结算时间" br>{{m.settleTime}}</sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-info name="当前结算金额" br>{{m.realPrice}}</sa-info>
 
+								<sa-info name="预申报编号" br>{{m.platSeqNo}}</sa-info>
 
 							</el-col>
 
 							<el-col :span="12">
 
-								<sa-info name="应结金额" br>{{m.shouldPrice}}</sa-info>
 
+								<sa-info name="结算单号" br>{{m.settleBillNo}}</sa-info>
 
 							</el-col>
 
 						</el-row>
 
 						<el-row :gutter="50">
 
 							<el-col :span="12">
 
-								<sa-info name="对账人" br>{{m.settleUserId}}</sa-info>
 
+								<sa-info name="进出口预申报单号" br>{{m.preIeportNo}}</sa-info>
 
 							</el-col>
 
 							<el-col :span="12">
 
-								<sa-info name="对账人员" br>{{m.recordUserId}}</sa-info>
 
+								<sa-info name="单证代码" br>{{m.preNo}}</sa-info>
 
 							</el-col>
 
 						</el-row>
 
 						<el-row :gutter="50">
 
 							<el-col :span="12">
 
-								<sa-info name="对账时间" br>{{m.recordTime}}</sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info name="是否对账" br>{{m.record}}</sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-info name="退款原因" br>{{m.refundReason}}</sa-info>
 
+								<sa-info name="订单号" br>{{m.tradeNo}}</sa-info>
 
 							</el-col>
 
 							<el-col :span="12">
 
-								<sa-info name="退款时间" br>{{m.refundTime}}</sa-info>
 
+								<sa-info name="买家" br>{{m.buyUserName}}</sa-info>
 
 							</el-col>
 
 						</el-row>
 
 						<el-row :gutter="50">
 
 							<el-col :span="12">
 
-								<sa-info name="出互市区时间" br>{{m.outTime}}</sa-info>
 
+								<sa-info name="商家名称" br>{{m.enterpriseName}}</sa-info>
 
 							</el-col>
 
 							<el-col :span="12">
 
 								<sa-info name="商品名称" br>{{m.goodsNames}}</sa-info>
 
@@ -109,48 +57,17 @@
 
 						</el-row>
 
 						<el-row :gutter="50">
 
 							<el-col :span="12">
 
-								<sa-info name="是否申报" br>{{m.apply}}</sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info name="申报时间" br>{{m.applyTime}}</sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-info name="申报结果" br>{{m.applyResult}}</sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info type="enum" name="分配方式" :value="m.distribution" :jv="{0: '均分', 1: '自选数量'}" br></sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-info type="enum" name="是否确认" :value="m.confirm" :jv="{0: '否', 1: '是'}" br></sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info name="是否接单" br>{{m.pick}}</sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-info name="接单时间" br>{{m.pickTime}}</sa-info>
 
+								<sa-info name="总重量" br>{{m.totalWeight}}</sa-info>
 
 							</el-col>
 
 							<el-col :span="12">
 
-								<sa-info name="店铺名称" br>{{m.shopName}}</sa-info>
 
+								<sa-info name="总金额" br>{{m.totalPrice}}</sa-info>
 
 							</el-col>
 
 						</el-row>
 
 						<el-row :gutter="50">
 
 							<el-col :span="12">
 
-								<sa-info name="是否发货" br>{{m.send}}</sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info name="发货时间" br>{{m.sendTime}}</sa-info>
 
+								<sa-info name="车牌号" br>{{m.veNo}}</sa-info>
 
 							</el-col>
 
 						</el-row>
 
-						<!-- <sa-info name="" br>{{m.receiveName}}</sa-info>
 
-						<sa-info name="" br>{{m.receivePhone}}</sa-info>
 
-						<sa-info name="" br>{{m.receiveAddress}}</sa-info> -->
 
-						<!-- <sa-info name="" br>{{m.applyFailReason}}</sa-info> -->
 
 					</el-form>
 
 				</div>
 
 			</div>

+ 9 - 31
sa-view/tb-order/tb-order-list.html
View File 

@@ -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 资源 -->
 
@@ -33,12 +33,13 @@
 
 					<sa-td name="买家" prop="buyUserName" ></sa-td>
 
 					<sa-td name="商家名称" prop="enterpriseName" ></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="280"></sa-td>
 
-					<sa-td name="总重量(kg)" 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="outTime" ></sa-td>
 
-					<sa-td name="店铺名称" prop="shopName" ></sa-td>
 
+					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 
+					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
 
+					<sa-td name="预申报编号" prop="platSeqNo" width="180"></sa-td>
 
+					<sa-td name="结算单号" prop="settleBillNo" width="180"></sa-td>
 
+					<sa-td name="进出口预申报单号" prop="preIeportNo" width="180"></sa-td>
 
+					<sa-td name="单证代码" prop="preNo" width="180"></sa-td>
 
 					<el-table-column label="操作" fixed="right"  width="100px">
 
 						<template slot-scope="s">
 
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 
@@ -81,14 +82,6 @@
 
 					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%');
 
@@ -124,22 +117,7 @@
 
 							}.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();

+ 17 - 60
sa-view/tb-orders/tb-orders-add.html
View File 

@@ -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 资源 -->
 
@@ -41,45 +41,25 @@
 
 								<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>
 
+								<sa-item type="text" name="互市区" v-model="m.tradeAreaName" 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>
 
+								<sa-item type="text" name="买家" v-model="m.purchaserName" br></sa-item>
 
 							</el-col>
 
 							<el-col :span="12">
 
-								<sa-item type="text" name="司机名称" v-model="m.driverName" br></sa-item>
 
+								<sa-item type="text" name="转售金额" v-model="m.resalePrice" 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>
 
+								<sa-item type="text" name="车牌号" v-model="m.veNo" br></sa-item>
 
 							</el-col>
 
 							<el-col :span="12">
 
 								<sa-item type="enum" name="订单状态已完成" v-model="m.orderFinish" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
 
 							</el-col>
 
 						</el-row>
 
-						<!-- <sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item> -->
 
-						<sa-item name="" class="s-ok" br>
 
-							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 
-						</sa-item>
 
 					</el-form>
 
 				</div>
 
 			</div>
 
@@ -105,58 +85,35 @@
 
 					createModel: function() {
 
 						return {
 
 							orderNo: '',		// 订单编号
 
-							goodsId: '',		// 商品id
 
 							goodsName: '',		// 商品名称
 
 							goodsFrom: '',		// 商品来源(国家)
 
-							shipperPhone: '',		// 发货商电话
 
-							shipperName: '',		// 发货商名称
 
-							driverId: '',		// 司机ID
 
-							driverName: '',		// 司机名称
 
-							driverPhone: '',		// 司机电话
 
-							carId: '',		// 车型ID
 
-							carType: '',		// 车型名称
 
-							consigneeName: '',		// 收货人名称
 
-							consigneePhone: '',		// 收货人电话号码
 
-							declarationNumber: '',		// (预留字段) 申报订单号
 
-							orderFinish: '',		// 订单状态已完成 (0=禁用,1=启用)
 
-							// deleteStatus: '',		// 删除状态(0=禁用,1=启用)
 
+							tradeAreaName: '',	// 互市区
 
+							purchaserName: '',	// 买家
 
+							resalePrice: '',	// 转售金额
 
+							veNo: '',			// 车牌号
 
+							orderFinish: '',	// 订单状态已完成 (0=禁用,1=启用)
 
 						}
 
 					},
 
 					// 提交数据
 
 					ok: function(){
 
 						// 表单校验
 
 						let m = this.m;
 
-						sa.checkNull(m.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.tradeAreaName, '请输入 [互市区]');
 
+						sa.checkNull(m.purchaserName, '请输入 [买家]');
 
+						sa.checkNull(m.resalePrice, '请输入 [转售金额]');
 
+						sa.checkNull(m.veNo, '请输入 [车牌号]');
 
 						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/TbOrders/add', m, function(res){
 
+							sa.ajax('/level-two-server/TbOrders/add', m, function(res){
 
 								sa.alert('增加成功', this.clean);
 
 							}.bind(this));
 
 						} else {	// 修改
 
-							sa.ajax('/level-one-server/TbOrders/update', m, function(res){
 
+							sa.ajax('/level-two-server/TbOrders/update', m, function(res){
 
 								sa.alert('修改成功', this.clean);
 
 							}.bind(this));
 
 						}
 
@@ -176,7 +133,7 @@
 
 					if(this.id <= 0) {
 
 						this.m = this.createModel();
 
 					} else {
 
-						sa.ajax('/level-one-server/TbOrders/getById?id=' + this.id, function(res) {
 
+						sa.ajax('/level-two-server/TbOrders/getById?id=' + this.id, function(res) {
 
 							this.m = res.data;
 
 							if(res.data == null) {
 
 								sa.alert('未能查找到 id=' + this.id + " 详细数据");

+ 7 - 24
sa-view/tb-orders/tb-orders-info.html
View File 

@@ -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 资源 -->
 
@@ -38,42 +38,25 @@
 
 								<sa-info name="商品来源" br>{{m.goodsFrom}}</sa-info>
 
 							</el-col>
 
 							<el-col :span="12">
 
-								<sa-info name="发货商电话" br>{{m.shipperPhone}}</sa-info>
 
+								<sa-info name="互市区" br>{{m.tradeAreaName}}</sa-info>
 
 							</el-col>
 
 						</el-row>
 
 						<el-row :gutter="50">
 
 							<el-col :span="12">
 
-								<sa-info name="发货商名称" br>{{m.shipperName}}</sa-info>
 
+								<sa-info name="买家" br>{{m.purchaserName}}</sa-info>
 
 							</el-col>
 
 							<el-col :span="12">
 
-								<sa-info name="司机名称" br>{{m.driverName}}</sa-info>
 
+								<sa-info name="转售金额" br>{{m.resalePrice}}</sa-info>
 
 							</el-col>
 
 						</el-row>
 
 						<el-row :gutter="50">
 
 							<el-col :span="12">
 
-								<sa-info name="司机电话" br>{{m.driverPhone}}</sa-info>
 
+								<sa-info name="车牌号" br>{{m.veNo}}</sa-info>
 
 							</el-col>
 
 							<el-col :span="12">
 
-								<sa-info name="车型名称" br>{{m.carType}}</sa-info>
 
+								<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.consigneeName}}</sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info name="收货人电话号码" br>{{m.consigneePhone}}</sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-info name="申报订单号" br>{{m.declarationNumber}}</sa-info>
 
-							</el-col>
 
-							<el-col :span="12">
 
-								<sa-info type="enum" name="订单状态已完成" :value="m.orderFinish" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
 
-							</el-col>
 
-						</el-row>
 
-						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
 
 					</el-form>
 
 				</div>
 
 			</div>
 
@@ -96,7 +79,7 @@
 
 				methods: {
 
 				},
 
 				mounted: function() {
 
-					sa.ajax('/level-one-server/TbOrders/getById?id=' + this.id, function(res) {
 
+					sa.ajax('/level-two-server/TbOrders/getById?id=' + this.id, function(res) {
 
 						this.m = res.data;
 
 						if(res.data == null) {
 
 							sa.alert('未能查找到 id=' + this.id + " 详细数据");

+ 20 - 74
sa-view/tb-orders/tb-orders-list.html
View File 

@@ -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 资源 -->
 
@@ -22,38 +22,29 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<!-- <div class="c-title">检索参数</div> -->
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="订单编号" v-model="p.orderNo"></sa-item>
 
-					<sa-item type="text" name="商品名称" v-model="p.goodsName"></sa-item>
 
+					<sa-item type="text" name="订单编号" v-model="p.orderNo" width="90px"></sa-item>
 
+					<sa-item type="text" name="商品名称" v-model="p.goodsName" width="90px"></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-button v-if="sa.isAuth('tb-orders-add')" size="mini" type="primary" @click="add()">新增</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>
 
-				</div>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td type="selection"></sa-td>
 
-					<sa-td name="订单编号" prop="orderNo" ></sa-td>
 
-					<sa-td name="商品名称" prop="goodsName" ></sa-td>
 
+					<sa-td name="订单编号" prop="orderNo" width="180px"></sa-td>
 
+					<sa-td name="商品名称" prop="goodsName" width="280px"></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="deleteStatus" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateDeleteStatus(s.row)"></sa-td> -->
 
-					<el-table-column label="操作" fixed="right"  width="240px">
 
+					<sa-td name="互市区" prop="tradeAreaName" width="120px"></sa-td>
 
+					<sa-td name="买家" prop="purchaserName" ></sa-td>
 
+					<sa-td name="转售金额" prop="resalePrice" ></sa-td>
 
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
 
+					<sa-td name="订单状态已完成" prop="orderFinish" type="switch" :jv="{0: '未完成', 1: '已完成'}" @change="s => updateOrderFinish(s.row)"></sa-td>
 
+					
+					<el-table-column label="操作" 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>
 
+							<!-- <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>
 
@@ -70,29 +61,8 @@
 
 				el: '.vue-box',
 
 				data: {
 
 					p: { // 查询参数
 
-						id: '',		// 货运订单管理表主键
 
 						orderNo: '',		// 订单编号
 
-						goodsId: '',		// 商品id
 
 						goodsName: '',		// 商品名称
 
-						goodsFrom: '',		// 商品来源(国家)
 
-						shipperPhone: '',		// 发货商电话
 
-						shipperName: '',		// 发货商名称
 
-						driverId: '',		// 司机ID
 
-						driverName: '',		// 司机名称
 
-						driverPhone: '',		// 司机电话
 
-						carId: '',		// 车型ID
 
-						carType: '',		// 车型名称
 
-						consigneeName: '',		// 收货人名称
 
-						consigneePhone: '',		// 收货人电话号码
 
-						declarationNumber: '',		// (预留字段) 申报订单号
 
-						orderFinish: '',		// 订单状态已完成 (0=禁用,1=启用)
 
-						createTime: '',		// 创建时间
 
-						createBy: '',		// 创建人编号
 
-						createName: '',		// 创建人名称
 
-						updateTime: '',		// 更新时间
 
-						updateBy: '',		// 更新人编号
 
-						updateName: '',		// 更新人名称
 
-						deleteStatus: '',		// 删除状态(0=禁用,1=启用)
 
 						pageNo: 1,		// 当前页
 
 						pageSize: 10,	// 页大小
 
 						sortType: 0		// 排序方式
 
@@ -103,7 +73,7 @@
 
 				methods: {
 
 					// 刷新
 
 					f5: function() {
 
-						sa.ajax('/level-one-server/TbOrders/getList', sa.removeNull(this.p), function(res) {
 
+						sa.ajax('/level-two-server/TbOrders/getList', sa.removeNull(this.p), function(res) {
 
 							this.dataList = res.data; // 数据
 
 							this.dataCount = res.dataCount; // 数据总数
 
 							sa.f5TableHeight();		// 刷新表格高度
 
@@ -113,14 +83,6 @@
 
 					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%');
 
@@ -132,7 +94,7 @@
 
 					// 删除
 
 					del: function(data) {
 
 						sa.confirm('是否删除，此操作不可撤销', function() {
 
-							sa.ajax('/level-one-server/TbOrders/delete?id=' + data.id, function(res) {
 
+							sa.ajax('/level-two-server/TbOrders/delete?id=' + data.id, function(res) {
 
 								sa.arrayDelete(this.dataList, data);
 
 								sa.ok('删除成功');
 
 								sa.f5TableHeight();		// 刷新表格高度
 
@@ -149,7 +111,7 @@
 
 						}
 
 						// 提交删除
 
 						sa.confirm('是否批量删除选中数据？此操作不可撤销', function() {
 
-							sa.ajax('/level-one-server/TbOrders/deleteByIds', {ids: ids.join(',')}, function(res) {
 
+							sa.ajax('/level-two-server/TbOrders/deleteByIds', {ids: ids.join(',')}, function(res) {
 
 								sa.arrayDelete(this.dataList, selection);
 
 								sa.ok('删除成功');
 
 								sa.f5TableHeight();		// 刷新表格高度
 
@@ -161,23 +123,7 @@
 
 						// 声明变量记录是否成功
 
 						var isOk = false;
 
 						var oldValue = data.orderFinish;
 
-						var ajax = sa.ajax('/level-one-server/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('/level-one-server/TbOrders/updateDeleteStatus', {id: data.id, value: data.deleteStatus}, function(res) {
 
+						var ajax = sa.ajax('/level-two-server/TbOrders/updateOrderFinish', {id: data.id, value: data.orderFinish}, function(res) {
 
 							isOk = true;
 
 							sa.msg('修改成功');
 
 						}.bind(this));
 
@@ -187,7 +133,7 @@
 
 								data.status = oldValue;
 
 							}
 
 						})
 
-					},
 
+					}
 
 				},
 
 				created: function() {
 
 					this.f5();

+ 0 - 215
sa-view/tb-two-market-orders/tb-two-market-orders-add.html
View File 

@@ -1,215 +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="../../static/kj/element-ui/theme-chalk/index.css">
 
-		<link rel="stylesheet" href="../../static/sa.css">
 
-		<script src="../../static/kj/vue.min.js"></script>
 
-		<script src="../../static/kj/element-ui/index.js"></script>
 
-		<script src="../../static/kj/httpVueLoader.js"></script>
 
-		<script src="../../static/kj/jquery.min.js"></script>
 
-		<script src="../../static/kj/layer/layer.js"></script>
 
-		<script src="../../static/sa.js"></script>
 
-		<style type="text/css">
 
-			.c-panel .el-form .c-label{width: 7em !important;}
 
-			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
 
-		</style>
 
-	</head>
 
-	<body>
 
-		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
 
-			<!-- ------- 内容部分 ------- -->
 
-			<div class="s-body">
 
-				<div class="c-panel">
 
-                    <div class="c-title" v-if="id == 0">数据添加</div>
 
-					<div class="c-title" v-else>数据修改</div>
 
-					<el-form v-if="m">
 
-						<el-row :gutter="50">
 
-							<el-col :span="12">
 
-								<sa-item type="text" name="订单编号" v-model="m.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>
 
-					</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: '',		// 备注 
-							// 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.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>

+ 0 - 128
sa-view/tb-two-market-orders/tb-two-market-orders-info.html
View File 

@@ -1,128 +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="../../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">
 
-						<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>
 
-			<!-- ------- 底部按钮 ------- -->
 
-			<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>

+ 0 - 155
sa-view/tb-two-market-orders/tb-two-market-orders-list.html
View File 

@@ -1,155 +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="../../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="text" name="订单编号" v-model="p.orderNo" width="7em"></sa-item>
 
-					<sa-item type="text" name="商品名称" v-model="p.goodsName" width="7em"></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>
 
-			
-				<!-- ------------- 数据列表 ------------- -->
 
-				<el-table class="data-table" ref="data-table" :data="dataList" >
 
-					<sa-td type="index" name="序号"></sa-td>
 
-					<sa-td name="订单编号" prop="orderNo" width="180"></sa-td>
 
-					<sa-td name="所属互市区" prop="tradeAreaName" ></sa-td>
 
-					<sa-td name="商品名称" prop="goodsName" width="280"></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="收货人名称" prop="consigneeName" ></sa-td>
 
-					<sa-td name="收货人电话号码" prop="consigneePhone" ></sa-td>
 
-					<el-table-column label="操作" fixed="right"  width="200px">
 
-						<template slot-scope="s">
 
-							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(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: { // 查询参数  
-						orderNo: '',		// 订单编号 
-						// goodsId: '',		// 商品id 
-						goodsName: '',		// 商品名称 
-						goodsFrom: '',		// 商品来源(国家) 
-						shipperPhone: '',		// 发货商电话 
-						shipperName: '',		// 发货商名称 
-						// driverId: '',		// 司机ID 
-						driverName: '',		// 司机名称 
-						driverPhone: '',		// 司机电话 
-						// carId: '',		// 车型ID 
-						carType: '',		// 车型名称 
-						consigneeName: '',		// 收货人名称 
-						consigneePhone: '',		// 收货人电话号码 
-						declarationNumber: '',		// (预留字段) 申报订单号 
-						orderFinish: '',		// 订单状态已完成 (0=禁用,1=启用) 
-						loadingAddress: '',		// 装货地址 
-						unloadingAddress: '',		// 卸货地址 
-						comment: '',		// 备注 
-						// tradeAreaId: '',		// 贸易区域id 
-						tradeAreaName: '',		// 贸易区域名称 
-						pageNo: 1,		// 当前页 
-						pageSize: 20,	// 页大小 
-						sortType: 0		// 排序方式 
-					},
 
-					dataCount: 0,
 
-					dataList: [], // 数据集合 
-				},
 
-				methods: {
 
-					// 刷新
 
-					f5: function() {
 
-						sa.ajax('/level-two-server/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%');
 
-					},
 
-					// 改 - 订单状态已完成 (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>