jack
/
kakapay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
kiki 2 years ago
parent
f3d5e3ca47 be1fc6ad7c
commit
8999eb85d4
2 changed files with 63 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      kakapay.zip
  2. 106
      src/views/order/TransferOrder/daifuSonOrder.vue

BIN
kakapay.zip
View File

Binary file not shown.

106
src/views/order/TransferOrder/daifuSonOrder.vue
View File

@ -46,43 +46,46 @@
</el-form-item> </el-form-item>
<el-collapse> <el-collapse>
<el-collapse-item name="1"> <el-collapse-item name="1">
<el-form-item label="持卡人姓名" prop="accountName"> <el-form-item label="持卡人姓名" prop="accountName">
<el-input size="medium" v-model="queryParams.accountName" placeholder="请输入持卡人姓名" <el-input size="medium" v-model="queryParams.accountName" placeholder="请输入持卡人姓名"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" /> @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item> </el-form-item>
<el-form-item label="订单金额" prop="amount"> <el-form-item label="订单金额" prop="amount">
<el-input size="medium" v-model="queryParams.amount" placeholder="请输入订单金额" @keyup.enter.native="handleQuery" <el-input size="medium" v-model="queryParams.amount" placeholder="请输入订单金额"
style="width: 180px; border-color: #e6f1ff" /> @keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="orderStatus"> <el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium"> <el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in showAll" :key="i" :label="item.label" :value="item.value"></el-option> <el-option v-for="(item, i) in showAll" :key="i" :label="item.label"
</el-select> :value="item.value"></el-option>
</el-form-item> </el-select>
</el-form-item>
<el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium"> <el-form-item label="通道" prop="platformChannelId">
<el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName" <el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
:value="item.id"></el-option> <el-option v-for="(item, i) in channelAll" :key="i" :label="item.channelName"
</el-select> :value="item.id"></el-option>
</el-form-item> </el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange[0]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss" <el-form-item label="创建时间">
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker> value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
</el-form-item> start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"></el-date-picker>
<el-form-item label="更新时间"> </el-form-item>
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" <el-form-item label="更新时间">
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"></el-date-picker> <el-date-picker v-model="dateRange[1]" size="small" style="width: 340px"
</el-form-item> value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
</el-collapse-item> start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
</el-collapse> :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-form-item style="margin-left:10px"> <el-form-item style="margin-left:10px">
<div class="searchTop flexBet" style="align-items: center"> <div class="searchTop flexBet" style="align-items: center">
@ -92,12 +95,12 @@
</el-row> </el-row>
<el-row :gutter="10" class="mb8" style="margin-left:8px"> <el-row :gutter="10" class="mb8" style="margin-left:8px">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button> <el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row :gutter="10" class="mb8"> <!-- <el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> --> </el-row> -->
</div> </div>
@ -138,9 +141,10 @@
</el-table-column> </el-table-column>
<el-table-column label="码商" align="center" prop="carddealerName" /> <el-table-column label="码商" align="center" prop="carddealerName" />
<el-table-column :label="'付款卡(必须一致)'" align="center" prop="payeeRealAmount" min-width="180"> <el-table-column :label="'付款卡(必须一致)'" align="center" prop="payeeRealAmount" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.accountName }}（{{ scope.row.bankName }}）（{{ scope.row.cardNumber }}） <span v-if="scope.row.payCarddealerCard">{{ scope.row.payCarddealerCard.cardHolder }}（{{ scope.row.payCarddealerCard.bankName }}）（{{ scope.row.payCarddealerCard.cardNumber }}）</span>
</template> </template>
</el-table-column> </el-table-column>
@ -173,6 +177,9 @@
</el-button> </el-button>
<el-button v-if="scope.row.orderStatus != 1" size="small" type="text" <el-button v-if="scope.row.orderStatus != 1" size="small" type="text"
@click="handleCertificate(scope.row)" style="color: #006eff">查看凭证</el-button> @click="handleCertificate(scope.row)" style="color: #006eff">查看凭证</el-button>
<el-button size="small" type="text" v-clipboard:copy="getReadableText(scope.row)"
v-clipboard:success="handleClipboardSuccess" style="color: #006eff">复制</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -314,7 +321,7 @@ import cardMerchantOrderRefreshMixin from "@/api/cardMerchantOrderRefresh.mixin"
export default { export default {
name: "TransferOrder", name: "TransferOrder",
dicts: ['collection_order_status'], dicts: ['collection_order_status'],
mixins: [cardMerchantOrderRefreshMixin], mixins: [cardMerchantOrderRefreshMixin],
data() { data() {
return { return {
amount: null, amount: null,
@ -416,6 +423,13 @@ export default {
this.init(); this.init();
}, },
methods: { methods: {
getReadableText(data) {
return `${data.cardNumber}/${data.accountName}/${data.bankName}/${this.NumberDiv(data.amount, 100)}`
},
/** 复制代码成功 */
handleClipboardSuccess() {
this.$modal.msgSuccess("复制成功");
},
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (row.orderStatus == 4) { if (row.orderStatus == 4) {
return "redOrder"; return "redOrder";
@ -524,7 +538,7 @@ export default {
this.infoList = response.rows; this.infoList = response.rows;
this.total = Number(response.total); this.total = Number(response.total);
}); });
}, },
/** 查询代付订单列表 */ /** 查询代付订单列表 */
getList(amount) { getList(amount) {
@ -547,7 +561,7 @@ export default {
this.infoList = response.rows; this.infoList = response.rows;
this.total = Number(response.total); this.total = Number(response.total);
this.loading = false; this.loading = false;
this.startTimer(queryParams) this.startTimer(queryParams)
}); });
}, },
// 取消按钮 // 取消按钮

Write Preview
Loading…
Cancel
Save