From 8439f9cfed273e26a1c1d62f0ef2a9857f8c9235 Mon Sep 17 00:00:00 2001 From: j1ack <1209452658@qq.com> Date: Mon, 22 May 2023 10:42:29 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=99=E5=90=88=E5=B9=B6=20git=20commit=20-m?= =?UTF-8?q?=20=E2=80=99=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/form.js | 65 +++- src/utils/ruoyi.js | 126 ++++-- src/views/egypt/egyptRechargeOrder/index.vue | 90 ++++- src/views/monitor/logininfor/index.vue | 101 ++++- src/views/monitor/operlog/index.vue | 95 ++++- .../pay/payAgentUser/payAgentDivideSort.vue | 91 ++++- .../pay/payAgentUser/payAgentUserList.vue | 112 +++++- src/views/pay/payAgentUser/payDaiFuDetail.vue | 355 +++++++++++++++++ .../payAgentUser/payDaiShouOrderContry.vue | 367 ++++++++++++++++++ .../pay/payAgentUser/payDaiShouOrderStore.vue | 358 +++++++++++++++++ .../pay/payAgentUser/payDaifuOrderDetail.vue | 345 ++++++++++++++++ .../pkCouponScopeRangeStoreList2.vue | 40 +- .../pkCouponScopeRangeStoreListWallet.vue | 35 +- src/views/pay/payOrder/my-date-picker.vue | 5 +- src/views/pay/payOrder/payDaiFuWater.vue | 56 ++- src/views/pay/payOrder/payMoneyCalcu.vue | 93 ++++- src/views/pay/payOrder/payMoneyWater.vue | 7 +- src/views/pay/payOrder/payOrderRecord.vue | 7 +- src/views/pay/payOrder/payOrderWater.vue | 27 +- src/views/pay/payOrder/paySettleWater.vue | 7 +- src/views/pay/payOrder/payuOrderWater.vue | 7 +- src/views/pay/payOrder/payuwater.vue | 7 +- src/views/pay/payTest/payCode.vue | 9 + src/views/system/config/index.vue | 99 ++++- src/views/system/dept/index.vue | 2 +- src/views/system/dict/index.vue | 97 ++++- src/views/system/menu/index.vue | 2 +- src/views/system/notice/index.vue | 2 +- src/views/system/post/index.vue | 2 +- src/views/system/role/index.vue | 92 ++++- src/views/system/user/index.vue | 92 ++++- src/views/tool/gen/index.vue | 92 ++++- 7uppay.zip => 测试7uppay.zip | Bin 4577833 -> 4585374 bytes 33 files changed, 2678 insertions(+), 207 deletions(-) create mode 100644 src/views/pay/payAgentUser/payDaiFuDetail.vue create mode 100644 src/views/pay/payAgentUser/payDaiShouOrderContry.vue create mode 100644 src/views/pay/payAgentUser/payDaiShouOrderStore.vue create mode 100644 src/views/pay/payAgentUser/payDaifuOrderDetail.vue rename 7uppay.zip => 测试7uppay.zip (89%) diff --git a/src/api/form.js b/src/api/form.js index c5f4e3c..a7fad6a 100644 --- a/src/api/form.js +++ b/src/api/form.js @@ -11,8 +11,8 @@ import { * */ export const common_api = { - //获取所有商户 - getAllPayTestStore: () => { + //获取所有商户 + getAllPayTestStore: () => { return request({ url: '/paytest/all', method: 'get', @@ -101,6 +101,45 @@ export const common_api = { * 用户模块 */ export const payAgentUser = { + // 更新商户密钥 + upStoreCaptcha: (data) => { + return request({ + url: '/store/store/upStoreCaptcha?storeId=' + data.storeId, + method: 'PUT', + }) + }, + // 订单代收统计明细列表（按国家） + rechargeOrderCountList: (query) => { + return request({ + url: '/order/rechargeRecord/rechargeOrderCountList', + method: 'get', + params: query, + }) + }, + // 订单代收统计明细列表（按商户） + findStoreAccountStatistics: (query) => { + return request({ + url: '/order/rechargeRecord/findStoreAccountStatistics', + method: 'get', + params: query, + }) + }, + // 代付订单统计 + paymentStatistics: (query) => { + return request({ + url: '/order/paymentStatistics', + method: 'get', + params: query, + }) + }, + // 代付明细统计 + paymentDetailsStatistics: (query) => { + return request({ + url: '/order/paymentDetailsStatistics', + method: 'get', + params: query, + }) + }, // 代理分成流水 getAgentDivideCountPtList: (query) => { return request({ @@ -373,14 +412,14 @@ export const transfer_capital_list = { * 资金流水 */ export const capitalDtlList = { -    // 流水导出 -    export: (query) => { -      return request({ -        url: '/record/transfer_capitaldtl_export', -        method: 'get', -        params: query -      }) -    }, + // 流水导出 + export: (query) => { + return request({ + url: '/record/transfer_capitaldtl_export', + method: 'get', + params: query + }) + }, // 查询资金流水列表 listInfo: (query) => { return request({ @@ -399,7 +438,7 @@ export const capitalDtlList = { * 结算流水 */ export const paySettleWater = { - + // 查询结算流水列表 listInfo: (query) => { return request({ @@ -1026,8 +1065,8 @@ export const payTest = { * 订单 */ export const payOrder = { - // 手动结算 - manualSettle: (data) => { + // 手动结算 + manualSettle: (data) => { return request({ url: '/record/manualSettle/' + data, method: 'GET', diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index 4d1b386..747c6ae 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -58,56 +58,100 @@ export function today() { } -// 添加日期范围 -export function addSESDateRange(params, dateRange, propName) { - var search = params; - search.beginTime = null - search.endTime = null; +// // 添加日期范围 +// export function addSESDateRange(params, dateRange, propName) { +// var search = params; +// search.beginTime = null +// search.endTime = null; - search.beginTimeEffectiveTime = null - search.endTimeEffectiveTime = null; +// search.beginTimeEffectiveTime = null +// search.endTimeEffectiveTime = null; - search.beginTimeRenewTime = null - search.endTimeRenewTime = null; +// search.beginTimeRenewTime = null +// search.endTimeRenewTime = null; - search.beginTimeValidateTime = null - search.endTimeValidateTime = null; +// search.beginTimeValidateTime = null +// search.endTimeValidateTime = null; - if (null != dateRange && '' != dateRange) { - // search.beginTime = dateRange[0]; - // search.endTime = dateRange[1]; - if (dateRange[0] && dateRange[1]) { - search.beginTime = dateRange[0]; - search.endTime = dateRange[1]; - } else if (!dateRange[0]) { - search.beginTime = undefined; - search.endTime = undefined; - } - if (dateRange[2] && dateRange[3]) { - search.beginTimeEffectiveTime = dateRange[2]; - search.endTimeEffectiveTime = dateRange[3]; - } else if (!dateRange[2]) { - search.beginTimeEffectiveTime = undefined; - search.endTimeEffectiveTime = undefined; +// if (null != dateRange && '' != dateRange) { +// // search.beginTime = dateRange[0]; +// // search.endTime = dateRange[1]; +// if (dateRange[0] && dateRange[1]) { +// search.beginTime = dateRange[0]; +// search.endTime = dateRange[1]; +// } else if (!dateRange[0]) { +// search.beginTime = undefined; +// search.endTime = undefined; +// } +// if (dateRange[2] && dateRange[3]) { +// search.beginTimeEffectiveTime = dateRange[2]; +// search.endTimeEffectiveTime = dateRange[3]; +// } else if (!dateRange[2]) { +// search.beginTimeEffectiveTime = undefined; +// search.endTimeEffectiveTime = undefined; +// } +// if (dateRange[4] && dateRange[5]) { +// search.beginTimeRenewTime = dateRange[4]; +// search.endTimeRenewTime = dateRange[5]; +// } else if (!dateRange[4]) { +// search.beginTimeRenewTime = undefined; +// search.endTimeRenewTime = undefined; +// } + +// if (dateRange[6] && dateRange[7]) { +// search.beginTimeValidateTime = dateRange[6]; +// search.endTimeValidateTime = dateRange[7]; +// } else if (!dateRange[7]) { +// search.beginTimeValidateTime = undefined; +// search.endTimeValidateTime = undefined; +// } + +// } +// return search; +// } + +// 添加日期范围 +export function addSESDateRange(params, dateRange, propName) { + var search = params; + search.beginTime = null + search.endTime = null; + search.upBeginTime = null + search.upEndTime = null; + if (propName) { + if (dateRange[0]) { + if (dateRange[0][0] && dateRange[0][1]) { + search.beginTime = dateRange[0][0]; + search.endTime = dateRange[0][1]; + } else if (!dateRange[0][0]) { + search.beginTime = undefined; + search.endTime = undefined; + } } - if (dateRange[4] && dateRange[5]) { - search.beginTimeRenewTime = dateRange[4]; - search.endTimeRenewTime = dateRange[5]; - } else if (!dateRange[4]) { - search.beginTimeRenewTime = undefined; - search.endTimeRenewTime = undefined; + if (dateRange[1]) { + if (dateRange[1][0] && dateRange[1][1]) { + search.upBeginTime = dateRange[1][0]; + search.upEndTime = dateRange[1][1]; + } else if (!dateRange[1][0]) { + search.upBeginTime = undefined; + search.upEndTime = undefined; + } } - - if (dateRange[6] && dateRange[7]) { - search.beginTimeValidateTime = dateRange[6]; - search.endTimeValidateTime = dateRange[7]; - } else if (!dateRange[7]) { - search.beginTimeValidateTime = undefined; - search.endTimeValidateTime = undefined; + } + if (!propName) { + if (null != dateRange && '' != dateRange) { + // search.beginTime = dateRange[0]; + // search.endTime = dateRange[1]; + if (dateRange[0] && dateRange[1]) { + search.beginTime = dateRange[0]; + search.endTime = dateRange[1]; + } else if (!dateRange[0]) { + search.beginTime = undefined; + search.endTime = undefined; + } } - } + return search; } diff --git a/src/views/egypt/egyptRechargeOrder/index.vue b/src/views/egypt/egyptRechargeOrder/index.vue index 2eebd11..29cc665 100644 --- a/src/views/egypt/egyptRechargeOrder/index.vue +++ b/src/views/egypt/egyptRechargeOrder/index.vue @@ -53,8 +53,9 @@ - + @@ -138,6 +139,91 @@ export default { }, data() { return { + pickerOptions: { + shortcuts: [ + { + text: '最近一天', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三天', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 3); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一周', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一个月', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三个月', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 3); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近半年', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 6); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一年', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 12); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近两年', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 24); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三年', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 36); + picker.$emit('pick', [start, end]); + } + }, + ] + }, dateRange: [], sortLevType: [ { diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue index 067b2c0..c72d5e7 100644 --- a/src/views/monitor/logininfor/index.vue +++ b/src/views/monitor/logininfor/index.vue @@ -48,15 +48,9 @@ - +
@@ -156,6 +150,91 @@ export default { dicts: ['sys_common_status'], data() { return { + pickerOptions: { + shortcuts: [ + { + text: '最近一天', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三天', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 3); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一周', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一个月', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三个月', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 3); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近半年', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 6); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一年', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 12); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近两年', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 24); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三年', + onClick (picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 36); + picker.$emit('pick', [start, end]); + } + }, + ] + }, // 遮罩层 loading: true, // 选中数组 @@ -221,8 +300,8 @@ export default { }, /** 排序触发事件 */ handleSortChange(column, prop, order) { - this.queryParams.orderByColumn = column.prop; - this.queryParams.isAsc = column.order; + // this.queryParams.orderByColumn = column.prop; + // this.queryParams.isAsc = column.order; this.getList(); }, /** 删除按钮操作 */ diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index d89acef..ccc474d 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -36,8 +36,10 @@ - +
@@ -150,6 +152,91 @@ export default { dicts: ['sys_oper_type', 'sys_common_status'], data() { return { + pickerOptions: { + shortcuts: [ + { + text: '最近一天', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三天', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 3); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一周', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一个月', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三个月', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 3); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近半年', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 6); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一年', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 12); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近两年', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 24); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三年', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 36); + picker.$emit('pick', [start, end]); + } + }, + ] + }, // 遮罩层 loading: true, // 选中数组 @@ -218,8 +305,8 @@ export default { }, /** 排序触发事件 */ handleSortChange(column, prop, order) { - this.queryParams.orderByColumn = column.prop; - this.queryParams.isAsc = column.order; + // this.queryParams.orderByColumn = column.prop; + // this.queryParams.isAsc = column.order; this.getList(); }, /** 详细按钮操作 */ diff --git a/src/views/pay/payAgentUser/payAgentDivideSort.vue b/src/views/pay/payAgentUser/payAgentDivideSort.vue index c87ef30..a829a0b 100644 --- a/src/views/pay/payAgentUser/payAgentDivideSort.vue +++ b/src/views/pay/payAgentUser/payAgentDivideSort.vue @@ -21,8 +21,10 @@ - + + - + +
@@ -160,20 +163,20 @@ v-hasPermi="['system:user:saveStoreOragent']">新增下级商户 代付 + @click="handleView(scope.row)">子钱包 分配代理商 查看密钥 - 删除 详情
子钱包 + v-hasPermi="['order:rechargeRecord:capitalList']" v-if="scope.row.userType == 'store'">子钱包 通道 @@ -320,8 +323,10 @@ {{ detailInfoList.storeKey }} 复制 + 更新 - + {{ detailInfoList.agentCount }} @@ -460,6 +465,91 @@ export default { } } return { + pickerOptions: { + shortcuts: [ + { + text: '最近一天', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三天', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 3); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一周', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一个月', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三个月', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 3); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近半年', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 6); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近一年', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 12); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近两年', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 24); + picker.$emit('pick', [start, end]); + } + }, + { + text: '最近三年', + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30 * 36); + picker.$emit('pick', [start, end]); + } + }, + ] + }, // 代理商 allAgent: [], // 国家 @@ -594,6 +684,16 @@ export default { }, }, methods: { + updateDetailKey() { + payAgentUser + .upStoreCaptcha({ + storeId: this.detailInfoList.storeId + }) + .then((response) => { + this.detailInfoList.storeKey = response.data.storeCaptcha + this.$forceUpdate() + }); + }, /** 删除按钮操作 */ handleDelete(row) { const userIds = row.userId || this.ids; diff --git a/src/views/pay/payAgentUser/payDaiFuDetail.vue b/src/views/pay/payAgentUser/payDaiFuDetail.vue new file mode 100644 index 0000000..016a022 --- /dev/null +++ b/src/views/pay/payAgentUser/payDaiFuDetail.vue @@ -0,0 +1,355 @@ + + + \ No newline at end of file diff --git a/src/views/pay/payAgentUser/payDaiShouOrderContry.vue b/src/views/pay/payAgentUser/payDaiShouOrderContry.vue new file mode 100644 index 0000000..5b85f52 --- /dev/null +++ b/src/views/pay/payAgentUser/payDaiShouOrderContry.vue @@ -0,0 +1,367 @@ + + + \ No newline at end of file diff --git a/src/views/pay/payAgentUser/payDaiShouOrderStore.vue b/src/views/pay/payAgentUser/payDaiShouOrderStore.vue new file mode 100644 index 0000000..d96718c --- /dev/null +++ b/src/views/pay/payAgentUser/payDaiShouOrderStore.vue @@ -0,0 +1,358 @@ + + + \ No newline at end of file diff --git a/src/views/pay/payAgentUser/payDaifuOrderDetail.vue b/src/views/pay/payAgentUser/payDaifuOrderDetail.vue new file mode 100644 index 0000000..1c108e4 --- /dev/null +++ b/src/views/pay/payAgentUser/payDaifuOrderDetail.vue @@ -0,0 +1,345 @@ + + + \ No newline at end of file diff --git a/src/views/pay/payAgentUser/pkCouponScopeRangeStoreList2.vue b/src/views/pay/payAgentUser/pkCouponScopeRangeStoreList2.vue index 2407874..33a0e62 100644 --- a/src/views/pay/payAgentUser/pkCouponScopeRangeStoreList2.vue +++ b/src/views/pay/payAgentUser/pkCouponScopeRangeStoreList2.vue @@ -75,12 +75,13 @@
- - - - - + + + + + @@ -218,30 +219,33 @@ export default { }, // 表单校验 rules: { + bankName: [ + { required: true, message: "请输入银行名称", trigger: "blur" }, + ], afterAmt: [ { required: true, message: "请输入本次修改金额", trigger: "blur" }, ], paymentAmount: [ { required: true, message: "请输入本次代付金额", trigger: "blur" }, ], - mobile: [ - { required: true, type: 'number', validator: checkPhone, message: '请输入正确的手机号', trigger: 'blur' }, - ], + // mobile: [ + // { required: true, type: 'number', validator: checkPhone, message: '请输入正确的手机号', trigger: 'blur' }, + // ], acctName: [ { required: true, message: "请输入开户人姓名", trigger: "blur" }, ], - bankSettleNo: [ - { required: true, message: "请输入支行联行号", trigger: "blur" }, - ], + // bankSettleNo: [ + // { required: true, message: "请输入支行联行号", trigger: "blur" }, + // ], acctId: [ { required: true, message: "请输入银行卡号", trigger: "blur" }, ], - bankBranchName: [ - { required: true, message: "请输入支行名称", trigger: "blur" }, - ], - bankId: [ - { required: true, message: "请选择出金通道", trigger: "blur" }, - ], + // bankBranchName: [ + // { required: true, message: "请输入支行名称", trigger: "blur" }, + // ], + // bankId: [ + // { required: true, message: "请选择出金通道", trigger: "blur" }, + // ], toAccountNo: [ { required: true, message: "请选择划转账户", trigger: "blur" }, ], diff --git a/src/views/pay/payAgentUser/pkCouponScopeRangeStoreListWallet.vue b/src/views/pay/payAgentUser/pkCouponScopeRangeStoreListWallet.vue index 505931b..92f1c9c 100644 --- a/src/views/pay/payAgentUser/pkCouponScopeRangeStoreListWallet.vue +++ b/src/views/pay/payAgentUser/pkCouponScopeRangeStoreListWallet.vue @@ -152,10 +152,12 @@
- - + + + + @@ -323,30 +325,33 @@ export default { }, // 表单校验 rules: { + bankName: [ + { required: true, message: "请输入银行名称", trigger: "blur" }, + ], afterAmt: [ { required: true, message: "请输入本次修改金额", trigger: "blur" }, ], paymentAmount: [ { required: true, message: "请输入本次代付金额", trigger: "blur" }, ], - mobile: [ - { required: true, type: 'number', validator: checkPhone, message: '请输入正确的手机号', trigger: 'blur' }, - ], + // mobile: [ + // { required: true, type: 'number', validator: checkPhone, message: '请输入正确的手机号', trigger: 'blur' }, + // ], acctName: [ { required: true, message: "请输入开户人姓名", trigger: "blur" }, ], - bankSettleNo: [ - { required: true, message: "请输入支行联行号", trigger: "blur" }, - ], + // bankSettleNo: [ + // { required: true, message: "请输入支行联行号", trigger: "blur" }, + // ], acctId: [ { required: true, message: "请输入银行卡号", trigger: "blur" }, ], - bankBranchName: [ - { required: true, message: "请输入支行名称", trigger: "blur" }, - ], - bankId: [ - { required: true, message: "请选择出金通道", trigger: "blur" }, - ], + // bankBranchName: [ + // { required: true, message: "请输入支行名称", trigger: "blur" }, + // ], + // bankId: [ + // { required: true, message: "请选择出金通道", trigger: "blur" }, + // ], toAccountNo: [ { required: true, message: "请选择划转账户", trigger: "blur" }, ], diff --git a/src/views/pay/payOrder/my-date-picker.vue b/src/views/pay/payOrder/my-date-picker.vue index 7b69307..882521f 100644 --- a/src/views/pay/payOrder/my-date-picker.vue +++ b/src/views/pay/payOrder/my-date-picker.vue @@ -2,14 +2,15 @@ + :default-time="['00:00:00', '23:59:59']" + />