Browse Source

update

master
j1ack 2 years ago
parent
commit
07d0ac58d7
  1. 49
      src/views/order/payOrder/csOrder.vue
  2. 63
      src/views/order/payOrder/index.vue
  3. 54
      src/views/order/payOrder/wwc.vue

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

@ -50,10 +50,13 @@
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
<el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<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-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
@ -389,7 +392,9 @@ export default {
carddealerCardHolder: null,
reqAmount: null,
platformChannelId: null,
downstreamMerchantOrderNo: null
downstreamMerchantOrderNo: null,
endAmount:null,
beginAmount:null,
},
//
isShowDetail: false,
@ -511,6 +516,8 @@ export default {
]
},
reqAmount: null,
endAmount: null,
beginAmount: null
};
},
created() {
@ -607,7 +614,7 @@ export default {
});
},
/** 查询代收订单列表 */
getList(reqAmount) {
getList(beginAmount,endAmount) {
this.loading = true;
let queryParams = {
pageNum: this.queryParams.pageNum,
@ -622,9 +629,10 @@ export default {
channelName: this.queryParams.channelName,
orderStatus: this.queryParams.orderStatus,
carddealerCardHolder: this.queryParams.carddealerCardHolder,
reqAmount: typeof (this.reqAmount) == 'object' ? null : !reqAmount ? null : parseFloat(this.reqAmount),
platformChannelId: this.queryParams.platformChannelId,
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo,
beginAmount:this.beginAmount,
endAmount:this.endAmount,
}
listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows;
@ -646,19 +654,28 @@ export default {
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
var reqAmount;
this.queryParams.reqAmount ? reqAmount = this.NumberMul(this.queryParams.reqAmount, 100) : this.queryParams.reqAmount
reqAmount = parseFloat(reqAmount)
/** 搜索按钮操作 */
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;
reqAmount ? this.reqAmount = reqAmount : this.reqAmount = null
reqAmount ? this.getList(reqAmount) : this.getList(null)
this.endAmount=endAmount
this.beginAmount=beginAmount
if(endAmount||beginAmount){
this.getList(beginAmount,endAmount)
}else{
this.getList()
}
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.queryParams.beginAmount=null;
this.queryParams.endAmount=null;
this.beginAmount=null;
this.endAmount=null;
this.resetForm("queryForm");
this.handleQuery();
},

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

@ -51,10 +51,15 @@
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
<el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<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-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
@ -104,7 +109,7 @@
<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>
@ -144,7 +149,8 @@
<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="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>
@ -188,7 +194,7 @@
<el-form-item label="商户编号">
{{ detailInfoList.merchantNo }}
</el-form-item>
<el-form-item label="订单请求金额">
{{ parseFloat(NumberDiv(detailInfoList.reqAmount, 100)).toFixed(2) }}
@ -208,7 +214,7 @@
<el-form-item label="订单状态">
{{ detailInfoList.orderStatus == 1 ? '待支付' : detailInfoList.orderStatus == 2 ? '成功' : '已超时' }}
</el-form-item>
</div>
<div class="card-detail">
<el-form-item label="商品名称">
@ -218,8 +224,9 @@
{{ detailInfoList.updateTime }}
</el-form-item>
<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>
@ -379,7 +386,9 @@ export default {
carddealerCardHolder: null,
reqAmount: null,
platformChannelId: null,
downstreamMerchantOrderNo: null
downstreamMerchantOrderNo: null,
endAmount:null,
beginAmount:null,
},
//
isShowDetail: false,
@ -499,7 +508,10 @@ export default {
orgReqAmount: [
{ required: true, message: "发起的金额不能为空", trigger: "blur" }
]
}
},
reqAmount: null,
endAmount: null,
beginAmount: null
};
},
$autoRefresh: {
@ -578,7 +590,7 @@ export default {
});
},
/** 查询代收订单列表 */
getList(reqAmount) {
getList(beginAmount,endAmount) {
this.loading = true;
let queryParams = {
pageNum: this.queryParams.pageNum,
@ -593,9 +605,10 @@ export default {
channelName: this.queryParams.channelName,
orderStatus: this.queryParams.orderStatus,
carddealerCardHolder: this.queryParams.carddealerCardHolder,
reqAmount: typeof (reqAmount) == 'object' ? null : !reqAmount ? null : parseFloat(reqAmount),
platformChannelId: this.queryParams.platformChannelId,
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo,
beginAmount:this.beginAmount,
endAmount:this.endAmount,
}
listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows;
@ -619,16 +632,26 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
var reqAmount;
this.queryParams.reqAmount ? reqAmount = this.NumberMul(this.queryParams.reqAmount, 100) : this.queryParams.reqAmount
reqAmount = parseFloat(reqAmount)
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;
reqAmount ? this.reqAmount = reqAmount : this.reqAmount = null
reqAmount ? this.getList(reqAmount) : this.getList(null)
this.endAmount=endAmount
this.beginAmount=beginAmount
if(endAmount||beginAmount){
this.getList(beginAmount,endAmount)
}else{
this.getList()
}
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.queryParams.beginAmount=null;
this.queryParams.endAmount=null;
this.beginAmount=null;
this.endAmount=null;
this.resetForm("queryForm");
this.handleQuery();
},

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

@ -51,11 +51,13 @@
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
<el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<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-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>
@ -385,7 +387,9 @@ export default {
carddealerCardHolder: null,
reqAmount: null,
platformChannelId: null,
downstreamMerchantOrderNo: null
downstreamMerchantOrderNo: null,
endAmount:null,
beginAmount:null,
},
//
isShowDetail: false,
@ -507,6 +511,8 @@ export default {
]
},
reqAmount: null,
endAmount: null,
beginAmount: null
};
},
created() {
@ -597,7 +603,8 @@ export default {
carddealerCardHolder: this.queryParams.carddealerCardHolder,
reqAmount: typeof (this.reqAmount) == 'object' ? null : !this.reqAmount ? null : parseFloat(this.reqAmount),
platformChannelId: this.queryParams.platformChannelId,
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo,
}
listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows;
@ -605,7 +612,7 @@ export default {
});
},
/** 查询代收订单列表 */
getList(reqAmount) {
getList(beginAmount,endAmount) {
this.loading = true;
let queryParams = {
pageNum: this.queryParams.pageNum,
@ -620,9 +627,10 @@ export default {
channelName: this.queryParams.channelName,
orderStatus: this.queryParams.orderStatus,
carddealerCardHolder: this.queryParams.carddealerCardHolder,
reqAmount: typeof (reqAmount) == 'object' ? null : !reqAmount ? null : parseFloat(reqAmount),
platformChannelId: this.queryParams.platformChannelId,
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo,
beginAmount:this.beginAmount,
endAmount:this.endAmount,
}
listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows;
@ -645,17 +653,27 @@ export default {
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
var reqAmount;
this.queryParams.reqAmount ? reqAmount = this.NumberMul(this.queryParams.reqAmount, 100) : this.queryParams.reqAmount
reqAmount = parseFloat(reqAmount)
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;
reqAmount ? this.reqAmount = reqAmount : this.reqAmount = null
reqAmount ? this.getList(reqAmount) : this.getList(null)
this.endAmount=endAmount
this.beginAmount=beginAmount
if(endAmount||beginAmount){
this.getList(beginAmount,endAmount)
}else{
this.getList()
}
},
/** 重置按钮操作 */
resetQuery() {
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.queryParams.beginAmount=null;
this.queryParams.endAmount=null;
this.beginAmount=null;
this.endAmount=null;
this.resetForm("queryForm");
this.handleQuery();
},

Loading…
Cancel
Save