Browse Source

’合并

git commit -m ’合并
master
j1ack 2 years ago
parent
commit
451a458270
  1. BIN
      dist.zip
  2. 9
      src/api/form.js
  3. 51
      src/views/carddealer/carddealer/index.vue
  4. 51
      src/views/merchant/merchant/index.vue
  5. 67
      src/views/order/TransferOrder/index.vue
  6. 156
      src/views/order/TransferOrder/readyOrder.vue
  7. 113
      src/views/order/carddealerOrder/index.vue
  8. 19
      src/views/order/carddealerOrder/readyOrder.vue
  9. 10
      src/views/order/payOrder/csOrder.vue
  10. 9
      src/views/order/payOrder/index.vue
  11. 6
      src/views/order/payOrder/wwc.vue
  12. BIN
      测试kakapay.zip

BIN
dist.zip

Binary file not shown.

9
src/api/form.js

@ -83,7 +83,7 @@ export const payAgentUser = {
// 更新密钥
upGoogleCaptcha: (data) => {
return request({
url: '/system/user/upGoogleCaptcha?userId='+data.userId,
url: '/system/user/upGoogleCaptcha?userId=' + data.userId,
method: 'PUT',
headers: {
Authorization: "Bearer " + getToken(),
@ -811,6 +811,13 @@ export const payDfOrder = {
* 商户代付订单管理
*/
export const payOutOrder = {
//点击审核
orderReview: (data) => {
return request({
url: '/order/TransferOrder/orderReview?' + qs.stringify(data),
method: 'post',
})
},
// 获取该卡商绑定的银行卡列表(区分代收代付)
getCarddealerCardList: (query) => {
return request({

51
src/views/carddealer/carddealer/index.vue

@ -637,9 +637,6 @@ export default {
debug: true,
},
methods: {
sortNum(a, b) {//
return a - b;
},
tableRowClassName({ row, rowIndex }) {
if (row.limitReceiveStatus == 1) {
return "greenOrder";
@ -710,16 +707,17 @@ export default {
this.form = response.data;
type == 'limitReceiveStatus' ? this.form.limitReceiveStatus = row.limitReceiveStatus : this.form.status = row.status
payCard.updateInfo(this.form).then((res) => {
if (type == 'limitReceiveStatus') {
if (row.limitReceiveStatus == 1) {
this.infoList.unshift(...this.infoList.splice(rowIndex, 1))
}
if (row.limitReceiveStatus == 2) {
this.getList()
}
}
// if (type == 'limitReceiveStatus') {
// if (row.limitReceiveStatus == 1) {
// this.infoList.unshift(...this.infoList.splice(rowIndex, 1))
// }
// if (row.limitReceiveStatus == 2) {
// this.getList()
// }
// }
if (res.code === 200) {
this.$message.success("编辑成功");
this.getList()
}
});
});
@ -736,33 +734,18 @@ export default {
this.allList = response.data
});
},
timerHandler(queryParams) {
listCarddealer(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => {
this.infoList = response.rows;
// this.infoList = this.infoList.sort(this.sortNum)//
for (var i = 0; i < this.infoList.length; i++) {
if (this.infoList[i].limitReceiveStatus == 1) {
this.ceshi = this.infoList[i] //
this.infoList.splice(i, 1)//
this.infoList.unshift(this.ceshi)//unshift
}
}
this.total = Number(response.total);
});
},
/** 查询码商列表 */
getList() {
this.loading = true;
listCarddealer(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => {
this.infoList = response.rows;
// this.infoList = this.infoList.sort(this.sortNum)//
for (var i = 0; i < this.infoList.length; i++) {
if (this.infoList[i].limitReceiveStatus == 1) {
this.ceshi = this.infoList[i] //
this.infoList.splice(i, 1)//
this.infoList.unshift(this.ceshi)//unshift
}
}
// for (var i = 0; i < this.infoList.length; i++) {
// if (this.infoList[i].limitReceiveStatus == 1) {
// this.ceshi = this.infoList[i] //
// this.infoList.splice(i, 1)//
// this.infoList.unshift(this.ceshi)//unshift
// }
// }
this.total = Number(response.total);
this.loading = false;
this.startTimer(this.queryParams)
@ -914,6 +897,7 @@ export default {
amount: amount,
googleCode: this.form.googleCode,
type: this.form.type,
remark:this.form.remark
}).then((response) => {
this.msgSuccess("操作成功");
this.openBalance = false;
@ -925,6 +909,7 @@ export default {
amount: amount,
googleCode: this.form.googleCode,
type: this.form.type,
remark:this.form.remark
}).then((response) => {
this.msgSuccess("操作成功");
this.openBalance = false;

51
src/views/merchant/merchant/index.vue

@ -84,11 +84,29 @@
<el-table-column label="状态" align="center" prop="status" width="140px">
<template slot-scope="scope">
<el-switch v-model="scope.row.status" active-text="" inactive-text="" :active-value="1" :inactive-value="0"
@change="switchStatusChange(scope.row)">
@change="switchStatusChange(scope.row, 'status')">
</el-switch>
</template>
</el-table-column>
<!-- <el-table-column label="手动提单审核开关" align="center" prop="whetherReview" width="140px">
<template slot-scope="scope">
<el-switch v-model="scope.row.whetherReview" active-text="" inactive-text="" active-value="Y"
inactive-value="N" @change="switchStatusChange(scope.row, 'whetherReview')">
</el-switch>
</template>
</el-table-column>
<el-table-column label="api提单审核开关" align="center" prop="whetherReviewApi" width="140px">
<template slot-scope="scope">
<el-switch v-model="scope.row.whetherReviewApi" active-text="" inactive-text="" active-value="Y"
inactive-value="N" @change="switchStatusChange(scope.row, 'whetherReviewApi')">
</el-switch>
</template>
</el-table-column> -->
<el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="200">
@ -228,6 +246,9 @@
<el-form-item label="谷歌验证码" prop="googleCode">
<el-input v-model="form.googleCode" placeholder="请输入谷歌验证码" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm('formBalance')"> </el-button>
@ -301,6 +322,17 @@
<el-switch v-model="form.paymentInterfaceStatus" active-text="" inactive-text="" :active-value=true
:inactive-value=false></el-switch>
</el-form-item>
<el-form-item label="手动提单审核开关" prop="whetherReview">
<el-switch v-model="form.whetherReview" active-text="" inactive-text="" active-value="Y"
inactive-value="N"></el-switch>
</el-form-item>
<el-form-item label="api提单审核开关" prop="whetherReviewApi">
<el-switch v-model="form.whetherReviewApi" active-text="" inactive-text="" active-value="Y"
inactive-value="N"></el-switch>
</el-form-item>
<el-form-item label="谷歌秘钥" prop="merchantNo">
<span>{{ form.googleCaptcha }}</span>
<el-button type="primary" @click="submitForm('googleKey')" style="margin-left: 10px"> </el-button>
@ -436,6 +468,8 @@ export default {
form: {},
//
rules: {
whetherReviewApi:[{ required: true, message: "请选择是否api提单审核", trigger: "blur" }],
whetherReview:[{ required: true, message: "请选择是否手动提单审核", trigger: "blur" }],
code: [{ required: true, message: "请输入谷歌验证码", trigger: "blur" }],
ipWhiteList: [{ required: true, message: "请输入IP", trigger: "blur" }],
payapiWhitelistIp: [{ required: true, message: "请输入代付IP", trigger: "blur" }],
@ -531,13 +565,21 @@ export default {
this.$forceUpdate()
},
//
switchStatusChange(row) {
switchStatusChange(row, type) {
this.reset()
const id = row.id || this.ids;
this.form = row;
this.form.status = row.status;
if (type == 'status') {
this.form.status = row.status;
} else if (type == 'whetherReview') {
this.form.whetherReview = row.whetherReview;
} else {
this.form.whetherReviewApi = row.whetherReviewApi;
}
updateMerchant(this.form).then((res) => {
if (res.code === 200) {
this.$message.success("编辑成功");
this.getList()
}
});
},
@ -634,7 +676,7 @@ export default {
//
handleBalance(row) {
this.reset();
this.title = "修改佣金";
this.title = "修改余额";
this.form.id = row.id;
this.openBalance = true;
},
@ -769,6 +811,7 @@ export default {
type: this.form.type,
amount: amount,
googleCode: this.form.googleCode,
remark: this.form.remark,
}).then((response) => {
this.msgSuccess("操作成功");
this.openBalance = false;

67
src/views/order/TransferOrder/index.vue

@ -42,6 +42,13 @@
<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="batchNo">
<el-input size="medium" v-model="queryParams.batchNo" placeholder="请输入批次号" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="类型" prop="orderSource">
@ -106,7 +113,7 @@
<el-table-column label="商户" align="center" prop="merchantName" />
<el-table-column label="商户订单号" align="center" prop="merchantOrderNo" />
<el-table-column label="商户下游订单号" align="center" prop="downstreamMerchantOrderNo" min-width="120" />
<el-table-column label="批次号" align="center" prop="batchNo" min-width="120" />
<el-table-column :label="'类型'" align="center" prop="securityDepositAmount">
<template slot-scope="scope">
{{ scope.row.orderSource == 1 ? '接口' : scope.row.orderSource == 2 ? '商户提现' : scope.row.orderSource
@ -152,6 +159,18 @@
{{ scope.row.orderStatus == 1 ? '待支付' : scope.row.orderStatus == 2 ? '支付成功' : '支付失败' }}
</template>
</el-table-column>
<!-- <el-table-column :label="'审核状态'" align="center" prop="auditStatus">
<template slot-scope="scope">
<span :class="scope.row.auditStatus == 'turn_down'?'red':scope.row.auditStatus == 'unaudited'?'yellow':scope.row.auditStatus == 'examination_passed'?'green':''">
{{ scope.row.auditStatus == 'unaudited' ? '未审核' : scope.row.auditStatus == 'examination_passed' ?
'审核通过' : scope.row.auditStatus == 'turn_down' ? '驳回' : '无需审核' }}
</span>
</template>
</el-table-column> -->
<el-table-column label="备注" align="center" prop="remark" />
@ -182,6 +201,9 @@
<el-form-item label="平台单号">
{{ detailInfoList.orderNo }}
</el-form-item>
<el-form-item label="批次号">
{{ detailInfoList.batchNo }}
</el-form-item>
<el-form-item label="商户订单号">
{{ detailInfoList.merchantOrderNo }}
</el-form-item>
@ -217,6 +239,18 @@
<el-form-item label="收款卡号">
{{ detailInfoList.cardNumber }}
</el-form-item>
<!-- <el-form-item label="审核状态">
<span>
{{ detailInfoList.auditStatus == 'unaudited' ? '未审核' : detailInfoList.auditStatus == 'examination_passed'
?
'审核通过' : detailInfoList.auditStatus == 'turn_down' ? '驳回' : '无需审核' }}
</span>
</el-form-item> -->
<el-form-item label="订单状态">
{{ detailInfoList.orderStatus == 1 ? '待支付' : detailInfoList.orderStatus == 2 ? '支付成功' : '支付失败' }}
</el-form-item>
@ -369,8 +403,8 @@ export default {
orderSource: null,
orderStatus: null,
platformChannelId: null,
downstreamMerchantOrderNo: null
downstreamMerchantOrderNo: null,
batchNo: null
},
showAll: [
{
@ -651,8 +685,8 @@ export default {
orderSource: this.queryParams.orderSource,
orderStatus: this.queryParams.orderStatus,
platformChannelId: this.queryParams.platformChannelId,
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo,
batchNo: this.queryParams.batchNo
}
listTransferOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows;
@ -792,30 +826,41 @@ export default {
</script>
<style>
.greyOrder {
background: #F4F4F5 !important;
background: #F4F4F5 !important;
}
.purpleTransfer {
background: #FDF7FF !important;
background: #FDF7FF !important;
}
/* #EEF6FF/#F1FAF5/#FDF7FF/#FFF6F4 */
.blueTransfer {
background: #EEF6FF !important;
background: #EEF6FF !important;
}
.yellowTransfer {
background: #FEFEE5 !important;
background: #FEFEE5 !important;
}
.greenTransfer {
background: #F1FAF5 !important;
background: #F1FAF5 !important;
}
.redTransfer {
background: #FFF6F4 !important;
background: #FFF6F4 !important;
}
</style>
<style scoped>
.red {
color: red !important;
}
.yellow {
color: #F49300 !important;
}
.green{
color: #67c23a !important;
}
::v-deep .el-table tbody tr:hover>td {
background-color: rgba(0, 0, 0, 0) !important
}

156
src/views/order/TransferOrder/readyOrder.vue

@ -22,6 +22,10 @@
<el-input size="medium" v-model="queryParams.downstreamMerchantOrderNo" placeholder="请输入商户下游订单号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="批次号" prop="batchNo">
<el-input size="medium" v-model="queryParams.batchNo" placeholder="请输入批次号" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="收款卡号" prop="cardNumber">
<el-input size="medium" v-model="queryParams.cardNumber" placeholder="请输入收款卡号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
@ -32,6 +36,14 @@
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<!-- <el-form-item label="审核状态" prop="auditStatus">
<el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态" clearable size="medium">
<el-option v-for="(item, i) in auditStatusAll" :key="i" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="姓名" prop="accountName">
<el-input size="medium" v-model="queryParams.accountName" placeholder="请输入姓名"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
@ -107,7 +119,7 @@
<el-table-column label="商户" align="center" prop="merchantName" />
<el-table-column label="商户订单号" align="center" prop="merchantOrderNo" />
<el-table-column label="商户下游订单号" align="center" prop="downstreamMerchantOrderNo" min-width="120" />
<el-table-column label="批次号" align="center" prop="batchNo" min-width="120" />
<el-table-column :label="'类型'" align="center" prop="securityDepositAmount">
<template slot-scope="scope">
{{ scope.row.orderSource == 1 ? '接口' : scope.row.orderSource == 2 ? '商户提现' : scope.row.orderSource
@ -153,6 +165,17 @@
{{ scope.row.orderStatus == 1 ? '待支付' : scope.row.orderStatus == 2 ? '支付成功' : '支付失败' }}
</template>
</el-table-column>
<!-- <el-table-column :label="'审核状态'" align="center" prop="auditStatus">
<template slot-scope="scope">
<span :class="scope.row.auditStatus == 'turn_down'?'red':scope.row.auditStatus == 'unaudited'?'yellow':scope.row.auditStatus == 'examination_passed'?'green':''">
{{ scope.row.auditStatus == 'unaudited' ? '未审核' : scope.row.auditStatus == 'examination_passed' ?
'审核通过' : scope.row.auditStatus == 'turn_down' ? '驳回' : '无需审核' }}
</span>
</template>
</el-table-column> -->
<el-table-column label="备注" align="center" prop="remark" />
@ -162,22 +185,32 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
min-width="120">
<template slot-scope="scope">
<el-button size="small" type="text" @click="switchStatusChange(scope.row, 'status')"
style="color: #006eff;margin-left: 10px;" :class="scope.row.canRace == 1 ? 'red' : 'yellow'">
{{ scope.row.canRace == 1 ? '锁定' : '解锁' }}
</el-button>
<el-button size="small" type="text" @click="handleToOther(scope.row)"
style="color: #006eff;">分配</el-button>
<el-button size="small" type="text" @click="handleOut(scope.row)"
style="color: #006eff">关闭</el-button>
<el-button size="small" type="text" @click="handleSuccess(scope.row)"
style="color: #006eff">成功</el-button>
<el-button size="small" type="text" @click="handleView(scope.row)"
style="color: #006eff">详情</el-button>
<el-button size="small" type="text" @click="handleSonOrder(scope.row)"
style="color: #006eff">子单</el-button>
<!-- <el-button size="small" type="text" @click="handleUnaudited(scope.row)" style="color: #006eff;"
v-if="scope.row.auditStatus == 'unaudited'">审核</el-button> -->
<!-- <span v-if="scope.row.auditStatus == 'unaudited'" class="yellow">当前订单未审核</span>
<span v-if="scope.row.auditStatus == 'turn_down'" class="red">当前订单已驳回</span> -->
<div v-if="scope.row.auditStatus != 'unaudited' && scope.row.auditStatus != 'turn_down'">
<el-button size="small" type="text" @click="switchStatusChange(scope.row, 'status')"
style="color: #006eff;margin-left: 10px;"
:class="scope.row.canRace == 1 ? 'red' : 'yellow'">
{{ scope.row.canRace == 1 ? '锁定' : '解锁' }}
</el-button>
<el-button size="small" type="text" @click="handleToOther(scope.row)"
style="color: #006eff;">分配</el-button>
<el-button size="small" type="text" @click="handleOut(scope.row)"
style="color: #006eff">关闭</el-button>
<el-button size="small" type="text" @click="handleSuccess(scope.row)"
style="color: #006eff">成功</el-button>
<el-button size="small" type="text" @click="handleView(scope.row)"
style="color: #006eff">详情</el-button>
<el-button size="small" type="text" @click="handleSonOrder(scope.row)"
style="color: #006eff">子单</el-button>
</div>
</template>
</el-table-column>
</el-table>
@ -198,6 +231,9 @@
<el-form-item label="商户订单号">
{{ detailInfoList.merchantOrderNo }}
</el-form-item>
<el-form-item label="批次号">
{{ detailInfoList.batchNo }}
</el-form-item>
<el-form-item label="商户下游订单号">
{{ detailInfoList.downstreamMerchantOrderNo }}
</el-form-item>
@ -296,6 +332,24 @@
</div>
</el-dialog>
<!-- 审核 -->
<el-dialog title="审核" :visible.sync="openAuditStatus" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="状态">
<el-radio-group v-model="form.auditStatus" @change="change">
<el-radio v-for="dict in auditStatusCon" :key="dict.value" :value="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFormAudit()"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<!-- 子单列表 -->
<el-dialog v-dialogDrag title="子单列表" :visible.sync="pkCouponScopeRangeParkingStoreOpen" width="80%" append-to-body
:close-on-click-modal="false">
@ -355,6 +409,7 @@ export default {
//
open: false,
openOther: false,
openAuditStatus: false,
//
queryParams: {
pageNum: 1,
@ -368,8 +423,38 @@ export default {
orderSource: null,
platformChannelId: null,
orderStatus: 1,
downstreamMerchantOrderNo: null
downstreamMerchantOrderNo: null,
batchNo: null,
auditStatus: null,
},
auditStatusAll: [
{
label: '审核通过',
value: 'examination_passed',
},
{
label: '驳回',
value: 'turn_down',
},
{
label: '未审核',
value: 'unaudited',
},
{
label: '无需审核',
value: 'no_review_required',
},
],
auditStatusCon: [
{
label: '审核通过',
value: 'examination_passed',
},
{
label: '驳回',
value: 'turn_down',
},
],
showAll: [
{
label: '全部',
@ -396,6 +481,9 @@ export default {
form: {},
//
rules: {
auditStatus: [
{ required: true, message: "请选择状态", trigger: "blur" }
],
carddealerId: [
{ required: true, message: "码商不能为空", trigger: "blur" }
],
@ -546,6 +634,14 @@ export default {
debug: true,
},
methods: {
//
handleUnaudited(row) {
this.reset()
this.form.orderNo = row.orderNo
this.form.auditStatus = 'examination_passed'
this.$forceUpdate()
this.openAuditStatus = true
},
tableRowClassName({ row, rowIndex }) {
if (row.sameMark == 1) {
return "purpleTransfer";
@ -690,7 +786,9 @@ export default {
orderSource: this.queryParams.orderSource,
orderStatus: this.queryParams.orderStatus,
platformChannelId: this.queryParams.platformChannelId,
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo
downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo,
batchNo: this.queryParams.batchNo,
auditStatus: this.queryParams.auditStatus
}
listTransferOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows;
@ -703,7 +801,8 @@ export default {
cancel() {
this.open = false;
this.openOther = false,
this.reset();
this.openAuditStatus = false
this.reset();
},
//
reset() {
@ -775,6 +874,17 @@ export default {
this.title = "修改代付订单";
});
},
//
submitFormAudit() {
payOutOrder.orderReview({
orderNo: this.form.orderNo,
auditStatus: this.form.auditStatus
}).then(response => {
this.msgSuccess("操作成功");
this.openAuditStatus = false;
this.getList();
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
@ -795,6 +905,7 @@ export default {
}
});
},
/** 成功按钮操作 */
handleSuccess(row) {
const ids = row.orderNo || this.ids;
@ -870,6 +981,7 @@ export default {
.purpleTransfer {
background: #FDF7FF !important;
}
/* #EEF6FF/#F1FAF5/#FDF7FF/#FFF6F4 */
.greyOrder {
@ -900,7 +1012,9 @@ export default {
.yellow {
color: #F49300 !important;
}
.green{
color: #67c23a !important;
}
::v-deep .el-table tbody tr:hover>td {
background-color: rgba(0, 0, 0, 0) !important
}

113
src/views/order/carddealerOrder/index.vue

@ -5,58 +5,56 @@
<div class="bar"></div>
<div class="text">全部提现订单</div>
</div> -->
</div>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="106px"
class="flex form" style="position: relative">
<el-form-item label="码商名称" prop="carddealerName">
<el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="订单号" prop="orderNo">
<el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入订单号" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商户订单号" prop="merchantOrderNo">
<el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in dictCon" :key="i" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item>
<div class="searchTop flexBet" style="align-items: center">
<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-row>
<!-- <el-row :gutter="10" class="mb8" style="margin-left: 20px">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col>
</el-row> -->
</div>
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="106px" class="flex form"
style="position: relative">
<el-form-item label="码商名称" prop="carddealerName">
<el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商名称"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="订单号" prop="orderNo">
<el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入订单号" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="商户订单号" prop="merchantOrderNo">
<el-input size="medium" v-model="queryParams.merchantOrderNo" placeholder="请输入商户订单号"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable size="medium">
<el-option v-for="(item, i) in dictCon" :key="i" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"></el-date-picker>
</el-form-item>
<el-form-item>
<div class="searchTop flexBet" style="align-items: center">
<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-row>
<el-row :gutter="10" class="mb8" style="margin-left: 20px">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col>
</el-row>
</div>
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
<div class="bg">
<el-table stripe :data="infoList" v-loading="loading" :row-class-name="tableRowClassName">
<el-table-column label="订单号" align="center" prop="orderNo" />
@ -107,8 +105,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="100">
<template slot-scope="scope">
<el-button size="small" type="text" @click="handleView(scope.row)" style="color: #006eff">详情</el-button>
<el-button size="small" type="text" @click="handleSonOrder(scope.row)" style="color: #006eff"
>子单</el-button>
<el-button size="small" type="text" @click="handleSonOrder(scope.row)" style="color: #006eff">子单</el-button>
</template>
</el-table-column>
</el-table>
@ -261,7 +258,7 @@ export default {
merchantName: null,
orderAmount: null,
reqAmount: null,
carddealerName:null,
carddealerName: null,
},
dictCon: [
{
@ -282,7 +279,7 @@ export default {
},
],
showAll: [
{
label: '接口',
value: 1,
@ -435,11 +432,11 @@ export default {
//
debug: true,
},
created() {
this.getList();
},
methods: {
tableRowClassName({ row, rowIndex }) {
if (row.orderStatus == 3) {
@ -565,8 +562,15 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有代付订单数据项?', "警告", {
this.$confirm('是否确认导出所有码商订单数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@ -596,6 +600,7 @@ export default {
::v-deep .el-table tbody tr:hover>td {
background-color: rgba(0, 0, 0, 0) !important
}
::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
background: none !important;
}

19
src/views/order/carddealerOrder/readyOrder.vue

@ -36,11 +36,11 @@
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</el-row>
<!-- <el-row :gutter="10" class="mb8" style="margin-left: 20px">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col>
</el-row> -->
<el-row :gutter="10" class="mb8" style="margin-left: 20px">
<el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleExport()">导出</el-button>
</el-col>
</el-row>
</div>
</el-form-item>
</el-form>
@ -710,8 +710,15 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
if (this.dateRange.length) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有代付订单数据项?', "警告", {
this.$confirm('是否确认导出所有码商订单数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"

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

@ -42,6 +42,12 @@
<el-input size="medium" v-model="queryParams.carddealerCardHolder" placeholder="请输入姓名"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="付款人" prop="payerName">
<el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
@ -633,6 +639,10 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if(this.form.paymentAmount>this.form.reqAmount){
this.$message.error('支付金额不能大于订单金额')
return;
}
let paymentAmount = this.NumberMul(this.form.paymentAmount, 100)
payToOrder.payOrderOvertimePayment({
orderNo: this.form.orderNo,

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

@ -44,6 +44,11 @@
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="付款人" prop="payerName">
<el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">
@ -621,6 +626,10 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if(this.form.paymentAmount>this.form.reqAmount){
this.$message.error('支付金额不能大于订单金额')
return;
}
let paymentAmount = this.NumberMul(this.form.paymentAmount, 100)
payToOrder.payOrderOvertimePayment({
orderNo: this.form.orderNo,

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

@ -43,6 +43,12 @@
<el-input size="medium" v-model="queryParams.carddealerCardHolder" placeholder="请输入姓名"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="付款人" prop="payerName">
<el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-collapse>
<el-collapse-item name="1">
<el-form-item label="订单金额" prop="reqAmount">

BIN
测试kakapay.zip

Binary file not shown.
Loading…
Cancel
Save