合并

src/views/design/received/index.vue

@@ -17,6 +17,7 @@
               <el-select
                 :disabled="disabledAll"
                 v-model="form.userId"
+                filterable
                 placeholder="请选择收资人"
                 class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
               >
@@ -93,6 +94,7 @@
                   <el-select
                     :disabled="disabledAll"
                     v-model="item.userId"
+                    filterable
                     placeholder="请选择人员"
                     class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
                   >
@@ -181,6 +183,7 @@ import { systemUserList } from '@/api/design/appointment';
 import { collectBatch, byProjectId, exportWord } from '@/api/design/received';
 import { getUser } from '@/api/system/user';
 import type { ComponentInternalInstance, ElFormInstance } from 'element-plus';
+import { getInfo } from '@/api/login';
 
 // 全局实例与状态管理
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -202,7 +205,7 @@ const disabledAll = ref(false); // 表单是否全部禁用
 const form = reactive({
   projectId: currentProject.value?.id,
   userId: '', // 收资人
-  user_major: '', // 专业
+  user_major: '1', // 专业
   phone: '', // 电话
   email: '', // 邮箱
   id: '', // 表单ID
@@ -273,6 +276,8 @@ const byProjectIdAll = async () => {
     disabledAll.value = false;
 
     if (res.code == 200 && res.data) {
+      console.log('🚀 ~ byProjectIdAll ~ res:', res);
+
       const data = res.data;
       // 回显基本信息
       form.userId = data.userId || '';
@@ -415,7 +420,7 @@ const onView = () => {
 /** 获取当前用户详情（回显个人信息） */
 const getUserDetail = async () => {
   try {
-    const res = await getUser(userId.value);
+    const res = await getInfo();
     if (res.data?.user) {
       form.userId = res.data.user.userId;
       form.phone = res.data.user.phonenumber || '';