|
|
@@ -26,6 +26,14 @@
|
|
|
<sa-item type="text" name="商家名称" v-model="p.enterpriseName" width="70px"></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>
|
|
|
+ </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>
|
|
|
+ </span>
|
|
|
</el-form>
|
|
|
<!-- ------------- 数据列表 ------------- -->
|
|
|
<el-table class="data-table" ref="data-table" :data="dataList" >
|
|
|
@@ -38,18 +46,25 @@
|
|
|
<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="upPrice" >
|
|
|
+ <sa-td name="订单状态" prop="upStatus" >
|
|
|
<template slot-scope="s">
|
|
|
- <div v-if="s.row.upStatus==2">已上架</div>
|
|
|
+ <div v-if="s.row.upStatus===2">已上架</div>
|
|
|
<div v-else>未上架</div>
|
|
|
</template>
|
|
|
</sa-td>
|
|
|
+ <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" >
|
|
|
<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>
|
|
|
+ <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">
|
|
|
@@ -61,19 +76,26 @@
|
|
|
<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>
|
|
|
+ <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="180px">
|
|
|
+ <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>
|
|
|
- <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>
|
|
|
+ <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>
|
|
|
+ <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>
|
|
|
+ <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="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
|
|
|
@@ -95,6 +117,22 @@
|
|
|
<el-button type="primary" @click="sel">转售二级</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+ <el-dialog :title="deduction.title" :visible.sync="deduction.visible" width="500px">
|
|
|
+ <sa-item name="车牌号" v-model="deduction.veNo" placeholder="车牌号" br></sa-item>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="deduction.visible = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="ToDeductionByVeNo">确定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog :title="sendCXB001.title" :visible.sync="sendCXB001.visible" width="500px">
|
|
|
+ <sa-item name="车牌号" v-model="sendCXB001.veNo" placeholder="车牌号" br></sa-item>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="sendCXB001.visible = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="ToSendCXB001ByVeNo">确定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
</div>
|
|
|
<script>
|
|
|
var app = new Vue({
|
|
|
@@ -113,6 +151,16 @@
|
|
|
selPrice:0
|
|
|
}
|
|
|
},
|
|
|
+ deduction: {
|
|
|
+ title: '按车补扣款',
|
|
|
+ visible: false,
|
|
|
+ veNo: ''
|
|
|
+ },
|
|
|
+ sendCXB001: {
|
|
|
+ title: '按车推结关',
|
|
|
+ visible: false,
|
|
|
+ veNo: ''
|
|
|
+ },
|
|
|
p: { // 查询参数
|
|
|
tradeNo: '', // 订单号
|
|
|
buyUserName: '', // 买家
|
|
|
@@ -120,7 +168,7 @@
|
|
|
returns:0,
|
|
|
chargebacks:0,
|
|
|
pageNo: 1, // 当前页
|
|
|
- pageSize: 20, // 页大小
|
|
|
+ pageSize: 10, // 页大小
|
|
|
sortType: 0 // 排序方式
|
|
|
},
|
|
|
dataCount: 0,
|
|
|
@@ -156,14 +204,47 @@
|
|
|
this.model.visible=false;
|
|
|
}.bind(this));
|
|
|
},
|
|
|
+
|
|
|
deduction(data) {
|
|
|
- sa.confirm('是否执行补扣款操作', function() {
|
|
|
+ sa.confirm('是否执行订单扣款操作', function() {
|
|
|
sa.ajax('/level-one-server/TbOrder/deduction?id=' + data.id, function(res) {
|
|
|
sa.ok('操作成功');
|
|
|
sa.f5TableHeight(); // 刷新表格高度
|
|
|
}.bind(this))
|
|
|
}.bind(this));
|
|
|
},
|
|
|
+ deductionByVeNo() {
|
|
|
+ this.deduction.visible=true
|
|
|
+ },
|
|
|
+ ToDeductionByVeNo() {
|
|
|
+ let veNo = this.deduction.veNo;
|
|
|
+ if(!veNo) {
|
|
|
+ sa.error('请输入车牌号')
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ 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(); // 刷新表格高度
|
|
|
+ }.bind(this))
|
|
|
+ }.bind(this));
|
|
|
+ },
|
|
|
+ sendCXB001ByVeNo() {
|
|
|
+ this.sendCXB001.visible=true
|
|
|
+ },
|
|
|
+ ToSendCXB001ByVeNo() {
|
|
|
+ let veNo = this.sendCXB001.veNo;
|
|
|
+ if(!veNo) {
|
|
|
+ sa.error('请输入车牌号')
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ 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) {
|
|
|
@@ -174,6 +255,10 @@
|
|
|
},
|
|
|
// 刷新
|
|
|
f5: function() {
|
|
|
+ this.deduction.veNo = '';
|
|
|
+ this.deduction.visible = false;
|
|
|
+ this.sendCXB001.veNo = '';
|
|
|
+ this.sendCXB001.visible = false;
|
|
|
sa.ajax('/level-one-server/TbOrder/getList', sa.removeNull(this.p), function(res) {
|
|
|
this.dataList = res.data; // 数据
|
|
|
this.dataCount = res.dataCount; // 数据总数
|
