查询优化

sa-frame/menu-list-sp.js

@@ -623,12 +623,108 @@ window.menuList.unshift({
 		name: '交易管理',
 		parent: true,
 		icon: 'el-icon-s-unfold',
-		childList: [{
+		childList: [
+			{
 			id: 'level-one-market',
 			icon: 'el-icon-school',
 			name: '一级市场',
 			parent: true,
-			childList: [{
+			childList: [
+				
+					{
+						id: 'level-order',
+						name: '交易订单',
+						icon: 'el-icon-s-operation',
+						parent: true,
+						childList: [{
+							id: 'ht-trade-settlement',
+							name: '进境结算单',
+							icon: 'el-icon-s-home',
+							url: 'sa-view/ht-trade-settlement/ht-trade-settlement-list.html',
+							childList: [
+								{
+									id: 'ht-trade-settlement-edit',
+									name: '修改订单',
+									isShow: false
+								},
+								{
+									id: 'tb-order-edit-price',
+									name: '修改上架金额',
+									isShow: false
+								},
+								{
+									id: 'ht-trade-settlement-hzsconfirm',
+									name: '互助社确认',
+									isShow: false
+								},
+							]
+						},
+							{
+								id: 'tb-order',
+								name: '边民购买订单',
+								icon: 'el-icon-s-custom',
+								url: 'sa-view/tb-order/tb-order-list.html',
+								childList: [{
+									id: 'tb-order-edit',
+									name: '修改订单',
+									isShow: false
+								},
+									{
+										id: 'tb-order-del',
+										name: '删除订单',
+										isShow: false
+									},
+									{
+										id: 'bank-info',
+										name: '银行回执',
+										isShow: false
+									},
+									{
+										id: 'tb-order-deduction',
+										name: '订单扣款',
+										isShow: false
+									},
+									{
+										id: 'tb-order-send009',
+										name: '补推009',
+										isShow: false
+									},
+									{
+										id: 'tb-order-sendCXB001',
+										name: '推送结关',
+										isShow: false
+									},{
+										id: 'tb-order-refund',
+										name: '退款',
+										isShow: false
+									},
+								]
+							},
+							{
+								id: 'tb-import-order',
+								name: '进口申报单',
+								icon: 'el-icon-s-unfold',
+								url: 'sa-view/tb-import-order/tb-import-order-list.html',
+								childList: [{
+									id: 'tb-import-order-add',
+									name: '订单添加',
+									isShow: false
+								},
+									{
+										id: 'tb-import-order-edit',
+										name: '订单更新',
+										isShow: false
+									},
+									{
+										id: 'tb-import-order-del',
+										name: '订单删除',
+										isShow: false
+									},
+								]
+							},
+						]
+					},
+				{
 				id: 'listing-manage',
 				name: '上架管理',
 				icon: 'el-icon-shopping-cart-full',
@@ -645,100 +741,6 @@ window.menuList.unshift({
 					}]
 				}]
 			},
-
-				{
-					id: 'level-order',
-					name: '交易订单',
-					icon: 'el-icon-s-operation',
-					parent: true,
-					childList: [{
-						id: 'ht-trade-settlement',
-						name: '进境结算单',
-						icon: 'el-icon-s-home',
-						url: 'sa-view/ht-trade-settlement/ht-trade-settlement-list.html',
-						childList: [
-							{
-								id: 'ht-trade-settlement-edit',
-								name: '修改订单',
-								isShow: false
-							},
-							{
-								id: 'tb-order-edit-price',
-								name: '修改上架金额',
-								isShow: false
-							},
-							{
-								id: 'ht-trade-settlement-hzsconfirm',
-								name: '互助社确认',
-								isShow: false
-							},
-						]
-					},
-						{
-							id: 'tb-order',
-							name: '边民购买订单',
-							icon: 'el-icon-s-custom',
-							url: 'sa-view/tb-order/tb-order-list.html',
-							childList: [{
-								id: 'tb-order-edit',
-								name: '修改订单',
-								isShow: false
-							},
-								{
-									id: 'tb-order-del',
-									name: '删除订单',
-									isShow: false
-								},
-								{
-									id: 'bank-info',
-									name: '银行回执',
-									isShow: false
-								},
-								{
-									id: 'tb-order-deduction',
-									name: '订单扣款',
-									isShow: false
-								},
-								{
-									id: 'tb-order-send009',
-									name: '补推009',
-									isShow: false
-								},
-								{
-									id: 'tb-order-sendCXB001',
-									name: '推送结关',
-									isShow: false
-								},{
-									id: 'tb-order-refund',
-									name: '退款',
-									isShow: false
-								},
-							]
-						},
-						{
-							id: 'tb-import-order',
-							name: '进口申报单',
-							icon: 'el-icon-s-unfold',
-							url: 'sa-view/tb-import-order/tb-import-order-list.html',
-							childList: [{
-								id: 'tb-import-order-add',
-								name: '订单添加',
-								isShow: false
-							},
-								{
-									id: 'tb-import-order-edit',
-									name: '订单更新',
-									isShow: false
-								},
-								{
-									id: 'tb-import-order-del',
-									name: '订单删除',
-									isShow: false
-								},
-							]
-						},
-					]
-				},
 				{
 					id: 'tb-wallet-manager',
 					name: '服务点管理',

sa-view/ht-trade-settlement/tb-order-sendCXB001ByVeNo.html

@@ -55,6 +55,7 @@
 				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td type="index" name="序号" width="80px"></sa-td>
 					<sa-td name="车牌号" prop="veNo"></sa-td>
+					<sa-td name="订单号" prop="tradeNo" width="200"></sa-td>
 					<sa-td name="买家" prop="buyUserName"></sa-td>
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 					<sa-td name="总重量" prop="netWt"></sa-td>

sa-view/listing-management/listing-management-order.html

@@ -88,7 +88,7 @@
 							@click="saleBatch()">批量转售</el-button>
 						<el-button v-if="sa.isAuth('tb-order-edit-price')" type="warning" style="margin-bottom:10px;"
 							@click="callBackSleBatch()">批量撤销转售</el-button>
-						
+
 					</div>
 				</el-form>
 				<div style="display: flex;padding: 10px;font-size: 16px;">
@@ -96,7 +96,7 @@
 					<div style="margin-left: 10px;">已上架:{{statics.upSize}};</div>
 					<div style="margin-left: 10px;">未上架:<span style="color:red">{{statics.notUpSize}}</span>;</div>
 					<div style="margin-left: 10px;">上架总金额:<span
-							style="color:red;font-weight: bold;">{{statics.upTotalPrice}}元</span>;</div>
+							style="color:red;font-weight: bold;">{{Math.round(statics.upTotalPrice*100)/100}}元</span>;</div>
 					<div style="margin-left: 10px;">已转售:{{statics.saleSize}};</div>
 					<div style="margin-left: 10px;">未转售:<span style="color:red">{{statics.notSaleSize}}</span></div>
 				</div>
@@ -403,4 +403,4 @@
 			})
 		</script>
 	</body>
-</html>
+</html>

sa-view/listing-management/listing-management.html

@@ -23,9 +23,33 @@
 					<sa-item type="text" name="车牌号" v-model="p.veNo" width="8em"></sa-item>
 					<sa-item type="text" name="商品名称" v-model="p.goodsNames" width="11em"></sa-item>
 					<sa-item type="date" name="申报日期" v-model="p.declTime" width="7em"></sa-item>
+					<sa-item type="text" name="航次号" v-model="p.voyageNo" width="11em"></sa-item>
 				</el-form>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="航次号" v-model="p.voyageNo" width="11em"></sa-item>
+					<sa-item name="上架状态" width="120px">
+						<el-select v-model="p.upStatus">
+							<el-option label="全部" value=""></el-option>
+							<el-option label="已上架" value="1"></el-option>
+							<el-option label="未上架" value="2"></el-option>
+							<el-option label="部分上架" value="3"></el-option>
+						</el-select>
+					</sa-item>
+					<sa-item name="转售状态" width="120px">
+						<el-select v-model="p.saleStatus">
+							<el-option label="全部" value=""></el-option>
+							<el-option label="已转售" value="1"></el-option>
+							<el-option label="未转售" value="2"></el-option>
+							<el-option label="部分转售" value="3"></el-option>
+						</el-select>
+					</sa-item>
+					<sa-item name="销售状态" width="120px">
+						<el-select v-model="p.beOrderStatus">
+							<el-option label="全部" value=""></el-option>
+							<el-option label="已销售" value="1"></el-option>
+							<el-option label="未销售" value="2"></el-option>
+							<el-option label="部分销售" value="3"></el-option>
+						</el-select>
+					</sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()" style="margin-left: 163px">查询</el-button>
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</el-form>
@@ -68,6 +92,9 @@
 						goodsNames: '',		// 商品名称
 						returns:0,
 						chargebacks:0,
+						upStatus:'',
+						saleStatus:'',
+						beOrderStatus:'',
 						pageNo: 1,		// 当前页
 						pageSize: 10,	// 页大小
 						sortType: 0		// 排序方式

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

@@ -31,13 +31,11 @@
 					<sa-td name="业务编号" prop="platSeqNo" width="150px"></sa-td>
 					<sa-td name="预录入编号" prop="preNo" width="150px"></sa-td>
 					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
+					<sa-td name="边民" prop="peopleName" ></sa-td>
 					<!--<sa-td name="申报人身份证号" prop="ciphertextIdno" width="140px"></sa-td>-->
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="互市区" prop="fieldName" width="160px"></sa-td>
-					<sa-td name="总金额" prop="sumAmt" ></sa-td>
-					<sa-td name="总毛重(kg)" prop="sumGrossWt" ></sa-td>
-					<sa-td name="总净重(kg)" prop="sumNetWt" ></sa-td>
-					<sa-td name="币制" prop="currCode" ></sa-td>
+					<sa-td name="总金额" prop="gLimit" ></sa-td>
+					<sa-td name="总重重(kg)" prop="gGrossWt" ></sa-td>
 					<sa-td name="件数" prop="packNo" ></sa-td>
 					<sa-td name="运输批次号" prop="manifestId" width="150px"></sa-td>
 					<sa-td name="创建时间" prop="createTime" width="140px"></sa-td>

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

@@ -70,7 +70,7 @@
 				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td type="index" width="30px"></sa-td>
 					<sa-td name="车牌号" prop="veNo"></sa-td>
-					<sa-td name="订单号" prop="tradeNo" width="180"></sa-td>
+					<sa-td name="订单号" prop="tradeNo" width="210"></sa-td>
 					<sa-td name="边民" prop="buyUserName"></sa-td>
 					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
@@ -92,10 +92,11 @@
 					<!--(一级市场)订单扣款回执状态[0=初始值 1=扣款成功 2=扣款失败]-->
 					<sa-td name="扣款状态" prop="sxb010Status">
 						<template slot-scope="s">
+						<div v-if="s.row.sxb010Status===3">扣款中</div>
+						<div v-else>
 							<div v-if="s.row.refundStatus==0">
 								<div v-if="s.row.sxb010Status===0">未扣款</div>
 								<div v-if="s.row.sxb010Status===1">扣款成功</div>
-								<div v-if="s.row.sxb010Status===3">扣款中</div>
 								<div v-else-if="s.row.sxb010Status===2">扣款失败</div>
 							</div>
 							<div v-else>
@@ -103,7 +104,8 @@
 								<div v-if="s.row.refundStatus===2">退款失败</div>
 								<div v-if="s.row.refundStatus===3">退款中</div>
 							</div>
-							
+						</div>
+														
 						</template>
 					</sa-td>
 					<sa-td name="销售状态" prop="beingOrder"><!--订单转售后是否在二级市场被下单-->
@@ -132,7 +134,7 @@
 							<el-button class="c-btn" type="success" @click="get(s.row)">查看</el-button>
 							<el-button class="c-btn" type="primary" @click="getBank(s.row)">银行回执</el-button>
 							<span>
-								<el-button v-if="(s.row.sxb010Status!=1||s.row.refundStatus==1)
+								<el-button v-if="(s.row.sxb010Status!=1||s.row.refundStatus==1)&&s.row.sxb010Status!=3
 												&&s.row.peopleConfirmStatus===1 && s.row.applyConfirmStatus===1
 												&&sa.isAuth('tb-order-deduction')" class="c-btn" type="warning"
 									@click="deductionHandle(s.row)">订单扣款</el-button>
@@ -336,43 +338,7 @@
 					getBank: function(data) {
 						sa.showIframe('银行回执', 'tb-order-bank-list.html?tradeNo=' + data.tradeNo, '1300px', '90%');
 					},
-					// 修改
-					update: function(data) {
-						sa.showIframe('修改数据', 'tb-order-add.html?id=' + data.id, '1000px', '90%');
-					},
-					// 新增
-					add: function(data) {
-						sa.showIframe('新增数据', 'tb-order-add.html?id=-1', '1000px', '90%');
-					},
-					// 删除
-					del: function(data) {
-						sa.confirm('是否删除，此操作不可撤销', function() {
-							sa.ajax('/level-one-server/TbOrder/delete?id=' + data.id, function(res) {
-								sa.arrayDelete(this.dataList, data);
-								sa.ok('删除成功');
-								sa.f5TableHeight(); // 刷新表格高度
-							}.bind(this))
-						}.bind(this));
-					},
-					// 批量删除
-					deleteByIds: function() {
-						// 获取选中元素的id列表
-						let selection = this.$refs['data-table'].selection;
-						let ids = sa.getArrayField(selection, 'id');
-						if (selection.length == 0) {
-							return sa.msg('请至少选择一条数据')
-						}
-						// 提交删除
-						sa.confirm('是否批量删除选中数据？此操作不可撤销', function() {
-							sa.ajax('/level-one-server/TbOrder/deleteByIds', {
-								ids: ids.join(',')
-							}, function(res) {
-								sa.arrayDelete(this.dataList, selection);
-								sa.ok('删除成功');
-								sa.f5TableHeight(); // 刷新表格高度
-							}.bind(this))
-						}.bind(this));
-					},
+			
 
 				},
 				created: function() {