From bad5c665fa13d2180bd1760bbf39845b59cbb9b4 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 13 Sep 2024 14:10:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/channel/index.vue | 77 ++++++++++++++++++++++-------- src/views/system/dept/index.vue | 62 +++++------------------- 2 files changed, 69 insertions(+), 70 deletions(-) diff --git a/src/views/system/channel/index.vue b/src/views/system/channel/index.vue index ab16e5c..ab0f8e9 100644 --- a/src/views/system/channel/index.vue +++ b/src/views/system/channel/index.vue @@ -36,11 +36,11 @@ - - - + + + + + @@ -66,7 +66,7 @@ /> - + @@ -74,14 +74,51 @@ - - - + + + +

相关配置

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
确 定 @@ -136,9 +173,9 @@ export default { name: [ {required: true, message: '渠道名称不能为空', target: 'blur'} ], - enabled: [ - {required: true, type: 'boolean', message: '是否启用不能为空', target: 'blur'} - ], + // enabled: [ + // {required: true, type: 'boolean', message: '是否启用不能为空', target: 'blur'} + // ], costRate: [ {required: true, type: 'number', message: '成本不能为空', target: 'blur'} ], @@ -156,14 +193,14 @@ export default { return parseFloat(val); }, // 更新是否启用 - onChangeEnabled(row, enabled) { - if (row == null) { - return this.$message.warning("参数错误"); - } - updateChannel({channelId: row.channelId, enabled: enabled}).catch(() => { - row.enabled = !enabled; - }) - }, + // onChangeEnabled(row, enabled) { + // if (row == null) { + // return this.$message.warning("参数错误"); + // } + // updateChannel({channelId: row.channelId, enabled: enabled}).catch(() => { + // row.enabled = !enabled; + // }) + // }, onChangeWithdrawEnabled(row, enabled) { if (row == null) { return this.$message.warning("参数错误"); diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 13799e6..1d95c9e 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -230,17 +230,17 @@ - - - - {{dict.label}} - - - + + + + + + + + + + + @@ -315,45 +315,7 @@ -
-

支付相关

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
From c29fd7f110f657e0480117783c342d0b32977b1e Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 13 Sep 2024 22:24:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/dept/index.vue | 28 +++++++++++++++++++++++++++- src/views/system/device/index.vue | 2 +- src/views/system/order/index.vue | 2 +- src/views/system/partner/index.vue | 1 + 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 1d95c9e..f5cf2d6 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -212,7 +212,7 @@ - + + + + + + + + + +
@@ -370,6 +384,7 @@ import { listArea } from '../../../api/system/area' import { fastSearch } from '@/api/user/user' import { getUser } from '@/api/system/user' import { withdraw } from '@/api/system/flow' + import { listChannel } from '@/api/system/channel' export default { name: "Dept", @@ -434,6 +449,8 @@ export default { options: [], // 运营区选项 areaOptions: [], + // 支付渠道选项 + channelOptions: [], // 默认排序 defaultSort: {prop: 'createTime', order: 'descending'}, // 弹出层标题 @@ -478,6 +495,9 @@ export default { handlingCharge: [ { required: true, message: "手续费不能为空", trigger: "blur" } ], + payChannel: [ + { required: true, message: "支付渠道不能为空", trigger: "blur" } + ], // orderNum: [ // { required: true, message: "显示排序不能为空", trigger: "blur" } // ], @@ -670,6 +690,9 @@ export default { this.areaOptions = response.rows; this.form.parentId = 100; }); + listChannel(this.queryParams).then(response => { + this.channelOptions = response.rows; + }); }); }, /** 展开/折叠操作 */ @@ -698,6 +721,9 @@ export default { listArea({ pageNum: 1, pageSize: 999}).then(response => { this.areaOptions = response.rows; }); + listChannel(this.queryParams).then(response => { + this.channelOptions = response.rows; + }); listDeptExcludeChild(row.deptId).then(response => { this.deptOptions = this.handleTree(response.data, "deptId"); if (this.deptOptions.length == 0) { diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue index 761c817..c52a6c6 100644 --- a/src/views/system/device/index.vue +++ b/src/views/system/device/index.vue @@ -1027,7 +1027,7 @@ export default { { key: 13, label: `车辆状态`, visible: true }, { key: 14, label: `锁`, visible: true }, { key: 15, label: `网络`, visible: true }, - { key: 16, label: `二维码`, visible: false }, + { key: 16, label: `二维码`, visible: true }, { key: 17, label: `创建时间`, visible: false }, ], showPlaceSearchMap: false, diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 986144f..349a14a 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -401,7 +401,7 @@ {{ form.rule.name }}
- {{ form.rule.description }} + {{ form.description }}
diff --git a/src/views/system/partner/index.vue b/src/views/system/partner/index.vue index 7831187..63e39b0 100644 --- a/src/views/system/partner/index.vue +++ b/src/views/system/partner/index.vue @@ -438,6 +438,7 @@ export default { dividendStatus: undefined, status: "0", remark: undefined, + payChannel: undefined, areaIds: [], postIds: [], roleIds: [] From 319328c50b9d428870d1cb6867464dc66c10cf28 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Sat, 14 Sep 2024 10:16:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/model/index.vue | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/views/system/model/index.vue b/src/views/system/model/index.vue index 42395b0..d94c789 100644 --- a/src/views/system/model/index.vue +++ b/src/views/system/model/index.vue @@ -80,6 +80,17 @@ + + + +