Browse Source

一级市场订单补扣款

linbl 2 months ago
parent
commit
8c11f27756

+ 5 - 0
sa-frame/menu-list-sp.js

@@ -663,6 +663,11 @@ window.menuList.unshift({
 								name: '删除订单',
 								isShow: false
 							},
+							{
+								id: 'tb-order-deduction',
+								name: '订单补扣款',
+								isShow: false
+							},
 						]
 					},
 					{

+ 32 - 4
sa-view/tb-order/tb-order-list.html

@@ -20,6 +20,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.tradeNo" width="80px"></sa-item>
 					<sa-item type="text" name="买家" v-model="p.buyUserName"></sa-item>
 					<sa-item type="text" name="商家名称" v-model="p.enterpriseName" width="70px"></sa-item>
@@ -29,6 +30,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="buyUserName" ></sa-td>
 					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
@@ -42,9 +44,22 @@
 							<div v-else>未上架</div>
 						</template>
 					</sa-td>
-					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="预申报编号" prop="platSeqNo" width="180"></sa-td>
-					<sa-td name="时间" prop="createTime" width="140px"></sa-td>
+					<!--(一级市场)订单扣款回执状态[0=初始值 1=扣款成功 2=扣款失败]-->
+					<sa-td name="扣款状态" prop="sxb010Status" >
+						<template slot-scope="s">
+							<div v-if="s.row.sxb010Status==1">扣款成功</div>
+							<div v-else-if="s.row.sxb010Status==2">扣款失败</div>
+							<div v-else>未扣款</div>
+						</template>
+					</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="preIeportNo" width="180"></sa-td> -->
 					<!--<sa-td type="enum" name="交易确认" prop="peopleConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
@@ -53,7 +68,12 @@
 					<el-table-column label="操作" fixed="right"  width="180px">
 						<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-view" @click="getBank(s.row)">银行回执</el-button>
+							<el-button class="c-btn" type="primary" icon="el-icon-info" @click="getBank(s.row)">银行回执</el-button>
+							<div>
+								<el-button v-if="s.row.sxb010Status==2&&sa.isAuth('tb-order-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>
 							<!--<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>
@@ -132,6 +152,14 @@
 							this.model.visible=false;
 						}.bind(this));
 					},
+					deduction(data) {
+						sa.confirm('是否执行补扣款操作', function() {
+							sa.ajax('/level-one-server/TbOrder/deduction?id=' + data.id, function(res) {
+								sa.ok('操作成功');
+								sa.f5TableHeight();		// 刷新表格高度
+							}.bind(this))
+						}.bind(this));
+					},
 					// 刷新
 					f5: function() {
 						sa.ajax('/level-one-server/TbOrder/getList', sa.removeNull(this.p), function(res) {

+ 0 - 4
sa-view/tb-people-tax-account/tb-people-tax-account-list.html

@@ -142,10 +142,6 @@
 				created: function() {
 					this.f5();
 					sa.onInputEnter();
-				},
-				mounted: function(){
-					this.f5();
-					sa.onInputEnter();
 				}
 			})
 		</script>