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

置顶，修改固定押金功能添加

master
j1ack 2 years ago
parent
7a157826f0
commit
11e1eb088d
33 changed files with 963 additions and 802 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. 19
      src/App.vue
  2. 23
      src/api/form.js
  3. 67
      src/layout/components/Navbar.vue
  4. 2
      src/plugins/auto-refresh.js
  5. 24
      src/views/carddealer/carddealer/index.vue
  6. 18
      src/views/carddealer/carddealerCard/index.vue
  7. 59
      src/views/carddealer/carddealerDev/index.vue
  8. 35
      src/views/carddealer/carddealerSms/index.vue
  9. 581
      src/views/carddealer/carddealerSms/indexIdentify.vue
  10. 585
      src/views/carddealer/carddealerSms/indexSuccess.vue
  11. 92
      src/views/carddealer/carddealerSmsTemp/index.vue
  12. 35
      src/views/dashboard/PanelGroup.vue
  13. 6
      src/views/merchant/merchant/index.vue
  14. 2
      src/views/order/TransferOrder/daifuSonOrder.vue
  15. 10
      src/views/order/TransferOrder/index.vue
  16. 72
      src/views/order/TransferOrder/readyOrder.vue
  17. 2
      src/views/order/carddealerOrder/carddealerSonOrder.vue
  18. 2
      src/views/order/carddealerOrder/index.vue
  19. 2
      src/views/order/carddealerOrder/readyOrder.vue
  20. 59
      src/views/order/payOrder/csOrder.vue
  21. 15
      src/views/order/payOrder/index.vue
  22. 8
      src/views/order/payOrder/wwc.vue
  23. 2
      src/views/payTest/dfTest.vue
  24. 31
      src/views/payTest/dsTest.vue
  25. 2
      src/views/platform/bank/index.vue
  26. 2
      src/views/platform/platformChannel/index.vue
  27. 2
      src/views/staticsRecord/cardTimeStatistics.vue
  28. 2
      src/views/staticsRecord/dayEndStatistics.vue
  29. 2
      src/views/staticsRecord/dayStatistics.vue
  30. 2
      src/views/staticsRecord/mechantTimeStatistics.vue
  31. 2
      src/views/staticsRecord/merchantCardStat.vue
  32. BIN
      正式kakapay.zip
  33. BIN
      测试kakapay.zip

19
src/App.vue
View File

@ -45,6 +45,25 @@ export default {
#app .sidebar-container .el-submenu .el-menu-item { #app .sidebar-container .el-submenu .el-menu-item {
width: 203px !important; width: 203px !important;
} */ } */
/* toptime标识 */
.redTip {
position: relative;
}
.redTip:last-child::before {
content: '';
height: 0px;
width: 0px;
border: 10px solid #000;
border-top-color: transparent;
border-bottom-color: red;
border-left-color: transparent;
border-right-color: transparent;
position: absolute;
right: -10px;
top: -10px;
transform: rotate(45deg);
}
#app .sidebar-container .nest-menu .el-submenu>.el-submenu__title, #app .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
#app .sidebar-container .el-submenu .el-menu-item { #app .sidebar-container .el-submenu .el-menu-item {

23
src/api/form.js
View File

@ -11,6 +11,13 @@ import {
* *
*/ */
export const common_api = { export const common_api = {
//获取在线卡商信息
onLineCarddealer: (query) => {
return request({
url: '/carddealer/carddealer/onLineCarddealer',
method: 'get',
})
},
//查码商可分配通道 //查码商可分配通道
findChannelListAll: (query) => { findChannelListAll: (query) => {
return request({ return request({
@ -407,7 +414,13 @@ export const payCard = {
method: 'post', method: 'post',
}) })
}, },
// 操作金额（固定佣金）
operatingDayMargin: (data) => {
return request({
url: '/carddealer/carddealer/operatingDayMargin?' + qs.stringify(data),
method: 'post',
})
},
// 操作金额（佣金） // 操作金额（佣金）
operatingBalance: (data) => { operatingBalance: (data) => {
return request({ return request({
@ -811,6 +824,14 @@ export const payDfOrder = {
* 商户代付订单管理 * 商户代付订单管理
*/ */
export const payOutOrder = { export const payOutOrder = {
// 置顶
orderTop: (query) => {
return request({
url: '/order/TransferOrder/orderTop',
method: 'get',
params: query,
})
},
//点击审核 //点击审核
orderReview: (data) => { orderReview: (data) => {
return request({ return request({

67
src/layout/components/Navbar.vue
View File

@ -8,6 +8,10 @@
<div class="right-menu"> <div class="right-menu">
<template v-if="device !== 'mobile'"> <template v-if="device !== 'mobile'">
<el-button type="primary" icon="" size="small" style="margin-right:24px"
@click="dialogVisible = true">码商押金</el-button>
<el-switch :value="autoRefresh" :inactive-text="autoRefresh ? `自动刷新: (${autoRefreshCountdown}S)` : '自动刷新: '" <el-switch :value="autoRefresh" :inactive-text="autoRefresh ? `自动刷新: (${autoRefreshCountdown}S)` : '自动刷新: '"
@change="onAutoRefreshChanged" style="margin-right: 14px;" /> @change="onAutoRefreshChanged" style="margin-right: 14px;" />
@ -49,6 +53,24 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
<el-dialog title="码商押金" :visible.sync="dialogVisible" width="20%">
<el-table :data="tableData" style="width: 100%">
<el-table-column :label="'名称'" align="center" prop="storeNo" min-width="150">
<template slot-scope="scope">
<span style="color:#333">{{ scope.row.username }}</span>
</template>
</el-table-column>
<el-table-column :label="'押金'" align="center" prop="storeNo" min-width="150">
<template slot-scope="scope">
<span :style="{ color: NumberDiv(scope.row.margin, 100) < 5000 ? '#FF3535' : '#30C17B' }">
{{ NumberDiv(scope.row.margin, 100) }}
</span>
</template>
</el-table-column>
</el-table>
</el-dialog>
</div> </div>
</template> </template>
@ -63,6 +85,7 @@ import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git' import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc' import RuoYiDoc from '@/components/RuoYi/Doc'
import { getUserProfile } from "@/api/system/user"; import { getUserProfile } from "@/api/system/user";
import { common_api } from "@/api/form";
export default { export default {
components: { components: {
@ -75,9 +98,14 @@ export default {
RuoYiGit, RuoYiGit,
RuoYiDoc RuoYiDoc
}, },
data() { data() {
return { return {
user: {}, user: {},
dialogVisible: false,
tableData: [],
timer: null,
}; };
}, },
computed: { computed: {
@ -89,13 +117,6 @@ export default {
'autoRefresh', 'autoRefresh',
'autoRefreshCountdown', 'autoRefreshCountdown',
]), ]),
// autoRefresh: {
// get() {
// console.log(this.$store.getters.autoRefresh)
// this.refresh = this.$store.getters.autoRefresh
// }
// },
setting: { setting: {
get() { get() {
return this.$store.state.settings.showSettings return this.$store.state.settings.showSettings
@ -115,11 +136,29 @@ export default {
}, },
mounted() { mounted() {
this.getUser(); this.getUser();
this.getList();
this.secondMethod()
}, },
methods: { methods: {
secondMethod() {
this.timer = setInterval(() => {
this.getList();
}, 30000)
},
getList() {
common_api.onLineCarddealer().then((response) => {
this.tableData = response.data
});
},
// 改变自动刷新的状态 // 改变自动刷新的状态
onAutoRefreshChanged(value) { onAutoRefreshChanged(value) {
if (value) {
this.secondMethod()
} else {
clearInterval(this.timer)
}
this.$store.commit('app/SET_AUTO_REFRESH', value) this.$store.commit('app/SET_AUTO_REFRESH', value)
}, },
getUser() { getUser() {
getUserProfile().then(response => { getUserProfile().then(response => {
@ -145,6 +184,20 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 21vh !important;
}
::v-deep .el-dialog {
border-radius: 8px;
}
::v-deep .el-dialog__body {
padding-top: 0;
overflow-y: scroll;
max-height: 360px;
}
.navbar { .navbar {
height: 50px; height: 50px;
overflow: hidden; overflow: hidden;

2
src/plugins/auto-refresh.js
View File

@ -28,7 +28,7 @@ export default function (Vue) {
return { return {
autoRefreshStates: { autoRefreshStates: {
// 默认的刷新间隔 // 默认的刷新间隔
interval: 1000 * 10, interval: 3000 * 10,
// 最多执行的次数, 超出后停止 // 最多执行的次数, 超出后停止
maxExecuteTimes: 100, maxExecuteTimes: 100,
// 当前执行的次数 // 当前执行的次数

24
src/views/carddealer/carddealer/index.vue
View File

@ -149,6 +149,8 @@
style="color: #006eff">修改佣金</el-button> style="color: #006eff">修改佣金</el-button>
<el-button size="small" type="text" @click="handleBalance(scope.row, 'balance')" <el-button size="small" type="text" @click="handleBalance(scope.row, 'balance')"
style="color: #006eff">修改押金</el-button> style="color: #006eff">修改押金</el-button>
<el-button size="small" type="text" @click="handleBalance(scope.row, 'guBalance')" style="color: #006eff"
v-hasPermi="['carddealer:carddealer:operatingDayMargin']">修改固定押金</el-button>
<el-button size="small" type="text" @click="handleUpdate(scope.row)" style="color: #006eff">编辑</el-button> <el-button size="small" type="text" @click="handleUpdate(scope.row)" style="color: #006eff">编辑</el-button>
@ -623,7 +625,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -814,7 +816,7 @@ export default {
handleBalance(row, type) { handleBalance(row, type) {
this.reset(); this.reset();
this.openType = type this.openType = type
type == 'money' ? this.title = "修改佣金" : this.title = "修改押金" type == 'money' ? this.title = "修改佣金" : type == 'guBalance' ? this.title = "修改固定押金" : this.title = "修改押金"
this.form.id = row.id; this.form.id = row.id;
this.openBalance = true; this.openBalance = true;
}, },
@ -897,19 +899,31 @@ export default {
amount: amount, amount: amount,
googleCode: this.form.googleCode, googleCode: this.form.googleCode,
type: this.form.type, type: this.form.type,
remark:this.form.remark remark: this.form.remark
}).then((response) => { }).then((response) => {
this.msgSuccess("操作成功"); this.msgSuccess("操作成功");
this.openBalance = false; this.openBalance = false;
this.getList(); this.getList();
}); });
} else { } else if (this.openType == 'balance') {
payCard.operatingMargin({ payCard.operatingMargin({
id: this.form.id, id: this.form.id,
amount: amount, amount: amount,
googleCode: this.form.googleCode, googleCode: this.form.googleCode,
type: this.form.type, type: this.form.type,
remark:this.form.remark remark: this.form.remark
}).then((response) => {
this.msgSuccess("操作成功");
this.openBalance = false;
this.getList();
});
} else {
payCard.operatingDayMargin({
id: this.form.id,
amount: amount,
googleCode: this.form.googleCode,
type: this.form.type,
remark: this.form.remark
}).then((response) => { }).then((response) => {
this.msgSuccess("操作成功"); this.msgSuccess("操作成功");
this.openBalance = false; this.openBalance = false;

18
src/views/carddealer/carddealerCard/index.vue
View File

@ -129,6 +129,7 @@
parseFloat(NumberDiv(scope.row.singleMax, 100)).toFixed(2) }} parseFloat(NumberDiv(scope.row.singleMax, 100)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="权重次数" align="center" prop="frequency" />
<el-table-column :label="'已支付统计'" align="center" prop="paidCnt"> <el-table-column :label="'已支付统计'" align="center" prop="paidCnt">
<template slot-scope="scope"> <template slot-scope="scope">
@ -149,15 +150,17 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="150"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="small" type="text" @click="handleChannel(scope.row)" style="color: #006eff">分配通道</el-button> <el-button size="small" type="text" @click="handleChannel(scope.row)" style="color: #006eff"
v-if="scope.row.auditStatus == 1">分配通道</el-button>
<el-button size="small" type="text" @click="handleKill(scope.row)" style="color: #006eff">清除</el-button> <el-button size="small" type="text" @click="handleKill(scope.row)" style="color: #006eff"
v-if="scope.row.auditStatus == 1">清除</el-button>
<el-button size="small" type="text" @click="handleDelete(scope.row)" style="color: #006eff">删除</el-button> <el-button size="small" type="text" @click="handleDelete(scope.row)" style="color: #006eff">删除</el-button>
<el-button size="small" type="text" @click="handleAudit(scope.row, 1)" style="color: #006eff" <el-button size="small" type="text" @click="handleAudit(scope.row, 1)" style="color: #006eff"
v-if="scope.row.auditStatus == 0">通过</el-button> v-if="scope.row.auditStatus == 0">通过</el-button>
<el-button size="small" type="text" @click="handleAudit(scope.row, 2)" style="color: #006eff" <el-button size="small" type="text" @click="handleAudit(scope.row, 2)" style="color: #006eff"
v-if="scope.row.auditStatus == 0">驳回</el-button> v-if="scope.row.auditStatus == 0">驳回</el-button>
<el-button size="small" type="text" @click="handleUpdate(scope.row)" style="color: #006eff">设置</el-button> <el-button size="small" type="text" @click="handleUpdate(scope.row)" style="color: #006eff"
v-if="scope.row.auditStatus == 1">设置</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -181,7 +184,9 @@
<el-form-item label="日收款笔数" prop=""> <el-form-item label="日收款笔数" prop="">
<el-input v-model="form.dayMaxNumber" placeholder="" style="width:150px" @input="change" /> <el-input v-model="form.dayMaxNumber" placeholder="" style="width:150px" @input="change" />
</el-form-item> </el-form-item>
<el-form-item label="权重次数" prop="">
<el-input v-model="form.frequency" placeholder="" style="width:150px" @input="change" />
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm('form')">保 存</el-button> <el-button type="primary" @click="submitForm('form')">保 存</el-button>
@ -332,7 +337,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -510,6 +515,7 @@ export default {
singleMin: singleMin, singleMin: singleMin,
dayMaxNumber: this.form.dayMaxNumber, dayMaxNumber: this.form.dayMaxNumber,
dayReceiveMax: dayReceiveMax, dayReceiveMax: dayReceiveMax,
frequency: this.form.frequency,
id: this.form.id id: this.form.id
}).then((res) => { }).then((res) => {
if (res.code === 200) { if (res.code === 200) {

59
src/views/carddealer/carddealerDev/index.vue
View File

@ -5,40 +5,40 @@
<div class="bar"></div> <div class="bar"></div>
<div class="text">设备管理</div> <div class="text">设备管理</div>
</div> --> </div> -->
</div> </div>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="76px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="76px" class="flex form"
class="flex form" style="position: relative"> style="position: relative">
<el-form-item label="码商" prop="carddealerName"> <el-form-item label="码商" prop="carddealerName">
<el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商" <el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商" @keyup.enter.native="handleQuery"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" /> style="width: 180px; border-color: #e6f1ff" />
</el-form-item> </el-form-item>
<el-form-item label="设备key" prop="devKey"> <el-form-item label="设备key" prop="devKey">
<el-input size="medium" v-model="queryParams.devKey" placeholder="请输入设备key" @keyup.enter.native="handleQuery" <el-input size="medium" v-model="queryParams.devKey" placeholder="请输入设备key" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" /> style="width: 180px; border-color: #e6f1ff" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="创建时间"> <!-- <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker> range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker>
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<div class="searchTop flexBet" style="align-items: center"> <div class="searchTop flexBet" style="align-items: center">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <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 icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</el-row> </el-row>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <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 class="bg"> <div class="bg">
<el-table stripe :data="infoList" v-loading="loading"> <el-table stripe :data="infoList" v-loading="loading">
<el-table-column label="码商" align="center" prop="carddealerName" /> <el-table-column label="码商" align="center" prop="carddealerName" />
@ -61,13 +61,13 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="small" type="text" @click="switchStatusChange(scope.row, 'status')" style="color: #006eff"> <el-button size="small" type="text" @click="switchStatusChange(scope.row, 'status')" style="color: #006eff">
{{ scope.row.status == 1 ? '启用' : '禁用' }} {{ scope.row.status == 1 ? '禁用' : '启用' }}
</el-button> </el-button>
<el-button size="small" type="text" @click="handleDelete(scope.row)" style="color: #006eff">删除</el-button> <el-button size="small" type="text" @click="handleDelete(scope.row)" style="color: #006eff">删除</el-button>
<el-button size="small" type="text" @click="switchStatusChange(scope.row, 'isAutoStatus')" <el-button size="small" type="text" @click="switchStatusChange(scope.row, 'isAutoStatus')"
style="color: #006eff"> style="color: #006eff">
{{ scope.row.isAutoStatus == 1 ? '启用自动确认' : '禁用自动确认' }} {{ scope.row.isAutoStatus == 1 ? '禁用自动确认' : '启用自动确认' }}
</el-button> </el-button>
@ -136,7 +136,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -156,9 +156,9 @@ export default {
payDev.getInfo(id).then((response) => { payDev.getInfo(id).then((response) => {
this.form = response.data; this.form = response.data;
if (type == 'status') { if (type == 'status') {
row.status == 1 ? this.form.status = 0 : this.form.status = 1 row.status == 1 ? this.form.status = 2 : this.form.status = 1
} else { } else {
row.isAutoStatus == 1 ? this.form.isAutoStatus = 0 : this.form.isAutoStatus = 1 row.isAutoStatus == 1 ? this.form.isAutoStatus = 2 : this.form.isAutoStatus = 1
} }
payDev.updateInfo(this.form).then((res) => { payDev.updateInfo(this.form).then((res) => {
if (res.code === 200) { if (res.code === 200) {
@ -166,9 +166,10 @@ export default {
this.getList() this.getList()
} }
}); });
this.$forceUpdate()
}); });
}, },
timerHandler(queryParams){ timerHandler(queryParams) {
listCarddealerDev(this.queryParams).then(response => { listCarddealerDev(this.queryParams).then(response => {
this.infoList = response.rows; this.infoList = response.rows;
this.total = Number(response.total); this.total = Number(response.total);

35
src/views/carddealer/carddealerSms/index.vue
View File

@ -22,7 +22,11 @@
<el-input size="medium" v-model="queryParams.devKey" placeholder="请输入设备key" @keyup.enter.native="handleQuery" <el-input size="medium" v-model="queryParams.devKey" placeholder="请输入设备key" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" /> style="width: 180px; border-color: #e6f1ff" />
</el-form-item> </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-form-item label="短信内容" prop="content"> <el-form-item label="短信内容" prop="content">
<el-input size="medium" v-model="queryParams.content" placeholder="请输入短信内容" @keyup.enter.native="handleQuery" <el-input size="medium" v-model="queryParams.content" placeholder="请输入短信内容" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" /> style="width: 180px; border-color: #e6f1ff" />
@ -37,13 +41,11 @@
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker> range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker>
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<div class="searchTop flexBet" style="align-items: center"> <div class="searchTop flexBet" style="align-items: center;margin-left: 10px;">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <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 icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</el-row> </el-row>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -67,6 +69,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="卡号" align="center" prop="cardNumber" /> <el-table-column label="卡号" align="center" prop="cardNumber" />
<el-table-column label="付款人" align="center" prop="payerName" />
<el-table-column label="短信中的时间" align="center" prop="smsTime" min-width="180" /> <el-table-column label="短信中的时间" align="center" prop="smsTime" min-width="180" />
<el-table-column label="设备接收时间" align="center" prop="recvTime" min-width="180" /> <el-table-column label="设备接收时间" align="center" prop="recvTime" min-width="180" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="180" /> <el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
@ -157,6 +161,7 @@ export default {
ver: null, ver: null,
carddealerName: null, carddealerName: null,
id: null, id: null,
payerName:null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -179,7 +184,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -220,25 +225,7 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
id: null,
content: null,
phone: null,
devKey: null,
bankName: null,
amount: null,
recvTime: null,
createTime: null,
cardNumber: null,
cardHolder: null,
verifyStatus: 1,
smsTime: null,
smsType: null,
payType: null,
orderNo: null,
carddealerId: null,
verifyRemarks: null,
md5: null,
ver: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },

581
src/views/carddealer/carddealerSms/indexIdentify.vue
View File

@ -1,184 +1,191 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="flexBet searchTop"> <div class="flexBet searchTop">
<!-- <div class="title flex m20"> <!-- <div class="title flex m20">
<div class="bar"></div> <div class="bar"></div>
<div class="text">识别失败短信列表</div> <div class="text">识别失败短信列表</div>
</div> --> </div> -->
</div>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="76px" </div>
class="flex form" style="position: relative">
<el-form-item label="码商" prop="carddealerName"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="76px" class="flex form"
<el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商" style="position: relative">
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" /> <el-form-item label="码商" prop="carddealerName">
</el-form-item> <el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商" @keyup.enter.native="handleQuery"
<el-form-item label="短信ID" prop="id"> style="width: 180px; border-color: #e6f1ff" />
<el-input size="medium" v-model="queryParams.id" placeholder="请输入短信ID" @keyup.enter.native="handleQuery" </el-form-item>
style="width: 180px; border-color: #e6f1ff" /> <el-form-item label="短信ID" prop="id">
</el-form-item> <el-input size="medium" v-model="queryParams.id" placeholder="请输入短信ID" @keyup.enter.native="handleQuery"
<el-form-item label="设备key" prop="devKey"> style="width: 180px; border-color: #e6f1ff" />
<el-input size="medium" v-model="queryParams.devKey" placeholder="请输入设备key" @keyup.enter.native="handleQuery" </el-form-item>
style="width: 180px; border-color: #e6f1ff" /> <el-form-item label="设备key" prop="devKey">
</el-form-item> <el-input size="medium" v-model="queryParams.devKey" placeholder="请输入设备key" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
<el-form-item label="短信内容" prop="content"> </el-form-item>
<el-input size="medium" v-model="queryParams.content" placeholder="请输入短信内容" @keyup.enter.native="handleQuery" <el-form-item label="付款人" prop="payerName">
style="width: 180px; border-color: #e6f1ff" /> <el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人" @keyup.enter.native="handleQuery"
</el-form-item> style="width: 180px; border-color: #e6f1ff" />
<el-form-item label="识别备注" prop="verifyRemarks"> </el-form-item>
<el-input size="medium" v-model="queryParams.verifyRemarks" placeholder="请输入识别备注" <el-form-item label="短信内容" prop="content">
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" /> <el-input size="medium" v-model="queryParams.content" placeholder="请输入短信内容" @keyup.enter.native="handleQuery"
</el-form-item> style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<!-- <el-form-item label="创建时间"> <el-form-item label="识别备注" prop="verifyRemarks">
<el-input size="medium" v-model="queryParams.verifyRemarks" placeholder="请输入识别备注"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<!-- <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker> range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker>
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<div class="searchTop flexBet" style="align-items: center"> <div class="searchTop flexBet" style="align-items: center;margin-left: 10px;">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <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 icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</el-row> </el-row>
</div>
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8"> </div>
</el-form-item>
</el-form>
<!-- <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 class="bg"> <div class="bg">
<el-table stripe :data="infoList" v-loading="loading"> <el-table stripe :data="infoList" v-loading="loading">
<el-table-column label="短信id" align="center" prop="id" /> <el-table-column label="短信id" align="center" prop="id" />
<el-table-column label="码商" align="center" prop="carddealerName" /> <el-table-column label="码商" align="center" prop="carddealerName" />
<el-table-column label="设备key" align="center" prop="devKey" /> <el-table-column label="设备key" align="center" prop="devKey" />
<el-table-column label="发送号码" align="center" prop="phone" /> <el-table-column label="发送号码" align="center" prop="phone" />
<el-table-column label="银行" align="center" prop="bankName" /> <el-table-column label="银行" align="center" prop="bankName" />
<el-table-column :label="'金额'" align="center" prop="amountIntervalMax"> <el-table-column :label="'金额'" align="center" prop="amountIntervalMax">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(NumberDiv(scope.row.amount, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(scope.row.amount, 100)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="卡号" align="center" prop="cardNumber" /> <el-table-column label="卡号" align="center" prop="cardNumber" />
<el-table-column label="短信中的时间" align="center" prop="smsTime" min-width="180" /> <el-table-column label="付款人" align="center" prop="payerName" />
<el-table-column label="设备接收时间" align="center" prop="recvTime" min-width="180" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="180" /> <el-table-column label="短信中的时间" align="center" prop="smsTime" min-width="180" />
<el-table-column :label="'识别状态'" align="center" prop="verifyStatus"> <el-table-column label="设备接收时间" align="center" prop="recvTime" min-width="180" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
<el-table-column :label="'识别状态'" align="center" prop="verifyStatus">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.verifyStatus == 2 ? '识别失败短信列表' : {{ scope.row.verifyStatus == 2 ? '识别失败短信列表' :
scope.row.verifyStatus == 1 && scope.row.orderNo? '匹配成功短信列表' : '匹配失败短信列表' }} scope.row.verifyStatus == 1 && scope.row.orderNo ? '匹配成功短信列表' : '匹配失败短信列表' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="失败原因" align="center" prop="verifyRemarks" min-width="180" /> <el-table-column label="失败原因" align="center" prop="verifyRemarks" min-width="180" />
<el-table-column label="匹配单号" align="center" prop="orderNo" min-width="180" /> <el-table-column label="匹配单号" align="center" prop="orderNo" min-width="180" />
<el-table-column label="短信内容" align="center" prop="content" min-width="180" /> <el-table-column label="短信内容" align="center" prop="content" min-width="180" />
<el-table-column label="app版本" align="center" prop="ver" /> <el-table-column label="app版本" align="center" prop="ver" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="60"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="small" type="text" @click="handleIdentify(scope.row)" style="color: #006eff">识别</el-button> <el-button size="small" type="text" @click="handleIdentify(scope.row)" style="color: #006eff">识别</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"> @pagination="getList">
</pagination> </pagination>
</div>
</div> </div>
</template>
</div>
</template>
<script> <script>
import { listCarddealerSms, getCarddealerSms, delCarddealerSms, addCarddealerSms, updateCarddealerSms, exportCarddealerSms } from "@/api/carddealer/carddealerSms"; import { listCarddealerSms, getCarddealerSms, delCarddealerSms, addCarddealerSms, updateCarddealerSms, exportCarddealerSms } from "@/api/carddealer/carddealerSms";
import Editor from '@/components/Editor'; import Editor from '@/components/Editor';
import { paySes } from "@/api/form"; import { paySes } from "@/api/form";
import cardMerchantOrderRefreshMixin from "@/api/cardMerchantOrderRefresh.mixin"; import cardMerchantOrderRefreshMixin from "@/api/cardMerchantOrderRefresh.mixin";
export default { export default {
name: "CarddealerSms", name: "CarddealerSms",
components: { components: {
Editor, Editor,
}, },
mixins: [cardMerchantOrderRefreshMixin], mixins: [cardMerchantOrderRefreshMixin],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 短信列表格数据 // 短信列表格数据
infoList: [], infoList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
content: null, content: null,
phone: null, phone: null,
devKey: null, devKey: null,
bankName: null, bankName: null,
amount: null, amount: null,
recvTime: null, recvTime: null,
cardNumber: null, cardNumber: null,
cardHolder: null, cardHolder: null,
verifyStatus: 2, verifyStatus: 2,
smsTime: null, smsTime: null,
smsType: null, smsType: null,
payType: null, payType: null,
orderNo: null, orderNo: null,
carddealerId: null, carddealerId: null,
verifyRemarks: null, verifyRemarks: null,
md5: null, md5: null,
ver: null, ver: null,
carddealerName: null, carddealerName: null,
id: null, id: null,
}, payerName: null
// 表单参数
form: {}, },
// 表单校验 // 表单参数
rules: { form: {},
content: [ // 表单校验
{ required: true, message: "内容不能为空", trigger: "blur" } rules: {
], content: [
phone: [ { required: true, message: "内容不能为空", trigger: "blur" }
{ required: true, message: "发送号码不能为空", trigger: "blur" } ],
], phone: [
devKey: [ { required: true, message: "发送号码不能为空", trigger: "blur" }
{ required: true, message: "设备key不能为空", trigger: "blur" } ],
], devKey: [
createTime: [ { required: true, message: "设备key不能为空", trigger: "blur" }
{ required: true, message: "入库时间不能为空", trigger: "blur" } ],
], createTime: [
} { required: true, message: "入库时间不能为空", trigger: "blur" }
}; ],
}, }
$autoRefresh: { };
},
$autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -191,136 +198,136 @@ import cardMerchantOrderRefreshMixin from "@/api/cardMerchantOrderRefresh.mixin"
// 是否启用调试模式 // 是否启用调试模式
debug: true, debug: true,
}, },
created() { created() {
this.getList();
},
methods: {
timerHandler(queryParams) {
listCarddealerSms(this.queryParams).then(response => {
this.infoList = response.rows;
this.total = Number(response.total);
});
},
/** 查询短信列列表 */
getList() {
this.loading = true;
listCarddealerSms(this.queryParams).then(response => {
this.infoList = response.rows;
this.total = Number(response.total);
this.loading = false;
this.startTimer(this.queryParams)
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
content: null,
phone: null,
devKey: null,
bankName: null,
amount: null,
recvTime: null,
createTime: null,
cardNumber: null,
cardHolder: null,
verifyStatus: 2,
smsTime: null,
smsType: null,
payType: null,
orderNo: null,
carddealerId: null,
verifyRemarks: null,
md5: null,
ver: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
methods: { /** 重置按钮操作 */
timerHandler(queryParams) { resetQuery() {
listCarddealerSms(this.queryParams).then(response => { this.resetForm("queryForm");
this.infoList = response.rows; this.handleQuery();
this.total = Number(response.total);
});
}, },
/** 查询短信列列表 */ // 多选框选中数据
getList() { handleSelectionChange(selection) {
this.loading = true; this.ids = selection.map(item => item.id)
listCarddealerSms(this.queryParams).then(response => { this.single = selection.length !== 1
this.infoList = response.rows; this.multiple = !selection.length
this.total = Number(response.total); },
this.loading = false; /** 新增按钮操作 */
this.startTimer(this.queryParams) handleAdd() {
}); this.reset();
}, this.open = true;
// 取消按钮 this.title = "添加短信列";
cancel() { },
this.open = false; /** 修改按钮操作 */
this.reset(); handleUpdate(row) {
}, this.reset();
// 表单重置 const id = row.id || this.ids
reset() { getCarddealerSms(id).then(response => {
this.form = { this.form = response.data;
id: null,
content: null,
phone: null,
devKey: null,
bankName: null,
amount: null,
recvTime: null,
createTime: null,
cardNumber: null,
cardHolder: null,
verifyStatus: 2,
smsTime: null,
smsType: null,
payType: null,
orderNo: null,
carddealerId: null,
verifyRemarks: null,
md5: null,
ver: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true; this.open = true;
this.title = "添加短信列"; this.title = "修改短信列";
}, });
/** 修改按钮操作 */ },
handleUpdate(row) { /** 提交按钮 */
this.reset(); submitForm() {
const id = row.id || this.ids this.$refs["form"].validate(valid => {
getCarddealerSms(id).then(response => { if (valid) {
this.form = response.data; if (this.form.id != null) {
this.open = true; updateCarddealerSms(this.form).then(response => {
this.title = "修改短信列"; this.msgSuccess("修改成功");
}); this.open = false;
}, this.getList();
/** 提交按钮 */ });
submitForm() { } else {
this.$refs["form"].validate(valid => { addCarddealerSms(this.form).then(response => {
if (valid) { this.msgSuccess("新增成功");
if (this.form.id != null) { this.open = false;
updateCarddealerSms(this.form).then(response => { this.getList();
this.msgSuccess("修改成功"); });
this.open = false;
this.getList();
});
} else {
addCarddealerSms(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
} }
}); }
}, });
/** 识别按钮操作 */ },
handleIdentify(row) { /** 识别按钮操作 */
const ids = row.id || this.ids; handleIdentify(row) {
this.$confirm('是否确认识别短信编号为"' + ids + '"的数据项?', "警告", { const ids = row.id || this.ids;
confirmButtonText: "确定", this.$confirm('是否确认识别短信编号为"' + ids + '"的数据项?', "警告", {
cancelButtonText: "取消", confirmButtonText: "确定",
type: "warning" cancelButtonText: "取消",
}).then(function () { type: "warning"
return paySes.identify(ids); }).then(function () {
}).then(() => { return paySes.identify(ids);
this.getList(); }).then(() => {
this.msgSuccess("识别成功"); this.getList();
}) this.msgSuccess("识别成功");
}, })
/** 导出按钮操作 */ },
handleExport() { /** 导出按钮操作 */
const queryParams = this.queryParams; handleExport() {
this.$confirm('是否确认导出所有短信列数据项?', "警告", { const queryParams = this.queryParams;
confirmButtonText: "确定", this.$confirm('是否确认导出所有短信列数据项?', "警告", {
cancelButtonText: "取消", confirmButtonText: "确定",
type: "warning" cancelButtonText: "取消",
}).then(function () { type: "warning"
return exportCarddealerSms(queryParams); }).then(function () {
}).then(response => { return exportCarddealerSms(queryParams);
this.download(response.msg); }).then(response => {
}) this.download(response.msg);
} })
} }
}; }
</script> };
</script>

585
src/views/carddealer/carddealerSms/indexSuccess.vue
View File

@ -1,184 +1,197 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="flexBet searchTop"> <div class="flexBet searchTop">
<!-- <div class="title flex m20"> <!-- <div class="title flex m20">
<div class="bar"></div> <div class="bar"></div>
<div class="text">匹配成功短信列表</div> <div class="text">匹配成功短信列表</div>
</div> --> </div> -->
</div>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="76px" </div>
class="flex form" style="position: relative">
<el-form-item label="码商" prop="carddealerName"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="76px" class="flex form"
<el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商" style="position: relative">
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" /> <el-form-item label="码商" prop="carddealerName">
</el-form-item> <el-input size="medium" v-model="queryParams.carddealerName" placeholder="请输入码商" @keyup.enter.native="handleQuery"
<el-form-item label="短信ID" prop="id"> style="width: 180px; border-color: #e6f1ff" />
<el-input size="medium" v-model="queryParams.id" placeholder="请输入短信ID" @keyup.enter.native="handleQuery" </el-form-item>
style="width: 180px; border-color: #e6f1ff" /> <el-form-item label="短信ID" prop="id">
</el-form-item> <el-input size="medium" v-model="queryParams.id" placeholder="请输入短信ID" @keyup.enter.native="handleQuery"
<el-form-item label="设备key" prop="devKey"> style="width: 180px; border-color: #e6f1ff" />
<el-input size="medium" v-model="queryParams.devKey" placeholder="请输入设备key" @keyup.enter.native="handleQuery" </el-form-item>
style="width: 180px; border-color: #e6f1ff" /> <el-form-item label="设备key" prop="devKey">
</el-form-item> <el-input size="medium" v-model="queryParams.devKey" placeholder="请输入设备key" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
<el-form-item label="短信内容" prop="content"> </el-form-item>
<el-input size="medium" v-model="queryParams.content" placeholder="请输入短信内容" @keyup.enter.native="handleQuery" <el-form-item label="付款人" prop="payerName">
style="width: 180px; border-color: #e6f1ff" /> <el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人" @keyup.enter.native="handleQuery"
</el-form-item> style="width: 180px; border-color: #e6f1ff" />
<el-form-item label="识别备注" prop="verifyRemarks"> </el-form-item>
<el-input size="medium" v-model="queryParams.verifyRemarks" placeholder="请输入识别备注" <el-form-item label="订单号" prop="orderNo">
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" /> <el-input size="medium" v-model="queryParams.orderNo" placeholder="请输入订单号" @keyup.enter.native="handleQuery"
</el-form-item> style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<!-- <el-form-item label="创建时间">
<el-form-item label="短信内容" prop="content">
<el-input size="medium" v-model="queryParams.content" placeholder="请输入短信内容" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<el-form-item label="识别备注" prop="verifyRemarks">
<el-input size="medium" v-model="queryParams.verifyRemarks" placeholder="请输入识别备注"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" />
</el-form-item>
<!-- <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker> range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker>
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<div class="searchTop flexBet" style="align-items: center"> <div class="searchTop flexBet" style="align-items: center;margin-left: 10px;">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <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 icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</el-row> </el-row>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <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 class="bg"> <div class="bg">
<el-table stripe :data="infoList" v-loading="loading"> <el-table stripe :data="infoList" v-loading="loading">
<el-table-column label="短信id" align="center" prop="id" /> <el-table-column label="短信id" align="center" prop="id" />
<el-table-column label="码商" align="center" prop="carddealerName" /> <el-table-column label="码商" align="center" prop="carddealerName" />
<el-table-column label="设备key" align="center" prop="devKey" /> <el-table-column label="设备key" align="center" prop="devKey" />
<el-table-column label="发送号码" align="center" prop="phone" /> <el-table-column label="发送号码" align="center" prop="phone" />
<el-table-column label="银行" align="center" prop="bankName" /> <el-table-column label="银行" align="center" prop="bankName" />
<el-table-column :label="'金额'" align="center" prop="amountIntervalMax"> <el-table-column :label="'金额'" align="center" prop="amountIntervalMax">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(NumberDiv(scope.row.amount, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(scope.row.amount, 100)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="卡号" align="center" prop="cardNumber" /> <el-table-column label="卡号" align="center" prop="cardNumber" />
<el-table-column label="短信中的时间" align="center" prop="smsTime" min-width="180" /> <el-table-column label="付款人" align="center" prop="payerName" />
<el-table-column label="设备接收时间" align="center" prop="recvTime" min-width="180" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="180" /> <el-table-column label="短信中的时间" align="center" prop="smsTime" min-width="180" />
<el-table-column :label="'识别状态'" align="center" prop="verifyStatus"> <el-table-column label="设备接收时间" align="center" prop="recvTime" min-width="180" />
<el-table-column label="创建时间" align="center" prop="createTime" min-width="180" />
<el-table-column :label="'识别状态'" align="center" prop="verifyStatus">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.verifyStatus == 2 ? '识别失败短信列表' : {{ scope.row.verifyStatus == 2 ? '识别失败短信列表' :
scope.row.verifyStatus == 1 && scope.row.orderNo? '匹配成功短信列表' : '匹配失败短信列表' }} scope.row.verifyStatus == 1 && scope.row.orderNo ? '匹配成功短信列表' : '匹配失败短信列表' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="失败原因" align="center" prop="verifyRemarks" min-width="180" /> <el-table-column label="失败原因" align="center" prop="verifyRemarks" min-width="180" />
<el-table-column label="匹配单号" align="center" prop="orderNo" min-width="180" /> <el-table-column label="匹配单号" align="center" prop="orderNo" min-width="180" />
<el-table-column label="短信内容" align="center" prop="content" min-width="180" /> <el-table-column label="短信内容" align="center" prop="content" min-width="180" />
<el-table-column label="app版本" align="center" prop="ver" /> <el-table-column label="app版本" align="center" prop="ver" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="60"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="small" type="text" @click="handleIdentify(scope.row)" style="color: #006eff">识别</el-button> <el-button size="small" type="text" @click="handleIdentify(scope.row)" style="color: #006eff">识别</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"> @pagination="getList">
</pagination> </pagination>
</div>
</div> </div>
</template>
</div>
</template>
<script> <script>
import { listCarddealerSms, getCarddealerSms, delCarddealerSms, addCarddealerSms, updateCarddealerSms, exportCarddealerSms } from "@/api/carddealer/carddealerSms"; import { listCarddealerSms, getCarddealerSms, delCarddealerSms, addCarddealerSms, updateCarddealerSms, exportCarddealerSms } from "@/api/carddealer/carddealerSms";
import Editor from '@/components/Editor'; import Editor from '@/components/Editor';
import { paySes } from "@/api/form"; import { paySes } from "@/api/form";
import cardMerchantOrderRefreshMixin from "@/api/cardMerchantOrderRefresh.mixin"; import cardMerchantOrderRefreshMixin from "@/api/cardMerchantOrderRefresh.mixin";
export default { export default {
name: "CarddealerSms", name: "CarddealerSms",
components: { components: {
Editor, Editor,
}, },
mixins: [cardMerchantOrderRefreshMixin], mixins: [cardMerchantOrderRefreshMixin],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 短信列表格数据 // 短信列表格数据
infoList: [], infoList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
content: null, content: null,
phone: null, phone: null,
devKey: null, devKey: null,
bankName: null, bankName: null,
amount: null, amount: null,
recvTime: null, recvTime: null,
cardNumber: null, cardNumber: null,
cardHolder: null, cardHolder: null,
verifyStatus: 3, verifyStatus: 3,
smsTime: null, smsTime: null,
smsType: null, smsType: null,
payType: null, payType: null,
orderNo: null, orderNo: null,
carddealerId: null, carddealerId: null,
verifyRemarks: null, verifyRemarks: null,
md5: null, md5: null,
ver: null, ver: null,
carddealerName: null, carddealerName: null,
id: null, id: null,
}, payerName: null,
// 表单参数 orderNo: null,
form: {},
// 表单校验 },
rules: { // 表单参数
content: [ form: {},
{ required: true, message: "内容不能为空", trigger: "blur" } // 表单校验
], rules: {
phone: [ content: [
{ required: true, message: "发送号码不能为空", trigger: "blur" } { required: true, message: "内容不能为空", trigger: "blur" }
], ],
devKey: [ phone: [
{ required: true, message: "设备key不能为空", trigger: "blur" } { required: true, message: "发送号码不能为空", trigger: "blur" }
], ],
createTime: [ devKey: [
{ required: true, message: "入库时间不能为空", trigger: "blur" } { required: true, message: "设备key不能为空", trigger: "blur" }
], ],
} createTime: [
}; { required: true, message: "入库时间不能为空", trigger: "blur" }
}, ],
$autoRefresh: { }
};
},
$autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -191,136 +204,136 @@ import cardMerchantOrderRefreshMixin from "@/api/cardMerchantOrderRefresh.mixin"
// 是否启用调试模式 // 是否启用调试模式
debug: true, debug: true,
}, },
created() { created() {
this.getList();
},
methods: {
timerHandler(queryParams) {
listCarddealerSms(this.queryParams).then(response => {
this.infoList = response.rows;
this.total = Number(response.total);
});
},
/** 查询短信列列表 */
getList() {
this.loading = true;
listCarddealerSms(this.queryParams).then(response => {
this.infoList = response.rows;
this.total = Number(response.total);
this.loading = false;
this.startTimer(this.queryParams)
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
content: null,
phone: null,
devKey: null,
bankName: null,
amount: null,
recvTime: null,
createTime: null,
cardNumber: null,
cardHolder: null,
verifyStatus: 3,
smsTime: null,
smsType: null,
payType: null,
orderNo: null,
carddealerId: null,
verifyRemarks: null,
md5: null,
ver: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
methods: { /** 重置按钮操作 */
timerHandler(queryParams) { resetQuery() {
listCarddealerSms(this.queryParams).then(response => { this.resetForm("queryForm");
this.infoList = response.rows; this.handleQuery();
this.total = Number(response.total);
});
}, },
/** 查询短信列列表 */ // 多选框选中数据
getList() { handleSelectionChange(selection) {
this.loading = true; this.ids = selection.map(item => item.id)
listCarddealerSms(this.queryParams).then(response => { this.single = selection.length !== 1
this.infoList = response.rows; this.multiple = !selection.length
this.total = Number(response.total); },
this.loading = false; /** 新增按钮操作 */
this.startTimer(this.queryParams) handleAdd() {
}); this.reset();
}, this.open = true;
// 取消按钮 this.title = "添加短信列";
cancel() { },
this.open = false; /** 修改按钮操作 */
this.reset(); handleUpdate(row) {
}, this.reset();
// 表单重置 const id = row.id || this.ids
reset() { getCarddealerSms(id).then(response => {
this.form = { this.form = response.data;
id: null,
content: null,
phone: null,
devKey: null,
bankName: null,
amount: null,
recvTime: null,
createTime: null,
cardNumber: null,
cardHolder: null,
verifyStatus: 3,
smsTime: null,
smsType: null,
payType: null,
orderNo: null,
carddealerId: null,
verifyRemarks: null,
md5: null,
ver: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true; this.open = true;
this.title = "添加短信列"; this.title = "修改短信列";
}, });
/** 修改按钮操作 */ },
handleUpdate(row) { /** 提交按钮 */
this.reset(); submitForm() {
const id = row.id || this.ids this.$refs["form"].validate(valid => {
getCarddealerSms(id).then(response => { if (valid) {
this.form = response.data; if (this.form.id != null) {
this.open = true; updateCarddealerSms(this.form).then(response => {
this.title = "修改短信列"; this.msgSuccess("修改成功");
}); this.open = false;
}, this.getList();
/** 提交按钮 */ });
submitForm() { } else {
this.$refs["form"].validate(valid => { addCarddealerSms(this.form).then(response => {
if (valid) { this.msgSuccess("新增成功");
if (this.form.id != null) { this.open = false;
updateCarddealerSms(this.form).then(response => { this.getList();
this.msgSuccess("修改成功"); });
this.open = false;
this.getList();
});
} else {
addCarddealerSms(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
} }
}); }
}, });
/** 识别按钮操作 */ },
handleIdentify(row) { /** 识别按钮操作 */
const ids = row.id || this.ids; handleIdentify(row) {
this.$confirm('是否确认识别短信编号为"' + ids + '"的数据项?', "警告", { const ids = row.id || this.ids;
confirmButtonText: "确定", this.$confirm('是否确认识别短信编号为"' + ids + '"的数据项?', "警告", {
cancelButtonText: "取消", confirmButtonText: "确定",
type: "warning" cancelButtonText: "取消",
}).then(function () { type: "warning"
return paySes.identify(ids); }).then(function () {
}).then(() => { return paySes.identify(ids);
this.getList(); }).then(() => {
this.msgSuccess("识别成功"); this.getList();
}) this.msgSuccess("识别成功");
}, })
/** 导出按钮操作 */ },
handleExport() { /** 导出按钮操作 */
const queryParams = this.queryParams; handleExport() {
this.$confirm('是否确认导出所有短信列数据项?', "警告", { const queryParams = this.queryParams;
confirmButtonText: "确定", this.$confirm('是否确认导出所有短信列数据项?', "警告", {
cancelButtonText: "取消", confirmButtonText: "确定",
type: "warning" cancelButtonText: "取消",
}).then(function () { type: "warning"
return exportCarddealerSms(queryParams); }).then(function () {
}).then(response => { return exportCarddealerSms(queryParams);
this.download(response.msg); }).then(response => {
}) this.download(response.msg);
} })
} }
}; }
</script> };
</script>

92
src/views/carddealer/carddealerSmsTemp/index.vue
View File

@ -5,51 +5,51 @@
<div class="bar"></div> <div class="bar"></div>
<div class="text">短信模板</div> <div class="text">短信模板</div>
</div> --> </div> -->
</div> </div>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="76px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="76px" class="flex form"
class="flex form" style="position: relative"> style="position: relative">
<el-form-item label="发送号码" prop="phone"> <el-form-item label="发送号码" prop="phone">
<el-input size="medium" v-model="queryParams.phone" placeholder="请输入发送号码" @keyup.enter.native="handleQuery" <el-input size="medium" v-model="queryParams.phone" placeholder="请输入发送号码" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" /> style="width: 180px; border-color: #e6f1ff" />
</el-form-item> </el-form-item>
<el-form-item label="银行名称" prop="bankName"> <el-form-item label="银行名称" prop="bankName">
<el-input size="medium" v-model="queryParams.bankName" placeholder="请输入银行名称" @keyup.enter.native="handleQuery" <el-input size="medium" v-model="queryParams.bankName" placeholder="请输入银行名称" @keyup.enter.native="handleQuery"
style="width: 180px; border-color: #e6f1ff" /> style="width: 180px; border-color: #e6f1ff" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="创建时间"> <!-- <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker> range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker>
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<div class="searchTop flexBet" style="align-items: center"> <div class="searchTop flexBet" style="align-items: center">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <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 icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</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="handleAdd()">添加</el-button> <el-button type="primary" plain icon="" size="medium" @click="handleAdd()">添加</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>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="searchTop flexBet"> <div class="searchTop flexBet">
</div> </div>
<div class="bg"> <div class="bg">
<el-table stripe :data="infoList" v-loading="loading"> <el-table stripe :data="infoList" v-loading="loading">
<el-table-column label="模板id" align="center" prop="id" /> <el-table-column label="模板id" align="center" prop="id" />
@ -115,21 +115,21 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 添加或修改商户对话框 --> <!-- 添加或修改商户对话框 -->
<el-dialog :title="title" :visible.sync="openCode" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="openCode" width="500px" append-to-body>
<el-form ref="formCode" :model="form" :rules="rules" label-width="80px"> <el-form ref="formCode" :model="form" :rules="rules" label-width="80px">
<el-form-item label="正文" prop="content"> <el-form-item label="正文" prop="content">
<el-input v-model="form.content" placeholder="请输入正文" type="textarea" /> <el-input v-model="form.content" placeholder="请输入正文" type="textarea" />
</el-form-item> </el-form-item>
<div class="dialog-footer" style="display:flex;justify-content: right;margin-bottom: 10px;"> <div class="dialog-footer" style="display:flex;justify-content: right;margin-bottom: 10px;">
<el-button type="primary" @click="toSubmit('formCode')">确 定</el-button> <el-button type="primary" @click="toSubmit('formCode')">确 定</el-button>
</div> </div>
<el-form-item label="报文" prop="msg"> <el-form-item label="报文" prop="msg">
<el-input v-model="form.msg" type="textarea" /> <el-input v-model="form.msg" type="textarea" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
</div> </div>
@ -165,7 +165,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
openCode:false, openCode: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -187,7 +187,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -263,9 +263,9 @@ export default {
this.multiple = !selection.length this.multiple = !selection.length
}, },
// 测试 // 测试
handleCode(row){ handleCode(row) {
this.reset(); this.reset();
this.form.id=row.id this.form.id = row.id
this.openCode = true; this.openCode = true;
this.title = "测试"; this.title = "测试";
}, },
@ -276,12 +276,14 @@ export default {
this.title = "添加短信模版"; this.title = "添加短信模版";
}, },
// 发送 // 发送
toSubmit(){ toSubmit() {
paySes.test(this.form).then(response => { paySes.test(this.form).then(response => {
this.form.msg= JSON.stringify(response.data) this.form.msg = JSON.stringify(response.data)
this.$forceUpdate()
}).catch((err) => {
let a = err.toString()
this.form.msg = a.split(':')[1]
this.$forceUpdate() this.$forceUpdate()
}).catch((err)=>{
}) })
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */

35
src/views/dashboard/PanelGroup.vue
View File

@ -199,12 +199,11 @@
</div> </div>
<div style="margin-top:15px"> <div style="margin-top:15px">
<el-progress :text-inside="true" text-color="#fff" :stroke-width="26" <el-progress :text-inside="true" text-color="#fff" :stroke-width="26"
:percentage="parseFloat(NumberDiv(data.paySuccessQty, data.payTotalQty) * 100).toFixed(2)" :percentage="parseFloat(NumberDiv(data.paySuccessQty, data.payTotalQty) * 100).toFixed(2)" :show-text="true"
:show-text="true" v-if="data.paySuccessQty!=0||data.payTotalQty!=0"></el-progress> v-if="data.paySuccessQty != 0 || data.payTotalQty != 0"></el-progress>
<el-progress :text-inside="true" text-color="#fff" :stroke-width="26" <el-progress :text-inside="true" text-color="#fff" :stroke-width="26" :percentage="0" :show-text="true"
:percentage="0" v-else></el-progress>
:show-text="true" v-else></el-progress>
</div> </div>
</div> </div>
@ -231,12 +230,8 @@
<div style="margin-top:15px"> <div style="margin-top:15px">
<el-progress :text-inside="true" text-color="#fff" :stroke-width="26" <el-progress :text-inside="true" text-color="#fff" :stroke-width="26"
:percentage="parseFloat(NumberDiv(data.paySuccessAmount, data.payTotalAmount) * 100).toFixed(2)" :percentage="parseFloat(NumberDiv(data.paySuccessAmount, data.payTotalAmount) * 100).toFixed(2)"
v-if="data.paySuccessAmount!=0||data.payTotalAmount!=0" v-if="data.paySuccessAmount != 0 || data.payTotalAmount != 0"></el-progress>
></el-progress> <el-progress :text-inside="true" text-color="#fff" :stroke-width="26" :percentage="0" v-else></el-progress>
<el-progress :text-inside="true" text-color="#fff" :stroke-width="26"
:percentage="0"
v-else
></el-progress>
</div> </div>
</div> </div>
<div class="bottomitem flexBet"> <div class="bottomitem flexBet">
@ -359,8 +354,8 @@
</div> </div>
<div class="t2"> <div class="t2">
<!-- {{ NumberDiv(data.limitReceiveTotalAmount, 100) }} --> <!-- {{ NumberDiv(data.limitReceiveTotalAmount, 100) }} -->
<count-to :start-val="0" :end-val="NumberDiv(data.limitReceiveTotalAmount, 100)" :decimals="2" :duration="3600" <count-to :start-val="0" :end-val="NumberDiv(data.limitReceiveTotalAmount, 100)" :decimals="2"
class="card-panel-num" /> :duration="3600" class="card-panel-num" />
</div> </div>
</div> </div>
@ -443,6 +438,9 @@
</div> </div>
</el-row> </el-row>
</template> </template>
@ -463,6 +461,8 @@ export default {
systemDate: '', systemDate: '',
queryParams: {}, queryParams: {},
dateRange: [], dateRange: [],
dialogVisible: false,
tableData: []
}; };
}, },
components: { components: {
@ -470,7 +470,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -527,6 +527,7 @@ export default {
to {} to {}
} }
::v-deep .el-progress-bar__innerText { ::v-deep .el-progress-bar__innerText {
position: absolute; position: absolute;
top: 0; top: 0;
@ -597,7 +598,8 @@ export default {
.mtop { .mtop {
margin-top: 10px; margin-top: 10px;
.item{
.item {
margin-bottom: 5px; margin-bottom: 5px;
} }
} }
@ -808,4 +810,5 @@ span {
float: none !important; float: none !important;
} }
} }
}</style> }
</style>

6
src/views/merchant/merchant/index.vue
View File

@ -323,7 +323,7 @@
:inactive-value=false></el-switch> :inactive-value=false></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="手动提单审核开关" prop="whetherReview"> <!-- <el-form-item label="手动提单审核开关" prop="whetherReview">
<el-switch v-model="form.whetherReview" active-text="是" inactive-text="否" active-value="Y" <el-switch v-model="form.whetherReview" active-text="是" inactive-text="否" active-value="Y"
inactive-value="N"></el-switch> inactive-value="N"></el-switch>
</el-form-item> </el-form-item>
@ -331,7 +331,7 @@
<el-form-item label="api提单审核开关" prop="whetherReviewApi"> <el-form-item label="api提单审核开关" prop="whetherReviewApi">
<el-switch v-model="form.whetherReviewApi" active-text="是" inactive-text="否" active-value="Y" <el-switch v-model="form.whetherReviewApi" active-text="是" inactive-text="否" active-value="Y"
inactive-value="N"></el-switch> inactive-value="N"></el-switch>
</el-form-item> </el-form-item> -->
<el-form-item label="谷歌秘钥" prop="merchantNo"> <el-form-item label="谷歌秘钥" prop="merchantNo">
<span>{{ form.googleCaptcha }}</span> <span>{{ form.googleCaptcha }}</span>
@ -509,7 +509,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

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

@ -431,7 +431,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

10
src/views/order/TransferOrder/index.vue
View File

@ -145,11 +145,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'实扣金额'" align="center" prop="payeeRealAmount"> <!-- <el-table-column :label="'实扣金额'" align="center" prop="payeeRealAmount">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(NumberDiv(scope.row.decreaseAmount, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(scope.row.decreaseAmount, 100)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="银行名称" align="center" prop="bankName" /> <el-table-column label="银行名称" align="center" prop="bankName" />
<el-table-column label="卡号" align="center" prop="cardNumber" /> <el-table-column label="卡号" align="center" prop="cardNumber" />
<el-table-column label="姓名" align="center" prop="accountName" /> <el-table-column label="姓名" align="center" prop="accountName" />
@ -228,9 +228,9 @@
<el-form-item label="创建时间"> <el-form-item label="创建时间">
{{ detailInfoList.createTime }} {{ detailInfoList.createTime }}
</el-form-item> </el-form-item>
<el-form-item label="实扣金额"> <!-- <el-form-item label="实扣金额">
{{ parseFloat(NumberDiv(detailInfoList.decreaseAmount, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(detailInfoList.decreaseAmount, 100)).toFixed(2) }}
</el-form-item> </el-form-item> -->
<el-form-item label="更新时间"> <el-form-item label="更新时间">
{{ detailInfoList.updateTime }} {{ detailInfoList.updateTime }}
</el-form-item> </el-form-item>
@ -559,7 +559,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

72
src/views/order/TransferOrder/readyOrder.vue
View File

@ -56,12 +56,12 @@
<el-input size="medium" v-model="queryParams.reqAmount" placeholder="请输入订单金额" <el-input size="medium" v-model="queryParams.reqAmount" 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="orderSource"> <!-- <el-form-item label="类型" prop="orderSource">
<el-select v-model="queryParams.orderSource" placeholder="请选择类型" clearable size="medium"> <el-select v-model="queryParams.orderSource" placeholder="请选择类型" clearable size="medium">
<el-option v-for="(item, i) in showAll" :key="i" :label="item.label" <el-option v-for="(item, i) in showAll" :key="i" :label="item.label"
:value="item.value"></el-option> :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="通道" prop="platformChannelId"> <el-form-item label="通道" prop="platformChannelId">
<el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium"> <el-select v-model="queryParams.platformChannelId" placeholder="请选择通道" clearable size="medium">
@ -112,20 +112,19 @@
<div class="bg"> <div class="bg">
<el-table stripe :data="infoList" v-loading="loading" :row-class-name="tableRowClassName"
:cell-class-name="addTdClass">
<el-table stripe :data="infoList" v-loading="loading" :row-class-name="tableRowClassName">
<el-table-column label="订单号" align="center" prop="orderNo" /> <el-table-column label="订单号" align="center" prop="orderNo" />
<el-table-column label="商户" align="center" prop="merchantName" /> <el-table-column label="商户" align="center" prop="merchantName" />
<el-table-column label="商户订单号" align="center" prop="merchantOrderNo" /> <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="downstreamMerchantOrderNo" min-width="120" />
<el-table-column label="批次号" align="center" prop="batchNo" min-width="120" /> <el-table-column label="批次号" align="center" prop="batchNo" min-width="120" />
<el-table-column :label="'类型'" align="center" prop="securityDepositAmount"> <!-- <el-table-column :label="'类型'" align="center" prop="securityDepositAmount">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.orderSource == 1 ? '接口' : scope.row.orderSource == 2 ? '商户提现' : scope.row.orderSource {{ scope.row.orderSource == 1 ? '接口' : scope.row.orderSource == 2 ? '商户提现' : scope.row.orderSource
== 3 ? '商户后台付款' : '码商提现' }} == 3 ? '商户后台付款' : '码商提现' }}
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="'订单金额'" align="center" prop="reqAmount"> <el-table-column :label="'订单金额'" align="center" prop="reqAmount">
<template slot-scope="scope"> <template slot-scope="scope">
@ -133,29 +132,29 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'手续费'" align="center" prop="merchantFee"> <!-- <el-table-column :label="'手续费'" align="center" prop="merchantFee">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(NumberDiv(scope.row.merchantFee, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(scope.row.merchantFee, 100)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="'已完成代付金额'" align="center" prop="payeeRealAmount"> <el-table-column :label="'已完成'" align="center" prop="payeeRealAmount">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(NumberDiv(scope.row.payeeRealAmount, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(scope.row.payeeRealAmount, 100)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'剩余可申请金额'" align="center" prop="payeeRealAmount"> <el-table-column :label="'剩余金额'" align="center" prop="payeeRealAmount">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(NumberDiv(scope.row.applicableAmount, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(scope.row.applicableAmount, 100)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'实扣金额'" align="center" prop="payeeRealAmount"> <!-- <el-table-column :label="'实扣金额'" align="center" prop="payeeRealAmount">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(NumberDiv(scope.row.decreaseAmount, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(scope.row.decreaseAmount, 100)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="银行名称" align="center" prop="bankName" /> <el-table-column label="银行名称" align="center" prop="bankName" />
<el-table-column label="卡号" align="center" prop="cardNumber" /> <el-table-column label="卡号" align="center" prop="cardNumber" />
<el-table-column label="姓名" align="center" prop="accountName" /> <el-table-column label="姓名" align="center" prop="accountName" />
@ -209,6 +208,9 @@
style="color: #006eff">详情</el-button> style="color: #006eff">详情</el-button>
<el-button size="small" type="text" @click="handleSonOrder(scope.row)" <el-button size="small" type="text" @click="handleSonOrder(scope.row)"
style="color: #006eff">子单</el-button> style="color: #006eff">子单</el-button>
<el-button size="small" type="text" @click="handleTop(scope.row)" style="color: #006eff;"
v-hasPermi="['order:TransferOrder:orderTop']">置顶</el-button>
</div> </div>
</template> </template>
@ -246,18 +248,18 @@
<el-form-item label="订单请求金额"> <el-form-item label="订单请求金额">
{{ parseFloat(NumberDiv(detailInfoList.reqAmount, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(detailInfoList.reqAmount, 100)).toFixed(2) }}
</el-form-item> </el-form-item>
<el-form-item label="手续费"> <!-- <el-form-item label="手续费">
{{ parseFloat(NumberDiv(detailInfoList.merchantFee, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(detailInfoList.merchantFee, 100)).toFixed(2) }}
</el-form-item> </el-form-item> -->
<el-form-item label="到账金额"> <el-form-item label="到账金额">
{{ parseFloat(NumberDiv(detailInfoList.payeeRealAmount, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(detailInfoList.payeeRealAmount, 100)).toFixed(2) }}
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
{{ detailInfoList.createTime }} {{ detailInfoList.createTime }}
</el-form-item> </el-form-item>
<el-form-item label="实扣金额"> <!-- <el-form-item label="实扣金额">
{{ parseFloat(NumberDiv(detailInfoList.decreaseAmount, 100)).toFixed(2) }} {{ parseFloat(NumberDiv(detailInfoList.decreaseAmount, 100)).toFixed(2) }}
</el-form-item> </el-form-item> -->
<el-form-item label="更新时间"> <el-form-item label="更新时间">
{{ detailInfoList.updateTime }} {{ detailInfoList.updateTime }}
</el-form-item> </el-form-item>
@ -279,11 +281,11 @@
<el-form-item label="银行名称"> <el-form-item label="银行名称">
{{ detailInfoList.bankName }} {{ detailInfoList.bankName }}
</el-form-item> </el-form-item>
<el-form-item label="类型"> <!-- <el-form-item label="类型">
{{ detailInfoList.orderSource == 1 ? '接口' : detailInfoList.orderSource == 2 ? '商户提现' : {{ detailInfoList.orderSource == 1 ? '接口' : detailInfoList.orderSource == 2 ? '商户提现' :
detailInfoList.orderSource detailInfoList.orderSource
== 3 ? '商户后台付款' : '码商提现' }} == 3 ? '商户后台付款' : '码商提现' }}
</el-form-item> </el-form-item> -->
<el-form-item label="收款人"> <el-form-item label="收款人">
{{ detailInfoList.accountName }} {{ detailInfoList.accountName }}
</el-form-item> </el-form-item>
@ -620,7 +622,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -642,7 +644,15 @@ export default {
this.$forceUpdate() this.$forceUpdate()
this.openAuditStatus = true this.openAuditStatus = true
}, },
addTdClass({ row, column }) {
console.log(column)
if (row.topTime) {
return "redTip";
}
},
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (row.sameMark == 1) { if (row.sameMark == 1) {
return "purpleTransfer"; return "purpleTransfer";
} }
@ -905,12 +915,26 @@ export default {
} }
}); });
}, },
// 置顶
handleTop(row) {
const ids = row.orderNo || this.ids;
this.$confirm(`确定置顶该笔订单吗？`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(function () {
return payOutOrder.orderTop({
orderNo: ids,
});
}).then(() => {
this.getList();
this.msgSuccess("操作成功");
})
},
/** 成功按钮操作 */ /** 成功按钮操作 */
handleSuccess(row) { handleSuccess(row) {
const ids = row.orderNo || this.ids; const ids = row.orderNo || this.ids;
// row.payeeRealAmount > 0 针对未完成订单里面有成交数量的提示 if (row.applicableAmount > 0 && row.applicableAmount < row.reqAmount) {
if (row.payeeRealAmount > 0) {
this.$confirm(`该笔订单未全部完成，需要确认吗？`, "警告", { this.$confirm(`该笔订单未全部完成，需要确认吗？`, "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -997,8 +1021,6 @@ export default {
}; };
</script> </script>
<style> <style>
.purpleTransfer { .purpleTransfer {
background: #FDF7FF !important; background: #FDF7FF !important;
} }

2
src/views/order/carddealerOrder/carddealerSonOrder.vue
View File

@ -389,7 +389,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

2
src/views/order/carddealerOrder/index.vue
View File

@ -419,7 +419,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

2
src/views/order/carddealerOrder/readyOrder.vue
View File

@ -442,7 +442,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

59
src/views/order/payOrder/csOrder.vue
View File

@ -44,8 +44,8 @@
</el-form-item> </el-form-item>
<el-form-item label="付款人" prop="payerName"> <el-form-item label="付款人" prop="payerName">
<el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人" <el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人" @keyup.enter.native="handleQuery"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" /> style="width: 180px; border-color: #e6f1ff" />
</el-form-item> </el-form-item>
<el-collapse> <el-collapse>
@ -237,6 +237,9 @@
<el-form-item label="回调方式" v-if="detailInfoList.orderStatus != 3"> <el-form-item label="回调方式" v-if="detailInfoList.orderStatus != 3">
{{ detailInfoList.isAutoNotify == 1 ? '自动回调' : '手动回调' }} {{ detailInfoList.isAutoNotify == 1 ? '自动回调' : '手动回调' }}
</el-form-item> </el-form-item>
<el-form-item label="短信id" v-if="detailInfoList.isAutoNotify == 1">
{{ detailInfoList.smsId }}
</el-form-item>
<el-form-item label="通道费率"> <el-form-item label="通道费率">
{{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee, {{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee,
100)).toFixed(2) }} 100)).toFixed(2) }}
@ -345,7 +348,7 @@ export default {
carddealerCardHolder: null, carddealerCardHolder: null,
reqAmount: null, reqAmount: null,
platformChannelId: null, platformChannelId: null,
downstreamMerchantOrderNo:null downstreamMerchantOrderNo: null
}, },
// 显示详情 // 显示详情
isShowDetail: false, isShowDetail: false,
@ -475,7 +478,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -566,7 +569,7 @@ export default {
carddealerCardHolder: this.queryParams.carddealerCardHolder, carddealerCardHolder: this.queryParams.carddealerCardHolder,
reqAmount: typeof (this.reqAmount) == 'object' ? null : !reqAmount ? null : parseFloat(this.reqAmount), reqAmount: typeof (this.reqAmount) == 'object' ? null : !reqAmount ? null : parseFloat(this.reqAmount),
platformChannelId: this.queryParams.platformChannelId, platformChannelId: this.queryParams.platformChannelId,
downstreamMerchantOrderNo:this.queryParams.downstreamMerchantOrderNo downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo
} }
listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => { listPayOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => {
this.infoList = response.rows; this.infoList = response.rows;
@ -639,9 +642,9 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if(this.form.paymentAmount>this.form.reqAmount){ if (this.form.paymentAmount > this.form.reqAmount) {
this.$message.error('支付金额不能大于订单金额') this.$message.error('支付金额不能大于订单金额')
return; return;
} }
let paymentAmount = this.NumberMul(this.form.paymentAmount, 100) let paymentAmount = this.NumberMul(this.form.paymentAmount, 100)
payToOrder.payOrderOvertimePayment({ payToOrder.payOrderOvertimePayment({
@ -681,26 +684,26 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
if (this.dateRange.length) { if (this.dateRange.length) {
if (this.dateRange[0]) { if (this.dateRange[0]) {
this.queryParams.beginTime = this.dateRange[0][0] this.queryParams.beginTime = this.dateRange[0][0]
this.queryParams.endTime = this.dateRange[0][1] this.queryParams.endTime = this.dateRange[0][1]
}else{ } else {
this.queryParams.beginTime = null this.queryParams.beginTime = null
this.queryParams.endTime = null this.queryParams.endTime = null
} }
if (this.dateRange[1]) { if (this.dateRange[1]) {
this.queryParams.updateBeginTime = this.dateRange[1][0] this.queryParams.updateBeginTime = this.dateRange[1][0]
this.queryParams.updateEndTime = this.dateRange[1][1] this.queryParams.updateEndTime = this.dateRange[1][1]
}else{ } else {
this.queryParams.updateBeginTime = null this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null this.queryParams.updateEndTime = null
} }
} else { } else {
this.queryParams.beginTime = null this.queryParams.beginTime = null
this.queryParams.endTime = null this.queryParams.endTime = null
this.queryParams.updateBeginTime = null this.queryParams.updateBeginTime = null
this.queryParams.updateEndTime = null this.queryParams.updateEndTime = null
} }
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有代收订单数据项?', "警告", { this.$confirm('是否确认导出所有代收订单数据项?', "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",

15
src/views/order/payOrder/index.vue
View File

@ -45,8 +45,8 @@
</el-form-item> </el-form-item>
<el-form-item label="付款人" prop="payerName"> <el-form-item label="付款人" prop="payerName">
<el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人" <el-input size="medium" v-model="queryParams.payerName" placeholder="请输入付款人" @keyup.enter.native="handleQuery"
@keyup.enter.native="handleQuery" style="width: 180px; border-color: #e6f1ff" /> style="width: 180px; border-color: #e6f1ff" />
</el-form-item> </el-form-item>
<el-collapse> <el-collapse>
@ -229,6 +229,9 @@
<el-form-item label="回调方式" v-if="detailInfoList.orderStatus != 3"> <el-form-item label="回调方式" v-if="detailInfoList.orderStatus != 3">
{{ detailInfoList.smsId == 0 ? '手动回调' : '自动回调' }} {{ detailInfoList.smsId == 0 ? '手动回调' : '自动回调' }}
</el-form-item> </el-form-item>
<el-form-item label="短信id" v-if="detailInfoList.isAutoNotify == 1">
{{ detailInfoList.smsId }}
</el-form-item>
<el-form-item label="通道费率"> <el-form-item label="通道费率">
{{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee, {{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee,
100)).toFixed(2) }} 100)).toFixed(2) }}
@ -460,7 +463,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
@ -626,9 +629,9 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if(this.form.paymentAmount>this.form.reqAmount){ if (this.form.paymentAmount > this.form.reqAmount) {
this.$message.error('支付金额不能大于订单金额') this.$message.error('支付金额不能大于订单金额')
return; return;
} }
let paymentAmount = this.NumberMul(this.form.paymentAmount, 100) let paymentAmount = this.NumberMul(this.form.paymentAmount, 100)
payToOrder.payOrderOvertimePayment({ payToOrder.payOrderOvertimePayment({

8
src/views/order/payOrder/wwc.vue
View File

@ -153,7 +153,8 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope"> <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="handleView(scope.row)" style="color: #006eff">详情</el-button>
<el-button size="small" type="text" @click="handleOver(scope.row)" style="color: #006eff" :disabled="scope.row.sameMark==1">已收款</el-button> <el-button size="small" type="text" @click="handleOver(scope.row)" style="color: #006eff"
:disabled="scope.row.sameMark == 1">已收款</el-button>
<!-- <el-button size="small" type="text" @click="handleNotify(scope.row)" style="color: #006eff">通知</el-button> --> <!-- <el-button size="small" type="text" @click="handleNotify(scope.row)" style="color: #006eff">通知</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
@ -236,6 +237,9 @@
<el-form-item label="回调方式" v-if="detailInfoList.orderStatus != 3"> <el-form-item label="回调方式" v-if="detailInfoList.orderStatus != 3">
{{ detailInfoList.isAutoNotify == 1 ? '自动回调' : '手动回调' }} {{ detailInfoList.isAutoNotify == 1 ? '自动回调' : '手动回调' }}
</el-form-item> </el-form-item>
<el-form-item label="短信id" v-if="detailInfoList.isAutoNotify == 1">
{{ detailInfoList.smsId }}
</el-form-item>
<el-form-item label="通道费率"> <el-form-item label="通道费率">
{{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee, {{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee,
100)).toFixed(2) }} 100)).toFixed(2) }}
@ -475,7 +479,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

2
src/views/payTest/dfTest.vue
View File

@ -425,7 +425,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

31
src/views/payTest/dsTest.vue
View File

@ -192,6 +192,9 @@
<el-form-item label="回调方式" v-if="detailInfoList.orderStatus != 3"> <el-form-item label="回调方式" v-if="detailInfoList.orderStatus != 3">
{{ detailInfoList.isAutoNotify == 1 ? '自动回调' : '手动回调' }} {{ detailInfoList.isAutoNotify == 1 ? '自动回调' : '手动回调' }}
</el-form-item> </el-form-item>
<el-form-item label="短信id" v-if="detailInfoList.isAutoNotify == 1">
{{ detailInfoList.smsId }}
</el-form-item>
<el-form-item label="通道费率"> <el-form-item label="通道费率">
{{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee, {{ detailInfoList.merchantRate + '%+' + parseFloat(NumberDiv(detailInfoList.merchantSingleFee,
100)).toFixed(2) }} 100)).toFixed(2) }}
@ -438,20 +441,20 @@ export default {
}; };
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行
handles: ["getList"], handles: ["getList"],
/** /**
* 调用 handles 后的回调函数 * 调用 handles 后的回调函数
* 这个字段为数组类型, 数组中的每个元素都是一个函数, 在对应索引的 handle 执行后被调用 * 这个字段为数组类型, 数组中的每个元素都是一个函数, 在对应索引的 handle 执行后被调用
*/ */
callbacks: [], callbacks: [],
// 是否启用调试模式 // 是否启用调试模式
debug: true, debug: true,
}, },
created() { created() {
this.getList(); this.getList();
this.init() this.init()

2
src/views/platform/bank/index.vue
View File

@ -148,7 +148,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

2
src/views/platform/platformChannel/index.vue
View File

@ -255,7 +255,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

2
src/views/staticsRecord/cardTimeStatistics.vue
View File

@ -166,7 +166,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

2
src/views/staticsRecord/dayEndStatistics.vue
View File

@ -175,7 +175,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

2
src/views/staticsRecord/dayStatistics.vue
View File

@ -151,7 +151,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

2
src/views/staticsRecord/mechantTimeStatistics.vue
View File

@ -210,7 +210,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

2
src/views/staticsRecord/merchantCardStat.vue
View File

@ -165,7 +165,7 @@ export default {
}, },
$autoRefresh: { $autoRefresh: {
// 刷新间隔时间 // 刷新间隔时间
interval: 1000 * 10, interval: 3000 * 10,
// 立即执行一次 // 立即执行一次
immediate: false, immediate: false,
// 被回调的函数, 不保证顺序执行 // 被回调的函数, 不保证顺序执行

BIN
正式kakapay.zip
View File

Binary file not shown.

BIN
测试kakapay.zip
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save