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

查询优化

qzy 1 month ago
parent
c4f257b4ea
commit
e8b0695379
10 changed files with 664 additions and 654 deletions
Unified View Show Diff Stats
  1. 452 472
      sa-frame/menu-list-sp.js
  2. 15 1
      sa-view/ht-byte/ht-byte-list.html
  3. 6 9
      sa-view/ht-trade-settlement/ht-trade-settlement-list.html
  4. 42 13
      sa-view/ht-trade-settlement/ht-trade-settlement-order.html
  5. 46 50
      sa-view/ht-trade-settlement/tb-order-sendCXB001ByVeNo.html
  6. 36 30
      sa-view/listing-management/listing-management-order.html
  7. 2 2
      sa-view/listing-management/listing-management.html
  8. 61 27
      sa-view/tb-order/tb-order-list.html
  9. 0 47
      sa-view/tb-orders/tb-orders-bank-list.html
  10. 4 3
      sa-view/tb-orders/tb-orders-list.html

File diff suppressed because it is too large
+ 452 - 472
sa-frame/menu-list-sp.js


+ 15 - 1
sa-view/ht-byte/ht-byte-list.html
View File 

@@ -29,7 +29,21 @@
 
 							<el-option label="未处理" :value="0"></el-option>
 
 							<el-option label="未处理" :value="0"></el-option>
 
 						</el-select>
 
 						</el-select>
 
 					</sa-item>
 
 					</sa-item>
 
-					<sa-item type="text" name="类型" v-model="p.dataType"></sa-item>
 
+					<sa-item name="类型" width="90px">
 
+						<el-select v-model="p.dataType" style="width: 120px;">
 
+							<el-option label="全部" value=""></el-option>
 
+							<el-option label="边民" value="001"></el-option>
 
+							<el-option label="商铺" value="002"></el-option>
 
+							<el-option label="合作社" value="003"></el-option>
 
+							<el-option label="互助组" value="004"></el-option>
 
+							<el-option label="商品信息" value="005"></el-option>
 
+							<el-option label="结算单" value="006"></el-option>
 
+							<el-option label="过卡3" value="007"></el-option>
 
+							<el-option label="进口申报单" value="008"></el-option>
 
+							<el-option label="边民确认" value="009"></el-option>
 
+							<el-option label="退单" value="010"></el-option>
 
+						</el-select>
 
+					</sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 					<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-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 
 				</el-form>
 
 				</el-form>

+ 6 - 9
sa-view/ht-trade-settlement/ht-trade-settlement-list.html
View File 

@@ -50,7 +50,7 @@
 
 					<sa-td name="确认时间" prop="hzsConfirmTime" width="160"></sa-td>
 
 					<sa-td name="确认时间" prop="hzsConfirmTime" width="160"></sa-td>
 
 					<sa-td name="申报单编号" prop="declareId" width="160px"></sa-td>
 
 					<sa-td name="申报单编号" prop="declareId" width="160px"></sa-td>
 
 					<sa-td name="提运单号" prop="billNo" width="160"></sa-td>
 
 					<sa-td name="提运单号" prop="billNo" width="160"></sa-td>
 
-					<el-table-column label="操作" width="210px" fixed="right">
 
+					<el-table-column label="操作" width="280px" fixed="right" align="center">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
 							<el-button class="c-btn" type="success" @click="get(s.row)">查看</el-button>
 
 							<el-button class="c-btn" type="success" @click="get(s.row)">查看</el-button>
 
 							<el-button class="c-btn" type="primary" @click="getOrder(s.row)">边民订单</el-button>
 
 							<el-button class="c-btn" type="primary" @click="getOrder(s.row)">边民订单</el-button>
 
@@ -58,17 +58,14 @@
 
 								<el-button
 
 								<el-button
 
 									v-if="s.row.hzsConfirmStatus===0 &&sa.isAuth('ht-trade-settlement-hzsconfirm')"
 
 									v-if="s.row.hzsConfirmStatus===0 &&sa.isAuth('ht-trade-settlement-hzsconfirm')"
 
 									class="c-btn" type="info" @click="hzsConfirm(s.row)">互助社确认</el-button>
 
 									class="c-btn" type="info" @click="hzsConfirm(s.row)">互助社确认</el-button>
 
-								<el-button v-else :disabled="true" class="c-btn" type="info">互助社确认</el-button>
 
 							</span>
 
 							</span>
 
 							<span>
 
 							<span>
 
-								<el-button v-if="sa.isAuth('tb-order-deduction')" class="c-btn" type="warning"
 
+								<el-button v-if="sa.isAuth('tb-order-deduction')&&s.row.hzsConfirmStatus==1" class="c-btn" type="warning"
 
 									@click="ToDeductionByVeNo(s.row)">按车订单扣款</el-button>
 
 									@click="ToDeductionByVeNo(s.row)">按车订单扣款</el-button>
 
-								<el-button v-else :disabled="true" class="c-btn" type="warning">按车订单扣款</el-button>
 
 							</span>
 
 							</span>
 
 							<span>
 
 							<span>
 
-								<el-button v-if="sa.isAuth('tb-order-sendCXB001')" class="c-btn" type="warning"
 
-									@click="ToSendCXB001ByVeNo(s.row)">按车推送结关</el-button>
 
-								<el-button v-else :disabled="true" class="c-btn" type="warning">按车推送结关</el-button>
 
+								<el-button v-if="sa.isAuth('tb-order-sendCXB001')&&s.row.hzsConfirmStatus==1" class="c-btn" type="warning"
 
+									@click="ToSendCXB001ByVeNo(s.row)">推送结关</el-button>
 
 							</span>
 
 							</span>
 
 						</template>
 
 						</template>
 
 					</el-table-column>
 
 					</el-table-column>
 
@@ -115,7 +112,7 @@
 
 						sa.showIframe('数据详情', 'ht-trade-settlement-info.html?id=' + data.id, '1050px', '90%');
 
 						sa.showIframe('数据详情', 'ht-trade-settlement-info.html?id=' + data.id, '1050px', '90%');
 
 					},
 
 					},
 
 					getOrder(data) {
 
 					getOrder(data) {
 
-						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?mainId=' + data.id, '90%', '94%');
 
+						sa.showIframe('边民订单', '../tb-order/tb-order-list.html?mainId=' + data.id, '90%', '94%');
 
 					},
 
 					},
 
 					hzsConfirm(data) {
 
 					hzsConfirm(data) {
 
 						sa.confirm('是否确认订单', function() {
 
 						sa.confirm('是否确认订单', function() {
 
@@ -136,7 +133,7 @@
 
 						let veNo = data.veNo;
 
 						let veNo = data.veNo;
 
 						let id = data.id;
 
 						let id = data.id;
 
 						sa.showIframe('按车推送结关【' + veNo + '】', 'tb-order-sendCXB001ByVeNo.html?veNo=' + veNo + '&id=' +
 
 						sa.showIframe('按车推送结关【' + veNo + '】', 'tb-order-sendCXB001ByVeNo.html?veNo=' + veNo + '&id=' +
 
-							id, '1660px', '97%');
 
+							id, '1200px', '97%');
 
 					},
 
 					},
 
 				},
 
 				},
 
 				created: function() {
 
 				created: function() {

+ 42 - 13
sa-view/ht-trade-settlement/ht-trade-settlement-order.html
View File 

@@ -28,37 +28,66 @@
 
 	<body>
 
 	<body>
 
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 
 			<div class="c-panel">
 
 			<div class="c-panel">
 
-				<!-- ------------- 检索参数 ------------- -->
 
-				<!-- <div class="c-title">检索参数</div> -->
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="边民" v-model="p.buyUserName"></sa-item>
 
-					<sa-item name="状态">
 
+				<div>
 
+					<sa-item type="text" name="边民" v-model="p.buyUserName" width="80px"></sa-item>
 
+					<sa-item name="确认状态" width="120px">
 
 						<el-select v-model="p.applyConfirmStatus">
 
 						<el-select v-model="p.applyConfirmStatus">
 
 							<el-option label="全部" value=""></el-option>
 
 							<el-option label="全部" value=""></el-option>
 
-							<el-option  label="已确认" :value="1"></el-option>
 
-							<el-option  label="未确认" :value="0"></el-option>
 
+							<el-option label="未确认" value="0"></el-option>
 
+							<el-option label="已确认" value="1"></el-option>
 
+						</el-select>
 
+					</sa-item>
 
+				</div>
 
+				<div>
 
+					<sa-item name="出卡3" width="120px">
 
+						<el-select v-model="p.finishStatus">
 
+							<el-option label="全部" value=""></el-option>
 
+							<el-option label="未出卡3" value="0"></el-option>
 
+							<el-option label="已出卡3" value="1"></el-option>
 
+						</el-select>
 
+					</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-select>
 
+					</sa-item>
 
+					<sa-item name="扣款状态" width="120px">
 
+						<el-select v-model="p.Sxb010Status">
 
+							<el-option label="全部" value=""></el-option>
 
+							<el-option label="未扣款" value="0"></el-option>
 
+							<el-option label="扣款失败" value="2"></el-option>
 
+							<el-option label="已扣款" value="1"></el-option>
 
 						</el-select>
 
 						</el-select>
 
 					</sa-item>
 
 					</sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 					<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 type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 
+				</div>
 
 				</el-form>
 
 				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList">
 
 				<el-table class="data-table" ref="data-table" :data="dataList">
 
 					<sa-td type="index" width="30px"></sa-td>
 
 					<sa-td type="index" width="30px"></sa-td>
 
 					<sa-td name="车牌号" prop="veNo"></sa-td>
 
 					<sa-td name="车牌号" prop="veNo"></sa-td>
 
-					<sa-td name="订单号" prop="tradeNo" width="180px"></sa-td>
 
+					<sa-td name="订单号" prop="tradeNo" width="190px"></sa-td>
 
 					<sa-td name="边民" prop="buyUserName"></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>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
 					<sa-td name="净重(kg)" prop="netWt"></sa-td>
 
 					<sa-td name="净重(kg)" prop="netWt"></sa-td>
 
-					<sa-td name="总金额" prop="totalPrice"></sa-td>
 
+					<sa-td name="总金额" prop="totalPrice"  width="90px"></sa-td>
 
 					<sa-td name="确认状态" prop="totalPrice">
 
 					<sa-td name="确认状态" prop="totalPrice">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
 							<div v-if="s.row.applyConfirmStatus==1">已确认</div>
 
 							<div v-if="s.row.applyConfirmStatus==1">已确认</div>
 
 							<div v-else>未确认</div>
 
 							<div v-else>未确认</div>
 
 						</template>
 
 						</template>
 
 					</sa-td>
 
 					</sa-td>
 
-					<sa-td name="上架金额(元)" prop="upPrice">
 
+					<sa-td name="过卡状态" prop="finishStatus">
 
+						<template slot-scope="s">
 
+							<div v-if="s.row.finishStatus===1">已过卡3</div>
 
+							<div v-else>未过卡3</div>
 
+						</template>
 
+					</sa-td>
 
+					<sa-td name="上架金额(元)" prop="upPrice"  width="90px">
 
 					</sa-td>
 
 					</sa-td>
 
 					<sa-td name="订单状态" prop="upPrice">
 
 					<sa-td name="订单状态" prop="upPrice">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
@@ -71,7 +100,7 @@
 
 					<sa-td type="enum" name="进口确认" prop="applyConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td> -->
 
 					<sa-td type="enum" name="进口确认" prop="applyConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td> -->
 
 					<el-table-column label="操作" fixed="right" width="100px">
 
 					<el-table-column label="操作" fixed="right" width="100px">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
-							<el-button class="c-btn" type="success" icon="el-icon-view"
 
+							<el-button class="c-btn" type="success"
 
 								@click="getBank(s.row)">银行回执</el-button>
 
 								@click="getBank(s.row)">银行回执</el-button>
 
 						</template>
 
 						</template>
 
 					</el-table-column>
 
 					</el-table-column>
 
@@ -115,7 +144,7 @@
 
 						applyConfirmStatus: '', // 商家名称
 
 						applyConfirmStatus: '', // 商家名称
 
 						saleMainId: sa.p('mainId', 0),
 
 						saleMainId: sa.p('mainId', 0),
 
 						pageNo: 1, // 当前页
 
 						pageNo: 1, // 当前页
 
-						pageSize: 20, // 页大小
 
+						pageSize: 10, // 页大小
 
 						sortType: 0 // 排序方式
 
 						sortType: 0 // 排序方式
 
 					},
 
 					},
 
 					dataCount: 0,
 
 					dataCount: 0,
 
@@ -177,4 +206,4 @@
 
 			})
 
 			})
 
 		</script>
 
 		</script>
 
 	</body>
 
 	</body>
 
-</html>
 
+</html>

+ 46 - 50
sa-view/ht-trade-settlement/tb-order-sendCXB001ByVeNo.html
View File 

@@ -3,7 +3,8 @@
 
 	<head>
 
 	<head>
 
 		<title>边民订单表-列表</title>
 
 		<title>边民订单表-列表</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
+		<meta name="viewport"
 
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
 		<!-- 所有的 css & js 资源 -->
 
 		<!-- 所有的 css & js 资源 -->
 
 		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
 
 		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
 
 		<link rel="stylesheet" href="../../static/sa.css">
 
 		<link rel="stylesheet" href="../../static/sa.css">
 
@@ -15,10 +16,14 @@
 
 		<script src="../../static/sa.js"></script>
 
 		<script src="../../static/sa.js"></script>
 
 		<style>
 
 		<style>
 
 			hr {
 
 			hr {
 
-				border: none;          /* 移除默认边框 */
 
-				height: 1px;           /* 设置高度 */
 
-				background-color: gainsboro;/* 设置颜色 */
 
-				margin: 5px 0;        /* 设置上下外边距 */
 
+				border: none;
 
+				/* 移除默认边框 */
 
+				height: 1px;
 
+				/* 设置高度 */
 
+				background-color: gainsboro;
 
+				/* 设置颜色 */
 
+				margin: 5px 0;
 
+				/* 设置上下外边距 */
 
 			}
 
 			}
 
 		</style>
 
 		</style>
 
 	</head>
 
 	</head>
 
@@ -26,8 +31,8 @@
 
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 
 			<div class="c-panel">
 
 			<div class="c-panel">
 
 				<el-form v-if="bigData">
 
 				<el-form v-if="bigData">
 
-					<div style="color: red;font-weight: bold">请核对当前进境结算单信息，以下列表为未结关的订单：</div>
 
-					<el-row style="margin-left: 200px;">
 
+					<el-divider content-position="left">结算单信息</el-divider>
 
+					<el-row style="margin-left: 50px;">
 
 						<el-col span="8">
 
 						<el-col span="8">
 
 							<sa-info name="车牌号" br>{{bigData.veNo}}</sa-info>
 
 							<sa-info name="车牌号" br>{{bigData.veNo}}</sa-info>
 
 							<sa-info name="预申报编号" br>{{bigData.platSeqNo}}</sa-info>
 
 							<sa-info name="预申报编号" br>{{bigData.platSeqNo}}</sa-info>
 
@@ -36,43 +41,39 @@
 
 						<el-col span="8">
 
 						<el-col span="8">
 
 							<sa-info name="总毛重(kg)" br>{{bigData.sumGrossWt}}</sa-info>
 
 							<sa-info name="总毛重(kg)" br>{{bigData.sumGrossWt}}</sa-info>
 
 							<sa-info name="总净重(kg)" br>{{bigData.sumNetWt}}</sa-info>
 
 							<sa-info name="总净重(kg)" br>{{bigData.sumNetWt}}</sa-info>
 
-							<sa-info name="总金额" br>{{bigData.sumAmt}}</sa-info>
 
+							<sa-info name="总金额(元)" br>{{bigData.sumAmt}}</sa-info>
 
 						</el-col>
 
 						</el-col>
 
 						<el-col span="8">
 
 						<el-col span="8">
 
 							<sa-info name="互市区" br>{{bigData.fieldName}}</sa-info>
 
 							<sa-info name="互市区" br>{{bigData.fieldName}}</sa-info>
 
 							<sa-info name="创建时间" br>{{bigData.createTime}}</sa-info>
 
 							<sa-info name="创建时间" br>{{bigData.createTime}}</sa-info>
 
 						</el-col>
 
 						</el-col>
 
+						<el-button type="success" icon="el-icon-info" @click="sendCXB001ByVeNo()">按车推送结关</el-button>
 
 					</el-row>
 
 					</el-row>
 
 				</el-form>
 
 				</el-form>
 
-				<hr>
 
-				<el-form ref="form" @submit.native.prevent>
 
-					<el-button type="success" icon="el-icon-info" @click="sendCXB001ByVeNo()">按车推送结关</el-button>
 
-				</el-form>
 
+				<el-divider content-position="left">边民订单</el-divider>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<!-- ------------- 数据列表 ------------- -->
 
-				<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="buyUserName" ></sa-td>
 
-					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 
+				<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="buyUserName"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
-					<sa-td name="总重量" prop="netWt" ></sa-td>
 
-					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 
-					<sa-td name="上架金额(元)" prop="upPrice" ></sa-td>
 
-					<sa-td name="订单状态" prop="upStatus" >
 
+					<sa-td name="总重量" prop="netWt"></sa-td>
 
+					<sa-td name="总金额" prop="totalPrice"></sa-td>
 
+					<sa-td name="上架金额(元)" prop="upPrice" width="100px"></sa-td>
 
+					<sa-td name="订单状态" prop="upStatus">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
 							<div v-if="s.row.upStatus===2">已上架</div>
 
 							<div v-if="s.row.upStatus===2">已上架</div>
 
 							<div v-else>未上架</div>
 
 							<div v-else>未上架</div>
 
 						</template>
 
 						</template>
 
 					</sa-td>
 
 					</sa-td>
 
-					<sa-td name="过卡状态" prop="finishStatus" >
 
+					<sa-td name="过卡状态" prop="finishStatus">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
 							<div v-if="s.row.finishStatus===1">已过卡3</div>
 
 							<div v-if="s.row.finishStatus===1">已过卡3</div>
 
 							<div v-else>未过卡3</div>
 
 							<div v-else>未过卡3</div>
 
 						</template>
 
 						</template>
 
 					</sa-td>
 
 					</sa-td>
 
 					<!--(一级市场)订单扣款回执状态[0=初始值 1=扣款成功 2=扣款失败]-->
 
 					<!--(一级市场)订单扣款回执状态[0=初始值 1=扣款成功 2=扣款失败]-->
 
-					<sa-td name="扣款状态" prop="sxb010Status" >
 
+					<sa-td name="扣款状态" prop="sxb010Status">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
 							<div v-if="s.row.sxb010Status===1">扣款成功</div>
 
 							<div v-if="s.row.sxb010Status===1">扣款成功</div>
 
 							<div v-else-if="s.row.sxb010Status===2">扣款失败</div>
 
 							<div v-else-if="s.row.sxb010Status===2">扣款失败</div>
 
@@ -80,17 +81,11 @@
 
 							<div v-else>未确认</div>
 
 							<div v-else>未确认</div>
 
 						</template>
 
 						</template>
 
 					</sa-td>
 
 					</sa-td>
 
-					<sa-td name="补扣次数" prop="deductionCount">
 
-						<template slot-scope="s">
 
-							<div v-if="s.row.deductionCount==0">0</div>
 
-							<div v-else>{{s.row.deductionCount}}</div>
 
-						</template>
 
-					</sa-td>
 
-					<sa-td name="补扣时间" prop="deductionTime" width="140px"></sa-td>
 
 					<sa-td name="创建时间" prop="createTime" width="140px"></sa-td>
 
 					<sa-td name="创建时间" prop="createTime" width="140px"></sa-td>
 
 				</el-table>
 
 				</el-table>
 
 				<!-- ------------- 分页 ------------- -->
 
 				<!-- ------------- 分页 ------------- -->
 
-				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
 
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount"
 
+					@change="f5()"></sa-item>
 
 			</div>
 
 			</div>
 
 		</div>
 
 		</div>
 
 		<script>
 
 		<script>
 
@@ -106,10 +101,10 @@
 
 					id: sa.p('id', 0),
 
 					id: sa.p('id', 0),
 
 					p: { // 查询参数
 
 					p: { // 查询参数
 
 						id: sa.p('id', 0),
 
 						id: sa.p('id', 0),
 
-						veNo: sa.p('veNo', 0),	// 车牌号
 
-						pageNo: 1,		// 当前页
 
-						pageSize: 10,	// 页大小
 
-						sortType: 0		// 排序方式
 
+						veNo: sa.p('veNo', 0), // 车牌号
 
+						pageNo: 1, // 当前页
 
+						pageSize: 10, // 页大小
 
+						sortType: 0 // 排序方式
 
 					},
 
 					},
 
 					dataCount: 0,
 
 					dataCount: 0,
 
 					dataList: [], // 数据集合
 
 					dataList: [], // 数据集合
 
@@ -117,37 +112,38 @@
 
 				},
 
 				},
 
 				methods: {
 
 				methods: {
 
 					sendCXB001ByVeNo() {
 
 					sendCXB001ByVeNo() {
 
-						if(this.dataCount === 0 ) {
 
-							sa.error('当前车没有需要推送结关的订单')
 
-							return;
 
-						}
 
 						sa.confirm('是否执行推送当前列表订单的结关信息操作', function() {
 
 						sa.confirm('是否执行推送当前列表订单的结关信息操作', function() {
 
-							sa.ajax('/level-one-server/TbOrder/sendCXB001ByVeNo?veNo=' + this.veNo, function(res) {
 
-								sa.alert('操作成功', this.clean);
 
-							}.bind(this))
 
+							sa.ajax('/level-one-server/TbOrder/sendCXB001ByVeNo?veNo=' + this.veNo + '&id=' +
 
+								this.id,
 
+								function(res) {
 
+									sa.alert('执行成功', this.clean);
 
+								}.bind(this))
 
 						}.bind(this));
 
 						}.bind(this));
 
 					},
 
 					},
 
 					clean: function() {
 
 					clean: function() {
 
-						parent.app.f5();		// 刷新父页面列表
 
-						sa.closeCurrIframe();	// 关闭本页
 
+						parent.app.f5(); // 刷新父页面列表
 
+						sa.closeCurrIframe(); // 关闭本页
 
 					},
 
 					},
 
 					f5: function() {
 
 					f5: function() {
 
-						sa.ajax('/level-one-server/TbOrder/getSendCXB001ByVeNoList', sa.removeNull(this.p), function(res) {
 
+						sa.ajax('/level-one-server/TbOrder/getSendCXB001ByVeNoList', sa.removeNull(this.p), function(
 
+							res) {
 
 							this.dataList = res.data; // 数据
 
 							this.dataList = res.data; // 数据
 
 							this.dataCount = res.dataCount; // 数据总数
 
 							this.dataCount = res.dataCount; // 数据总数
 
-							sa.f5TableHeight();		// 刷新表格高度
 
+							sa.f5TableHeight(); // 刷新表格高度
 
 						}.bind(this));
 
 						}.bind(this));
 
 					},
 
 					},
 
 				},
 
 				},
 
 				created: function() {
 
 				created: function() {
 
 					this.f5();
 
 					this.f5();
 
-					sa.ajax('/level-one-server/HtTradeSettlement/getById', {id : this.id}, function(res) {
 
+					sa.ajax('/level-one-server/HtTradeSettlement/getById', {
 
+						id: this.id
 
+					}, function(res) {
 
 						this.bigData = res.data; // 数据
 
 						this.bigData = res.data; // 数据
 
-						sa.f5TableHeight();		// 刷新表格高度
 
+						sa.f5TableHeight(); // 刷新表格高度
 
 					}.bind(this));
 
 					}.bind(this));
 
 					sa.onInputEnter();
 
 					sa.onInputEnter();
 
 				}
 
 				}
 
 			})
 
 			})
 
 		</script>
 
 		</script>
 
 	</body>
 
 	</body>
 
-</html>
 
+</html>

+ 36 - 30
sa-view/listing-management/listing-management-order.html
View File 

@@ -55,32 +55,41 @@
 
 				</el-form>
 
 				</el-form>
 
 				<el-divider content-position="left">边民订单-列表</el-divider>
 
 				<el-divider content-position="left">边民订单-列表</el-divider>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item name="上架状态">
 
-						<el-select v-model="p.upStatus" style="width: 120px;">
 
-							<el-option label="全部" value=""></el-option>
 
-							<el-option label="未上架" value="1"></el-option>
 
-							<el-option label="已上架" value="2"></el-option>
 
-						</el-select>
 
-					</sa-item>
 
-					<sa-item name="转售状态">
 
-						<el-select v-model="p.resaleStatus" style="width: 120px;">
 
-							<el-option label="全部" value=""></el-option>
 
-							<el-option label="未转售" value="0"></el-option>
 
-							<el-option label="已转售" value="1"></el-option>
 
-						</el-select>
 
-					</sa-item>
 
-					<sa-item type="text" name="边民" v-model="p.buyUserName" width="11em"></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-form ref="form" :model='p' @submit.native.prevent>
 
-					<el-button v-if="sa.isAuth('tb-order-edit-price')" type="primary" style="margin-bottom:10px;"
 
-						@click="editPriceByIds()">批量修改总价</el-button>
 
-					<el-button v-if="sa.isAuth('tb-order-edit-price')" type="primary" style="margin-bottom:10px;"
 
-						@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>
 
+						<sa-item name="上架状态">
 
+							<el-select v-model="p.upStatus" style="width: 120px;">
 
+								<el-option label="全部" value=""></el-option>
 
+								<el-option label="未上架" value="1"></el-option>
 
+								<el-option label="已上架" value="2"></el-option>
 
+							</el-select>
 
+						</sa-item>
 
+						<sa-item name="转售状态">
 
+							<el-select v-model="p.resaleStatus" style="width: 120px;">
 
+								<el-option label="全部" value=""></el-option>
 
+								<el-option label="未转售" value="0"></el-option>
 
+								<el-option label="已转售" value="1"></el-option>
 
+							</el-select>
 
+						</sa-item>
 
+					</div>
 
+					<div>
 
+						<sa-item name="销售状态">
 
+							<el-select v-model="p.beingOrder" style="width: 120px;">
 
+								<el-option label="全部" value=""></el-option>
 
+								<el-option label="未销售" value="0"></el-option>
 
+								<el-option label="已销售" value="1"></el-option>
 
+							</el-select>
 
+						</sa-item>
 
+						<sa-item type="text" name="边民" v-model="p.buyUserName" width="11em"></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-order-edit-price')" type="primary" style="margin-bottom:10px;"
 
+							@click="editPriceByIds()">批量修改总价</el-button>
 
+						<el-button v-if="sa.isAuth('tb-order-edit-price')" type="primary" style="margin-bottom:10px;"
 
+							@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>
 
 				</el-form>
 
 				<div style="display: flex;padding: 10px;font-size: 16px;">
 
 				<div style="display: flex;padding: 10px;font-size: 16px;">
 
 					<div>订单总数：{{dataCount}};</div>
 
 					<div>订单总数：{{dataCount}};</div>
 
@@ -96,7 +105,6 @@
 
 					<sa-td type="selection"></sa-td>
 
 					<sa-td type="selection"></sa-td>
 
 					<sa-td name="车牌号" prop="veNo"></sa-td>
 
 					<sa-td name="车牌号" prop="veNo"></sa-td>
 
 					<sa-td name="边民" prop="buyUserName"></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>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
 					<sa-td name="净重(kg)" prop="netWt"></sa-td>
 
 					<sa-td name="净重(kg)" prop="netWt"></sa-td>
 
 					<sa-td name="总金额" prop="totalPrice"></sa-td>
 
 					<sa-td name="总金额" prop="totalPrice"></sa-td>
 
@@ -125,14 +133,12 @@
 
 							<div v-else>未销售</div>
 
 							<div v-else>未销售</div>
 
 						</template>
 
 						</template>
 
 					</sa-td>
 
 					</sa-td>
 
-					<el-table-column label="操作" fixed="right" width="100px">
 
+					<el-table-column label="操作" fixed="right" width="150px">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
 							<div>
 
 							<div>
 
 								<el-button
 
 								<el-button
 
 									v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
 
 									v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
 
 									class="c-btn" type="success" @click="editPrice(s.row)">修改总价</el-button>
 
 									class="c-btn" type="success" @click="editPrice(s.row)">修改总价</el-button>
 
-							</div>
 
-							<div>
 
 								<el-button
 
 								<el-button
 
 									v-if="s.row.peopleConfirmStatus==1&&s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
 
 									v-if="s.row.peopleConfirmStatus==1&&s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
 
 									class="c-btn" type="primary" @click="sel(s.row)">转售二级</el-button>
 
 									class="c-btn" type="primary" @click="sel(s.row)">转售二级</el-button>

+ 2 - 2
sa-view/listing-management/listing-management.html
View File 

@@ -22,10 +22,10 @@
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
 					<sa-item type="text" name="车牌号" v-model="p.veNo" width="8em"></sa-item>
 
 					<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="text" name="商品名称" v-model="p.goodsNames" width="11em"></sa-item>
 
-					<sa-item type="text" name="商铺" v-model="p.shopName" width="11em"></sa-item>
 
+					<sa-item type="date" name="申报日期" v-model="p.declTime" width="7em"></sa-item>
 
 				</el-form>
 
 				</el-form>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="申报单编号" v-model="p.declareId" width="11em"></sa-item>
 
+					<sa-item type="text" name="航次号" v-model="p.voyageNo" width="11em"></sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()" style="margin-left: 163px">查询</el-button>
 
 					<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-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 
 				</el-form>
 
 				</el-form>

+ 61 - 27
sa-view/tb-order/tb-order-list.html
View File 

@@ -21,31 +21,62 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<div class="c-title">检索参数</div>
 
 				<div class="c-title">检索参数</div>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="车牌号" v-model="p.veNo" width="80px"></sa-item>
 
-					<sa-item type="text" name="订单号" v-model="p.tradeNo" width="80px"></sa-item>
 
-					<sa-item type="text" name="边民" v-model="p.buyUserName" width="80px"></sa-item>
 
-					<sa-item name="扣款状态">
 
-						<el-select v-model="p.Sxb010Status">
 
-							<el-option label="全部" value=""></el-option>
 
-							<el-option label="未扣款" value="0"></el-option>
 
-							<el-option label="扣款失败" value="2"></el-option>
 
-							<el-option label="已扣款" value="1"></el-option>
 
-						</el-select>
 
-					</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>
 
+					<div>
 
+						<sa-item type="text" name="车牌号" v-model="p.veNo" width="80px"></sa-item>
 
+						<sa-item type="text" name="边民" v-model="p.buyUserName" width="80px"></sa-item>
 
+						<sa-item name="确认状态" width="120px">
 
+							<el-select v-model="p.applyConfirmStatus">
 
+								<el-option label="全部" value=""></el-option>
 
+								<el-option label="未确认" value="0"></el-option>
 
+								<el-option label="已确认" value="1"></el-option>
 
+							</el-select>
 
+						</sa-item>
 
+						<sa-item name="出卡3" width="120px">
 
+							<el-select v-model="p.finishStatus">
 
+								<el-option label="全部" value=""></el-option>
 
+								<el-option label="未出卡3" value="0"></el-option>
 
+								<el-option label="已出卡3" value="1"></el-option>
 
+							</el-select>
 
+						</sa-item>
 
+					</div>
 
+					<div>
 
+						<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-select>
 
+						</sa-item>
 
+						<sa-item name="销售状态" width="100px">
 
+							<el-select v-model="p.beingOrder" style="width: 120px;">
 
+								<el-option label="全部" value=""></el-option>
 
+								<el-option label="未销售" value="0"></el-option>
 
+								<el-option label="已销售" value="1"></el-option>
 
+							</el-select>
 
+						</sa-item>
 
+						<sa-item name="扣款状态" width="120px">
 
+							<el-select v-model="p.Sxb010Status">
 
+								<el-option label="全部" value=""></el-option>
 
+								<el-option label="未扣款" value="0"></el-option>
 
+								<el-option label="扣款失败" value="2"></el-option>
 
+								<el-option label="已扣款" value="1"></el-option>
 
+							</el-select>
 
+						</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>
 
+					</div>
 
 				</el-form>
 
 				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList">
 
 				<el-table class="data-table" ref="data-table" :data="dataList">
 
 					<sa-td type="index" width="30px"></sa-td>
 
 					<sa-td type="index" width="30px"></sa-td>
 
 					<sa-td name="车牌号" prop="veNo"></sa-td>
 
 					<sa-td name="车牌号" prop="veNo"></sa-td>
 
 					<sa-td name="订单号" prop="tradeNo" width="180"></sa-td>
 
 					<sa-td name="订单号" prop="tradeNo" width="180"></sa-td>
 
-					<sa-td name="买家" prop="buyUserName"></sa-td>
 
+					<sa-td name="边民" prop="buyUserName"></sa-td>
 
 					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 
 					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
 					<sa-td name="净重(kg)" prop="netWt"></sa-td>
 
 					<sa-td name="净重(kg)" prop="netWt"></sa-td>
 
 					<sa-td name="总金额" prop="totalPrice"></sa-td>
 
 					<sa-td name="总金额" prop="totalPrice"></sa-td>
 
-					<sa-td name="上架金额(元)" prop="upPrice"></sa-td>
 
+					<sa-td name="上架金额(元)" prop="upPrice" width="100px"> </sa-td>
 
 					<sa-td name="订单状态" prop="upStatus">
 
 					<sa-td name="订单状态" prop="upStatus">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
 							<div v-if="s.row.upStatus===2">已上架</div>
 
 							<div v-if="s.row.upStatus===2">已上架</div>
 
@@ -66,6 +97,12 @@
 
 							<div v-else-if="s.row.sxb010Status===2">扣款失败</div>
 
 							<div v-else-if="s.row.sxb010Status===2">扣款失败</div>
 
 						</template>
 
 						</template>
 
 					</sa-td>
 
 					</sa-td>
 
+					<sa-td name="销售状态" prop="beingOrder"><!--订单转售后是否在二级市场被下单-->
 
+						<template slot-scope="s">
 
+							<div v-if="s.row.beingOrder==1">已销售</div>
 
+							<div v-else>未销售</div>
 
+						</template>
 
+					</sa-td>
 
 					<sa-td name="补扣次数" prop="deductionCount">
 
 					<sa-td name="补扣次数" prop="deductionCount">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
 							<div v-if="s.row.deductionCount==0">0</div>
 
 							<div v-if="s.row.deductionCount==0">0</div>
 
@@ -81,28 +118,24 @@
 
 						:jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}"></sa-td>
 
 						:jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}"></sa-td>
 
 					<sa-td type="enum" name="进口确认" prop="applyConfirmStatus"
 
 					<sa-td type="enum" name="进口确认" prop="applyConfirmStatus"
 
 						:jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}"></sa-td>
 
 						:jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}"></sa-td>
 
-					<el-table-column label="操作" fixed="right" width="210px">
 
+					<el-table-column label="操作" fixed="right" width="210px" align="center">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
-							<el-button class="c-btn" type="success" icon="el-icon-view"
 
+							<el-button class="c-btn" type="success"
 
 								@click="get(s.row)">查看</el-button>
 
 								@click="get(s.row)">查看</el-button>
 
-							<el-button class="c-btn" type="primary" icon="el-icon-info"
 
+							<el-button class="c-btn" type="primary"
 
 								@click="getBank(s.row)">银行回执</el-button>
 
 								@click="getBank(s.row)">银行回执</el-button>
 
 							<span>
 
 							<span>
 
 								<el-button v-if="s.row.sxb010Status!=1
 
 								<el-button v-if="s.row.sxb010Status!=1
 
 												&&s.row.peopleConfirmStatus===1 && s.row.applyConfirmStatus===1
 
 												&&s.row.peopleConfirmStatus===1 && s.row.applyConfirmStatus===1
 
 												&&sa.isAuth('tb-order-deduction')" class="c-btn" type="warning" @click="deductionHandle(s.row)">订单扣款</el-button>
 
 												&&sa.isAuth('tb-order-deduction')" class="c-btn" type="warning" @click="deductionHandle(s.row)">订单扣款</el-button>
 
-								<el-button v-else :disabled="true" class="c-btn" type="warning">订单扣款</el-button>
 
 							</span>
 
 							</span>
 
 							<span>
 
 							<span>
 
-								<el-button v-if="s.row.finishStatus!=1
 
+							<!-- 	<el-button v-if="s.row.finishStatus!=1
 
 												&&sa.isAuth('tb-order-sendCXB001')" class="c-btn" type="warning"
 
 												&&sa.isAuth('tb-order-sendCXB001')" class="c-btn" type="warning"
 
-									@click="sendCXB001Handle(s.row)">推送结关</el-button>
 
-								<el-button v-else :disabled="true" class="c-btn" type="warning">推送结关</el-button>
 
+									@click="sendCXB001Handle(s.row)">推送结关</el-button> -->
 
 							</span>
 
 							</span>
 
-							<el-button v-if="sa.isAuth('tb-order-send009')" class="c-btn" type="danger"
 
-								@click="send009ToHt(s.row)">补推009</el-button>
 
-							<!--<el-button v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
 
-									   class="c-btn" type="warning" icon="el-icon-view" @click="editPrice(s.row)">修改上架金额</el-button>-->
 
+							<el-button v-if="sa.isAuth('tb-order-send009')&&s.row.applyConfirmStatus==0" class="c-btn" type="danger"
 
+								@click="send009ToHt(s.row)">人工确认</el-button>
 
 						</template>
 
 						</template>
 
 					</el-table-column>
 
 					</el-table-column>
 
 				</el-table>
 
 				</el-table>
 
@@ -173,7 +206,8 @@
 
 						chargebacks: 0,
 
 						chargebacks: 0,
 
 						pageNo: 1, // 当前页
 
 						pageNo: 1, // 当前页
 
 						pageSize: 10, // 页大小
 
 						pageSize: 10, // 页大小
 
-						sortType: 0 // 排序方式
 
+						sortType: 0 ,// 排序方式
 
+						saleMainId: sa.p('mainId', ''),
 
 					},
 
 					},
 
 					dataCount: 0,
 
 					dataCount: 0,
 
 					dataList: [], // 数据集合
 
 					dataList: [], // 数据集合

+ 0 - 47
sa-view/tb-orders/tb-orders-bank-list.html
View File 

@@ -59,53 +59,6 @@
 
 							sa.f5TableHeight();		// 刷新表格高度
 
 							sa.f5TableHeight();		// 刷新表格高度
 
 						}.bind(this));
 
 						}.bind(this));
 
 					},
 
 					},
 
-					// 查看
 
-					get: function(data) {
 
-						sa.showIframe('数据详情', 'bank-info-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('修改数据', 'bank-info-add.html?id=' + data.id, '1000px', '90%');
 
-					},
 
-					// 新增
 
-					add: function(data) {
 
-						sa.showIframe('新增数据', 'bank-info-add.html?id=-1', '1000px', '90%');
 
-					},
 
-					// 删除
 
-					del: function(data) {
 
-						sa.confirm('是否删除，此操作不可撤销', function() {
 
-							sa.ajax('/BankInfo/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('/BankInfo/deleteByIds', {ids: ids.join(',')}, function(res) {
 
-								sa.arrayDelete(this.dataList, selection);
 
-								sa.ok('删除成功');
 
-								sa.f5TableHeight();		// 刷新表格高度
 
-							}.bind(this))
 
-						}.bind(this));
 
-					},
 
 				},
 
 				},
 
 				created: function() {
 
 				created: function() {
 
 					this.f5();
 
 					this.f5();

+ 4 - 3
sa-view/tb-orders/tb-orders-list.html
View File 

@@ -51,9 +51,10 @@
 
 					<sa-td name="车牌号" prop="veNo" width="80px"></sa-td>
 
 					<sa-td name="车牌号" prop="veNo" width="80px"></sa-td>
 
 					<sa-td name="订单编号" prop="orderNo" width="180px"></sa-td>
 
 					<sa-td name="订单编号" prop="orderNo" width="180px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsName" ></sa-td>
 
 					<sa-td name="商品名称" prop="goodsName" ></sa-td>
 
-					<sa-td name="买家" prop="purchaserName" width="100px"></sa-td>
 
 					<sa-td name="货主" prop="leaderName" width="100px"></sa-td>
 
 					<sa-td name="货主" prop="leaderName" width="100px"></sa-td>
 
 					<sa-td name="转售金额" prop="resalePrice" width="80px"></sa-td>
 
 					<sa-td name="转售金额" prop="resalePrice" width="80px"></sa-td>
 
+					<sa-td name="买家" prop="purchaserName" width="100px"></sa-td>
 
+					<sa-td name="下单时间" prop="orderTime" width="100px"></sa-td>
 
 					<sa-td name="订单状态" prop="orderFinish" type="enum" :jv="{0: '未完成[#ff910a]', 1: '已完成[green]'}" @change="s => updateOrderFinish(s.row)" width="80px"></sa-td>
 
 					<sa-td name="订单状态" prop="orderFinish" type="enum" :jv="{0: '未完成[#ff910a]', 1: '已完成[green]'}" @change="s => updateOrderFinish(s.row)" width="80px"></sa-td>
 
 					<sa-td name="支付状态" prop="isPay" type="enum" :jv="{0: '未支付[#ff910a]', 1: '支付成功[green]', 2: '支付失败[red]', 3: '支付中[blue]'}" width="80px"></sa-td>
 
 					<sa-td name="支付状态" prop="isPay" type="enum" :jv="{0: '未支付[#ff910a]', 1: '支付成功[green]', 2: '支付失败[red]', 3: '支付中[blue]'}" width="80px"></sa-td>
 
 					<sa-td name="补扣次数" prop="deductionCount" width="80px">
 
 					<sa-td name="补扣次数" prop="deductionCount" width="80px">
 
@@ -63,8 +64,8 @@
 
 						</template>
 
 						</template>
 
 					</sa-td>
 
 					</sa-td>
 
 					<sa-td name="补扣时间" prop="deductionTime" width="140px"></sa-td>
 
 					<sa-td name="补扣时间" prop="deductionTime" width="140px"></sa-td>
 
-					<sa-td name="创建时间" prop="createTime" width="140px"></sa-td>
 
-					<el-table-column label="操作" fixed="right" width="190px">
 
+					<sa-td name="转售时间" prop="createTime" width="140px"></sa-td>
 
+					<el-table-column label="操作" fixed="right" width="390px">
 
 						<template slot-scope="s">
 
 						<template slot-scope="s">
 
 							<el-button class="c-btn" type="success"  @click="get(s.row)">查看</el-button>
 
 							<el-button class="c-btn" type="success"  @click="get(s.row)">查看</el-button>
 
 							<el-button class="c-btn" type="primary" icon="el-icon-info" @click="getBank(s.row)">银行回执</el-button>
 
 							<el-button class="c-btn" type="primary" icon="el-icon-info" @click="getBank(s.row)">银行回执</el-button>

Some files were not shown because too many files changed in this diff