Browse Source

’合并

git commit -m ’合并
master
j1ack 2 years ago
parent
commit
8439f9cfed
  1. 65
      src/api/form.js
  2. 126
      src/utils/ruoyi.js
  3. 90
      src/views/egypt/egyptRechargeOrder/index.vue
  4. 101
      src/views/monitor/logininfor/index.vue
  5. 95
      src/views/monitor/operlog/index.vue
  6. 91
      src/views/pay/payAgentUser/payAgentDivideSort.vue
  7. 112
      src/views/pay/payAgentUser/payAgentUserList.vue
  8. 355
      src/views/pay/payAgentUser/payDaiFuDetail.vue
  9. 367
      src/views/pay/payAgentUser/payDaiShouOrderContry.vue
  10. 358
      src/views/pay/payAgentUser/payDaiShouOrderStore.vue
  11. 345
      src/views/pay/payAgentUser/payDaifuOrderDetail.vue
  12. 40
      src/views/pay/payAgentUser/pkCouponScopeRangeStoreList2.vue
  13. 35
      src/views/pay/payAgentUser/pkCouponScopeRangeStoreListWallet.vue
  14. 5
      src/views/pay/payOrder/my-date-picker.vue
  15. 56
      src/views/pay/payOrder/payDaiFuWater.vue
  16. 93
      src/views/pay/payOrder/payMoneyCalcu.vue
  17. 7
      src/views/pay/payOrder/payMoneyWater.vue
  18. 7
      src/views/pay/payOrder/payOrderRecord.vue
  19. 27
      src/views/pay/payOrder/payOrderWater.vue
  20. 7
      src/views/pay/payOrder/paySettleWater.vue
  21. 7
      src/views/pay/payOrder/payuOrderWater.vue
  22. 7
      src/views/pay/payOrder/payuwater.vue
  23. 9
      src/views/pay/payTest/payCode.vue
  24. 99
      src/views/system/config/index.vue
  25. 2
      src/views/system/dept/index.vue
  26. 97
      src/views/system/dict/index.vue
  27. 2
      src/views/system/menu/index.vue
  28. 2
      src/views/system/notice/index.vue
  29. 2
      src/views/system/post/index.vue
  30. 92
      src/views/system/role/index.vue
  31. 92
      src/views/system/user/index.vue
  32. 92
      src/views/tool/gen/index.vue
  33. BIN
      测试7uppay.zip

65
src/api/form.js

@ -11,8 +11,8 @@ import {
* *
*/ */
export const common_api = { export const common_api = {
//获取所有商户 //获取所有商户
getAllPayTestStore: () => { getAllPayTestStore: () => {
return request({ return request({
url: '/paytest/all', url: '/paytest/all',
method: 'get', method: 'get',
@ -101,6 +101,45 @@ export const common_api = {
* 用户模块 * 用户模块
*/ */
export const payAgentUser = { 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) => { getAgentDivideCountPtList: (query) => {
return request({ return request({
@ -373,14 +412,14 @@ export const transfer_capital_list = {
* 资金流水 * 资金流水
*/ */
export const capitalDtlList = { export const capitalDtlList = {
   // 流水导出 // 流水导出
    export: (query) => { export: (query) => {
      return request({ return request({
        url: '/record/transfer_capitaldtl_export', url: '/record/transfer_capitaldtl_export',
        method: 'get', method: 'get',
        params: query params: query
      }) })
    }, },
// 查询资金流水列表 // 查询资金流水列表
listInfo: (query) => { listInfo: (query) => {
return request({ return request({
@ -399,7 +438,7 @@ export const capitalDtlList = {
* 结算流水 * 结算流水
*/ */
export const paySettleWater = { export const paySettleWater = {
// 查询结算流水列表 // 查询结算流水列表
listInfo: (query) => { listInfo: (query) => {
return request({ return request({
@ -1026,8 +1065,8 @@ export const payTest = {
* 订单 * 订单
*/ */
export const payOrder = { export const payOrder = {
// 手动结算 // 手动结算
manualSettle: (data) => { manualSettle: (data) => {
return request({ return request({
url: '/record/manualSettle/' + data, url: '/record/manualSettle/' + data,
method: 'GET', method: 'GET',

126
src/utils/ruoyi.js

@ -58,56 +58,100 @@ export function today() {
} }
// 添加日期范围 // // 添加日期范围
export function addSESDateRange(params, dateRange, propName) { // export function addSESDateRange(params, dateRange, propName) {
var search = params; // var search = params;
search.beginTime = null // search.beginTime = null
search.endTime = null; // search.endTime = null;
search.beginTimeEffectiveTime = null // search.beginTimeEffectiveTime = null
search.endTimeEffectiveTime = null; // search.endTimeEffectiveTime = null;
search.beginTimeRenewTime = null // search.beginTimeRenewTime = null
search.endTimeRenewTime = null; // search.endTimeRenewTime = null;
search.beginTimeValidateTime = null // search.beginTimeValidateTime = null
search.endTimeValidateTime = null; // search.endTimeValidateTime = null;
if (null != dateRange && '' != dateRange) { // if (null != dateRange && '' != dateRange) {
// search.beginTime = dateRange[0]; // // search.beginTime = dateRange[0];
// search.endTime = dateRange[1]; // // search.endTime = dateRange[1];
if (dateRange[0] && dateRange[1]) { // if (dateRange[0] && dateRange[1]) {
search.beginTime = dateRange[0]; // search.beginTime = dateRange[0];
search.endTime = dateRange[1]; // search.endTime = dateRange[1];
} else if (!dateRange[0]) { // } else if (!dateRange[0]) {
search.beginTime = undefined; // search.beginTime = undefined;
search.endTime = undefined; // search.endTime = undefined;
} // }
if (dateRange[2] && dateRange[3]) { // if (dateRange[2] && dateRange[3]) {
search.beginTimeEffectiveTime = dateRange[2]; // search.beginTimeEffectiveTime = dateRange[2];
search.endTimeEffectiveTime = dateRange[3]; // search.endTimeEffectiveTime = dateRange[3];
} else if (!dateRange[2]) { // } else if (!dateRange[2]) {
search.beginTimeEffectiveTime = undefined; // search.beginTimeEffectiveTime = undefined;
search.endTimeEffectiveTime = 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]) { if (dateRange[1]) {
search.beginTimeRenewTime = dateRange[4]; if (dateRange[1][0] && dateRange[1][1]) {
search.endTimeRenewTime = dateRange[5]; search.upBeginTime = dateRange[1][0];
} else if (!dateRange[4]) { search.upEndTime = dateRange[1][1];
search.beginTimeRenewTime = undefined; } else if (!dateRange[1][0]) {
search.endTimeRenewTime = undefined; search.upBeginTime = undefined;
search.upEndTime = undefined;
}
} }
}
if (dateRange[6] && dateRange[7]) { if (!propName) {
search.beginTimeValidateTime = dateRange[6]; if (null != dateRange && '' != dateRange) {
search.endTimeValidateTime = dateRange[7]; // search.beginTime = dateRange[0];
} else if (!dateRange[7]) { // search.endTime = dateRange[1];
search.beginTimeValidateTime = undefined; if (dateRange[0] && dateRange[1]) {
search.endTimeValidateTime = undefined; search.beginTime = dateRange[0];
search.endTime = dateRange[1];
} else if (!dateRange[0]) {
search.beginTime = undefined;
search.endTime = undefined;
}
} }
} }
return search; return search;
} }

90
src/views/egypt/egyptRechargeOrder/index.vue

@ -53,8 +53,9 @@
</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: 340px" value-format="yyyy-MM-dd HH:mm:ss"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker> type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -138,6 +139,91 @@ export default {
}, },
data() { data() {
return { 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: [], dateRange: [],
sortLevType: [ sortLevType: [
{ {

101
src/views/monitor/logininfor/index.vue

@ -48,15 +48,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="登录时间"> <el-form-item label="登录时间">
<el-date-picker <el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
v-model="dateRange" type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
style="width: 240px" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></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;">
@ -156,6 +150,91 @@ export default {
dicts: ['sys_common_status'], dicts: ['sys_common_status'],
data() { data() {
return { 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, loading: true,
// //
@ -221,8 +300,8 @@ export default {
}, },
/** 排序触发事件 */ /** 排序触发事件 */
handleSortChange(column, prop, order) { handleSortChange(column, prop, order) {
this.queryParams.orderByColumn = column.prop; // this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order; // this.queryParams.isAsc = column.order;
this.getList(); this.getList();
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */

95
src/views/monitor/operlog/index.vue

@ -36,8 +36,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="操作时间"> <el-form-item label="操作时间">
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" <el-date-picker v-model="dateRange" size="small" style="width: 340px"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></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;">
@ -150,6 +152,91 @@ export default {
dicts: ['sys_oper_type', 'sys_common_status'], dicts: ['sys_oper_type', 'sys_common_status'],
data() { data() {
return { 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, loading: true,
// //
@ -218,8 +305,8 @@ export default {
}, },
/** 排序触发事件 */ /** 排序触发事件 */
handleSortChange(column, prop, order) { handleSortChange(column, prop, order) {
this.queryParams.orderByColumn = column.prop; // this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order; // this.queryParams.isAsc = column.order;
this.getList(); this.getList();
}, },
/** 详细按钮操作 */ /** 详细按钮操作 */

91
src/views/pay/payAgentUser/payAgentDivideSort.vue

@ -21,8 +21,10 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<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: 340px"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker> value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="代理" prop="name"> <el-form-item label="代理" prop="name">
<el-input size="medium" v-model="queryParams.name" placeholder="请输入代理" @keyup.enter.native="handleQuery" <el-input size="medium" v-model="queryParams.name" placeholder="请输入代理" @keyup.enter.native="handleQuery"
@ -98,6 +100,91 @@
name: "PkAdWeiList", name: "PkAdWeiList",
data() { data() {
return { 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]);
}
},
]
},
sum: {}, sum: {},
dateRange: [], dateRange: [],
// 广 // 广

112
src/views/pay/payAgentUser/payAgentUserList.vue

@ -35,10 +35,13 @@
<el-input size="medium" v-model="queryParams.parentName" placeholder="请输入上级名称" @keyup.enter.native="handleQuery" <el-input size="medium" v-model="queryParams.parentName" 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: 340px" value-format="yyyy-MM-dd HH:mm:ss"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"></el-date-picker> type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></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">
@ -160,20 +163,20 @@
v-hasPermi="['system:user:saveStoreOragent']">新增下级商户</el-button> v-hasPermi="['system:user:saveStoreOragent']">新增下级商户</el-button>
<el-button size="small" type="text" style="color: #006EFF;" v-if="scope.row.userType == 'agent'" <el-button size="small" type="text" style="color: #006EFF;" v-if="scope.row.userType == 'agent'"
@click="handleView(scope.row)">代付</el-button> @click="handleView(scope.row)">子钱包</el-button>
<!-- 商户 --> <!-- 商户 -->
<el-button size="small" v-if="scope.row.userType == 'store'" type="text" <el-button size="small" v-if="scope.row.userType == 'store'" type="text"
@click="handleAgent('分配代理商', 'divide', scope.row)" style="color: #006EFF;">分配代理商</el-button> @click="handleAgent('分配代理商', 'divide', scope.row)" style="color: #006EFF;">分配代理商</el-button>
<el-button size="small" type="text" style="color: #006EFF;" @click="handleCode('身份验证', scope.row)" <el-button size="small" type="text" style="color: #006EFF;" @click="handleCode('身份验证', scope.row)"
v-hasPermi="['system:user:getGoogleCaptcha']">查看密钥</el-button> v-hasPermi="['system:user:getGoogleCaptcha']">查看密钥</el-button>
<el-button size="small" type="text" style="color: #006EFF;" @click="handleDelete(scope.row)" <el-button size="small" type="text" style="color: #006EFF;" @click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']">删除</el-button> v-hasPermi="['system:user:remove']">删除</el-button>
<el-button size="small" type="text" style="color: #006EFF;" @click="handleViewMy(scope.row)" <el-button size="small" type="text" style="color: #006EFF;" @click="handleViewMy(scope.row)"
v-hasPermi="['store:store:query']" v-if="scope.row.userType == 'store'">详情</el-button><br /> v-hasPermi="['store:store:query']" v-if="scope.row.userType == 'store'">详情</el-button><br />
<el-button size="small" type="text" style="color: #006EFF;" @click="handleViewTo(scope.row)" <el-button size="small" type="text" style="color: #006EFF;" @click="handleViewTo(scope.row)"
v-hasPermi="['order:rechargeRecord:capitalList']">子钱包</el-button> v-hasPermi="['order:rechargeRecord:capitalList']" v-if="scope.row.userType == 'store'">子钱包</el-button>
<el-button size="small" type="text" style="color: #006EFF;" @click="go('/add', scope.row.storeId)" <el-button size="small" type="text" style="color: #006EFF;" @click="go('/add', scope.row.storeId)"
v-if="scope.row.userType == 'store'">通道</el-button> v-if="scope.row.userType == 'store'">通道</el-button>
@ -320,8 +323,10 @@
<el-form-item label="签名Key"> <el-form-item label="签名Key">
{{ detailInfoList.storeKey }} <span v-if="detailInfoList.storeKey" @click="copy(detailInfoList.storeKey)" {{ detailInfoList.storeKey }} <span v-if="detailInfoList.storeKey" @click="copy(detailInfoList.storeKey)"
style="cursor: pointer;color:#006EFF;margin-left: 10px;">复制</span> style="cursor: pointer;color:#006EFF;margin-left: 10px;">复制</span>
<span v-if="detailInfoList.storeKey" @click="updateDetailKey()"
style="cursor: pointer;color:#006EFF;margin-left: 10px;">更新</span>
</el-form-item> </el-form-item>
<el-form-item label="代理数"> <el-form-item label="代理数">
{{ detailInfoList.agentCount }} {{ detailInfoList.agentCount }}
</el-form-item> </el-form-item>
@ -460,6 +465,91 @@ export default {
} }
} }
return { 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: [], allAgent: [],
// //
@ -594,6 +684,16 @@ export default {
}, },
}, },
methods: { methods: {
updateDetailKey() {
payAgentUser
.upStoreCaptcha({
storeId: this.detailInfoList.storeId
})
.then((response) => {
this.detailInfoList.storeKey = response.data.storeCaptcha
this.$forceUpdate()
});
},
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const userIds = row.userId || this.ids; const userIds = row.userId || this.ids;

355
src/views/pay/payAgentUser/payDaiFuDetail.vue

@ -0,0 +1,355 @@
<template>
<div class="app-container">
<div class="flexBet searchTop">
<div class="title flex m20">
<div class="bar"></div>
<div class="text">{{ $route.meta.title }}</div>
</div>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleAdd">新增</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
<div class="bg">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px">
<el-form-item label="钱包编号" prop="accountNo">
<el-input size="medium" v-model="queryParams.accountNo" placeholder="请输入钱包编号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="币种" prop="currency">
<el-input size="medium" v-model="queryParams.currency" placeholder="请输入币种"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table stripe v-loading="loading" :data="infoList">
<el-table-column label="商户名称" align="center" prop="storeName" />
<el-table-column label="商户号" align="center" prop="storeNo" />
<el-table-column label="支付类型" align="center" prop="typeName" />
<el-table-column label="成功率" align="center" prop="successRate">
<template slot-scope="scope">
{{ scope.row.successRate}}%
</template>
</el-table-column>
<el-table-column label="钱包编号" align="center" prop="accountNo" />
<el-table-column label="币种" align="center" prop="currency" />
<el-table-column label="代付成功订单数" align="center" prop="paymentSuccessOrderNum" />
<el-table-column label="成功代付金额" align="center" prop="paymentSuccessPrice" />
<el-table-column label="代付总订单数" align="center" prop="paymentTotalOrder" />
<!-- <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
fixed="right"
>
<template slot-scope="scope">
<el-button
size="small"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="small"
type="text"
icon="el-icon-delete"
style="color: red"
@click="handleDelete(scope.row)"
>删除</el-button
>
</template>
</el-table-column> -->
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
</div>
</template>
<script>
import { common_api, payAgentUser } from "@/api/form";
export default {
name: "PkAdWeiList",
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]);
}
},
]
},
sum: {},
dateRange: [],
// 广
imageUrl: "",
//
loading: true,
//
exportLoading: false,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// 广
infoList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 20,
accountNo: null,
storeName: null,
currency: null,
},
//
form: {},
//
rules: {
positionName: [
{ required: true, message: "请输入广告名称", trigger: "blur" },
]
}
};
},
created() {
this.addDate();
this.getList();
},
methods: {
//
addDate() {
let nowDate = new Date();
let date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
date: nowDate.getDate(),
}
let systemDate;
let systemDateSec;
if (date.date <= 9) {
systemDate = date.year + '-' + 0 + date.month + '-' + 0 + date.date;
} else {
systemDate = date.year + '-' + 0 + date.month + '-' + date.date;
}
if (date.date <= 9) {
systemDateSec = date.year + '-' + 0 + date.month + '-' + 0 + (date.date - 1);
} else {
systemDateSec = date.year + '-' + 0 + date.month + '-' + date.date;
}
this.dateRange = [systemDateSec + ' ' + '00' + ':' + '00' + ':' + '00', systemDate + ' ' + '23' + ':' + '59' + ':' + '59']
this.$forceUpdate()
},
getList() {
this.loading = true;
payAgentUser
.paymentDetailsStatistics(this.addSESDateRange(this.queryParams, this.dateRange))
.then((response) => {
this.infoList = response.data.rows;
this.total = Number(response.total);
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加广告位信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
pkUserInfo.getInfo(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改广告位信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
const loading = this.$loading({
lock: true,
text: `正在${this.form.id ? "修改" : "添加"}广告位信息`,
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
});
if (this.form.id != null) {
pkUserInfo.updateInfo(this.form).then((response) => {
loading.close();
this.open = false;
this.msgSuccess("修改成功");
this.getList();
}).catch(() => {
loading.close();
})
} else {
pkUserInfo.addInfo(this.form).then((response) => {
loading.close();
this.open = false;
this.msgSuccess("新增成功");
this.getList();
}).catch(() => {
loading.close();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除广告位名称为"' + row.positionName + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(function () {
return pkUserInfo.delInfo(ids);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(() => { });
}
},
};
</script>

367
src/views/pay/payAgentUser/payDaiShouOrderContry.vue

@ -0,0 +1,367 @@
<template>
<div class="app-container">
<div class="flexBet searchTop">
<div class="title flex m20">
<div class="bar"></div>
<div class="text">{{ $route.meta.title }}</div>
</div>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleAdd">新增</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
<div class="bg">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px">
<el-form-item label="交易时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions"></el-date-picker>
</el-form-item>
<el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="支付渠道" prop="channelType">
<el-select v-model="queryParams.channelType" placeholder="请选择支付渠道" clearable size="medium">
<el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName"
:value="item.payChannel"></el-option>
</el-select>
</el-form-item>
<el-form-item label="支付类型" prop="payType">
<el-select v-model="queryParams.payType" placeholder="请选择支付类型" clearable size="medium">
<el-option v-for="(item, i) in sortLevType" :key="i" :label="item.typeName"
:value="item.payType"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table stripe v-loading="loading" :data="infoList">
<el-table-column label="国家编号" align="center" prop="nationCode" />
<el-table-column label="收益" align="center" prop="income" />
<el-table-column label="总订单数" align="center" prop="orderCount" />
<el-table-column label="订单成功金额" align="center" prop="payAmt" />
<el-table-column label="成功订单数" align="center" prop="successOrderCount" />
<el-table-column label="订单总金额" align="center" prop="tranAmt" />
<el-table-column label="成功率" align="center" prop="successRate">
<template slot-scope="scope">
{{ NumberMul(scope.row.successRate,100) }}%
</template>
</el-table-column>
<!-- <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
fixed="right"
>
<template slot-scope="scope">
<el-button
size="small"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="small"
type="text"
icon="el-icon-delete"
style="color: red"
@click="handleDelete(scope.row)"
>删除</el-button
>
</template>
</el-table-column> -->
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
</div>
</template>
<script>
import { common_api, payAgentUser } from "@/api/form";
export default {
name: "PkAdWeiList",
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]);
}
},
]
},
sum: {},
dateRange: [],
// 广
imageUrl: "",
//
loading: true,
//
exportLoading: false,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// 广
infoList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 20,
storeName: null,
payType: null,
channelType: null,
},
//
form: {},
userLevType: [],
sortLevType: [],
//
rules: {
positionName: [
{ required: true, message: "请输入广告名称", trigger: "blur" },
]
}
};
},
created() {
this.addDate();
this.getList();
this.init();
},
methods: {
init() {
common_api.payChannelAll().then((response) => {
this.userLevType = response.data
});
common_api.payTypeAll().then((response) => {
this.sortLevType = response.data
});
},
//
addDate() {
let nowDate = new Date();
let date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
date: nowDate.getDate(),
}
let systemDate;
let systemDateSec;
if (date.date <= 9) {
systemDate = date.year + '-' + 0 + date.month + '-' + 0 + date.date;
} else {
systemDate = date.year + '-' + 0 + date.month + '-' + date.date;
}
if (date.date <= 9) {
systemDateSec = date.year + '-' + 0 + date.month + '-' + 0 + (date.date - 1);
} else {
systemDateSec = date.year + '-' + 0 + date.month + '-' + date.date;
}
this.dateRange = [systemDateSec + ' ' + '00' + ':' + '00' + ':' + '00', systemDate + ' ' + '23' + ':' + '59' + ':' + '59']
this.$forceUpdate()
},
getList() {
this.loading = true;
payAgentUser
.rechargeOrderCountList(this.addSESDateRange(this.queryParams, this.dateRange))
.then((response) => {
this.infoList = response.data;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加广告位信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
pkUserInfo.getInfo(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改广告位信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
const loading = this.$loading({
lock: true,
text: `正在${this.form.id ? "修改" : "添加"}广告位信息`,
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
});
if (this.form.id != null) {
pkUserInfo.updateInfo(this.form).then((response) => {
loading.close();
this.open = false;
this.msgSuccess("修改成功");
this.getList();
}).catch(() => {
loading.close();
})
} else {
pkUserInfo.addInfo(this.form).then((response) => {
loading.close();
this.open = false;
this.msgSuccess("新增成功");
this.getList();
}).catch(() => {
loading.close();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除广告位名称为"' + row.positionName + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(function () {
return pkUserInfo.delInfo(ids);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(() => { });
}
},
};
</script>

358
src/views/pay/payAgentUser/payDaiShouOrderStore.vue

@ -0,0 +1,358 @@
<template>
<div class="app-container">
<div class="flexBet searchTop">
<div class="title flex m20">
<div class="bar"></div>
<div class="text">{{ $route.meta.title }}</div>
</div>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleAdd">新增</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
<div class="bg">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px">
<el-form-item label="交易时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions"></el-date-picker>
</el-form-item>
<el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="账户编号" prop="accountNo">
<el-input size="medium" v-model="queryParams.accountNo" placeholder="请输入账户编号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="国家编号" prop="nationCode">
<el-input size="medium" v-model="queryParams.nationCode" placeholder="请输入国家编号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table stripe v-loading="loading" :data="infoList">
<el-table-column label="商户名称" align="center" prop="storeName" />
<el-table-column label="账户编号" align="center" prop="accountNo" />
<el-table-column label="成功订单数" align="center" prop="successOrderCount" />
<el-table-column label="订单成功金额" align="center" prop="payAmt" />
<el-table-column label="订单总金额" align="center" prop="tranAmt" />
<el-table-column label="总订单数" align="center" prop="orderCount" />
<el-table-column label="成功率" align="center" prop="successRate">
<template slot-scope="scope">
{{ NumberMul(scope.row.successRate,100) }}%
</template>
</el-table-column>
<el-table-column label="支付类型名称" align="center" prop="typeName" />
<el-table-column label="国家编号" align="center" prop="nationCode" />
<!-- <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
fixed="right"
>
<template slot-scope="scope">
<el-button
size="small"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="small"
type="text"
icon="el-icon-delete"
style="color: red"
@click="handleDelete(scope.row)"
>删除</el-button
>
</template>
</el-table-column> -->
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
</div>
</template>
<script>
import { common_api, payAgentUser } from "@/api/form";
export default {
name: "PkAdWeiList",
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]);
}
},
]
},
sum: {},
dateRange: [],
// 广
imageUrl: "",
//
loading: true,
//
exportLoading: false,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// 广
infoList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 20,
accountNo: null,
storeName: null,
nationCode: null,
},
//
form: {},
//
rules: {
positionName: [
{ required: true, message: "请输入广告名称", trigger: "blur" },
]
}
};
},
created() {
this.addDate();
this.getList();
},
methods: {
//
addDate() {
let nowDate = new Date();
let date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
date: nowDate.getDate(),
}
let systemDate;
let systemDateSec;
if (date.date <= 9) {
systemDate = date.year + '-' + 0 + date.month + '-' + 0 + date.date;
} else {
systemDate = date.year + '-' + 0 + date.month + '-' + date.date;
}
if (date.date <= 9) {
systemDateSec = date.year + '-' + 0 + date.month + '-' + 0 + (date.date - 1);
} else {
systemDateSec = date.year + '-' + 0 + date.month + '-' + date.date;
}
this.dateRange = [systemDateSec + ' ' + '00' + ':' + '00' + ':' + '00', systemDate + ' ' + '23' + ':' + '59' + ':' + '59']
this.$forceUpdate()
},
getList() {
this.loading = true;
payAgentUser
.findStoreAccountStatistics(this.addSESDateRange(this.queryParams, this.dateRange))
.then((response) => {
this.infoList = response.rows;
this.total = Number(response.total);
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加广告位信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
pkUserInfo.getInfo(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改广告位信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
const loading = this.$loading({
lock: true,
text: `正在${this.form.id ? "修改" : "添加"}广告位信息`,
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
});
if (this.form.id != null) {
pkUserInfo.updateInfo(this.form).then((response) => {
loading.close();
this.open = false;
this.msgSuccess("修改成功");
this.getList();
}).catch(() => {
loading.close();
})
} else {
pkUserInfo.addInfo(this.form).then((response) => {
loading.close();
this.open = false;
this.msgSuccess("新增成功");
this.getList();
}).catch(() => {
loading.close();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除广告位名称为"' + row.positionName + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(function () {
return pkUserInfo.delInfo(ids);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(() => { });
}
},
};
</script>

345
src/views/pay/payAgentUser/payDaifuOrderDetail.vue

@ -0,0 +1,345 @@
<template>
<div class="app-container">
<div class="flexBet searchTop">
<div class="title flex m20">
<div class="bar"></div>
<div class="text">{{ $route.meta.title }}</div>
</div>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button type="primary" plain icon="" size="medium" @click="handleAdd">新增</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
<div class="bg">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px">
<el-form-item label="国家" prop="currency">
<el-input size="medium" v-model="queryParams.currency" placeholder="请输入国家"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:unlink-panels="true" :default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table stripe v-loading="loading" :data="infoList">
<el-table-column label="国家" align="center" prop="currency" />
<el-table-column label="代付收益金额" align="center" prop="incomePrice" />
<el-table-column label="总代付金额" align="center" prop="paymentAllPrice" />
<el-table-column label="代付成功订单数" align="center" prop="paymentSuccessOrderNum" />
<el-table-column label="成功代付金额" align="center" prop="paymentSuccessPrice" />
<el-table-column label="代付总订单数" align="center" prop="paymentTotalOrder" />
<el-table-column label="成功率" align="center" prop="successRate">
<template slot-scope="scope">
{{ scope.row.successRate}}%
</template>
</el-table-column>
<!-- <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
fixed="right"
>
<template slot-scope="scope">
<el-button
size="small"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="small"
type="text"
icon="el-icon-delete"
style="color: red"
@click="handleDelete(scope.row)"
>删除</el-button
>
</template>
</el-table-column> -->
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
</div>
</template>
<script>
import { common_api, payAgentUser } from "@/api/form";
export default {
name: "PkAdWeiList",
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]);
}
},
]
},
sum: {},
dateRange: [],
// 广
imageUrl: "",
//
loading: true,
//
exportLoading: false,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// 广
infoList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 20,
accountNo: null,
storeName: null,
currency: null,
},
//
form: {},
//
rules: {
positionName: [
{ required: true, message: "请输入广告名称", trigger: "blur" },
]
}
};
},
created() {
this.addDate();
this.getList();
},
methods: {
//
addDate() {
let nowDate = new Date();
let date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
date: nowDate.getDate(),
}
let systemDate;
let systemDateSec;
if (date.date <= 9) {
systemDate = date.year + '-' + 0 + date.month + '-' + 0 + date.date;
} else {
systemDate = date.year + '-' + 0 + date.month + '-' + date.date;
}
if (date.date <= 9) {
systemDateSec = date.year + '-' + 0 + date.month + '-' + 0 + (date.date - 1);
} else {
systemDateSec = date.year + '-' + 0 + date.month + '-' + date.date;
}
this.dateRange = [systemDateSec + ' ' + '00' + ':' + '00' + ':' + '00', systemDate + ' ' + '23' + ':' + '59' + ':' + '59']
this.$forceUpdate()
},
getList() {
this.loading = true;
payAgentUser
.paymentStatistics(this.addSESDateRange(this.queryParams, this.dateRange))
.then((response) => {
this.infoList = response.data.rows;
this.total = Number(response.total);
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加广告位信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
pkUserInfo.getInfo(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改广告位信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
const loading = this.$loading({
lock: true,
text: `正在${this.form.id ? "修改" : "添加"}广告位信息`,
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
});
if (this.form.id != null) {
pkUserInfo.updateInfo(this.form).then((response) => {
loading.close();
this.open = false;
this.msgSuccess("修改成功");
this.getList();
}).catch(() => {
loading.close();
})
} else {
pkUserInfo.addInfo(this.form).then((response) => {
loading.close();
this.open = false;
this.msgSuccess("新增成功");
this.getList();
}).catch(() => {
loading.close();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除广告位名称为"' + row.positionName + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(function () {
return pkUserInfo.delInfo(ids);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(() => { });
}
},
};
</script>

40
src/views/pay/payAgentUser/pkCouponScopeRangeStoreList2.vue

@ -75,12 +75,13 @@
<el-divider></el-divider> <el-divider></el-divider>
</div> </div>
<div v-if="isCoin == 'N'"> <div v-if="isCoin == 'N'">
<el-form-item label="出金通道" prop="bankId"> <el-form-item label="银行名称" prop="bankName">
<el-select v-model="form.bankId" placeholder="请选择出金通道" clearable size="medium" @change="getValue"> <!-- <el-select v-model="form.bankId" placeholder="请选择出金通道" clearable size="medium" @change="getValue">
<el-option v-for="(item, i) in bankCon" :key="i" :label="item.bankName" <el-option v-for="(item, i) in bankCon" :key="i" :label="item.bankName" :value="item.id"></el-option>
:value="item.id"></el-option> </el-select> -->
</el-select> <el-input v-model="form.bankName" placeholder="请输入银行名称" />
</el-form-item>
</el-form-item>
<el-form-item label="银行卡号" prop="acctId"> <el-form-item label="银行卡号" prop="acctId">
<el-input v-model="form.acctId" placeholder="请输入银行卡号" /> <el-input v-model="form.acctId" placeholder="请输入银行卡号" />
</el-form-item> </el-form-item>
@ -218,30 +219,33 @@ export default {
}, },
// //
rules: { rules: {
bankName: [
{ required: true, message: "请输入银行名称", trigger: "blur" },
],
afterAmt: [ afterAmt: [
{ required: true, message: "请输入本次修改金额", trigger: "blur" }, { required: true, message: "请输入本次修改金额", trigger: "blur" },
], ],
paymentAmount: [ paymentAmount: [
{ required: true, message: "请输入本次代付金额", trigger: "blur" }, { required: true, message: "请输入本次代付金额", trigger: "blur" },
], ],
mobile: [ // mobile: [
{ required: true, type: 'number', validator: checkPhone, message: '请输入正确的手机号', trigger: 'blur' }, // { required: true, type: 'number', validator: checkPhone, message: '', trigger: 'blur' },
], // ],
acctName: [ acctName: [
{ required: true, message: "请输入开户人姓名", trigger: "blur" }, { required: true, message: "请输入开户人姓名", trigger: "blur" },
], ],
bankSettleNo: [ // bankSettleNo: [
{ required: true, message: "请输入支行联行号", trigger: "blur" }, // { required: true, message: "", trigger: "blur" },
], // ],
acctId: [ acctId: [
{ required: true, message: "请输入银行卡号", trigger: "blur" }, { required: true, message: "请输入银行卡号", trigger: "blur" },
], ],
bankBranchName: [ // bankBranchName: [
{ required: true, message: "请输入支行名称", trigger: "blur" }, // { required: true, message: "", trigger: "blur" },
], // ],
bankId: [ // bankId: [
{ required: true, message: "请选择出金通道", trigger: "blur" }, // { required: true, message: "", trigger: "blur" },
], // ],
toAccountNo: [ toAccountNo: [
{ required: true, message: "请选择划转账户", trigger: "blur" }, { required: true, message: "请选择划转账户", trigger: "blur" },
], ],

35
src/views/pay/payAgentUser/pkCouponScopeRangeStoreListWallet.vue

@ -152,10 +152,12 @@
<el-divider></el-divider> <el-divider></el-divider>
</div> </div>
<div v-if="isCoin == 'N'"> <div v-if="isCoin == 'N'">
<el-form-item label="出金通道" prop="bankId"> <el-form-item label="银行名称" prop="bankName">
<el-select v-model="form.bankId" placeholder="请选择出金通道" clearable size="medium" @change="getValue"> <!-- <el-select v-model="form.bankId" placeholder="请选择出金通道" clearable size="medium" @change="getValue">
<el-option v-for="(item, i) in bankCon" :key="i" :label="item.bankName" :value="item.id"></el-option> <el-option v-for="(item, i) in bankCon" :key="i" :label="item.bankName" :value="item.id"></el-option>
</el-select> </el-select> -->
<el-input v-model="form.bankName" placeholder="请输入银行名称" />
</el-form-item> </el-form-item>
<el-form-item label="银行卡号" prop="acctId"> <el-form-item label="银行卡号" prop="acctId">
<el-input v-model="form.acctId" placeholder="请输入银行卡号" /> <el-input v-model="form.acctId" placeholder="请输入银行卡号" />
@ -323,30 +325,33 @@ export default {
}, },
// //
rules: { rules: {
bankName: [
{ required: true, message: "请输入银行名称", trigger: "blur" },
],
afterAmt: [ afterAmt: [
{ required: true, message: "请输入本次修改金额", trigger: "blur" }, { required: true, message: "请输入本次修改金额", trigger: "blur" },
], ],
paymentAmount: [ paymentAmount: [
{ required: true, message: "请输入本次代付金额", trigger: "blur" }, { required: true, message: "请输入本次代付金额", trigger: "blur" },
], ],
mobile: [ // mobile: [
{ required: true, type: 'number', validator: checkPhone, message: '请输入正确的手机号', trigger: 'blur' }, // { required: true, type: 'number', validator: checkPhone, message: '', trigger: 'blur' },
], // ],
acctName: [ acctName: [
{ required: true, message: "请输入开户人姓名", trigger: "blur" }, { required: true, message: "请输入开户人姓名", trigger: "blur" },
], ],
bankSettleNo: [ // bankSettleNo: [
{ required: true, message: "请输入支行联行号", trigger: "blur" }, // { required: true, message: "", trigger: "blur" },
], // ],
acctId: [ acctId: [
{ required: true, message: "请输入银行卡号", trigger: "blur" }, { required: true, message: "请输入银行卡号", trigger: "blur" },
], ],
bankBranchName: [ // bankBranchName: [
{ required: true, message: "请输入支行名称", trigger: "blur" }, // { required: true, message: "", trigger: "blur" },
], // ],
bankId: [ // bankId: [
{ required: true, message: "请选择出金通道", trigger: "blur" }, // { required: true, message: "", trigger: "blur" },
], // ],
toAccountNo: [ toAccountNo: [
{ required: true, message: "请选择划转账户", trigger: "blur" }, { required: true, message: "请选择划转账户", trigger: "blur" },
], ],

5
src/views/pay/payOrder/my-date-picker.vue

@ -2,14 +2,15 @@
<el-date-picker <el-date-picker
v-on="$listeners" v-on="$listeners"
v-bind="$attrs" v-bind="$attrs"
type="daterange" type="datetimerange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
:unlink-panels="true" :unlink-panels="true"
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="dateRange" v-model="dateRange"
/> :default-time="['00:00:00', '23:59:59']"
/>
</template> </template>
<script> <script>

56
src/views/pay/payOrder/payDaiFuWater.vue

@ -13,10 +13,6 @@
<div class="bg"> <div class="bg">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="96px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="96px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<el-form-item label="批次号" prop="batchNo">
<el-input size="medium" v-model="queryParams.batchNo" placeholder="请输入批次号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="商户订单号" prop="outTradeNo"> <el-form-item label="商户订单号" prop="outTradeNo">
<el-input size="medium" v-model="queryParams.outTradeNo" placeholder="请输入商户订单号" <el-input size="medium" v-model="queryParams.outTradeNo" placeholder="请输入商户订单号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
@ -29,19 +25,10 @@
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称" <el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="开户名" prop="acctName">
<el-input size="medium" v-model="queryParams.acctName" placeholder="请输入开户名"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="银行卡号" prop="acctId"> <el-form-item label="银行卡号" prop="acctId">
<el-input size="medium" v-model="queryParams.acctId" placeholder="请输入银行卡号" <el-input size="medium" v-model="queryParams.acctId" placeholder="请输入银行卡号"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="身份证号码" prop="certId">
<el-input size="medium" v-model="queryParams.certId" placeholder="请输入身份证号码"
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="代付状态" prop="orderStatus"> <el-form-item label="代付状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择代付状态" size="medium"> <el-select v-model="queryParams.orderStatus" placeholder="请选择代付状态" size="medium">
<el-option v-for="dict in dict.type.payment_status" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.payment_status" :key="dict.value" :label="dict.label"
@ -49,12 +36,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="入金渠道" prop="channelType">
<el-select v-model="queryParams.channelType" placeholder="请选择入金渠道" clearable size="medium">
<el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName"
:value="item.payChannel"></el-option>
</el-select>
</el-form-item>
<el-form-item label="出金渠道" prop="outChannel"> <el-form-item label="出金渠道" prop="outChannel">
<el-select v-model="queryParams.outChannel" placeholder="请选择出金渠道" clearable size="medium"> <el-select v-model="queryParams.outChannel" placeholder="请选择出金渠道" clearable size="medium">
<el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName" <el-option v-for="(item, i) in userLevType" :key="i" :label="item.channelName"
@ -68,13 +49,6 @@
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="用户类型" prop="userType">
<el-select v-model="queryParams.userType" placeholder="请选择用户类型" size="medium">
<el-option v-for="dict in typeCon" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="订单来源" prop="sourceType"> <el-form-item label="订单来源" prop="sourceType">
<el-select v-model="queryParams.sourceType" placeholder="请选择订单来源" size="medium"> <el-select v-model="queryParams.sourceType" placeholder="请选择订单来源" size="medium">
<el-option v-for="dict in dict.type.source_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.source_type" :key="dict.value" :label="dict.label"
@ -82,12 +56,21 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="代付时间"> <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" style="width: 240px;border-color: #E6F1FF;" <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px"
value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :picker-options="pickerOptions" :unlink-panels="true"></el-date-picker> end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="更新时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</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">
@ -159,7 +142,7 @@
{{ scope.row.outChannelName }} {{ scope.row.outChannelName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'商户名称\n代付时间'" align="center" prop="storeNo" min-width="150"> <el-table-column :label="'商户名称\n创建时间'" align="center" prop="storeNo" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.storeName }}<br /> {{ scope.row.storeName }}<br />
{{ scope.row.createTime }} {{ scope.row.createTime }}
@ -170,6 +153,11 @@
{{ scope.row.sourceType == 's_manual' ? '手工提单' : 'API下发' }} {{ scope.row.sourceType == 's_manual' ? '手工提单' : 'API下发' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="'更新时间'" align="center" prop="storeNo" min-width="120">
<template slot-scope="scope">
{{ scope.row.updateTime }}
</template>
</el-table-column>
<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"
min-width="80"> min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
@ -180,7 +168,7 @@
@click="handleViewMy(scope.row)">详情</el-button> @click="handleViewMy(scope.row)">详情</el-button>
<el-button size="small" v-if="scope.row.orderStatus == 'processsuccess'" type="text" <el-button size="small" v-if="scope.row.orderStatus == 'processsuccess'" type="text"
style="color: #006EFF;" @click="handleRecharge(scope.row)" style="color: #006EFF;" @click="handleRecharge(scope.row)"
v-hasPermi="['order:rechargeRecord:paymentReissueNotice']">补发通知</el-button> v-hasPermi="['record:paymentReissueNotice']">补发通知</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -227,7 +215,7 @@
</el-dialog> </el-dialog>
<!-- 详情 --> <!-- 详情 -->
<el-dialog v-dialogDrag :close-on-click-modal="false" title="详情" :visible.sync="isShowDetailMy" width="70%" <el-dialog v-dialogDrag :close-on-click-modal="false" title="详情" :visible.sync="isShowDetailMy" width="60%"
append-to-body> append-to-body>
<el-form label-width="142px" :label-suffix="':'"> <el-form label-width="142px" :label-suffix="':'">
<div class="card-detail flex"> <div class="card-detail flex">
@ -647,7 +635,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
platform_payment_list platform_payment_list
.listInfo(this.addSESDateRange(this.queryParams, this.dateRange)) .listInfo(this.addSESDateRange(this.queryParams, this.dateRange, 'type'))
.then((response) => { .then((response) => {
this.infoList = response.rows; this.infoList = response.rows;
this.total = Number(response.total); this.total = Number(response.total);

93
src/views/pay/payOrder/payMoneyCalcu.vue

@ -17,9 +17,10 @@
@keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<el-form-item label="统计日期"> <el-form-item label="统计日期">
<el-date-picker v-model="dateRange" style="width: 240px;border-color: #E6F1FF;" <el-date-picker v-model="dateRange" size="small" style="width: 340px"
value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true"></el-date-picker> end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
@ -86,7 +87,91 @@ export default {
components: { pkCouponScopeRangeStoreList }, components: { pkCouponScopeRangeStoreList },
data() { data() {
return { 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]);
}
},
]
},
userLevType: [ userLevType: [
], ],

7
src/views/pay/payOrder/payMoneyWater.vue

@ -55,9 +55,10 @@
</el-form-item> </el-form-item>
<el-form-item label="交易时间"> <el-form-item label="交易时间">
<el-date-picker v-model="dateRange" style="width: 240px;border-color: #E6F1FF;" <el-date-picker v-model="dateRange" size="small" style="width: 340px"
value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :picker-options="pickerOptions" :unlink-panels="true"></el-date-picker> end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></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;">

7
src/views/pay/payOrder/payOrderRecord.vue

@ -27,9 +27,10 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px" <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<el-form-item label="交易时间"> <el-form-item label="交易时间">
<el-date-picker v-model="dateRange" style="width: 240px;border-color: #E6F1FF;" <el-date-picker v-model="dateRange" size="small" style="width: 340px"
value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :picker-options="pickerOptions" :unlink-panels="true"></el-date-picker> end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="商户名称" prop="storeName"> <el-form-item label="商户名称" prop="storeName">
<el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称" <el-input size="medium" v-model="queryParams.storeName" placeholder="请输入商户名称"

27
src/views/pay/payOrder/payOrderWater.vue

@ -75,11 +75,18 @@
end-placeholder="结束日期" :picker-options="pickerOptions" :unlink-panels="true"></el-date-picker> end-placeholder="结束日期" :picker-options="pickerOptions" :unlink-panels="true"></el-date-picker>
</el-form-item> --> </el-form-item> -->
<el-form-item label="交易时间"> <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss" <el-date-picker v-model="dateRange[0]" size="small" style="width: 340px"
type="datetimerange" range-separator="-" :picker-options="pickerOptions" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']"></el-date-picker> :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item>
<el-form-item label="支付时间">
<el-date-picker v-model="dateRange[1]" size="small" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
@ -238,9 +245,10 @@
</el-form-item> </el-form-item>
<el-form-item label="通知状态"> <el-form-item label="通知状态">
{{ detailInfoList.notifyRemark }} {{ detailInfoList.notifyStatus=='notify_failed'?'回调失败':detailInfoList.notifyStatus=='notify_success'?'回调成功':'未回调' }}
</el-form-item> </el-form-item>
<el-form-item label='交易状态'> <el-form-item label='交易状态'>
<el-tag v-if="detailInfoList.orderStatus" :type="detailInfoList.orderStatus == 'pay_unpaid' ? 'warning' : detailInfoList.orderStatus == 'pay_success' ? 'success' : <el-tag v-if="detailInfoList.orderStatus" :type="detailInfoList.orderStatus == 'pay_unpaid' ? 'warning' : detailInfoList.orderStatus == 'pay_success' ? 'success' :
detailInfoList.orderStatus == 'pay_failure' ? 'danger' : detailInfoList.orderStatus == 'pay_processing' ? 'warning' : 'primary' detailInfoList.orderStatus == 'pay_failure' ? 'danger' : detailInfoList.orderStatus == 'pay_processing' ? 'warning' : 'primary'
@ -284,6 +292,10 @@
</el-form-item> --> </el-form-item> -->
</div> </div>
<div> <div>
<el-form-item label="通知备注">
{{ detailInfoList.notifyRemark }}
</el-form-item>
<el-form-item label="通道手续费金额"> <el-form-item label="通道手续费金额">
{{ detailInfoList.poundageAmt }} {{ detailInfoList.poundageAmt }}
</el-form-item> </el-form-item>
@ -641,8 +653,7 @@ export default {
} else { } else {
this.systemDate = date.year + '-' + 0 + date.month + '-' + date.date; this.systemDate = date.year + '-' + 0 + date.month + '-' + date.date;
} }
this.dateRange[0] = this.systemDate + ' ' + '00' + ':' + '00' + ':' + '00' this.dateRange[0] = [this.systemDate + ' ' + '00' + ':' + '00' + ':' + '00', this.systemDate + ' ' + '23' + ':' + '59' + ':' + '59']
this.dateRange[1] = this.systemDate + ' ' + '23' + ':' + '59' + ':' + '59'
this.$forceUpdate() this.$forceUpdate()
}, },
@ -746,7 +757,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
payOrder payOrder
.rechargeRecord(this.addSESDateRange(this.queryParams, this.dateRange)) .rechargeRecord(this.addSESDateRange(this.queryParams, this.dateRange, 'type'))
.then((response) => { .then((response) => {
this.infoList = response.rows; this.infoList = response.rows;
this.total = Number(response.total); this.total = Number(response.total);

7
src/views/pay/payOrder/paySettleWater.vue

@ -34,9 +34,10 @@
<el-form-item label="交易时间"> <el-form-item label="交易时间">
<el-date-picker v-model="dateRange" style="width: 240px;border-color: #E6F1FF;" <el-date-picker v-model="dateRange" size="small" style="width: 340px"
value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :picker-options="pickerOptions" :unlink-panels="true"></el-date-picker> end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="" size="medium" @click="handleQuery">搜索</el-button>

7
src/views/pay/payOrder/payuOrderWater.vue

@ -83,9 +83,10 @@
</el-form-item> </el-form-item>
<el-form-item label="代付时间"> <el-form-item label="代付时间">
<el-date-picker v-model="dateRange" style="width: 240px;border-color: #E6F1FF;" <el-date-picker v-model="dateRange" size="small" style="width: 340px"
value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :picker-options="pickerOptions" :unlink-panels="true"></el-date-picker> end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

7
src/views/pay/payOrder/payuwater.vue

@ -67,9 +67,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="交易时间"> <el-form-item label="交易时间">
<el-date-picker v-model="dateRange" style="width: 240px;border-color: #E6F1FF;" <el-date-picker v-model="dateRange" size="small" style="width: 340px"
value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期" :picker-options="pickerOptions" :unlink-panels="true"></el-date-picker> end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

9
src/views/pay/payTest/payCode.vue

@ -36,9 +36,14 @@
<el-input v-model="form.payKey" placeholder="" style="width: 315px;border-color: #E6F1FF;" <el-input v-model="form.payKey" placeholder="" style="width: 315px;border-color: #E6F1FF;"
v-hasPermi="['pay:test:query']" /> v-hasPermi="['pay:test:query']" />
</el-form-item> --> </el-form-item> -->
<el-form-item label="交易金额" prop="tranAmt"> <el-form-item label="交易金额" prop="tranAmt">
<el-input v-model="form.tranAmt" placeholder="" style="width: 315px;border-color: #E6F1FF;" /> <el-input v-model="form.tranAmt" placeholder="" style="width: 315px;border-color: #E6F1FF;" />
</el-form-item> </el-form-item>
<!-- payerName -->
<el-form-item label="付款人姓名" prop="">
<el-input v-model="form.payerName" placeholder="" style="width: 315px;border-color: #E6F1FF;" />
</el-form-item>
<el-form-item label="支付类型" prop="payType"> <el-form-item label="支付类型" prop="payType">
<el-select v-model="form.payType" placeholder="请选择支付类型" clearable size="medium"> <el-select v-model="form.payType" placeholder="请选择支付类型" clearable size="medium">
@ -126,6 +131,9 @@ export default {
showCode: false, showCode: false,
rules: { rules: {
payerName: [
{ required: true, message: "请输入付款人", trigger: "blur" },
],
version: [ version: [
{ required: true, message: "请输入版本号", trigger: "blur" }, { required: true, message: "请输入版本号", trigger: "blur" },
], ],
@ -177,6 +185,7 @@ export default {
productDesc: '商品描述', productDesc: '商品描述',
req_data: null, req_data: null,
mediaType: null, mediaType: null,
payerName:null,
}, },
list: [ list: [
{ {

99
src/views/system/config/index.vue

@ -11,7 +11,7 @@
</el-row> </el-row>
</div> </div>
<div class="bg"> <div class="bg">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" class="flex form" style="padding:0 20px"> <el-form :model="queryParams" ref="queryForm" size="medium" :inline="true" v-show="showSearch" label-width="68px" class="flex form" style="padding:0 20px">
<el-form-item label="参数名称" prop="configName"> <el-form-item label="参数名称" prop="configName">
<el-input <el-input
v-model="queryParams.configName" v-model="queryParams.configName"
@ -41,15 +41,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
v-model="dateRange" type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
style="width: 240px" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></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;">
@ -201,6 +195,91 @@ export default {
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],
data() { data() {
return { 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, loading: true,
// //

2
src/views/system/dept/index.vue

@ -11,7 +11,7 @@
</el-row> </el-row>
</div> </div>
<div class="bg"> <div class="bg">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="flex form" <el-form :model="queryParams" ref="queryForm" size="medium" :inline="true" v-show="showSearch" class="flex form"
style="padding:0 20px"> style="padding:0 20px">
<el-form-item label="部门名称" prop="deptName"> <el-form-item label="部门名称" prop="deptName">
<el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery" />

97
src/views/system/dict/index.vue

@ -49,15 +49,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
v-model="dateRange" type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
style="width: 240px" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></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;">
@ -231,6 +225,91 @@ export default {
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
data() { data() {
return { 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, loading: true,
// //

2
src/views/system/menu/index.vue

@ -13,7 +13,7 @@
</div> </div>
<div class="bg"> <div class="bg">
<el-form class="flex form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" <el-form class="flex form" :model="queryParams" ref="queryForm" size="medium" :inline="true" v-show="showSearch"
style="padding:0 20px"> style="padding:0 20px">
<el-form-item label="菜单名称" prop="menuName"> <el-form-item label="菜单名称" prop="menuName">
<el-input v-model="queryParams.menuName" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.menuName" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery" />

2
src/views/system/notice/index.vue

@ -12,7 +12,7 @@
</el-row> </el-row>
</div> </div>
<div class="bg"> <div class="bg">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" class="flex form" style="padding:0 20px"> <el-form :model="queryParams" ref="queryForm" size="medium" :inline="true" v-show="showSearch" label-width="68px" class="flex form" style="padding:0 20px">
<el-form-item label="公告标题" prop="noticeTitle"> <el-form-item label="公告标题" prop="noticeTitle">
<el-input <el-input
v-model="queryParams.noticeTitle" v-model="queryParams.noticeTitle"

2
src/views/system/post/index.vue

@ -11,7 +11,7 @@
</el-row> </el-row>
</div> </div>
<div class="bg"> <div class="bg">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" class="flex form" style="padding:0 20px"> <el-form :model="queryParams" ref="queryForm" size="medium" :inline="true" v-show="showSearch" label-width="68px" class="flex form" style="padding:0 20px">
<el-form-item label="岗位编码" prop="postCode"> <el-form-item label="岗位编码" prop="postCode">
<el-input v-model="queryParams.postCode" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.postCode" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>

92
src/views/system/role/index.vue

@ -14,7 +14,7 @@
<div class="bg"> <div class="bg">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="flex form" <el-form :model="queryParams" ref="queryForm" size="medium" :inline="true" v-show="showSearch" class="flex form"
style="padding:0 20px"> style="padding:0 20px">
<el-form-item label="角色名称" prop="roleName"> <el-form-item label="角色名称" prop="roleName">
<el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable
@ -32,8 +32,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" style="width: 240px;border-color: #E6F1FF;" value-format="yyyy-MM-dd" <el-date-picker v-model="dateRange" size="medium" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></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;">
@ -188,6 +189,91 @@ export default {
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
data() { data() {
return { 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, loading: true,
// //

92
src/views/system/user/index.vue

@ -31,8 +31,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" <el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -281,6 +282,91 @@ export default {
components: { Treeselect }, components: { Treeselect },
data() { data() {
return { 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]);
}
},
]
},
// //
openCode: false, openCode: false,
// //
@ -564,7 +650,7 @@ export default {
this.dateRange = []; this.dateRange = [];
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.deptId = undefined; this.queryParams.deptId = undefined;
this.$refs.tree.setCurrentKey(null); // this.$refs.tree.setCurrentKey(null);
this.handleQuery(); this.handleQuery();
}, },
// //

92
src/views/tool/gen/index.vue

@ -12,7 +12,7 @@
</div> </div>
<div class="bg"> <div class="bg">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" <el-form :model="queryParams" ref="queryForm" size="medium" :inline="true" v-show="showSearch" label-width="68px"
class="flex form" style="padding:0 20px"> class="flex form" style="padding:0 20px">
<el-form-item label="表名称" prop="tableName"> <el-form-item label="表名称" prop="tableName">
<el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable @keyup.enter.native="handleQuery" />
@ -21,8 +21,9 @@
<el-input v-model="queryParams.tableComment" placeholder="请输入表描述" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.tableComment" placeholder="请输入表描述" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" <el-date-picker v-model="dateRange" size="small" style="width: 340px" value-format="yyyy-MM-dd HH:mm:ss"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :unlink-panels="true"
:default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions"></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;">
@ -116,6 +117,91 @@ export default {
components: { importTable }, components: { importTable },
data() { data() {
return { 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, loading: true,
// //

BIN
7uppay.zip → 测试7uppay.zip

Binary file not shown.
Loading…
Cancel
Save