From 37a2b3a61f687d0dffb4b9365bbd18aa429dbc2e Mon Sep 17 00:00:00 2001
From: bestlee <bestlee@djxinxi.net>
Date: Thu, 8 Oct 2026 14:52:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=94=B3=E8=AF=B7-=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8B=E8=AE=BE=E7=BD=AE=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/my/initiateChange/index.vue         | 21 ++++++++++++++++++-
 .../my/initiateChange/modules/changeApply.vue |  3 ++-
 .../my/initiateChange/modules/footer.vue      |  5 +++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/views/my/initiateChange/index.vue b/src/views/my/initiateChange/index.vue
index 11560bf..42b09d8 100644
--- a/src/views/my/initiateChange/index.vue
+++ b/src/views/my/initiateChange/index.vue
@@ -8,7 +8,7 @@ import { localStg } from '@/utils/storage';
 import { storeToRefs } from 'pinia';
 import { useChangeStore } from '@/store/modules/change';
 import { queryUnsavedApi, saveChangeApi, submitChangeApi, getChangeDetailApi } from '@/service/api/change';
-import { systemConfigApi, templateListApi, } from '@/service/api/system';
+import { systemConfigApi, templateListApi, peopleListApi } from '@/service/api/system';
 import { orgListApi } from '@/service/api/user';
 import { formatTimestamp, anyToTimestamp } from "@/utils/common";
 import ChangePre from "./modules/changePre.vue";
@@ -35,6 +35,8 @@ const changeTrainingRef = ref<any>(null);
 const pssrRef = ref<any>(null);
 const evaluationRef = ref<any>(null);
 const closeConfirmRef = ref<any>(null);
+// 所有人员
+const memberList = ref<any>([]);
 // 表单数据
 const changePreForm = ref<any>(null)
 const changeApplyForm = ref<any>(null)
@@ -324,7 +326,23 @@ const getOrgList = async () => {
   }
 }
 
+// 获取所有人员
+const getAllMembers = async () => {
+  const {data,error} = await peopleListApi();
+  if(!error){
+    const transformed = data.map((item:any) => ({
+      user_id: item.id,
+      user_name: item.realname,
+      full_name: item.realname + (`(${item.user_departments.map((d:any) => d.label).join(';')})`),
+      org_id: item.user_departments.map((d:any) => d.organization_id).join(';'),
+      org_name: item.user_departments.map((d:any) => d.label).join(';')
+    }));
+    memberList.value = transformed;
+  }
+}
+
 onMounted(() => {
+  getAllMembers();
   getOrgList();
   getConfig();
   getTemplateConfig();
@@ -397,6 +415,7 @@ onMounted(() => {
           :formInfo="changePreForm" 
           :currentForm="changeApplyForm"
           :confirmed="confirmed[tab]"
+          :members="memberList"
           @save="saveDraft"
           @submit="submitConfirm"
           @confirmTab="confirmTab"
diff --git a/src/views/my/initiateChange/modules/changeApply.vue b/src/views/my/initiateChange/modules/changeApply.vue
index 389e885..cad98df 100644
--- a/src/views/my/initiateChange/modules/changeApply.vue
+++ b/src/views/my/initiateChange/modules/changeApply.vue
@@ -14,7 +14,7 @@ import previewComponent from '@/components/previewFile/index.vue'
 const themeStore = useThemeStore();
 const changeStore = useChangeStore();
 
-const props = defineProps(['type','orgTree','templateList','typeList','levelList','isAiOpen','title','currentId','formInfo', 'currentForm', 'confirmed'])
+const props = defineProps(['type','orgTree','templateList','typeList','levelList','isAiOpen','title','currentId','formInfo', 'currentForm', 'confirmed','members'])
 const emit = defineEmits(['save','submit','confirmTab','update:title']);
 
 watch(() => props.currentForm, (newVal:any) => {
@@ -663,6 +663,7 @@ defineExpose({form, questions, applyAiResult, generateLevel: useAiLevel})
   :isAiOpen="props.isAiOpen"
   :currentForm="form"
   :confirmed="props.confirmed"
+  :members="props.members"
   @save="saveDraft"
   @submit="submitConfirm"
   @confirmTab="confirmTab"
diff --git a/src/views/my/initiateChange/modules/footer.vue b/src/views/my/initiateChange/modules/footer.vue
index fc4a48b..77e9f40 100644
--- a/src/views/my/initiateChange/modules/footer.vue
+++ b/src/views/my/initiateChange/modules/footer.vue
@@ -15,7 +15,8 @@ const props = defineProps([
     'title',
     'isAiOpen',
     'currentForm',
-    'confirmed'
+    'confirmed',
+    'members',
 ])
 const emit = defineEmits(['save','submit','confirmTab','regenerate']);
 
@@ -243,7 +244,7 @@ defineExpose({clearApprovers, setRegenerateLoading})
             <div class="mb-2 flex items-center gap-2 text-sm font-semibold text-slate-700">
                 <NTag type="info" size="small">{{Number(index)+1}}</NTag> {{item.name}} {{item.countersign ? '（专业会签）' : ''}}
             </div>
-            <NSelect :value="approvers[item.id]" multiple :options="item.members" label-field="user_name" value-field="user_id"
+            <NSelect :value="approvers[item.id]" multiple :options="props.members" label-field="full_name" value-field="user_id"
             @update:value="(v) => updateApprover(item.id, v)" />
         </div>
         <NButton v-if="flowList.length" type="primary" class="w-full" @click="finishApprover">完成设置</NButton>