From 1deae1d89a7039ef0b943be291f6c1b9aaa5ad2c Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 10:30:33 +0800
Subject: [PATCH] feat(mes): 生产报工新增「可报工数量」展示 - `src/api/mes/pro/task/index.ts`: `MesProTaskApi.Task` 接口新增 `reportableQuantity` (可报工数量) 字段定义 - `src/views/mes/pro/feedback/data.ts`: - 生产报工弹框表单中新增「可报工数量」字段展示，设置为不可编辑，且仅在新建/编辑模式下显示 - 在生产任务选择弹框 (`ProTaskSelect`) 的 `onChange` 事件中，自动从选中的任务对象中提取并带入 `reportableQuantity` - 完善了表单联动的重置逻辑，确保更换工单等操作时正确清空此字段
---
src/views/im/home/composables/useGroupCallMembers.ts | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/src/views/im/home/composables/useGroupCallMembers.ts b/src/views/im/home/composables/useGroupCallMembers.ts
new file mode 100644
index 0000000..b6fb416
--- /dev/null
+++ b/src/views/im/home/composables/useGroupCallMembers.ts
@@ -0,0 +1,53 @@
+import { computed, type ComputedRef, type Ref } from 'vue'
+
+import { ImConversationType } from '../../utils/constants'
+import { getSenderAvatar, getSenderDisplayName } from '../../utils/user'
+import { useRtcStore } from '../store/rtcStore'
+
+/** 缇ら�氳瘽鎴愬憳瑙嗗浘妯″瀷锛氬凡鍔犲叆 + 鎺ュ叆涓紱pending 澶村儚 UI 鍗婇�忔槑锛宩oined 涓嶉�忔槑 */
+export interface GroupCallMember {
+ userId: number
+ nickname: string
+ avatar?: string
+ pending: boolean
+}
+
+/**
+ * 缇ら�氳瘽鎴愬憳鍒楄〃 computed锛歫oined 鍦ㄥ墠锛屾湭 joined 鐨� invitee 鍦ㄥ悗锛�
+ * 缂撳瓨涓虹┖锛堟潵鐢甸灞忔覆鏌撴棭浜� syncGroupActiveCall 鍥炲啓锛夋椂鐢� fallback 涓诲彨鍏滃簳锛岄伩鍏嶇┖鐧�
+ *
+ * @param groupId 缇ょ紪鍙�
+ * @param fallbackInviterId 鍏滃簳涓诲彨锛涚紦瀛樹负绌烘椂濉竴涓ご鍍忥紝鏍囪涓哄凡鍔犲叆鑰岄潪 pending
+ */
+export function useGroupCallMembers(
+ groupId: Ref<number | undefined>,
+ fallbackInviterId?: Ref<number | undefined>
+): ComputedRef<GroupCallMember[]> {
+ const rtcStore = useRtcStore()
+ return computed(() => {
+ const gid = groupId.value
+ if (!gid) {
+ return []
+ }
+ const groupCall = rtcStore.getGroupCall(gid)
+ const joinedIds = groupCall?.joinedUserIds ?? []
+ const inviteeIds = groupCall?.inviteeIds ?? []
+ const joinedSet = new Set(joinedIds)
+ const orderedIds = [...joinedIds, ...inviteeIds.filter((id) => !joinedSet.has(id))]
+ if (orderedIds.length > 0) {
+ return orderedIds.map((userId) => toVM(userId, gid, !joinedSet.has(userId)))
+ }
+ const fallback = fallbackInviterId?.value
+ return fallback ? [toVM(fallback, gid, false)] : []
+ })
+}
+
+/** 鎶� userId 缈昏瘧鎴愯鍥炬ā鍨嬶紝缁熶竴璧� user.ts helper 瑙ｆ瀽鏄电О / 澶村儚 */
+function toVM(userId: number, groupId: number, pending: boolean): GroupCallMember {
+ return {
+ userId,
+ nickname: getSenderDisplayName(userId, ImConversationType.GROUP, groupId),
+ avatar: getSenderAvatar(userId, ImConversationType.GROUP, groupId) || undefined,
+ pending
+ }
+}
--
Gitblit v1.9.3