From b2d0ac2db80c08783fd848933230618cc30d76a2 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 30 八月 2023 11:38:24 +0800
Subject: [PATCH] 添加锦汇企业编码. 修复点位列表平铺的bug

---
 src/views/personalCenter/components/SubAccount.vue |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/views/personalCenter/components/SubAccount.vue b/src/views/personalCenter/components/SubAccount.vue
index f2acc07..d09cca9 100644
--- a/src/views/personalCenter/components/SubAccount.vue
+++ b/src/views/personalCenter/components/SubAccount.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="sub-account" v-if="!isShowAdd && !isShowRelate">
-    <div class="head-name">瀛愯处鎴风鐞�</div>
+    <div class="head-name" v-show="showHeadName">瀛愯处鍙风鐞�</div>
     <div class="search">
       <div class="left">
         <div class="id">
@@ -41,6 +41,7 @@
         :data="dataList"
         :fit="true"
         :default-sort="{ prop: 'createTime', order: 'descending' }"
+        v-loading="tbLoading"
       >
         <el-table-column label="搴忓彿" width="55" class-name="index">
           <template slot-scope="scope">{{ scope.$index + 1 + (page - 1) * size }}</template>
@@ -200,10 +201,10 @@
           <el-option
             v-for="item in taskOptions"
             style="font-size: 12px"
-            :key="item.id"
-            :value="item.name"
-            :label="item.name"
-            :title="item.name"
+            :key="item.value"
+            :value="item.value"
+            :label="item.value"
+            :title="item.value"
           ></el-option>
         </el-select>
         <el-select
@@ -251,8 +252,8 @@
     TreeMenu
   },
   computed: {
-    taskOptions() {
-      return this.VideoPhotoData.tasks.filter((item) => !item.isDelete)
+    showHeadName() {
+      return this.$route.path === "/personalCenter"
     }
   },
   data() {
@@ -269,6 +270,7 @@
       }
     }
     return {
+      tbLoading: false,
       searchTime: [this.$moment().format("YYYY-MM-DD 00:00:00"), this.$moment().format("YYYY-MM-DD HH:mm:ss")], //鎼滅储鏃堕棿
       page: 1,
       size: 10, //鍒嗛〉鐩稿叧
@@ -284,6 +286,7 @@
           enable: true
         }
       },
+      taskOptions: [],
       options: {
         lazy: true,
         lazyLoad(node, resolve) {
@@ -385,6 +388,7 @@
     this.fetchDataTree()
   },
   mounted() {
+    this.taskOptions = this.Constants.sceneNameOptions
     this.TreeDataPool.reset()
     this.TreeDataPool.multiple = true
     this.VideoPhotoData.queryTaskList()
@@ -442,8 +446,12 @@
       this.smsEnable = false
       findTaskById({ id: row.id }).then((rsp) => {
         if (rsp && rsp.success && rsp.data != "") {
-          this.smsSceneConfig = rsp.data.taskName.split(",")
-          this.smsLevelConfig = rsp.data.level.split(",")
+          if (rsp.data.taskName != "") {
+            this.smsSceneConfig = rsp.data.taskName.split(",")
+          }
+          if (rsp.data.level != "") {
+            this.smsLevelConfig = rsp.data.level.split(",")
+          }
           this.smsEnable = rsp.data.enable
         }
       })
@@ -551,6 +559,7 @@
           // 缂栬緫涓嶆彁浜ゅ瘑鐮�
           if (this.isEditing) {
             delete json.password
+            json.isChangePwd = false
           }
 
           if (typeof json.areaId === "string") {
@@ -600,6 +609,11 @@
       })
     },
     findUserList() {
+      this.tbLoading = true
+      if (this.inputText.length) {
+        this.inputText = this.inputText.trim()
+      }
+
       findUserList({
         inputText: this.inputText,
         page: this.page,
@@ -613,9 +627,12 @@
           } else {
             this.$notify.error("鍔犺浇瀛愯处鎴峰垪琛ㄥけ璐�")
           }
+
+          this.tbLoading = false
         })
         .catch((e) => {
           this.$notify.error(e.msg)
+          this.tbLoading = false
         })
     },
     goback() {

--
Gitblit v1.8.0