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] =?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 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="绑定运营区" label-width="90">
-              <el-select style="width: 85%" v-model="form.areaIds" multiple placeholder="请绑定运营区">
+              <el-select style="width: 91%" v-model="form.areaIds" multiple placeholder="请绑定运营区">
                 <el-option
                   v-for="item in areaOptions"
                   :key="item.areaId"
@@ -223,6 +223,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="支付渠道" label-width="90" prop="payChannel">
+              <el-select style="width: 91%" v-model="form.payChannel" placeholder="请绑定支付渠道">
+                <el-option
+                  v-for="item in channelOptions"
+                  :key="item.channelId"
+                  :label="item.name"
+                  :value="item.channelId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <div v-if="form.parentId != 0">
           <el-row>
 <!--            <el-col :span="12">-->
@@ -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 }}
               </span><br />
                 <span>
-                {{ form.rule.description }}
+                {{ form.description }}
               </span><br />
             </el-form-item>
           </el-col>
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: []