查询优化

sa-frame/menu-list-sp.js

@@ -656,11 +656,7 @@ window.menuList.unshift({
 						name: '进境结算单',
 						icon: 'el-icon-s-home',
 						url: 'sa-view/ht-trade-settlement/ht-trade-settlement-list.html',
-						childList: [{
-							id: 'ht-trade-settlement-add',
-							name: '添加订单',
-							isShow: false
-						},
+						childList: [
 							{
 								id: 'ht-trade-settlement-edit',
 								name: '修改订单',
@@ -712,6 +708,10 @@ window.menuList.unshift({
 									id: 'tb-order-sendCXB001',
 									name: '推送结关',
 									isShow: false
+								},{
+									id: 'tb-order-refund',
+									name: '退款',
+									isShow: false
 								},
 							]
 						},

sa-view/app-user/app-user-list.html

@@ -33,7 +33,6 @@
 					</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('app-user-add')" size="mini" type="primary" @click="add()">新增</el-button>
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
@@ -60,7 +59,7 @@
 					<el-table-column label="操作" fixed="right"  width="270px">
 						<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('app-user-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button  v-if="sa.isAuth('app-user-edit')&&(s.row.userType==1||s.row.userType==2)" class="c-btn" type="primary" icon="el-icon-edit" @click="updateRole(s.row)">类型</el-button>
 							<el-button v-if="sa.isAuth('app-user-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="pass(s.row)">改密</el-button>
 							<el-button v-if="sa.isAuth('app-user-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 						</template>
@@ -69,6 +68,21 @@
 				<!-- ------------- 分页 ------------- -->
 				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
 			</div>
+			<el-dialog
+			  title="修改类型"
+			  :visible.sync="dialogVisible"
+			  width="400px">
+			  <sa-item name="类型">
+			  	<el-select v-model="form.userType">
+			  		<el-option label="边民" :value="1"></el-option>
+			  		<el-option label="组长" :value="2"></el-option>
+			  	</el-select>
+			  </sa-item>
+			  <span slot="footer" class="dialog-footer">
+			    <el-button @click="dialogVisible = false">取 消</el-button>
+			    <el-button type="primary" @click="subEditRole">确 定</el-button>
+			  </span>
+			</el-dialog>
 		</div>
 		<script>
 			var app = new Vue({
@@ -78,6 +92,7 @@
 				},
 				el: '.vue-box',
 				data: {
+					dialogVisible:false,
 					p: { // 查询参数
 						phone: '',		// 手机号码
 						name: '',		// 姓名
@@ -87,8 +102,25 @@
 					},
 					dataCount: 0,
 					dataList: [], // 数据集合
+					form:{
+						userType:'',
+						id:''
+					}
 				},
 				methods: {
+					updateRole(data){
+						this.dialogVisible=true;
+						this.form={
+							userType:data.userType,
+							id:data.id
+						}
+					},
+					subEditRole(){
+						sa.ajax('/sp-admin/AppUser/updateRole', sa.removeNull(this.form), function(res) {
+							this.dialogVisible=false;
+							sa.f5();		// 刷新表格高度
+						}.bind(this));
+					},
 					// 刷新
 					f5: function() {
 						sa.ajax('/sp-admin/AppUser/getList', sa.removeNull(this.p), function(res) {

sa-view/ht-trade-settlement/ht-trade-settlement-list.html

@@ -28,6 +28,8 @@
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="车牌号" v-model="p.veNo" width="7em"></sa-item>
 					<sa-item type="date" name="申报日期" v-model="p.declTime" width="7em"></sa-item>
+					<sa-item type="text" name="商品" v-model="p.goodsNames" width="7em"></sa-item>
+					<sa-item type="text" name="商铺" v-model="p.shopName" 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>
@@ -60,12 +62,12 @@
 									class="c-btn" type="info" @click="hzsConfirm(s.row)">互助社确认</el-button>
 							</span>
 							<span>
-								<el-button v-if="sa.isAuth('tb-order-deduction')&&s.row.hzsConfirmStatus==1" class="c-btn" type="warning"
-									@click="ToDeductionByVeNo(s.row)">按车订单扣款</el-button>
+								<el-button v-if="sa.isAuth('tb-order-deduction')&&s.row.hzsConfirmStatus==1"
+									class="c-btn" type="warning" @click="ToDeductionByVeNo(s.row)">按车订单扣款</el-button>
 							</span>
 							<span>
-								<el-button v-if="sa.isAuth('tb-order-sendCXB001')&&s.row.hzsConfirmStatus==1" class="c-btn" type="warning"
-									@click="ToSendCXB001ByVeNo(s.row)">推送结关</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>
 						</template>
 					</el-table-column>
@@ -117,7 +119,7 @@
 					hzsConfirm(data) {
 						sa.confirm('是否确认订单', function() {
 							sa.ajax('/level-one-server/HtTradeSettlement/hzsConfirm?id=' + data.id, function(
-							res) {
+								res) {
 								sa.ok('确认成功');
 								this.f5();
 							}.bind(this))

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

@@ -17,46 +17,18 @@
 	<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.sn"></sa-item>
-					<sa-item type="text" name="报文发送时间" v-model="p.date"></sa-item>
-					<sa-item type="text" name="互市点机构代码" v-model="p.organization"></sa-item>
-					<sa-item type="text" name="银行标识" v-model="p.bankCode"></sa-item>
-					<sa-item type="text" name="报文业务类型" v-model="p.operation"></sa-item>
-					<sa-item type="text" name="消息回执代码" v-model="p.code"></sa-item>
-					<sa-item type="text" name="订单号" v-model="p.source"></sa-item>
-					<sa-item type="text" name="扣款成功的流水单号" v-model="p.result"></sa-item>
-					<sa-item type="text" name="回执内容" v-model="p.note"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></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('bank-info-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 name="报文编号" prop="sn" ></sa-td> -->
 					<sa-td name="互市代码" prop="organization" ></sa-td>
 					<sa-td name="银行标识" prop="bankCode" ></sa-td>
 					<sa-td name="业务类型" prop="operation" ></sa-td>
 					<sa-td name="回执代码" prop="code" ></sa-td>
-					<sa-td name="订单号" prop="source" width="180px"></sa-td>
+					<sa-td name="订单号" prop="source" width="189px"></sa-td>
 					<sa-td name="流水单号" prop="result" ></sa-td>
 					<sa-td name="回执内容" prop="note" width="300px"></sa-td>
 					<!-- <sa-td name="报文发送时间" prop="date" width="150px"></sa-td> -->
 					<sa-td name="创建时间" prop="createTime" width="150px"></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('bank-info-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
-							<el-button v-if="sa.isAuth('bank-info-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>

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

@@ -92,9 +92,18 @@
 					<!--(一级市场)订单扣款回执状态[0=初始值 1=扣款成功 2=扣款失败]-->
 					<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-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>
+								<div v-if="s.row.refundStatus===1">退款成功</div>
+								<div v-if="s.row.refundStatus===2">退款失败</div>
+								<div v-if="s.row.refundStatus===3">退款中</div>
+							</div>
+							
 						</template>
 					</sa-td>
 					<sa-td name="销售状态" prop="beingOrder"><!--订单转售后是否在二级市场被下单-->
@@ -120,22 +129,23 @@
 						:jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}"></sa-td>
 					<el-table-column label="操作" fixed="right" width="210px" align="center">
 						<template slot-scope="s">
-							<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>
+							<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
+								<el-button v-if="(s.row.sxb010Status!=1||s.row.refundStatus==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>
 							</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"
 									@click="sendCXB001Handle(s.row)">推送结关</el-button> -->
 							</span>
-							<el-button v-if="sa.isAuth('tb-order-send009')&&s.row.applyConfirmStatus==0" class="c-btn" type="danger"
-								@click="send009ToHt(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)">推送009</el-button>
+							<el-button v-if="sa.isAuth('tb-order-refund')&&s.row.sxb010Status==1&&(s.row.refundStatus==0||s.row.refundStatus==2)" class="c-btn"
+								type="danger" @click="orderRefund(s.row)">退款</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -206,7 +216,7 @@
 						chargebacks: 0,
 						pageNo: 1, // 当前页
 						pageSize: 10, // 页大小
-						sortType: 0 ,// 排序方式
+						sortType: 0, // 排序方式
 						saleMainId: sa.p('mainId', ''),
 					},
 					dataCount: 0,
@@ -248,12 +258,19 @@
 							this.model.visible = false;
 						}.bind(this));
 					},
-
+					orderRefund(data) {
+						sa.confirm('是否执行订单退款操作', function() {
+							sa.ajax('/level-one-server/TbOrder/orderRefund?id=' + data.id, function(res) {
+								sa.ok('操作成功');
+								this.f5();
+							}.bind(this))
+						}.bind(this));
+					},
 					deductionHandle(data) {
 						sa.confirm('是否执行订单扣款操作', function() {
 							sa.ajax('/level-one-server/TbOrder/deduction?id=' + data.id, function(res) {
 								sa.ok('操作成功');
-								sa.f5TableHeight(); // 刷新表格高度
+								this.f5();
 							}.bind(this))
 						}.bind(this));
 					},
@@ -365,4 +382,4 @@
 			})
 		</script>
 	</body>
-</html>
+</html>

sa-view/tb-orders/tb-orders-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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
 		<link rel="stylesheet" href="../../static/sa.css">
@@ -22,41 +23,57 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<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.leaderName" width="90px"></sa-item>
-					<sa-item type="text" name="订单编号" v-model="p.orderNo" width="90px"></sa-item>
-					<sa-item name="订单状态" width="90px">
-						<el-select v-model="p.orderFinish" 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="90px">
-						<el-select v-model="p.isPay" style="width: 120px;">
-							<el-option label="全部" value=""></el-option>
-							<el-option label="未支付" value="0"></el-option>
-							<el-option label="支付中" value="3"></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>
-					<!-- <el-button v-if="sa.isAuth('tb-orders-add')" size="mini" type="primary" @click="add()">新增</el-button> -->
+					<div>
+						<sa-item type="text" name="车牌号" v-model="p.veNo" width="80px"></sa-item>
+						<sa-item type="text" name="货主" v-model="p.leaderName" width="90px"></sa-item>
+						<sa-item type="text" name="商品" v-model="p.goodsName" width="90px"></sa-item>
+						<sa-item type="text" name="订单编号" v-model="p.orderNo" width="90px"></sa-item>
+					</div>
+					<div>
+						<sa-item name="订单状态" width="90px">
+							<el-select v-model="p.orderFinish" 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="90px">
+							<el-select v-model="p.isPay" style="width: 120px;">
+								<el-option label="全部" value=""></el-option>
+								<el-option label="未支付" value="0"></el-option>
+								<el-option label="支付中" value="3"></el-option>
+								<el-option label="支付失败" value="2"></el-option>
+								<el-option label="支付成功" value="1"></el-option>
+							</el-select>
+						</sa-item>
+						<sa-item name="下单状态" width="90px">
+							<el-select v-model="p.beOrder" 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>
+						<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="primary" @click="payBatch">批量扣款</el-button>
+					</div>
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
-				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="index" width="30px"></sa-td>
+				<el-table class="data-table" ref="data-table" :data="dataList">
+					<sa-td type="selection" width="30px"></sa-td>
 					<sa-td name="车牌号" prop="veNo" width="80px"></sa-td>
 					<sa-td name="订单编号" prop="orderNo" width="180px"></sa-td>
-					<sa-td name="商品名称" prop="goodsName" ></sa-td>
+					<sa-td name="商品名称" prop="goodsName" width="160px"></sa-td>
 					<sa-td name="货主" prop="leaderName" width="100px"></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="isPay" type="enum" :jv="{0: '未支付[#ff910a]', 1: '支付成功[green]', 2: '支付失败[red]', 3: '支付中[blue]'}" width="80px"></sa-td>
+					<sa-td name="转售时间" prop="createTime" width="140px"></sa-td>
+					<sa-td name="下单时间" prop="orderTime" width="160px"></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="orderFinish" type="enum" :jv="{0: '未完成[#ff910a]', 1: '已完成[green]'}"
+						@change="s => updateOrderFinish(s.row)" width="80px"></sa-td>
 					<sa-td name="补扣次数" prop="deductionCount" width="80px">
 						<template slot-scope="s">
 							<div v-if="s.row.deductionCount==0">0</div>
@@ -64,23 +81,23 @@
 						</template>
 					</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="390px">
+
+					<el-table-column label="操作" fixed="right" width="320px">
 						<template slot-scope="s">
-							<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="success" @click="get(s.row)">查看</el-button>
+							<el-button class="c-btn" type="primary" @click="getBank(s.row)">银行回执</el-button>
 							<span>
-								<el-button
-										   class="c-btn" type="warning"  @click="deduction(s.row)">采购补扣款</el-button>
-								<el-button v-else :disabled="true" class="c-btn" type="warning">采购补扣款</el-button>
+								<el-button v-if="s.row.isPay!=1" class="c-btn" type="warning"
+									@click="deduction(s.row)">补扣款</el-button>
 							</span>
-							<el-button class="c-btn" type="primary" icon="el-icon-printer" @click="subPrint(s.row)">交易凭证</el-button>
-							<el-button class="c-btn" type="info" icon="el-icon-info" @click="subEmail(s.row)">电子协议</el-button>
+							<el-button class="c-btn" type="primary" @click="subPrint(s.row)">交易凭证</el-button>
+							<el-button class="c-btn" type="info" @click="subEmail(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>
 		</div>
 		<script>
@@ -92,22 +109,45 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数
-						orderNo: '',		// 订单编号
-						goodsName: '',		// 商品名称
-						pageNo: 1,		// 当前页
-						pageSize: 10,	// 页大小
-						sortType: 0		// 排序方式
+						orderFinish: '',
+						isPay: '',
+						orderNo: '', // 订单编号
+						goodsName: '', // 商品名称
+						beOrder: '',
+						pageNo: 1, // 当前页
+						pageSize: 10, // 页大小
+						sortType: 0 // 排序方式
 					},
 					dataCount: 0,
 					dataList: [], // 数据集合
 				},
 				methods: {
+					payBatch() {
+						// 获取选中元素的id列表
+						let selection = this.$refs['data-table'].selection;
+						let ids = sa.getArrayField(selection, 'id');
+						if (selection.length == 0) {
+							return sa.msg('请至少选择一条数据')
+						}
+						let isPayList = selection.filter(obj => obj.isPay == 1 || obj.isPay == 3);
+						if (isPayList.length > 0) {
+							return sa.msg('数据中包含了已支付或支付中订单');
+						}
+						sa.confirm('是否执行补扣款操作', function() {
+							sa.ajax('/level-two-server/TbOrders/payBatch', {
+								ids: ids.join(',')
+							}, function(res) {
+								sa.ok('操作成功');
+								this.f5();
+							}.bind(this))
+						}.bind(this));
+					},
 					// 刷新
 					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();		// 刷新表格高度
+							sa.f5TableHeight(); // 刷新表格高度
 						}.bind(this));
 					},
 					// 查看
@@ -130,59 +170,26 @@
 						sa.confirm('是否执行补扣款操作', function() {
 							sa.ajax('/level-two-server/TbOrders/deduction?id=' + data.id, function(res) {
 								sa.ok('操作成功');
-								sa.f5TableHeight();		// 刷新表格高度
+								sa.f5TableHeight(); // 刷新表格高度
 								this.f5();
 							}.bind(this))
 						}.bind(this));
 					},
-					// 修改
-					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%');
-					},
-					// 删除
-					del: function(data) {
-						sa.confirm('是否删除，此操作不可撤销', function() {
-							sa.ajax('/level-two-server/TbOrders/delete?id=' + data.id, function(res) {
-								sa.arrayDelete(this.dataList, data);
-								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度
-								this.f5()
-							}.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-two-server/TbOrders/deleteByIds', {ids: ids.join(',')}, function(res) {
-								sa.arrayDelete(this.dataList, selection);
-								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度
-							}.bind(this))
-						}.bind(this));
-					},
 					// 改 - 订单状态已完成 (0=禁用,1=启用)
 					updateOrderFinish: function(data) {
 						// 声明变量记录是否成功
 						var isOk = false;
 						var oldValue = data.orderFinish;
-						var ajax = sa.ajax('/level-two-server/TbOrders/updateOrderFinish', {id: data.id, value: data.orderFinish}, 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));
 						// 如果未能修改成功, 则回滚
 						$.when(ajax).done(function() {
-							if(isOk == false) {
+							if (isOk == false) {
 								data.status = oldValue;
 							}
 						})
@@ -195,4 +202,4 @@
 			})
 		</script>
 	</body>
-</html>
+</html>