From 14817696a26eb142ccae03fa7c43050840e057f5 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:35:03 +0800
Subject: [PATCH] feat(mes): 优化生产订单与排产任务列表显示，新增启停工及校验逻辑 1. 生产订单列表展示优化 (WorkOrder) - 新增「生产状态」列，全局注册 `ORDER_PRODUCTION_STATUS` 常量并绑定系统动态字典。 - 彻底重构「工序生产进度」单元格显示：弃用臃肿的 Steps 组件，改为极简横向布局（彩色状态圆点 + 进度百分比），解决表格行高被强行撑开及内容截断问题，支持横向滚动。 - 优化「完成进度」列宽及展示样式，将百分比数值外置同行显示，更加直观。 2. 排产任务列表改造 (Task) - 顶部表头重构，由单一标题重构为「全部 / 未完成 / 已完成」的 Tabs 标签页切换结构。 - 重写数据过滤逻辑，剥离写死的 status 查询，改为使用 `scheduleStatus` 字段动态响应 Tabs 切换 (0: 未完成, 1: 已完成)。 3. 工单业务逻辑增强与状态流转 - 落实「工单查询逻辑设计方案」，优化底层的工单条件检索逻辑。 - 实现「添加工单启停功能」与「停工状态」，支持工单在执行过程中的暂停与恢复业务流转。 - 强化容错与防呆设计：操作「完成订单」时增加前置校验 `handleCheckFinish`，若生产状态为未完成，强制弹出二次确认 Modal，避免误操作。 # 相关讨论/参考方案 # - 添加工单启停功能 # - 停工状态功能设计方案 # - 工单查询逻辑设计方案 # - 工单完成进度显示优化
---
src/views/im/home/components/group/group-create-dialog.vue | 144 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 144 insertions(+), 0 deletions(-)
diff --git a/src/views/im/home/components/group/group-create-dialog.vue b/src/views/im/home/components/group/group-create-dialog.vue
new file mode 100644
index 0000000..18b87a5
--- /dev/null
+++ b/src/views/im/home/components/group/group-create-dialog.vue
@@ -0,0 +1,144 @@
+<script lang="ts" setup>
+import type { FriendLite } from '../../types'
+
+import { computed, ref } from 'vue'
+
+import { Button, message, Modal } from 'ant-design-vue'
+
+import { createGroup } from '#/api/im/group'
+
+import { buildDefaultGroupName } from '../../../utils/group'
+import { useFriendStore } from '../../store/friendStore'
+import { useGroupStore } from '../../store/groupStore'
+import { FriendPickerPanel } from '../picker'
+
+defineOptions({ name: 'ImGroupCreateDialog' })
+
+const emit = defineEmits<{
+ /** 鍒涘缓鎴愬姛锛屾惡甯︽柊缇ょ紪鍙凤紱鐖朵晶閫氬父鐢ㄦ潵璺宠浆鍒版柊缇や細璇� */
+ created: [groupId: number]
+}>()
+
+const friendStore = useFriendStore()
+const groupStore = useGroupStore()
+
+const visible = ref(false)
+const submitting = ref(false)
+const lockedIds = ref<number[]>([])
+const selectedIds = ref<number[]>([])
+
+defineExpose({
+ /** 鎵撳紑鍙戣捣缇よ亰寮圭獥锛歳eset 鈫� 鐏屽弬 鈫� visible=true */
+ open(opts?: { lockedIds?: number[] }) {
+ lockedIds.value = opts?.lockedIds ? [...opts.lockedIds] : []
+ selectedIds.value = []
+ submitting.value = false
+ visible.value = true
+ }
+})
+
+/** 鍏ㄩ噺濂藉弸锛氱洿鎺ュ鐢� friendStore Lite 瑙嗗浘锛堝甫鎷奸煶瀛楁渚涘垎妗剁敤锛� */
+const friends = computed<FriendLite[]>(() => friendStore.getActiveFriendLiteList)
+
+/** 瀹屾垚鎸夐挳鍙偣锛氳嚦灏戞湁 1 涓潪 locked 鍕鹃�夛紙locked 鏄叆鍙ｉ攣瀹氶」锛屼笉绠�"鐢ㄦ埛涓诲姩閫夋嫨"锛� */
+const canSubmit = computed(() => selectedIds.value.length > 0)
+
+/** 鎷垮埌鎵�鏈夎杩涚兢鐨勫ソ鍙嬶紙locked + selected锛夛紱寤虹兢榛樿缇ゅ悕鎸夎繖鎵逛汉鐢熸垚 */
+function resolveMembersToInvite(): FriendLite[] {
+ const seen = new Set<number>()
+ const result: FriendLite[] = []
+ const byId = new Map(friends.value.map((f) => [f.id, f]))
+ for (const id of lockedIds.value) {
+ if (seen.has(id)) {
+ continue
+ }
+ const friend = byId.get(id)
+ if (friend) {
+ seen.add(id)
+ result.push(friend)
+ }
+ }
+ for (const id of selectedIds.value) {
+ if (seen.has(id)) {
+ continue
+ }
+ const friend = byId.get(id)
+ if (friend) {
+ seen.add(id)
+ result.push(friend)
+ }
+ }
+ return result
+}
+
+/** 鍒涘缓缇よ亰锛氬缓缇わ紙鍚屾椂閭�璇峰垵濮嬫垚鍛橈級鈫� upsert groupStore 鈫� emit created 璁╃埗椤佃烦杞柊浼氳瘽 */
+async function handleOk() {
+ const members = resolveMembersToInvite()
+ if (members.length === 0) {
+ return
+ }
+ submitting.value = true
+ try {
+ const memberUserIds = members.map((m) => m.id)
+ const name = buildDefaultGroupName(members)
+ const group = await createGroup({ name, memberUserIds, joinApproval: false })
+ if (!group?.id) {
+ throw new Error('鍒涘缓缇ゅけ璐ワ細鏈繑鍥炵兢缂栧彿')
+ }
+ // 鐩存帴 upsert 杩� groupStore锛岀渷涓�娆� fetchGroupList 鈥斺�� 鏈嶅姟绔繑鍥� VO 宸茬粡澶熷缓浼氳瘽浜�
+ groupStore.upsertGroup({
+ id: group.id,
+ name: group.name,
+ avatar: group.avatar,
+ notice: group.notice,
+ ownerUserId: group.ownerUserId
+ })
+ message.success('缇よ亰鍒涘缓鎴愬姛')
+ emit('created', group.id)
+ visible.value = false
+ } finally {
+ submitting.value = false
+ }
+}
+</script>
+
+<template>
+ <!--
+ 鍙戣捣缇よ亰锛氶�夊ソ鍙� 鈫� 榛樿鎸夋墍閫夋垚鍛樺悕鐢熸垚缇ゅ悕 鈫� createGroup
+ - dialog 澹虫湰缁勪欢鎸佹湁锛涢�夋嫨 UI 濮旀墭 FriendPickerPanel
+ - lockedIds 鐢辫皟鐢ㄦ柟閫氳繃 open({ lockedIds }) 浼犲叆锛涚鑱婁晶 +寤虹兢閿佸畾瀵规柟
+ - 涓嶅啀瑕佹眰鍏堣緭鍏ョ兢鍚� / 涓嶅啀灞曠ず銆岃繘缇ゅ鎵广�嶅紑鍏筹紝瀵归綈寰俊 PC
+ - 瀵瑰鎺ュ彛锛歳ef + open({ lockedIds }) + emit created(groupId)
+ -->
+ <Modal
+ v-model:open="visible"
+ title="鍙戣捣缇よ亰"
+ width="720px"
+ :mask-closable="false"
+ class="im-picker-dialog"
+ >
+ <div class="h-[480px]">
+ <FriendPickerPanel
+ v-model:selected-ids="selectedIds"
+ :friends="friends"
+ :locked-ids="lockedIds"
+ />
+ </div>
+
+ <template #footer>
+ <Button @click="visible = false">鍙栨秷</Button>
+ <Button type="primary" :loading="submitting" :disabled="!canSubmit" @click="handleOk">
+ 瀹屾垚
+ </Button>
+ </template>
+ </Modal>
+</template>
+
+<style scoped lang="scss">
+@use '../picker/picker-dialog' as picker;
+
+/* :deep 绌块�� el-dialog 鍐呴儴绫伙紱澶嶇敤 picker 鍏叡 mixin */
+.im-picker-dialog {
+ @include picker.styles;
+}
+</style>
--
Gitblit v1.9.3