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: []