Browse Source

修改商户充值订单订单金额搜索

master
j1ack 2 years ago
parent
commit
47896df9d1
  1. 31
      src/views/order/payOrder/csOrder.vue
  2. 31
      src/views/order/payOrder/index.vue
  3. 100
      src/views/order/payOrder/wwc.vue

31
src/views/order/payOrder/csOrder.vue

@ -591,30 +591,8 @@ export default {
}
});
},
timerHandler() {
let queryParams = {
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize,
orderNo: this.queryParams.orderNo,
merchantOrderNo: this.queryParams.merchantOrderNo,
carddealerCardNumber: this.queryParams.carddealerCardNumber,
merchantName: this.queryParams.merchantName,
carddealerName: this.queryParams.carddealerName,
payerName: this.queryParams.payerName,
orderAmount: this.queryParams.orderAmount,
channelName: this.queryParams.channelName,
orderStatus: this.queryParams.orderStatus,
carddealerCardHolder: this.queryParams.carddealerCardHolder,
reqAmount: typeof (this.reqAmount) == 'object' ? null : !this.reqAmount ? null : parseFloat(this.reqAmount),
platformChannelId: this.queryParams.platformChannelId,
}
listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows;
this.total = Number(response.total);
});
},
/** 查询代收订单列表 */
getList(beginAmount,endAmount) {
getList() {
this.loading = true;
let queryParams = {
pageNum: this.queryParams.pageNum,
@ -638,7 +616,6 @@ export default {
this.infoList = response.rows;
this.total = Number(response.total);
this.loading = false;
this.startTimer(queryParams)
});
},
//
@ -663,11 +640,7 @@ export default {
this.queryParams.pageNum = 1;
this.endAmount=endAmount
this.beginAmount=beginAmount
if(endAmount||beginAmount){
this.getList(beginAmount,endAmount)
}else{
this.getList()
}
this.getList()
},
/** 重置按钮操作 */
resetQuery() {

31
src/views/order/payOrder/index.vue

@ -567,30 +567,8 @@ export default {
}
});
},
timerHandler() {
let queryParams = {
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize,
orderNo: this.queryParams.orderNo,
merchantOrderNo: this.queryParams.merchantOrderNo,
carddealerCardNumber: this.queryParams.carddealerCardNumber,
merchantName: this.queryParams.merchantName,
carddealerName: this.queryParams.carddealerName,
payerName: this.queryParams.payerName,
orderAmount: this.queryParams.orderAmount,
channelName: this.queryParams.channelName,
orderStatus: this.queryParams.orderStatus,
carddealerCardHolder: this.queryParams.carddealerCardHolder,
reqAmount: typeof (this.reqAmount) == 'object' ? null : !this.reqAmount ? null : parseFloat(this.reqAmount),
platformChannelId: this.queryParams.platformChannelId,
}
listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows;
this.total = Number(response.total);
});
},
/** 查询代收订单列表 */
getList(beginAmount,endAmount) {
getList() {
this.loading = true;
let queryParams = {
pageNum: this.queryParams.pageNum,
@ -614,7 +592,6 @@ export default {
this.infoList = response.rows;
this.total = Number(response.total);
this.loading = false;
this.startTimer(queryParams)
});
},
//
@ -639,11 +616,7 @@ export default {
this.queryParams.pageNum = 1;
this.endAmount=endAmount
this.beginAmount=beginAmount
if(endAmount||beginAmount){
this.getList(beginAmount,endAmount)
}else{
this.getList()
}
this.getList()
},
/** 重置按钮操作 */
resetQuery() {

100
src/views/order/payOrder/wwc.vue

@ -52,12 +52,12 @@
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额区间" prop="reqAmount">
<el-input size="medium" v-model="queryParams.beginAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
--
<el-input size="medium" v-model="queryParams.endAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-input size="medium" v-model="queryParams.beginAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
--
<el-input size="medium" v-model="queryParams.endAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
<el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName" :value="item.id"></el-option>
@ -88,7 +88,8 @@
<el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
<el-button type="primary" plain icon="" size="medium" @click="handleExport()" v-hasPermi="['order:payOrder:export']">导出</el-button>
<el-button type="primary" plain icon="" size="medium" @click="handleExport()"
v-hasPermi="['order:payOrder:export']">导出</el-button>
</el-row>
@ -138,7 +139,7 @@
<!-- <el-table-column label="支行" align="center" prop="carddealerCardOrganization" /> -->
<el-table-column :label="'是否是承兑商订单'" align="center" prop="isAcceptorOrder">
<template slot-scope="scope">
<span :style="{color:scope.row.isAcceptorOrder?'red':'#000'}">{{ scope.row.isAcceptorOrder?'是':'否' }}</span>
<span :style="{ color: scope.row.isAcceptorOrder ? 'red' : '#000' }">{{ scope.row.isAcceptorOrder ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column label="通道" align="center" prop="platformChannelName" />
@ -159,12 +160,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button size="small" type="text" @click="getCertificate(scope.row)" style="color: #006eff" v-if="scope.row.proofImg">查看凭证</el-button>
<el-button size="small" type="text" @click="handleView(scope.row)" style="color: #006eff" v-hasPermi="['order:payOrder:query']">详情</el-button>
<el-button size="small" type="text" @click="getCertificate(scope.row)" style="color: #006eff"
v-if="scope.row.proofImg">查看凭证</el-button>
<el-button size="small" type="text" @click="handleView(scope.row)" style="color: #006eff"
v-hasPermi="['order:payOrder:query']">详情</el-button>
<el-button size="small" type="text" @click="handleOver(scope.row)" style="color: #006eff"
:disabled="scope.row.sameMark == 1" v-hasPermi="['order:payOrder:overtimePayment']"
v-if="!scope.row.isAcceptorOrder"
>已收款</el-button>
v-if="!scope.row.isAcceptorOrder">已收款</el-button>
<!-- <el-button size="small" type="text" @click="handleNotify(scope.row)" style="color: #006eff">通知</el-button> -->
</template>
</el-table-column>
@ -226,8 +228,9 @@
</div>
<div class="card-detail">
<el-form-item :label="'是否是承兑商订单'">
<span :style="{color:detailInfoList.isAcceptorOrder?'red':'#000'}">{{ detailInfoList.isAcceptorOrder?'是':'否' }}</span>
</el-form-item>
<span :style="{ color: detailInfoList.isAcceptorOrder ? 'red' : '#000' }">{{ detailInfoList.isAcceptorOrder ? '是' : '否'
}}</span>
</el-form-item>
<el-form-item label="收款卡号">
{{ detailInfoList.carddealerCardNumber }}
</el-form-item>
@ -290,7 +293,7 @@
</div>
</el-dialog>
<!-- 凭证 -->
<el-dialog v-dialogDrag :close-on-click-modal="false" title="凭证" :visible.sync="isShowDetailImg" width="40%"
append-to-body>
@ -388,8 +391,8 @@ export default {
reqAmount: null,
platformChannelId: null,
downstreamMerchantOrderNo: null,
endAmount:null,
beginAmount:null,
endAmount: null,
beginAmount: null,
},
//
isShowDetail: false,
@ -535,8 +538,8 @@ export default {
debug: true,
},
methods: {
//
previewImage(abUrl) {
//
previewImage(abUrl) {
this.srcList[0] = abUrl;
},
//
@ -587,32 +590,8 @@ export default {
}
});
},
timerHandler() {
let queryParams = {
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize,
orderNo: this.queryParams.orderNo,
merchantOrderNo: this.queryParams.merchantOrderNo,
carddealerCardNumber: this.queryParams.carddealerCardNumber,
merchantName: this.queryParams.merchantName,
carddealerName: this.queryParams.carddealerName,
payerName: this.queryParams.payerName,
orderAmount: this.queryParams.orderAmount,
channelName: this.queryParams.channelName,
orderStatus: this.queryParams.orderStatus,
carddealerCardHolder: this.queryParams.carddealerCardHolder,
reqAmount: typeof (this.reqAmount) == 'object' ? null : !this.reqAmount ? null : parseFloat(this.reqAmount),
platformChannelId: this.queryParams.platformChannelId,
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo,
}
listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows;
this.total = Number(response.total);
});
},
/** 查询代收订单列表 */
getList(beginAmount,endAmount) {
getList() {
this.loading = true;
let queryParams = {
pageNum: this.queryParams.pageNum,
@ -629,14 +608,13 @@ export default {
carddealerCardHolder: this.queryParams.carddealerCardHolder,
platformChannelId: this.queryParams.platformChannelId,
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo,
beginAmount:this.beginAmount,
endAmount:this.endAmount,
beginAmount: this.beginAmount,
endAmount: this.endAmount,
}
listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows;
this.total = Number(response.total);
this.loading = false;
this.startTimer(queryParams)
});
},
//
@ -653,27 +631,23 @@ export default {
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
var beginAmount=null;
var endAmount=null;
handleQuery() {
var beginAmount = null;
var endAmount = null;
this.queryParams.beginAmount ? beginAmount = this.NumberMul(this.queryParams.beginAmount, 100) : this.queryParams.beginAmount
this.queryParams.endAmount ? endAmount = this.NumberMul(this.queryParams.endAmount, 100) : this.queryParams.endAmount
this.queryParams.pageNum = 1;
this.endAmount=endAmount
this.beginAmount=beginAmount
if(endAmount||beginAmount){
this.getList(beginAmount,endAmount)
}else{
this.getList()
}
this.endAmount = endAmount
this.beginAmount = beginAmount
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.queryParams.beginAmount=null;
this.queryParams.endAmount=null;
this.beginAmount=null;
this.endAmount=null;
this.queryParams.beginAmount = null;
this.queryParams.endAmount = null;
this.beginAmount = null;
this.endAmount = null;
this.resetForm("queryForm");
this.handleQuery();
},

Loading…
Cancel
Save