From 20ba9778ea1348f7719acd7abf7411f77056cd53 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 10:15:12 +0800
Subject: [PATCH] feat(bpm): 北方科技流程模型三项改造(对标中亿装配)
---
src/views/bpm/model/form/modules/basic-info.vue | 58 ++++++++++++++---------------
src/views/bpm/model/form/modules/process-design.vue | 7 +++
src/views/bpm/model/form/index.vue | 44 +++++++++++-----------
3 files changed, 56 insertions(+), 53 deletions(-)
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index 8ac2c8d..3bd2c3f 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -188,7 +188,7 @@
} else {
// 鎯呭喌涓夛細鏂板鍦烘櫙
formData.value.startUserType = 0; // 鍏ㄤ綋
- formData.value.managerUserIds.push(userStore.userInfo?.id);
+ // 娴佺▼绠$悊鍛橀粯璁ゅ�肩◢鍚庤缃紙闇�瑕佸厛鍔犺浇鐢ㄦ埛鍒楄〃鎵嶈兘瀹氫綅瓒呯骇绠$悊鍛橈級
}
// 鑾峰彇琛ㄥ崟鍒楄〃
@@ -198,6 +198,24 @@
userList.value = await getSimpleUserList();
// 鑾峰彇閮ㄩ棬鍒楄〃
deptList.value = await getSimpleDeptList();
+
+ // 娴佺▼绠$悊鍛樺浐瀹氫负瓒呯骇绠$悊鍛橈紙瀹㈡埛瑕佹眰锛岀晫闈笂涓嶇粰閫夋嫨锛夈��
+ // 鍚屾椂鎶娿�屽綋鍓嶆搷浣滀汉銆嶄竴骞跺啓鍏ワ細鍚庣 updateModel 鏄�屽厛鏍¢獙绠$悊鍛樸�佸悗鍐欏叆銆嶏紝
+ // 鍙啓瓒呯鐨勮瘽锛屾崲涓�涓处鍙峰啀淇敼灏变細鎶ャ�屼綘涓嶆槸璇ユ祦绋嬬殑绠$悊鍛樸�嶏紝涓旀棤娉曡嚜鎰堛��
+ const adminUser = userList.value.find(
+ (user: SystemUserApi.User) => user.username === 'admin',
+ );
+ const currentUserId = userStore.userInfo?.id;
+ const managerIds: number[] = [];
+ if (adminUser?.id) {
+ managerIds.push(adminUser.id);
+ }
+ if (currentUserId && !managerIds.includes(currentUserId)) {
+ managerIds.push(currentUserId);
+ }
+ if (managerIds.length > 0) {
+ formData.value.managerUserIds = managerIds;
+ }
// 鏈�缁堬紝璁剧疆 currentStep 鍒囨崲鍒扮涓�姝�
currentStep.value = 0;
@@ -355,27 +373,9 @@
/** 姝ラ鍒囨崲澶勭悊 */
async function handleStepClick(index: number) {
- try {
- if (index !== 0) {
- await validateBasic();
- }
- if (index !== 1) {
- await validateForm();
- }
- if (index !== 2) {
- await validateProcess();
- }
- if (index !== 3) {
- await validateExtra();
- }
- // 鍒囨崲姝ラ
- currentStep.value = index;
- } catch (error) {
- console.error('姝ラ鍒囨崲澶辫触:', error);
- if (currentStep.value !== 2) {
- message.warning('璇峰厛瀹屽杽褰撳墠姝ラ蹇呭~淇℃伅');
- }
- }
+ // 姝ラ涔嬮棿鍏佽鑷敱鍒囨崲锛堝惈鍓嶈繘鍜屽悗閫�锛夛紝鍒囨崲鏃朵笉鍋氭牎楠岋紱
+ // 蹇呭~淇℃伅鐨勬牎楠岀粺涓�鍦ㄣ�屼繚瀛樸�嶃�屽彂甯冦�嶆椂鎵ц锛坴alidateAllSteps锛夛紝閬垮厤鍗″湪涓棿姝ラ鍑轰笉鍘�
+ currentStep.value = index;
}
/** 杩斿洖鍒楄〃椤� */
diff --git a/src/views/bpm/model/form/modules/basic-info.vue b/src/views/bpm/model/form/modules/basic-info.vue
index a297e25..3810aad 100644
--- a/src/views/bpm/model/form/modules/basic-info.vue
+++ b/src/views/bpm/model/form/modules/basic-info.vue
@@ -14,6 +14,7 @@
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
import { IconifyIcon } from '@vben/icons';
+import { useUserStore } from '@vben/stores';
import {
Avatar,
@@ -56,6 +57,7 @@
const formRef = ref(); // 琛ㄥ崟寮曠敤
const modelData = defineModel<any>(); // 鍒涘缓鏈湴鏁版嵁鍓湰
+const userStore = useUserStore(); // 褰撳墠鐧诲綍鐢ㄦ埛锛堝啓鍏ユ祦绋嬬鐞嗗憳锛岄伩鍏嶆崲璐﹀彿鍚庢棤娉曞啀淇敼妯″瀷锛�
const selectedStartUsers = ref<SystemUserApi.User[]>([]); // 閫変腑鐨勫彂璧蜂汉
const selectedStartDepts = ref<SystemDeptApi.Dept[]>([]); // 閫変腑鐨勫彂璧烽儴闂�
@@ -113,6 +115,28 @@
newVal.managerUserIds.includes(user.id),
) as SystemUserApi.User[])
: [];
+ // 娴佺▼绠$悊鍛樺浐瀹氫负瓒呯骇绠$悊鍛橈細杩涘叆椤甸潰鍗冲己鍒跺洖鍐欙紝淇敼鍦烘櫙鍚屾牱鐢熸晥銆�
+ // 娉ㄦ剰锛氬悓鏃舵妸銆屽綋鍓嶆搷浣滀汉銆嶄竴骞跺啓鍏ャ�傚洜涓哄悗绔� updateModel 鏄�屽厛鏍¢獙绠$悊鍛樸�佸悗鍐欏叆銆嶏紝
+ // 涓�鏃︽ā鍨嬭淇濆瓨鎴愬彧鍖呭惈瓒呯锛岀敤鍏朵粬璐﹀彿鍐嶆淇敼灏变細鎶�
+ // 銆屾搷浣滄祦绋嬪け璐ワ紝鍘熷洜锛氫綘涓嶆槸璇ユ祦绋�(xxx)鐨勭鐞嗗憳銆嶏紝涓旀棤娉曡嚜鎰堛��
+ const admin = props.userList.find(
+ (user: SystemUserApi.User) => user.username === 'admin',
+ );
+ const currentUserId = userStore.userInfo?.id;
+ const managerIds: number[] = [];
+ if (admin) {
+ managerIds.push(admin.id);
+ }
+ if (currentUserId && !managerIds.includes(currentUserId)) {
+ managerIds.push(currentUserId);
+ }
+ if (managerIds.length > 0) {
+ newVal.managerUserIds = managerIds;
+ // 鐣岄潰涓婁粛鐒跺彧灞曠ず銆岃秴绾х鐞嗗憳銆�
+ const displayUser =
+ admin ?? props.userList.find((user) => user.id === managerIds[0]);
+ selectedManagerUsers.value = displayUser ? [displayUser] : [];
+ }
},
{
immediate: true,
@@ -398,36 +422,10 @@
</div>
</Form.Item>
<Form.Item label="娴佺▼绠$悊鍛�" name="managerUserIds">
- <div class="flex flex-wrap gap-1">
- <div
- v-for="user in selectedManagerUsers"
- :key="user.id"
- class="relative flex h-9 items-center rounded-full bg-gray-100 pr-2 hover:bg-gray-200 dark:border dark:border-gray-500 dark:bg-gray-700 dark:hover:bg-gray-600"
- >
- <Avatar class="m-1 size-7" v-if="user.avatar" :src="user.avatar" />
- <Avatar class="m-1 size-7" v-else>
- {{ user.nickname?.substring(0, 1) }}
- </Avatar>
- <span class="text-gray-700 dark:text-gray-200">
- {{ user.nickname }}
- </span>
- <IconifyIcon
- icon="lucide:x"
- class="ml-2 size-4 cursor-pointer text-gray-400 hover:text-red-500"
- @click="handleRemoveManagerUser(user)"
- />
- </div>
- <Button
- type="link"
- @click="openManagerUserSelect"
- class="flex items-center"
- >
- <template #icon>
- <IconifyIcon icon="lucide:user-plus" class="size-4" />
- </template>
- 閫夋嫨浜哄憳
- </Button>
- </div>
+ <!-- 娴佺▼绠$悊鍛樺浐瀹氫负瓒呯骇绠$悊鍛橈紝涓嶅厑璁搁�夋嫨 -->
+ <span class="text-gray-700 dark:text-gray-200">
+ {{ selectedManagerUsers[0]?.nickname || '瓒呯骇绠$悊鍛�' }}
+ </span>
</Form.Item>
</Form>
diff --git a/src/views/bpm/model/form/modules/process-design.vue b/src/views/bpm/model/form/modules/process-design.vue
index 8f2495b..22c9edd 100644
--- a/src/views/bpm/model/form/modules/process-design.vue
+++ b/src/views/bpm/model/form/modules/process-design.vue
@@ -47,7 +47,12 @@
/** 鏄惁鏄剧ず璁捐鍣� */
const showDesigner = computed(() => {
- return Boolean(modelData.value?.key && modelData.value?.name);
+ // 绠�鏄撹璁″櫒锛圫imple 绫诲瀷锛夊缁堟樉绀猴紝涓嶄緷璧� key/name锛�
+ // 鍙湁 BPMN 璁捐鍣ㄦ墠瑕佹眰鍏堝~鍐欐祦绋嬫爣璇嗕笌鍚嶇О
+ if (modelData.value?.type === BpmModelType.BPMN) {
+ return Boolean(modelData.value?.key && modelData.value?.name);
+ }
+ return true;
});
defineExpose({ validate });
--
Gitblit v1.9.3