mdm-client 1.0.2 → 1.0.4

package/src/components/other/addressBook.vue

@@ -47,6 +47,31 @@
               </template>
             </vue-virtual-tree>
 
+            <!-- 会议终端树 -->
+             <vue-virtual-tree
+              v-show="activeTab === '会议终端'"
+              ref="terminalTreeRef"
+              :data="terminalTreeData"
+              :props="{ children: 'children', label: 'label' }"
+              node-key="id"
+              show-checkbox
+              :height="dynamicTreeHeight"
+              :item-height="36"
+              @check="handleNodeCheck"
+              :filter-node-method="filterNode"
+            >
+              <template #default="{ node, data }">
+                <span class="custom-tree-node">
+                  <span class="custom-tree-node-label" :title="node.label" v-if="data.isDept">{{
+                    node.label
+                  }}</span>
+                  <span class="custom-tree-node-user" v-else>
+                    <span :class="['custom-tree-node-icon']"></span>
+                    <span class="custom-tree-node-label" :title="node.label">{{ node.label }}</span>
+                  </span>
+                </span>
+              </template>
+            </vue-virtual-tree>
             <!-- 应用树 -->
             <vue-virtual-tree
               v-show="activeTab === '人员'"
@@ -73,6 +98,31 @@
               </template>
             </vue-virtual-tree>
 
+            <!-- volte树 -->
+            <vue-virtual-tree
+              v-show="activeTab === 'volte'"
+              ref="volteTreeRef"
+              :data="volteTreeData"
+              :props="{ children: 'children', label: 'label' }"
+              node-key="id"
+              show-checkbox
+              :height="dynamicTreeHeight"
+              :item-height="36"
+              @check="handleNodeCheck"
+              :filter-node-method="filterNode"
+            >
+              <template #default="{ node, data }">
+                <span class="custom-tree-node">
+                  <span class="custom-tree-node-label" :title="node.label" v-if="data.isDept">{{
+                    node.label
+                  }}</span>
+                  <span class="custom-tree-node-user" v-else>
+                    <span :class="['custom-tree-node-icon']"></span>
+                    <span class="custom-tree-node-label" :title="node.label">{{ node.label }}</span>
+                  </span>
+                </span>
+              </template>
+            </vue-virtual-tree>
             <!-- 常用分组树 -->
             <vue-virtual-tree
               v-show="activeTab === '常用分组'"
@@ -165,7 +215,18 @@
           <div class="checkutl">
             <div v-for="item of tempInviteList" :key="item.id" class="userFlex">
               <div class="label">
-                <span :class="['custom-item-icon', getInviteItemIconClass(item)]"></span> {{ item.label }}
+                <span :class="['custom-item-icon', getInviteItemIconClass(item)]"></span>
+                <span>{{ item.label }}</span>
+                <!-- 会议终端：小输入框编辑会议ID，Enter/失焦提交 -->
+                <el-input
+                  v-if="item.source === '会议终端' && item.callMethod == 1"
+                  v-model="item._callMeetingID"
+                  class="terminal-id-input"
+                  placeholder="请输入会议ID"
+                  @keyup.enter="confirmTerminalMeetingId(item)"
+                  @blur="confirmTerminalMeetingId(item)"
+                />
+                <span :class="getChosenItemPlatformClass(item)"></span>
               </div>
               <div class="close" @click="removeInviteItem(item)"></div>
             </div>
@@ -207,7 +268,7 @@
 
 <script>
 import { debounce } from "lodash-es";
-import { mittBus, ShowMessage, deleteCommonGroupAndUser, getAddressOrgTree, getAddressAppTree, getCommonOrgTree, queryEquipmentAddressBook, queryMonitorAddressBook } from "../../utils/index";
+import { mittBus, ShowMessage, deleteCommonGroupAndUser, getAddressOrgTree, getAddressAppTree, getCommonOrgTree, queryEquipmentAddressBook, queryMonitorAddressBook, getVolteAddressBook, getMeetingRoomAddressBook, updateConfTerminal } from "../../utils/index";
 import VueVirtualTree from "@fit2cloud-ui/vue-virtual-tree";
 import CustomGroupDialog from "./customGroupDialog.vue";
 import EditGroupDialog from "./editGroupDialog.vue";
@@ -236,6 +297,12 @@ export default {
       type: String,
       default: "",
     },
+    tabList: {
+      type: Array,
+      default: () => {
+        return ["组织架构", "人员", "会议终端", "volte", "设备", "监控", "常用分组"];
+      },
+    }
   },
   data() {
     return {
@@ -243,14 +310,15 @@ export default {
       
       // 树数据
       treeData: [],
+      terminalTreeData: [],
       appTreeData: [],
+      volteTreeData: [],
       groupTreeData: [],
       equipmentTreeData: [],
       monitorTreeData: [],
       
       // 标签页相关
       activeTab: "组织架构",
-      tabList: ["组织架构", "人员", "设备", "监控", "常用分组"],
       
       // 搜索相关
       filterText: "",
@@ -316,17 +384,17 @@ export default {
     
     // 监听对话框显示状态
     isaddressShow: {
-      async handler(newVal) {
+      handler(newVal) {
         if (newVal) {
           // 初始化选中状态
           this.isSyncing = true;
           this.chosenList = [...this.tempInviteList];
-          await this.$nextTick();
-          this.syncTreeSelectionFromChosenList();
-          // 更新树高度
-          await this.$nextTick();
-          this.updateTreeHeight();
-          this.isSyncing = false;
+          this.$nextTick(() => {
+            this.syncTreeSelectionFromChosenList();
+            // 更新树高度
+            this.updateTreeHeight();
+            this.isSyncing = false;
+          });
         }
       }
     }
@@ -341,23 +409,28 @@ export default {
         this.$refs.orgTreeRef.filter(val);
       } else if (this.activeTab === "人员" && this.$refs.appTreeRef) {
         this.$refs.appTreeRef.filter(val);
+      } else if (this.activeTab === "volte" && this.$refs.volteTreeRef) {
+        this.$refs.volteTreeRef.filter(val);
       } else if (this.activeTab === "常用分组" && this.$refs.groupTreeRef) {
         this.$refs.groupTreeRef.filter(val);
       } else if (this.activeTab === "设备" && this.$refs.equipmentTreeRef) {
         this.$refs.equipmentTreeRef.filter(val);
       } else if (this.activeTab === "监控" && this.$refs.monitorTreeRef) {
         this.$refs.monitorTreeRef.filter(val);
-      }
+      } else if (this.activeTab === "会议终端" && this.$refs.terminalTreeRef) {
+        this.$refs.terminalTreeRef.filter(val);
+      } 
     }, 300);
     
     // 监听mitt事件
     mittBus.on("getaddressBookUser", (e) => {
       this.filterText = "";
       // 转换props.inviteList的数据格式以适配新的tree结构
-      this.tempInviteList = this.inviteList.map((item) => {
-        // 如果已经是新格式，直接使用
-        return item;
-      });
+      // this.tempInviteList = this.inviteList.map((item) => {
+      //   // 如果已经是新格式，直接使用
+      //   return item;
+      // });
+      this.tempInviteList = []
       this.isaddressShow = true;
       if (e) {
         this.isInner = e.isInner;
@@ -397,6 +470,14 @@ export default {
         this.appTreeData = res.data.data;
       }
     },
+
+    // 获取volte树数据
+    async getVolteTreeData() {
+      const res = await getVolteAddressBook({}, { baseUrl: this.baseUrl, token: this.token });
+      if(res.data?.code == 200) {
+        this.volteTreeData = res.data.data;
+      }
+    },
     
     // 获取常用分组树数据
     async getGroupTreeData() {
@@ -421,14 +502,29 @@ export default {
         this.monitorTreeData = res.data.data;
       }
     },
-    
+    // 获取会议终端树数据
+    async getTerminalTreeData() {
+      try {
+        const res = await getMeetingRoomAddressBook({}, { baseUrl: this.baseUrl, token: this.token });
+        if (res.data?.code == 200) {
+          const data = res.data?.data || [];
+          this.terminalTreeData = data.length > 0 ? data : [];
+        } else {
+          this.terminalTreeData = [];
+        }
+      } catch (e) {
+        this.terminalTreeData = [];
+      }
+    },
     // 获取所有树数据
     async getAllTreeData() {
       await this.getOrgTreeData();
       await this.getAppTreeData();
+      await this.getVolteTreeData();
       await this.getGroupTreeData();
       await this.getEquipmentTreeData();
       await this.getMonitorTreeData();
+      await this.getTerminalTreeData();
     },
     
     // 过滤树节点的方法 - 虚拟树使用filter-node-method
@@ -456,16 +552,20 @@ export default {
         // 修改判断条件，只有当isDept为false时，才是叶子节点
         // isDept为true的节点(即使是空数组)都视为非叶子节点
         if (!node.isDept) {
-          leafNodes.push({
-            ...node,
-            source: this.activeTab, // 记录节点来源于哪个树
-          });
+          leafNodes.push(this.prepareChosenUser(node, this.activeTab));
         }
       });
 
       return leafNodes;
     },
-    
+    // 构建已选用户对象：当来源为“会议终端”时，初始化 _callMeetingID，避免输入框为空
+    prepareChosenUser(raw, source) {
+      const user = { ...raw, source };
+      if (source === '会议终端') {
+        user._callMeetingID = raw?.callMeetingID ?? '';
+      }
+      return user;
+    },
     // 更新chosenList，保留其他树的选中状态
     updateChosenListWithLeafNodes(newLeafNodes) {
       // 从chosenList中过滤掉当前激活树的节点
@@ -474,13 +574,39 @@ export default {
       // 将当前树的新叶子节点添加进来
       const mergedList = [...otherTreeNodes];
 
-      // 添加新节点，避免重复
+      // 添加新节点，避免重复（基于source+id组合判断）
+      const validNewNodes = [];
       newLeafNodes.forEach((node) => {
-        if (!mergedList.some((item) => item.id === node.id)) {
-          mergedList.push(node);
+        if (!mergedList.some((item) => item.id === node.id && item.source === node.source)) {
+          validNewNodes.push(node);
         }
       });
-
+      // 检查 volte 用户数量限制（限制volte用户总数，不限于当前标签页）
+      const currentVolteCount = mergedList.filter(user => user.source === 'volte').length;
+      const newVolteNodes = validNewNodes.filter(node => node.source === 'volte');
+
+      if (currentVolteCount + newVolteNodes.length > 10) {
+        // 超出限制，需要处理
+        if (this.activeTab === 'volte') {
+          // 如果当前在volte标签页，清空当前树的选中状态并提示
+          this.$refs.volteTreeRef && this.$refs.volteTreeRef.setCheckedKeys([]);
+          this.showMessage.message('warning', '单次VoLTE呼叫仅支持选择10人');
+          // 只保留其他树的选中状态，不添加新的volte节点
+          this.chosenList = otherTreeNodes;
+          return;
+        } else {
+          // 如果不在volte标签页，只添加非volte节点，并提示volte限制
+          const nonVolteNodes = validNewNodes.filter(node => node.source !== 'volte');
+          if (newVolteNodes.length > 0) {
+            this.showMessage.message('warning', '单次VoLTE呼叫仅支持选择10人，VoLTE用户未添加');
+          }
+          mergedList.push(...nonVolteNodes);
+          this.chosenList = mergedList;
+          return;
+        }
+      }
+      // 添加所有有效的新节点
+      mergedList.push(...validNewNodes);
       this.chosenList = mergedList;
     },
     
@@ -491,16 +617,20 @@ export default {
         this.$refs.orgTreeRef.setCheckedKeys([]);
       } else if (this.activeTab === "人员" && this.$refs.appTreeRef) {
         this.$refs.appTreeRef.setCheckedKeys([]);
+      } else if (this.activeTab === "volte" && this.$refs.volteTreeRef) {
+        this.$refs.volteTreeRef.setCheckedKeys([]);
       } else if (this.activeTab === "常用分组" && this.$refs.groupTreeRef) {
         this.$refs.groupTreeRef.setCheckedKeys([]);
       } else if (this.activeTab === "设备" && this.$refs.equipmentTreeRef) {
         this.$refs.equipmentTreeRef.setCheckedKeys([]);
       } else if (this.activeTab === "监控" && this.$refs.monitorTreeRef) {
         this.$refs.monitorTreeRef.setCheckedKeys([]);
+      } else if (this.activeTab === "会议终端" && this.$refs.terminalTreeRef) {
+        this.$refs.terminalTreeRef.setCheckedKeys([]);
       }
       
       // 然后根据chosenList设置选中状态
-      const selectedIds = this.chosenList.map((user) => user.id);
+      const selectedIds = this.chosenList.filter(user => user.source === this.activeTab).map((user) => user.id);
 
       if (this.activeTab === "组织架构" && this.$refs.orgTreeRef) {
         selectedIds.forEach((id) => {
@@ -510,6 +640,10 @@ export default {
         selectedIds.forEach((id) => {
           this.$refs.appTreeRef.setChecked(id, true, false);
         });
+      } else if (this.activeTab === "volte" && this.$refs.volteTreeRef) {
+        selectedIds.forEach((id) => {
+          this.$refs.volteTreeRef.setChecked(id, true, false);
+        });
       } else if (this.activeTab === "常用分组" && this.$refs.groupTreeRef) {
         selectedIds.forEach((id) => {
           this.$refs.groupTreeRef.setChecked(id, true, false);
@@ -522,6 +656,10 @@ export default {
         selectedIds.forEach((id) => {
           this.$refs.monitorTreeRef.setChecked(id, true, false);
         });
+      } else if (this.activeTab === "会议终端" && this.$refs.terminalTreeRef) {
+        selectedIds.forEach((id) => {
+          this.$refs.terminalTreeRef.setChecked(id, true, false);
+        });
       }
     },
     
@@ -541,17 +679,40 @@ export default {
     
     // 根据邀请列表项类型获取图标类名
     getInviteItemIconClass(item) {
-      if (item.source !== '设备' && item.source !== '监控') return 'custom-item-icon-person';
-      return item.source === '设备' ? 'custom-item-icon-device' : 'custom-item-icon-monitor';
+      if (item.source !== '设备' && item.source !== '监控' && item.source !== 'volte') return 'custom-item-icon-person';
+      if (item.source === '设备') return 'custom-item-icon-device';
+      if (item.source === '监控') return 'custom-item-icon-monitor';
+      if (item.source === 'volte') return 'custom-item-icon-person'; // volte 使用人员图标
+      return 'custom-item-icon-person';
+    },
+    getChosenItemPlatformClass(item) {
+      if(item.source === "组织架构") {
+        return 'platform platform-mini'
+      } else if(item.source === "人员") {
+        return 'platform platform-application'
+      } else if(item.source === "常用分组") {
+        if(item.original === '组织架构') {
+          return 'platform platform-mini'
+        } else if(item.original === '人员') {
+          return 'platform platform-application'
+        } else if(item.original === 'volte') {
+          return 'platform platform-volte'
+        } else {
+          return 'platform platform-unknown'
+        }
+      } else if(item.source === "volte") {
+        return 'platform platform-volte'
+      } else {
+        return 'platform platform-unknown'
+      }
     },
-    
     getinvitation() {
       this.$refs.inviteNonContactDialogRef.open();
     },
 
     addOutterContactToChosenList(outterContact) {
-      // 检查是否已存在
-      if (this.tempInviteList.find((item) => item.id === outterContact.id)) {
+      // 改进的存在性检查：结合source和手机号进行查找
+      if (this.tempInviteList.find((item) => item.phone === outterContact.phone && item.source === outterContact.source)) {
         this.showMessage.message("error", "该人员已存在");
         return;
       }
@@ -571,11 +732,11 @@ export default {
         this.showMessage.message("error", "请先选择要添加的人员");
         return;
       }
-      if(this.tempInviteList.some((item) => item.source === '设备' || item.source === '监控')) {
+      if(this.tempInviteList.some((item) => item.source === '设备' || item.source === '监控' || item.source === '会议终端')) {
         this.showMessage.message("info", "设备和监控人员暂不支持添加分组, 将不会被添加到常用分组");
       }
       // 确保数据格式正确
-      const formattedList = this.tempInviteList.filter((item) => item.source !== '设备' && item.source !== '监控').map((item) => {
+      const formattedList = this.tempInviteList.filter((item) => item.source !== '设备' && item.source !== '监控' && item.source !== '常用分组' && item.source !== '会议终端').map((item) => {
         return {
           id: item.id,
           label: item.label,
@@ -612,13 +773,13 @@ export default {
     },
 
     removeInviteItem(item) {
-      const index = this.tempInviteList.findIndex((user) => user.id === item.id);
+      const index = this.tempInviteList.findIndex((user) => user.id === item.id && user.source === item.source);
       if (index !== -1) {
         this.isSyncing = true;
         this.tempInviteList.splice(index, 1);
 
         // 同步到chosenList
-        const chosenIndex = this.chosenList.findIndex((user) => user.id === item.id);
+        const chosenIndex = this.chosenList.findIndex((user) => user.id === item.id && user.source === item.source);
         if (chosenIndex !== -1) {
           this.chosenList.splice(chosenIndex, 1);
         }
@@ -639,12 +800,36 @@ export default {
         if (this.$refs.monitorTreeRef) {
           this.$refs.monitorTreeRef.setChecked(item.id, false);
         }
+        if( this.$refs.volteTreeRef) {
+          this.$refs.volteTreeRef.setChecked(item.id, false);
+        }
+        if (this.$refs.terminalTreeRef) {
+          this.$refs.terminalTreeRef.setChecked(item.id, false);
+        }
         this.$nextTick(() => {
           this.isSyncing = false;
         });
       }
     },
 
+    // 更新会议终端会议ID（Enter/失焦）
+    async confirmTerminalMeetingId(user) {
+      const newId = (user._callMeetingID || '').toString().trim()
+      const oldId = (user.callMeetingID || '').toString().trim()
+      if (newId === oldId) return
+      try {
+        const res = await updateConfTerminal({ id: user.id, callMeetingID: newId }, { baseUrl: props.baseUrl, token: props.token })
+        if (res.data?.code == 200) {
+          user.callMeetingID = newId
+          this.showMessage.message('success', '会议ID已更新')
+        } else {
+          this.showMessage.message('error', res.data?.msg || '更新会议ID失败')
+        }
+      } catch (e) {
+        this.showMessage.message('error', e.message || '网络异常，更新会议ID失败')
+      }
+    },
+
     cancel() {
       this.tempInviteList = [];
       this.isaddressShow = false;
@@ -652,7 +837,7 @@ export default {
 
     confirm() {
       // 转换数据格式以保持向后兼容
-      const convertedList = this.tempInviteList.filter((item) => item.source !== '设备' && item.source !== '监控').map((item) => {
+      const convertedList = this.tempInviteList.filter((item) => item.source !== '设备' && item.source !== '监控' && item.source !== '会议终端').map((item) => {
         return {
           ...item,
         };
@@ -662,11 +847,17 @@ export default {
           ...item,
         };
       });
-
+      const convertedTerminalList = this.tempInviteList.filter(item => item.source === '会议终端')
+        .map(item => {
+          return {
+            ...item,
+          }
+        })
       this.$emit("inviteListUpdate", convertedList);
       if (this.isInner) {
         this.$emit("appendInvitePeople", convertedList);
         this.$emit("appendInviteDevice", convertedDeviceList);
+        this.$emit("appendInviteTerminal", convertedTerminalList);
       }
       this.isaddressShow = false;
     },
@@ -1036,6 +1227,30 @@ export default {
             font-size: 16px;
             color: var(--theme-font-color);
 
+            :deep(.el-input) {
+              margin-left: 8px;
+              width: 100px;
+              line-height: 28px;
+              height: 28px;
+              border: none;
+              .el-input__inner {
+                box-shadow: none;
+                background-color: transparent;
+                border-radius: 0px;
+                border: none;
+                border-bottom: 1px solid var(--input-border-color);
+                padding: 0 6px;
+                color: var(--theme-font-color);
+                font-size: 14px;
+                font-weight: 400;
+                line-height: 28px;
+                &::placeholder {
+                  color: var(--input-placeholder-color);
+                  font-family: var(--main-font);
+                }
+              }
+            }
+
             .custom-item-icon {
               width: 20px;
               height: 20px;
@@ -1055,6 +1270,18 @@ export default {
                 100%;
               }
             }
+            .platform {
+              display: none;
+              width: 16px;
+              height: 16px;
+              margin-left: 5px;
+              &-mini {
+                background: url("../../assets/image/common/platform_mini_icon.png") no-repeat center / 100% 100%;
+              }
+              &-volte {
+                background: url("../../assets/image/common/platform_volte_icon.png") no-repeat center / 100% 100%;
+              }
+            }
           }
 
           .close {
@@ -1063,6 +1290,16 @@ export default {
             height: 16px;
             background: var(--close-icon) no-repeat center / 100% 100%;
           }
+
+          &:hover {
+            .platform {
+              display: inline-block;
+              &-unknown,
+              &-application {
+                display: none;
+              }
+            }
+          }
         }
       }
     }

package/src/components/other/appointDialog.vue

@@ -123,7 +123,7 @@ export default {
 .appoint-dialog {
   width: 220px;
   position: absolute;
-  z-index: 100;
+  z-index: 2100;
   background: var(--dialog-bg);
   box-shadow: 0px 0px 8px 0px var(--dialog-shadow-color);
   border-radius: 8px;

package/src/components/other/customGroupDialog.vue

@@ -81,7 +81,8 @@ export default {
               userID: item.id,
               userName: item.label,
               phone: item.phone,
-              loginCode: item?.loginCode ? item.loginCode : ""
+              loginCode: item?.loginCode ? item.loginCode : "",
+              source: item.source,
             }
           }),
         }, {