From 8c03d543b88144eb5bd84260b1fb43846426b801 Mon Sep 17 00:00:00 2001 From: tx <2622874537@qq.com> Date: Fri, 18 Oct 2024 18:03:20 +0800 Subject: [PATCH] 11 --- src/views/system/accessory/index.vue | 4 +- src/views/system/channelWithdraw/index.vue | 181 ++++++++++----------- src/views/system/partner/index.vue | 35 +++- 3 files changed, 117 insertions(+), 103 deletions(-) diff --git a/src/views/system/accessory/index.vue b/src/views/system/accessory/index.vue index 36fd93c..6d78560 100644 --- a/src/views/system/accessory/index.vue +++ b/src/views/system/accessory/index.vue @@ -119,9 +119,9 @@ - +
确 定 diff --git a/src/views/system/channelWithdraw/index.vue b/src/views/system/channelWithdraw/index.vue index 64437dc..ba59b0d 100644 --- a/src/views/system/channelWithdraw/index.vue +++ b/src/views/system/channelWithdraw/index.vue @@ -2,33 +2,28 @@
- + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 是 @@ -43,127 +38,116 @@ - 导出 + 导出 - + - + - + - + - - - - - + + + {{ dict.label }} + + + + + + + + + + + + + + + + + - + - + - + @@ -189,22 +173,22 @@ const defaultSort = { export default { name: "ChannelWithdraw", mixins: [$showColumns, $withdrawServiceType], - dicts: ['account_type', 'withdraw_service_type'], + dicts: ['account_type', 'withdraw_service_type','rl_handling_charge_type'], data() { return { span: 12, // 字段列表 columns: [ - {key: 'channelId', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"}, - {key: 'name', visible: true, label: '渠道名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'picture', visible: true, label: '图片', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"}, - {key: 'enabled', visible: true, label: '是否启用', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + { key: 'channelId', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80" }, + { key: 'name', visible: true, label: '渠道名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null }, + { key: 'picture', visible: true, label: '图片', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100" }, + { key: 'enabled', visible: true, label: '是否启用', minWidth: null, sortable: true, overflow: false, align: 'center', width: null }, // {key: 'accountType', visible: true, label: '对应账户类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, // {key: 'serviceType', visible: true, label: '服务费收取类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'serviceRate', visible: true, label: '手续费', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'costRate', visible: true, label: '渠道成本', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'minAmount', visible: true, label: '单笔最低', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'maxAmount', visible: true, label: '单笔最高', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + { key: 'serviceRate', visible: true, label: '手续费', minWidth: null, sortable: true, overflow: false, align: 'center', width: null }, + { key: 'costRate', visible: true, label: '渠道成本', minWidth: null, sortable: true, overflow: false, align: 'center', width: null }, + { key: 'minAmount', visible: true, label: '单笔最低', minWidth: null, sortable: true, overflow: false, align: 'center', width: null }, + { key: 'maxAmount', visible: true, label: '单笔最高', minWidth: null, sortable: true, overflow: false, align: 'center', width: null }, ], // 排序方式 orderSorts: ['ascending', 'descending', null], @@ -266,10 +250,11 @@ export default { }, created() { this.getList(); + console.log(this.dict.type,'dict.typedict.type'); }, methods: { onChangeEnabled(row, enabled) { - updateChannelWithdraw({channelId: row.channelId, enabled: enabled}).catch(() => { + updateChannelWithdraw({ channelId: row.channelId, enabled: enabled }).catch(() => { row.enabled = !enabled; }) }, @@ -324,7 +309,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.channelId) - this.single = selection.length!==1 + this.single = selection.length !== 1 this.multiple = !selection.length }, /** 新增按钮操作 */ @@ -366,12 +351,12 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const channelIds = row.channelId || this.ids; - this.$modal.confirm('是否确认删除提现渠道编号为"' + channelIds + '"的数据项？').then(function() { + this.$modal.confirm('是否确认删除提现渠道编号为"' + channelIds + '"的数据项？').then(function () { return delChannelWithdraw(channelIds); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); + }).catch(() => { }); }, /** 导出按钮操作 */ handleExport() { diff --git a/src/views/system/partner/index.vue b/src/views/system/partner/index.vue index 77877db..c1b7f7a 100644 --- a/src/views/system/partner/index.vue +++ b/src/views/system/partner/index.vue @@ -181,16 +181,21 @@ - - + + + + + + + @@ -273,6 +278,7 @@ import { updateExt } from "@/api/rl/ext"; import { getToken } from "@/utils/auth"; import { listCity } from "@/api/rl/common"; import Treeselect from "@riophae/vue-treeselect"; +import { listAgent, getAgent, delAgent, addAgent, updateAgent } from "@/api/rl/agent"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { @@ -360,6 +366,7 @@ export default { value: '04', label: '调度员' }], + agentList:[], // 表单校验 rules: { dividendProportion: [ @@ -399,13 +406,35 @@ export default { }, created() { this.getList(); + setTimeout(() => { + console.log(this.dicts,'dictsdicts'); + }, 200); + // this.getDeptTree(); this.getConfigKey("sys.user.initPassword").then(response => { this.initPassword = response.msg; }); this.getListCity(); + this.getAgentList() }, methods: { + getAgentList() { + let data = { + pageNum: 1, + pageSize: 30, + + } + listAgent(this.addDateRange(data)).then(response => { + console.log(response,'responseresponseresponse'); + this.agentList=response.rows + // this.options = response.rows.map(item => ({ + // value: item.userId, + // label: item.realName+' ' +item.phonenumber + // })); + console.log( this.options,' this.options this.options'); + }); + + }, formatDividendProportion(row) { let dividendProportion = row.dividendProportion; if (dividendProportion !== null && dividendProportion !== undefined) {