Kaynağa Gözat

部分功能优化

qzy 1 ay önce
ebeveyn
işleme
edce8662af

+ 68 - 49
sa-view/ht-trade-settlement/ht-trade-settlement-order.html

@@ -3,7 +3,8 @@
 	<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" />
+		<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">
@@ -14,8 +15,14 @@
 		<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;}
+			.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>
@@ -24,32 +31,36 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<!-- <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>
+					<sa-item type="text" name="边民" v-model="p.buyUserName"></sa-item>
+					<sa-item name="状态">
+						<el-select v-model="p.applyConfirmStatus">
+							<el-option label="全部" value=""></el-option>
+							<el-option  label="已确认" :value="1"></el-option>
+							<el-option  label="未确认" :value="0"></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>
 				</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 name="订单号" prop="tradeNo" width="180px"></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="totalWeight" ></sa-td>
-					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="总金额" prop="totalPrice" ></sa-td>
-					<sa-td name="上架金额(元)" prop="upPrice" >
-						<!--<template slot-scope="s">
-							<div >{{s.row.upPrice}}
-							<el-link v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')" style="font-size: 12px;"  type="primary" @click="editPrice(s.row)">
-								修改
-							</el-link>
-							</div>
-						</template>-->
+					<sa-td name="净重(kg)" prop="netWt"></sa-td>
+					<sa-td name="车牌号" prop="veNo"></sa-td>
+					<sa-td name="总金额" prop="totalPrice"></sa-td>
+					<sa-td name="确认状态" prop="totalPrice">
+						<template slot-scope="s">
+							<div v-if="s.row.applyConfirmStatus==1">已确认</div>
+							<div v-else>未确认</div>
+						</template>
+					</sa-td>
+					<sa-td name="上架金额(元)" prop="upPrice">
 					</sa-td>
-					<sa-td name="订单状态" prop="upPrice" >
+					<sa-td name="订单状态" prop="upPrice">
 						<template slot-scope="s">
 							<div v-if="s.row.upStatus==2">已上架</div>
 							<div v-else>未上架</div>
@@ -58,14 +69,16 @@
 					<!-- <sa-td type="enum" name="交易确认" prop="peopleConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
 					<sa-td type="enum" name="委托确认" prop="cooperEntrustStatus" :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">
-							<el-button class="c-btn" type="success" icon="el-icon-view" @click="getBank(s.row)">银行回执</el-button>
+							<el-button class="c-btn" type="success" icon="el-icon-view"
+								@click="getBank(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>
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount"
+					@change="f5()"></sa-item>
 			</div>
 			<el-dialog :title="model.title" :visible.sync="model.visible" width="500px">
 				<div>
@@ -91,51 +104,57 @@
 						title: '修改价格',
 						visible: false,
 						form: {
-							id:'',
-							upPrice:'',
-							selPrice:0
+							id: '',
+							upPrice: '',
+							selPrice: 0
 						}
 					},
 					p: { // 查询参数
-						tradeNo: '',		    // 订单号
-						buyUserName: '',		// 买家
-						enterpriseName: '',		// 商家名称
+						tradeNo: '', // 订单号
+						buyUserName: '', // 买家
+						applyConfirmStatus: '', // 商家名称
 						saleMainId: sa.p('mainId', 0),
-						pageNo: 1,		// 当前页
-						pageSize: 20,	// 页大小
-						sortType: 0		// 排序方式
+						pageNo: 1, // 当前页
+						pageSize: 20, // 页大小
+						sortType: 0 // 排序方式
 					},
 					dataCount: 0,
 					dataList: [], // 数据集合
 				},
 				methods: {
-					editPrice(item){
-						this.model={
-							title:'修改订单【'+item.tradeNo+'】价格',
-							visible:true,
-							form:item
+					editPrice(item) {
+						this.model = {
+							title: '修改订单【' + item.tradeNo + '】价格',
+							visible: true,
+							form: item
 						}
 					},
-					save(){
-						let price=this.model.form.selPrice;
-						if(!price){
+					save() {
+						let price = this.model.form.selPrice;
+						if (!price) {
 							sa.error('请输入金额')
 							return;
 						}
-						sa.ajax('/level-one-server/TbOrder/editUpPrice', {id:this.model.form.id,price:price}, function(res) {
+						sa.ajax('/level-one-server/TbOrder/editUpPrice', {
+							id: this.model.form.id,
+							price: price
+						}, function(res) {
 							this.f5();
-							this.model.visible=false;
+							this.model.visible = false;
 						}.bind(this));
 					},
-					sel(){
-						let price=this.model.form.selPrice;
-						if(!price){
+					sel() {
+						let price = this.model.form.selPrice;
+						if (!price) {
 							sa.error('请输入金额')
 							return;
 						}
-						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:this.model.form.id,resalePrice:price}, function(res) {
+						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {
+							id: this.model.form.id,
+							resalePrice: price
+						}, function(res) {
 							this.f5();
-							this.model.visible=false;
+							this.model.visible = false;
 						}.bind(this));
 					},
 					// 刷新
@@ -143,7 +162,7 @@
 						sa.ajax('/level-one-server/TbOrder/getList', sa.removeNull(this.p), function(res) {
 							this.dataList = res.data; // 数据
 							this.dataCount = res.dataCount; // 数据总数
-							sa.f5TableHeight();		// 刷新表格高度
+							sa.f5TableHeight(); // 刷新表格高度
 						}.bind(this));
 					},
 					// 查看银行回执
@@ -158,4 +177,4 @@
 			})
 		</script>
 	</body>
-</html>
+</html>

+ 1 - 0
sa-view/tb-import-order/tb-import-order-list.html

@@ -39,6 +39,7 @@
 					<sa-td name="总净重" prop="sumNetWt" ></sa-td>
 					<sa-td name="币制" prop="currCode" ></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>
 					<el-table-column label="操作" fixed="right"  width="120px">
 						<template slot-scope="s">

+ 96 - 72
sa-view/tb-order/tb-order-list.html

@@ -3,7 +3,8 @@
 	<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" />
+		<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">
@@ -22,49 +23,57 @@
 				<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 type="text" name="商家名称" v-model="p.enterpriseName" width="70px"></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>
 					<span>
-						<el-button v-if="sa.isAuth('tb-order-deduction')" type="success" icon="el-icon-info" @click="deductionByVeNo()">按车补扣款</el-button>
-						<el-button v-else :disabled="true"                type="success" icon="el-icon-info">按车补扣款</el-button>
+						<el-button v-if="sa.isAuth('tb-order-deduction')" type="success" icon="el-icon-info"
+							@click="deductionByVeNo()">按车补扣款</el-button>
+						<el-button v-else :disabled="true" type="success" icon="el-icon-info">按车补扣款</el-button>
 					</span>
 					<span>
-						<el-button v-if="sa.isAuth('tb-order-sendCXB001')" type="success" icon="el-icon-info" @click="sendCXB001ByVeNo()">按车推结关</el-button>
-						<el-button v-else :disabled="true"                 type="success" icon="el-icon-info">按车推结关</el-button>
+						<el-button v-if="sa.isAuth('tb-order-sendCXB001')" type="success" icon="el-icon-info"
+							@click="sendCXB001ByVeNo()">按车推结关</el-button>
+						<el-button v-else :disabled="true" type="success" icon="el-icon-info">按车推结关</el-button>
 					</span>
 				</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 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="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="totalWeight" ></sa-td>
-					<sa-td name="总金额" prop="totalPrice" ></sa-td>
-					<sa-td name="上架金额(元)" prop="upPrice" ></sa-td>
-					<sa-td name="订单状态" prop="upStatus" >
+					<sa-td name="净重(kg)" prop="netWt"></sa-td>
+					<sa-td name="总金额" prop="totalPrice"></sa-td>
+					<sa-td name="上架金额(元)" prop="upPrice"></sa-td>
+					<sa-td name="订单状态" prop="upStatus">
 						<template slot-scope="s">
 							<div v-if="s.row.upStatus===2">已上架</div>
 							<div v-else>未上架</div>
 						</template>
 					</sa-td>
-					<sa-td name="过卡状态" prop="finishStatus" >
+					<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>
 					<!--(一级市场)订单扣款回执状态[0=初始值 1=扣款成功 2=扣款失败]-->
-					<sa-td name="扣款状态" prop="sxb010Status" >
+					<sa-td name="扣款状态" prop="sxb010Status">
 						<template slot-scope="s">
+							<div v-if="s.row.sxb010Status===0">未扣款</div>
 							<div v-if="s.row.sxb010Status===1">扣款成功</div>
 							<div v-else-if="s.row.sxb010Status===2">扣款失败</div>
-							<div v-else-if="s.row.peopleConfirmStatus===1 && s.row.applyConfirmStatus===1">已确认</div>
-							<div v-else>未确认</div>
 						</template>
 					</sa-td>
 					<sa-td name="补扣次数" prop="deductionCount">
@@ -76,35 +85,40 @@
 					<sa-td name="补扣时间" prop="deductionTime" width="140px"></sa-td>
 					<sa-td name="创建时间" prop="createTime" width="140px"></sa-td>
 
-					<sa-td type="enum" name="交易确认" prop="peopleConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
-					<sa-td type="enum" name="委托确认" prop="cooperEntrustStatus" :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="210px">
+					<sa-td type="enum" name="交易确认" prop="peopleConfirmStatus"
+						:jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}"></sa-td>
+					<sa-td type="enum" name="委托确认" prop="cooperEntrustStatus"
+						: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="210px">
 						<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-info" @click="getBank(s.row)">银行回执</el-button>
+							<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-info"
+								@click="getBank(s.row)">银行回执</el-button>
 							<span>
 								<el-button v-if="s.row.sxb010Status!=1
 												&&s.row.peopleConfirmStatus===1 && s.row.applyConfirmStatus===1
-												&&sa.isAuth('tb-order-deduction')"
-										   class="c-btn" type="warning" @click="deduction(s.row)">订单扣款</el-button>
+												&&sa.isAuth('tb-order-deduction')" class="c-btn" type="warning" @click="deduction(s.row)">订单扣款</el-button>
 								<el-button v-else :disabled="true" class="c-btn" type="warning">订单扣款</el-button>
 							</span>
 							<span>
 								<el-button v-if="s.row.finishStatus!=1
-												&&sa.isAuth('tb-order-sendCXB001')"
-										   class="c-btn" type="warning" @click="sendCXB001Handle(s.row)">推送结关</el-button>
+												&&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>
 							</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="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>-->
 						</template>
 					</el-table-column>
 				</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>
 			<el-dialog :title="model.title" :visible.sync="model.visible" width="500px">
 				<div>
@@ -146,9 +160,9 @@
 						title: '修改价格',
 						visible: false,
 						form: {
-							id:'',
-							upPrice:'',
-							selPrice:0
+							id: '',
+							upPrice: '',
+							selPrice: 0
 						}
 					},
 					deduction: {
@@ -162,46 +176,52 @@
 						veNo: ''
 					},
 					p: { // 查询参数
-						tradeNo: '',		    // 订单号
-						buyUserName: '',		// 买家
-						enterpriseName: '',		// 商家名称
-						returns:0,
-						chargebacks:0,
-						pageNo: 1,		// 当前页
-						pageSize: 10,	// 页大小
-						sortType: 0		// 排序方式
+						tradeNo: '', // 订单号
+						buyUserName: '', // 买家
+						sxb010Status: '', // 商家名称
+						returns: 0,
+						chargebacks: 0,
+						pageNo: 1, // 当前页
+						pageSize: 10, // 页大小
+						sortType: 0 // 排序方式
 					},
 					dataCount: 0,
 					dataList: [], // 数据集合
 				},
 				methods: {
-					editPrice(item){
-						this.model={
-							title:'修改订单【'+item.tradeNo+'】价格',
-							visible:true,
-							form:item
+					editPrice(item) {
+						this.model = {
+							title: '修改订单【' + item.tradeNo + '】价格',
+							visible: true,
+							form: item
 						}
 					},
-					save(){
-						let price=this.model.form.selPrice;
-						if(!price){
+					save() {
+						let price = this.model.form.selPrice;
+						if (!price) {
 							sa.error('请输入金额')
 							return;
 						}
-						sa.ajax('/level-one-server/TbOrder/editUpPrice', {id:this.model.form.id,price:price}, function(res) {
+						sa.ajax('/level-one-server/TbOrder/editUpPrice', {
+							id: this.model.form.id,
+							price: price
+						}, function(res) {
 							this.f5();
-							this.model.visible=false;
+							this.model.visible = false;
 						}.bind(this));
 					},
-					sel(){
-						let price=this.model.form.selPrice;
-						if(!price){
+					sel() {
+						let price = this.model.form.selPrice;
+						if (!price) {
 							sa.error('请输入金额')
 							return;
 						}
-						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:this.model.form.id,price:price}, function(res) {
+						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {
+							id: this.model.form.id,
+							price: price
+						}, function(res) {
 							this.f5();
-							this.model.visible=false;
+							this.model.visible = false;
 						}.bind(this));
 					},
 
@@ -209,47 +229,49 @@
 						sa.confirm('是否执行订单扣款操作', function() {
 							sa.ajax('/level-one-server/TbOrder/deduction?id=' + data.id, function(res) {
 								sa.ok('操作成功');
-								sa.f5TableHeight();		// 刷新表格高度
+								sa.f5TableHeight(); // 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
 					deductionByVeNo() {
-						this.deduction.visible=true
+						this.deduction.visible = true
 					},
 					ToDeductionByVeNo() {
 						let veNo = this.deduction.veNo;
-						if(!veNo) {
+						if (!veNo) {
 							sa.error('请输入车牌号')
 							return;
 						}
-						sa.showIframe('按车补扣款【'+veNo+'】', 'tb-order-deductionByVeNo.html?veNo=' + veNo, '1660px', '97%');
+						sa.showIframe('按车补扣款【' + veNo + '】', 'tb-order-deductionByVeNo.html?veNo=' + veNo, '1660px',
+							'97%');
 					},
 
 					sendCXB001Handle(data) {
 						sa.confirm('是否执行推送结关信息操作', function() {
 							sa.ajax('/level-one-server/TbOrder/sendCXB001?id=' + data.id, function(res) {
 								sa.ok('操作成功');
-								sa.f5TableHeight();		// 刷新表格高度
+								sa.f5TableHeight(); // 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
 					sendCXB001ByVeNo() {
-						this.sendCXB001.visible=true
+						this.sendCXB001.visible = true
 					},
 					ToSendCXB001ByVeNo() {
 						let veNo = this.sendCXB001.veNo;
-						if(!veNo) {
+						if (!veNo) {
 							sa.error('请输入车牌号')
 							return;
 						}
-						sa.showIframe('按车推结关【'+veNo+'】', 'tb-order-sendCXB001ByVeNo.html?veNo=' + veNo, '1660px', '97%');
+						sa.showIframe('按车推结关【' + veNo + '】', 'tb-order-sendCXB001ByVeNo.html?veNo=' + veNo, '1660px',
+							'97%');
 					},
 
 					send009ToHt(data) {
 						sa.confirm('是否执行推送009报文操作', function() {
 							sa.ajax('/level-one-server/TbOrder/send009ToHt?id=' + data.id, function(res) {
 								sa.ok('操作成功');
-								sa.f5TableHeight();		// 刷新表格高度
+								sa.f5TableHeight(); // 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
@@ -262,7 +284,7 @@
 						sa.ajax('/level-one-server/TbOrder/getList', sa.removeNull(this.p), function(res) {
 							this.dataList = res.data; // 数据
 							this.dataCount = res.dataCount; // 数据总数
-							sa.f5TableHeight();		// 刷新表格高度
+							sa.f5TableHeight(); // 刷新表格高度
 						}.bind(this));
 					},
 					// 查看
@@ -287,7 +309,7 @@
 							sa.ajax('/level-one-server/TbOrder/delete?id=' + data.id, function(res) {
 								sa.arrayDelete(this.dataList, data);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度
+								sa.f5TableHeight(); // 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
@@ -296,15 +318,17 @@
 						// 获取选中元素的id列表
 						let selection = this.$refs['data-table'].selection;
 						let ids = sa.getArrayField(selection, 'id');
-						if(selection.length == 0) {
+						if (selection.length == 0) {
 							return sa.msg('请至少选择一条数据')
 						}
 						// 提交删除
 						sa.confirm('是否批量删除选中数据?此操作不可撤销', function() {
-							sa.ajax('/level-one-server/TbOrder/deleteByIds', {ids: ids.join(',')}, function(res) {
+							sa.ajax('/level-one-server/TbOrder/deleteByIds', {
+								ids: ids.join(',')
+							}, function(res) {
 								sa.arrayDelete(this.dataList, selection);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度
+								sa.f5TableHeight(); // 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
@@ -317,4 +341,4 @@
 			})
 		</script>
 	</body>
-</html>
+</html>