二级市场采购商补扣款

sa-view/tb-orders/tb-orders-info.html

@@ -52,16 +52,16 @@
 								<td>{{m.goodsName}}</td>
 							</tr>
 							<tr>
-								<th>商品来源</th>
-								<td>{{m.goodsFrom}}</td>
-								<th>互市区</th>
-								<td>{{m.tradeAreaName}}</td>
-							</tr>
-							<tr>
 								<th>买家</th>
 								<td>{{m.purchaserName}}</td>
+								<th>卖家</th>
+								<td>{{m.leaderName}}</td>
+							</tr>
+							<tr>
 								<th>转售金额</th>
 								<td>{{m.resalePrice}}</td>
+								<th>互市区</th>
+								<td>{{m.tradeAreaName}}</td>
 							</tr>
 							<tr>
 								<th>车牌号</th>

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

@@ -22,6 +22,7 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<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.orderNo" width="90px"></sa-item>
 					<sa-item type="text" name="商品名称" v-model="p.goodsName" width="90px"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
@@ -31,20 +32,31 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="index" 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="goodsFrom" ></sa-td>
-					<sa-td name="互市区" prop="tradeAreaName" ></sa-td>
 					<sa-td name="买家" prop="purchaserName" ></sa-td>
-					<sa-td name="卖家" prop="shipperName" ></sa-td>
-					<sa-td name="转售金额" prop="resalePrice" ></sa-td>
-					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="订状态" prop="orderFinish" type="enum" :jv="{0: '未完成[#ff910a]', 1: '已完成[green]'}" @change="s => updateOrderFinish(s.row)"></sa-td>
+					<sa-td name="卖家" prop="leaderName" width="120px"></sa-td>
+					<sa-td name="转售金额" prop="resalePrice" width="80px"></sa-td>
+					<sa-td name="互市区" prop="tradeAreaName" ></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="deductionCount" width="80px">
+						<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>
+					
 					<el-table-column label="操作" width="100px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
-							<!-- <el-button v-if="sa.isAuth('tb-orders-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
-							<el-button v-if="sa.isAuth('tb-orders-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button> -->
+							<div>
+								<el-button v-if="s.row.isPay==2&&sa.isAuth('tb-orders-deduction')"
+										   class="c-btn" type="warning" icon="el-icon-view" @click="deduction(s.row)">采购补扣款</el-button>
+								<el-button v-else :disabled="true" class="c-btn" type="warning" icon="el-icon-view">采购补扣款</el-button>
+							</div>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -83,6 +95,14 @@
 					get: function(data) {
 						sa.showIframe('数据详情', 'tb-orders-info.html?id=' + data.id, '950px', '60%');
 					},
+					deduction(data) {
+						sa.confirm('是否执行补扣款操作', function() {
+							sa.ajax('/level-two-server/TbOrders/deduction?id=' + data.id, function(res) {
+								sa.ok('操作成功');
+								sa.f5TableHeight();		// 刷新表格高度
+							}.bind(this))
+						}.bind(this));
+					},
 					// 修改
 					update: function(data) {
 						sa.showIframe('修改数据', 'tb-orders-add.html?id=' + data.id, '1000px', '90%');