From 7c0d09c62791a7f25aada5690663dbacea9c10de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Wed, 16 Apr 2025 15:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/enums.js                            |  1 +
 .../components/AreaJoinEditDialog.vue         | 22 ++++++++++++-------
 src/views/bst/areaJoin/index.vue              | 20 +++++++++++------
 src/views/bst/device/components/DeviceSn.vue  |  2 +-
 src/views/bst/device/view/view.vue            |  2 +-
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/utils/enums.js b/src/utils/enums.js
index 6103bb0..b28c743 100644
--- a/src/utils/enums.js
+++ b/src/utils/enums.js
@@ -148,6 +148,7 @@ export const DeviceLockStatus = {
 export const AreaJoinType = {
   JOIN: "1", // 加盟
   COOPERATE: "2", // 合伙
+  OPERATION: "3", // 运维
 }
 
 // 订单状态
diff --git a/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue b/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue
index 0d59571..b4bf172 100644
--- a/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue
+++ b/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue
@@ -14,18 +14,20 @@
         </form-col>
         <form-col :span="span" label="类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择类型" style="width: 100%;">
-            <el-option
-              v-for="dict in dict.type.area_join_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <template v-for="dict in dict.type.area_join_type">
+              <el-option
+                v-if="types.includes(dict.value)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </template>
           </el-select>
         </form-col>
         <form-col :span="span" label="绑定用户" prop="userPhone">
           <el-input v-model="form.userPhone" placeholder="请输入绑定用户手机号" />
         </form-col>
-        <form-col :span="span" label="分成比例" prop="point">
+        <form-col :span="span" label="分成比例" prop="point" v-if="form.type !== AreaJoinType.OPERATION">
           <el-input v-model="form.point" placeholder="请输入分成比例">
             <template slot="append">%</template>
           </el-input>
@@ -70,6 +72,10 @@ export default {
     initData: {
       type: Object,
       default: () => ({})
+    },
+    types: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
@@ -123,7 +129,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        type: AreaJoinType.JOIN,
+        type: this.types?.[0],
         areaId: null,
         userId: null,
         point: null,
diff --git a/src/views/bst/areaJoin/index.vue b/src/views/bst/areaJoin/index.vue
index 97fc135..b24f787 100644
--- a/src/views/bst/areaJoin/index.vue
+++ b/src/views/bst/areaJoin/index.vue
@@ -11,12 +11,14 @@
       </el-form-item>
       <el-form-item label="类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择类型" clearable @change="handleQuery">
-          <el-option
-            v-for="dict in dict.type.area_join_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <template v-for="dict in dict.type.area_join_type">
+            <el-option
+              v-if="types.includes(dict.value)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </template>
         </el-select>
       </el-form-item>
       <el-form-item label="用户" prop="userName">
@@ -145,6 +147,7 @@
       :id="editId"
       :init-data="initData"
       @success="getList"
+      :types="types"
     />
   </div>
 </template>
@@ -212,10 +215,13 @@ export default {
         userId: null,
         remark: null,
         createId: null
-      }
+      },
+      types: [],  // 类型列表
     };
   },
   created() {
+    this.types = this.$route.query?.types?.split(',') || [];
+    this.queryParams.types = this.types;
     this.getList();
   },
   methods: {
diff --git a/src/views/bst/device/components/DeviceSn.vue b/src/views/bst/device/components/DeviceSn.vue
index 2cf4d87..d75d89c 100644
--- a/src/views/bst/device/components/DeviceSn.vue
+++ b/src/views/bst/device/components/DeviceSn.vue
@@ -41,7 +41,7 @@ export default {
   computed: {
     // 二维码文本
     qrCodeText() {
-      return "https://wc.chuangtewl.com/xl/xd?s=" + this.sn;
+      return "https://wx.ccttiot.com/x/d?s=" + this.sn;
     },
   },
   methods: {
diff --git a/src/views/bst/device/view/view.vue b/src/views/bst/device/view/view.vue
index b07ff26..45b48f9 100644
--- a/src/views/bst/device/view/view.vue
+++ b/src/views/bst/device/view/view.vue
@@ -77,7 +77,7 @@
           <collapse-panel :value="true" title="运营信息">
             <el-descriptions :column="1">
               <el-descriptions-item label="运营区">{{ detail.areaName | dv }}</el-descriptions-item>
-              <el-descriptions-item label="运营商">{{ detail.mchName | dv }}</el-descriptions-item>
+              <el-descriptions-item label="车辆归属">{{ detail.mchName | dv }}</el-descriptions-item>
               <el-descriptions-item label="车型名称">{{ detail.modelName | dv }}</el-descriptions-item>
             </el-descriptions>
           </collapse-panel>