diff --git a/.env.development b/.env.development
index 0269bac..1db4544 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 # 李陈杰 209
-# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
@@ -14,8 +14,6 @@ VITE_APP_ENV = 'development'
 # 朱银
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 
-VITE_APP_BASE_API = 'http://192.168.110.149:8899'
-
 # 无人机接口地址
 
 VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512'
diff --git a/src/api/design/appointment/index.ts b/src/api/design/appointment/index.ts
index 61fdca8..9deefc3 100644
--- a/src/api/design/appointment/index.ts
+++ b/src/api/design/appointment/index.ts
@@ -27,3 +27,11 @@ export const systemUserList = (query) => {
     params: query
   });
 };
+// 查询
+export const desUserList = (query) => {
+  return request({
+    url: '/design/drawingreviewReceipts/desUser/list',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/design/drawingreview/index.ts b/src/api/design/drawingreview/index.ts
index d28e0be..7ed39e6 100644
--- a/src/api/design/drawingreview/index.ts
+++ b/src/api/design/drawingreview/index.ts
@@ -56,7 +56,7 @@ export const fillOutTheDesignVerificationForm = (data) => {
 export const drawingreviewReceipts = (data) => {
   return request({
     url: '/design/drawingreviewReceipts',
-    method: 'post',
+    method: 'put',
     data
   });
 };
@@ -96,3 +96,10 @@ export const drawingreview = (id) => {
     method: 'get'
   });
 };
+// 获取单据
+export const getDrawingreviewReceipts = (id) => {
+  return request({
+    url: '/design/drawingreviewReceipts/review/' + id,
+    method: 'get'
+  });
+};
diff --git a/src/api/materials/materialIssue/index.ts b/src/api/materials/materialIssue/index.ts
index a366fa6..99af31a 100644
--- a/src/api/materials/materialIssue/index.ts
+++ b/src/api/materials/materialIssue/index.ts
@@ -68,3 +68,10 @@ export const getMaterialName = (id: any) => {
     method: 'get'
   });
 };
+//获取出库记录
+export const inventoryList = (id: any) => {
+  return request({
+    url: '/materials/materialIssue/inventory/list/' + id,
+    method: 'get'
+  });
+};
diff --git a/src/api/project/contractor/types.ts b/src/api/project/contractor/types.ts
index f041fa6..0d4ab3f 100644
--- a/src/api/project/contractor/types.ts
+++ b/src/api/project/contractor/types.ts
@@ -28,10 +28,10 @@ export interface ContractorVO {
    * 管理人联系电话
    */
   custodianPhone: string;
-    /**
+  /**
    * 分包类型
    */
-    contractorType?: string;
+  contractorType?: string;
 
   /**
    * 公司相关文件
@@ -54,6 +54,14 @@ export interface ContractorForm extends BaseEntity {
    * 主键id
    */
   id?: string | number;
+  /**
+   * 供应商id
+   */
+  supplierId?: string | number;
+  /**
+   * 供应商
+   */
+  supplier?: string;
 
   /**
    * 主键id
@@ -127,10 +135,10 @@ export interface ContractorQuery extends PageQuery {
    * 管理人联系电话
    */
   custodianPhone?: string;
-    /**
+  /**
    * 分包类型
    */
-    contractorType?: string;
+  contractorType?: string;
 
   /**
    * 日期范围参数
diff --git a/src/api/supplierInput/supplierInput/index.ts b/src/api/supplierInput/supplierInput/index.ts
index 719aa11..834b072 100644
--- a/src/api/supplierInput/supplierInput/index.ts
+++ b/src/api/supplierInput/supplierInput/index.ts
@@ -8,7 +8,7 @@ import { SupplierInputVO, SupplierInputForm, SupplierInputQuery } from '@/api/su
  * @returns {*}
  */
 
-export const listSupplierInput = (query?: SupplierInputQuery): AxiosPromise<SupplierInputVO[]> => {
+export const listSupplierInput = (query?: any): AxiosPromise<SupplierInputVO[]> => {
   return request({
     url: '/supplierInput/supplierInput/list',
     method: 'get',
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 03000a9..f678b11 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -185,6 +185,10 @@ const props = defineProps({
   taskVariables: {
     type: Object as () => Record<string, any>,
     default: () => {}
+  },
+  businessId1: {
+    type: String,
+    default: ''
   }
 });
 //遮罩层
@@ -336,6 +340,9 @@ const handleCompleteTask = async () => {
   }
   if (isDrawing.value) {
     isShowSubmit.value = true;
+    nextTick(() => {
+      detailFormTeRef.value.getInfo(props.businessId1);
+    });
     return;
   }
   await proxy?.$modal.confirm('是否确认提交？');
@@ -538,6 +545,9 @@ const handleTermination = async () => {
 const handleTerminationTask = async () => {
   if (isDrawing.value) {
     isShowTermination.value = true;
+    nextTick(() => {
+      detailFormTeRef.value.getInfo(props.businessId);
+    });
     return;
   }
   const params = {
diff --git a/src/components/ProjectSelector/index.vue b/src/components/ProjectSelector/index.vue
index 5884a27..1259482 100644
--- a/src/components/ProjectSelector/index.vue
+++ b/src/components/ProjectSelector/index.vue
@@ -56,7 +56,13 @@ const handleSelect = async (projectId: string) => {
     text: '项目切换中...',
     background: 'rgba(0, 0, 0, 0.7)'
   });
+  setTimeout(() => {
+    if (loadingInstance && loadingInstance.visible) {
+      loadingInstance.close();
+    }
+  }, 3000);
   await changeProject(projectId);
+  console.log('切换项目', selectedProject);
 
   // 更新项目 & 权限
   userStore.setSelectedProject(selectedProject);
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 8703d66..d1e745a 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -16,7 +16,7 @@
       <template v-if="item.meta" #title>
         <svg-icon :icon-class="item.meta ? item.meta.icon : ''" />
         <span class="menu-title" :title="hasTitle(item.meta?.title)">{{ item.meta?.title }}</span>
-        <span class="bage" v-if="item.meta?.title == '我的任务' && total >= 0">{{ total }}</span>
+        <!-- <span class="bage" v-if="item.meta?.title == '我的任务' && total >= 0">{{ total }}</span> -->
       </template>
 
       <sidebar-item
@@ -59,7 +59,6 @@ const total = ref(0);
 onMounted(() => {
   if (onlyOneChild.value.meta?.title == '我的待办' || props.item.meta?.title == '我的任务') {
     console.log(44444444);
-    
     getWaitingList();
   }
 });
diff --git a/src/permission.ts b/src/permission.ts
index 4a7ff0e..6162675 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -10,6 +10,8 @@ import useUserStore from '@/store/modules/user';
 import useSettingsStore from '@/store/modules/settings';
 import usePermissionStore from '@/store/modules/permission';
 
+let isFirst = false;
+
 NProgress.configure({ showSpinner: false });
 const whiteList = ['/login', '/register', '/social-callback', '/register*', '/register/*', '/materials/purchaseDoc/uploadCode'];
 
@@ -17,56 +19,64 @@ const isWhiteList = (path: string) => {
   return whiteList.some((pattern) => isPathMatch(pattern, path));
 };
 
-router.beforeEach(async (to, from, next) => {
+router.beforeEach(async (to, from) => {
   NProgress.start();
-  if (to.path == '/indexEquipment' || to.path == '/materials/purchaseDoc/uploadCode' || to.path == '/codeDetail') {
-    next();
-  } else if (getToken()) {
-    to.meta.title && useSettingsStore().setTitle(to.meta.title);
-    /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' });
-      NProgress.done();
-    } else if (isWhiteList(to.path)) {
-      next();
-    } else {
-      if (useUserStore().roles.length === 0 || $cache.local.getJSON('isCheckRole')) {
-        isRelogin.show = true;
-        // 判断当前用户是否已拉取完user_info信息
-        const [err] = await tos(useUserStore().getInfo());
-        if (err) {
-          await useUserStore().logout();
-          ElMessage.error(err);
-          next({ path: '/' });
-        } else {
-          isRelogin.show = false;
-          const accessRoutes = await usePermissionStore().generateRoutes();
-          // 根据roles权限生成可访问的路由表
-          accessRoutes.forEach((route) => {
-            if (!isHttp(route.path)) {
-              router.addRoute(route); // 动态添加可访问路由表
-            }
-          });
-          $cache.local.remove('isCheckRole');
 
-          // @ts-expect-error hack方法 确保addRoutes已完成
-          next({ path: to.path, replace: true, params: to.params, query: to.query, hash: to.hash, name: to.name as string }); // hack方法 确保addRoutes已完成
-        }
-      } else {
-        next();
-      }
-    }
-  } else {
-    // 没有token
-    if (isWhiteList(to.path)) {
-      // 在免登录白名单，直接进入
-      next();
-    } else {
-      const redirect = encodeURIComponent(to.fullPath || '/');
-      next(`/login?redirect=${redirect}`); // 否则全部重定向到登录页
-      NProgress.done();
-    }
+  // 特殊页面放行
+  if (['/indexEquipment', '/materials/purchaseDoc/uploadCode', '/codeDetail'].includes(to.path)) {
+    return true;
   }
+
+  // 已登录
+  if (getToken()) {
+    if (to.meta.title) useSettingsStore().setTitle(to.meta.title);
+
+    if (to.path === '/login') {
+      NProgress.done();
+      return { path: '/' };
+    }
+
+    if (isWhiteList(to.path)) {
+      return true;
+    }
+    if ((!isFirst && useUserStore().roles.length === 0) || $cache.local.getJSON('isCheckRole') === 'true') {
+      isFirst = true;
+      isRelogin.show = true;
+
+      const [err] = await tos(useUserStore().getInfo());
+
+      if (err) {
+        await useUserStore().logout();
+        ElMessage.error(err);
+        NProgress.done();
+        return { path: '/' };
+      }
+
+      isRelogin.show = false;
+      const accessRoutes = await usePermissionStore().generateRoutes();
+      accessRoutes.forEach((route) => {
+        if (!isHttp(route.path)) router.addRoute(route);
+      });
+
+      $cache.local.remove('isCheckRole');
+
+      // 确保路由已添加后再跳转
+      return { ...to, replace: true };
+    }
+
+    return true;
+  } else {
+    isFirst = false;
+  }
+
+  // 未登录
+  if (isWhiteList(to.path)) {
+    return true;
+  }
+
+  const redirect = encodeURIComponent(to.fullPath || '/');
+  NProgress.done();
+  return { path: `/login?redirect=${redirect}` };
 });
 
 router.afterEach(() => {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index a2a9836..086d45c 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -28,7 +28,6 @@ const getSelectedProjectFromStorage = () => {
 const getProjectTeamListFromStorage = () => {
   const stored = $cache.local.getJSON('ProjectTeamList');
   console.log('获取缓存的项目班组列表:', stored);
-
   return stored ? stored : null;
 };
 
@@ -75,9 +74,7 @@ export const useUserStore = defineStore('user', () => {
         id: p.projectId,
         name: p.projectName || '未知项目'
       }));
-
       setProjects(projectList);
-
       // 如果有缓存的选中项目，且该项目在当前项目列表中存在，则使用缓存的项目
       const storedProject = getSelectedProjectFromStorage();
       if (storedProject && projectList.some((p) => p.id === storedProject.id)) {
@@ -88,16 +85,14 @@ export const useUserStore = defineStore('user', () => {
       }
     }
     const [err, res] = await to(getUserInfo());
-
     if (res) {
       const data = res.data;
       const user = data.user;
       const profile = user.avatar == '' || user.avatar == null ? defAva : user.avatar;
-
       if (data.roles && data.roles.length > 0) {
-        setRoles();
         permissionList.value = data.permissions;
         roleList.value = data.roles;
+        setRoles();
       } else {
         roles.value = ['ROLE_DEFAULT'];
       }
@@ -112,19 +107,16 @@ export const useUserStore = defineStore('user', () => {
     }
     return Promise.reject(err);
   };
-
   const setInfo = async () => {
     const [err, res] = await to(getUserInfo());
-
     if (res) {
       const data = res.data;
       const user = data.user;
       const profile = user.avatar == '' || user.avatar == null ? defAva : user.avatar;
-
       if (data.roles && data.roles.length > 0) {
-        setRoles();
         permissionList.value = data.permissions;
         roleList.value = data.roles;
+        setRoles();
       } else {
         roles.value = ['ROLE_DEFAULT'];
       }
diff --git a/src/views/design/appointment/index copy 2.vue b/src/views/design/appointment/index copy 2.vue
new file mode 100644
index 0000000..d87d820
--- /dev/null
+++ b/src/views/design/appointment/index copy 2.vue	
@@ -0,0 +1,804 @@
+<template>
+  <div class="p-6 bg-gray-50">
+    <div class="appointment mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
+      <!-- 表单标题区域 -->
+      <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
+        <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
+        <p class="text-blue-100 mt-2 opacity-90">请配置项目相关负责人员信息</p>
+        <el-button @click="disabledForm = false" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="disabledForm">
+          点击编辑
+        </el-button>
+      </div>
+      <!-- 表单内容区域 -->
+      <el-form ref="leaveFormRef" :model="form" :disabled="disabledForm" :rules="rules" label-width="120px" class="p-6 space-y-6">
+        <!-- 设计负责人 -->
+        <div class="fonts">
+          <el-row>
+            <el-col :span="8"
+              ><el-form-item label="设计负责人" prop="designLeader" class="mb-4">
+                <el-select
+                  v-model="form.designLeader"
+                  placeholder="请选择设计负责人"
+                  class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+                >
+                  <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 专业人员配置：专业 + 设计人员 + 校审人员 横向排列 -->
+        <div class="border border-gray-200 rounded-lg p-5 transition-all duration-300 hover:shadow-md bg-gray-50">
+          <div class="flex justify-between items-center mb-5">
+            <h3 class="text-lg font-semibold text-gray-700 flex items-center"><i class="el-icon-users mr-2 text-blue-500"></i>专业人员配置</h3>
+            <div class="flex gap-3">
+              <!-- 新增专业按钮 -->
+              <el-button type="primary" size="small" :disabled="disabledForm" @click="addMajor">
+                <i class="el-icon-plus mr-1"></i>新增专业
+              </el-button>
+            </div>
+          </div>
+
+          <!-- 表头 -->
+          <el-row :gutter="20" class="mb-3 font-medium text-gray-700">
+            <el-col :span="6" :xs="24" :sm="8">专业</el-col>
+            <el-col :span="9" :xs="24" :sm="8">设计人员（可多选）</el-col>
+            <el-col :span="9" :xs="24" :sm="8">校审人员（可多选）</el-col>
+          </el-row>
+
+          <!-- 分割线 -->
+          <el-divider class="my-4" />
+
+          <!-- 专业配置行：专业（左）+ 设计人员（中）+ 校审人员（右） 横向排列 -->
+          <div
+            v-for="(majorConfig, configIndex) in combinedConfigs"
+            :key="configIndex"
+            style="background: aliceblue; border-radius: 10px"
+            class="mb-5 animate-fadeIn"
+          >
+            <el-row :gutter="20" class="items-top">
+              <!-- 左侧：专业选择 -->
+              <el-col :span="6" :xs="24" :sm="8" class="mb-4 sm:mb-0" style="margin-top: 8px">
+                <el-form-item
+                  :prop="`designers.${configIndex}.userMajor`"
+                  :rules="{ required: true, message: '请选择专业', trigger: 'change' }"
+                  class="mb-0"
+                  label-width="80px"
+                  label="专业"
+                >
+                  <!-- 专业选择下拉框 -->
+                  <el-select
+                    v-model="form.designers[configIndex].userMajor"
+                    placeholder="请选择专业"
+                    class="w-full transition-all duration-300 border-gray-300"
+                    @change="(val) => handleMajorChange(val, configIndex)"
+                  >
+                    <!-- 临时添加调试显示 -->
+                    <template v-if="des_user_major && des_user_major.length > 0">
+                      <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
+                    </template>
+                    <template v-else>
+                      <el-option label="无专业数据" value="" disabled />
+                    </template>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <!-- 中间：设计人员 -->
+              <el-col :span="9" :xs="24" :sm="8" class="mb-4 sm:mb-0">
+                <div class="pl-0 sm:pl-4 border-l-0 sm:border-l-2 border-blue-200 py-0 sm:py-2">
+                  <!-- 设计人员列表 -->
+                  <div class="space-y-3">
+                    <div v-for="(person, personIndex) in majorConfig.designPersons" :key="personIndex" class="flex items-center">
+                      <el-form-item
+                        :prop="`designers.${configIndex}.persons.${personIndex}.userId`"
+                        :rules="{ required: true, message: '请选择人员', trigger: 'change' }"
+                        class="flex-1 mr-3 mb-0"
+                        label="设计人员"
+                        label-width="80px"
+                      >
+                        <el-select
+                          v-model="person.userId"
+                          placeholder="请选择设计人员"
+                          class="w-full transition-all duration-300 border-gray-300"
+                          @change="() => checkDuplicate(person, 'designers', configIndex, personIndex)"
+                        >
+                          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+                        </el-select>
+                      </el-form-item>
+                      <div>
+                        <el-button
+                          type="danger"
+                          size="small"
+                          @click="removePerson('designers', configIndex, personIndex)"
+                          class="transition-all duration-300 hover:bg-red-600"
+                          :disabled="majorConfig.designPersons.length <= 1 || disabledForm"
+                        >
+                          <el-icon :size="16">
+                            <Delete />
+                          </el-icon>
+                        </el-button>
+                        <el-button
+                          type="success"
+                          size="small"
+                          @click="addPerson('designers', configIndex)"
+                          class="transition-all duration-300 transform hover:scale-105"
+                          :disabled="!majorConfig.userMajor || disabledForm"
+                        >
+                          <el-icon :size="16">
+                            <Plus />
+                          </el-icon>
+                        </el-button>
+                      </div>
+                    </div>
+                  </div>
+
+                  <!-- 空状态提示 -->
+                  <div
+                    v-if="majorConfig.designPersons.length == 0"
+                    class="text-gray-500 text-sm py-2 bg-gray-100 rounded-lg border border-dashed border-gray-200 mt-1"
+                  >
+                    暂无设计人员，请点击"添加设计人员"
+                  </div>
+                </div>
+              </el-col>
+
+              <!-- 右侧：校审人员 -->
+              <el-col :span="9" :xs="24" :sm="8">
+                <div class="pl-0 sm:pl-4 border-l-0 sm:border-l-2 border-green-200 py-0 sm:py-2">
+                  <!-- 校审人员列表 -->
+                  <div class="space-y-3">
+                    <div v-for="(person, personIndex) in majorConfig.reviewPersons" :key="personIndex" class="flex items-center">
+                      <el-form-item
+                        :prop="`reviewers.${configIndex}.persons.${personIndex}.userId`"
+                        :rules="{ required: true, message: '请选择人员', trigger: 'change' }"
+                        class="flex-1 mr-3 mb-0"
+                        label="校审人员"
+                        label-width="80px"
+                      >
+                        <el-select
+                          v-model="person.userId"
+                          placeholder="请选择校审人员"
+                          class="w-full transition-all duration-300 border-gray-300"
+                          @change="() => checkDuplicate(person, 'reviewers', configIndex, personIndex)"
+                        >
+                          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+                        </el-select>
+                      </el-form-item>
+                      <div>
+                        <el-button
+                          type="danger"
+                          size="small"
+                          @click="removePerson('reviewers', configIndex, personIndex)"
+                          class="transition-all duration-300 hover:bg-red-600"
+                          :disabled="majorConfig.reviewPersons.length <= 1 || disabledForm"
+                        >
+                          <el-icon :size="16">
+                            <Delete />
+                          </el-icon>
+                        </el-button>
+                        <el-button
+                          type="success"
+                          size="small"
+                          @click="addPerson('reviewers', configIndex)"
+                          class="transition-all duration-300 transform hover:scale-105"
+                          :disabled="!majorConfig.userMajor || disabledForm"
+                        >
+                          <el-icon :size="16">
+                            <Plus />
+                          </el-icon>
+                        </el-button>
+                      </div>
+                    </div>
+                  </div>
+
+                  <!-- 空状态提示 -->
+                  <div
+                    v-if="majorConfig.reviewPersons.length == 0"
+                    class="text-gray-500 text-sm py-2 bg-gray-100 rounded-lg border border-dashed border-gray-200 mt-1"
+                  >
+                    暂无校审人员，请点击"添加校审人员"
+                  </div>
+                </div>
+              </el-col>
+            </el-row>
+            <!-- 删除专业配置行 -->
+            <el-row class="mt-2">
+              <el-col :span="24" class="text-right pr-4">
+                <el-button
+                  type="text"
+                  class="text-red-500 hover:text-red-700 transition-colors"
+                  @click="removeMajor(configIndex)"
+                  :disabled="combinedConfigs.length <= 1 || disabledForm"
+                >
+                  <i class="el-icon-delete mr-1"></i>删除专业
+                </el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+
+        <!-- 提交按钮区域 -->
+        <div  class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
+          <el-button
+            type="primary"
+            size="large"
+            v-hasPermi="['design:user:batch']"
+            @click="submitForm"
+            class="px-8 py-2.5 transition-all duration-300 transform hover:scale-105 bg-blue-500 hover:bg-blue-600 text-white font-medium"
+            :disabled="disabledForm"
+          >
+            <i class="el-icon-check mr-2"></i>确认提交
+          </el-button>
+          <el-button
+            size="large"
+            @click="resetForm"
+            class="px-8 py-2.5 transition-all duration-300 border-gray-300 hover:bg-gray-100 font-medium"
+            :disabled="disabledForm"
+          >
+            <i class="el-icon-refresh mr-2"></i>重置
+          </el-button>
+        </div>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script setup name="PersonnelForm" lang="ts">
+import { ref, reactive, computed, onMounted, toRefs, watch, WatchStopHandle } from 'vue';
+import { getCurrentInstance } from 'vue';
+import type { ComponentInternalInstance } from 'vue';
+import { useUserStoreHook } from '@/store/modules/user';
+import { ElMessage, ElLoading } from 'element-plus';
+import { Delete, Plus } from '@element-plus/icons-vue'; // 修复：添加Plus图标导入
+import { designUserAdd, designUserList, systemUserList } from '@/api/design/appointment';
+
+// 获取当前实例
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+// 专业字典数据 - 增加默认空数组避免undefined
+const { des_user_major = ref([]) } = toRefs<any>(proxy?.useDict('des_user_major') || {});
+
+// 调试：打印专业数据
+onMounted(() => {
+  console.log('专业数据:', des_user_major.value);
+});
+
+// 表单数据：保持原有数据结构不变
+interface MajorGroup {
+  userMajor: string | null; // 专业
+  persons: Array<{ userId: number | null }>; // 该专业下的多个人员
+}
+const form = reactive({
+  projectId: currentProject.value?.id,
+  designLeader: null, // 设计负责人
+  designers: [] as MajorGroup[], // 设计人员：按专业分组，每组含多个人员
+  reviewers: [] as MajorGroup[] // 校审人员：按专业分组，每组含多个人员
+});
+
+// 组合配置用于视图展示（专业+设计人员+校审人员）
+const combinedConfigs = computed(() => {
+  // 确保designers和reviewers数组长度一致
+  const maxLength = Math.max(form.designers.length, form.reviewers.length);
+  while (form.designers.length < maxLength) {
+    form.designers.push(createEmptyMajorGroup());
+  }
+  while (form.reviewers.length < maxLength) {
+    form.reviewers.push(createEmptyMajorGroup());
+  }
+
+  // 组合数据用于视图展示
+  return form.designers.map((designerGroup, index) => ({
+    userMajor: designerGroup.userMajor,
+    designPersons: designerGroup.persons,
+    reviewPersons: form.reviewers[index].persons
+  }));
+});
+
+// 表单验证规则
+const rules = reactive({
+  designLeader: [{ required: true, message: '请选择设计负责人', trigger: 'change' }]
+});
+
+// 用户列表
+const userList = ref([]);
+
+// 表单引用
+const leaveFormRef = ref();
+const disabledForm = ref(false); //控制提交按钮状态
+
+/** 查询当前部门的所有用户 */
+const getDeptAllUser = async (deptId: any) => {
+  try {
+    const res = await systemUserList({ deptId });
+    userList.value = res.rows;
+  } catch (error) {
+    ElMessage.error('获取用户列表失败');
+  }
+};
+
+/** 查询当前表单数据并回显 */
+const designUser = async () => {
+  if (!currentProject.value?.id) return;
+
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载配置数据中...',
+    background: 'rgba(255, 255, 255, 0.7)'
+  });
+  try {
+    const res = await designUserList({ projectId: currentProject.value?.id });
+    // 清空现有数据
+    form.designLeader = null;
+    form.designers = [];
+    form.reviewers = [];
+
+    if (res.code == 200 && res.rows && res.rows.length > 0) {
+      disabledForm.value = true;
+      // 1. 分类整理数据（按用户类型）
+      const designLeader = res.rows.find((item) => item.userType == 1);
+      const designerItems = res.rows.filter((item) => item.userType == 2);
+      const reviewerItems = res.rows.filter((item) => item.userType == 3);
+
+      // 2. 回显设计负责人
+      if (designLeader) form.designLeader = designLeader.userId;
+
+      // 3. 回显设计人员（按专业分组）
+      form.designers = groupPersonByMajor(designerItems);
+      // 4. 回显校审人员（按专业分组）
+      form.reviewers = groupPersonByMajor(reviewerItems);
+    }
+
+    // 补全默认空项（至少1个专业分组，每组至少1个人员）
+    if (form.designers.length == 0) form.designers.push(createEmptyMajorGroup());
+    if (form.reviewers.length == 0) form.reviewers.push(createEmptyMajorGroup());
+  } catch (error) {
+    ElMessage.error('获取配置数据失败');
+    // 异常时初始化默认空项
+    form.designers = [createEmptyMajorGroup()];
+    form.reviewers = [createEmptyMajorGroup()];
+  } finally {
+    loading.close();
+  }
+};
+
+/** 辅助函数：创建空的专业分组（含1个空人员） */
+const createEmptyMajorGroup = (): MajorGroup => ({
+  userMajor: null,
+  persons: [{ userId: null }]
+});
+
+/** 辅助函数：按专业分组整理人员数据（用于回显） */
+const groupPersonByMajor = (items: any[]): MajorGroup[] => {
+  const groupMap: Record<string, MajorGroup> = {};
+  items.forEach((item) => {
+    const major = item.userMajor || '未分类';
+    // 不存在该专业分组则创建
+    if (!groupMap[major]) {
+      groupMap[major] = { userMajor: item.userMajor, persons: [] };
+    }
+    // 添加当前人员到专业分组
+    groupMap[major].persons.push({ userId: item.userId });
+  });
+  // 处理空分组（确保每组至少1个人员）
+  Object.values(groupMap).forEach((group) => {
+    if (group.persons.length == 0) group.persons.push({ userId: null });
+  });
+  return Object.values(groupMap);
+};
+
+/** 新增专业配置行 */
+const addMajor = () => {
+  form.designers.push(createEmptyMajorGroup());
+  form.reviewers.push(createEmptyMajorGroup());
+
+  // 滚动到新增的专业配置行
+  setTimeout(() => {
+    const groups = document.querySelectorAll(`[data-v-${proxy?.$options.__scopeId}] .animate-fadeIn`);
+    if (groups.length > 0) {
+      groups[groups.length - 1].scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+    }
+  }, 100);
+};
+
+/** 删除专业配置行 */
+const removeMajor = (configIndex: number) => {
+  if (form.designers.length <= 1) {
+    ElMessage.warning('至少保留一个专业配置');
+    return;
+  }
+  form.designers.splice(configIndex, 1);
+  form.reviewers.splice(configIndex, 1);
+};
+
+/** 给指定专业配置行添加人员 */
+const addPerson = (type: 'designers' | 'reviewers', configIndex: number) => {
+  form[type][configIndex].persons.push({ userId: null });
+
+  // 滚动到新增的人员选择框
+  setTimeout(() => {
+    const personSelects = document.querySelectorAll(`[data-v-${proxy?.$options.__scopeId}] .el-select`);
+    if (personSelects.length > 0) {
+      personSelects[personSelects.length - 1].scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+    }
+  }, 100);
+};
+
+/** 从指定专业配置行删除人员 */
+const removePerson = (type: 'designers' | 'reviewers', configIndex: number, personIndex: number) => {
+  const targetGroup = form[type][configIndex];
+  if (targetGroup.persons.length <= 1) {
+    ElMessage.warning(`该专业至少保留一个${type == 'designers' ? '设计' : '校审'}人员`);
+    return;
+  }
+  targetGroup.persons.splice(personIndex, 1);
+};
+
+/** 专业变更时：清空当前专业下的人员（避免专业与人员不匹配） */
+const handleMajorChange = (newMajor: string, configIndex: number) => {
+  // 直接修改原始数据源，确保响应式生效
+  form.designers[configIndex].userMajor = newMajor;
+  form.reviewers[configIndex].userMajor = newMajor;
+  form.designers[configIndex].persons = [{ userId: null }];
+  form.reviewers[configIndex].persons = [{ userId: null }];
+  // ElMessage.info(`已重置「${getMajorLabel(newMajor)}」专业下的人员，请重新选择`);
+};
+
+// ========== 核心：重复校验逻辑 ==========
+/**
+ * 校验同一角色内（设计/校审）的「专业+人员」组合唯一性
+ */
+const checkDuplicate = (current: { userId: number | null }, role: 'designers' | 'reviewers', configIndex: number, personIndex: number) => {
+  console.log(`校验触发 - 角色: ${role}, 专业索引: ${configIndex}, 人员索引: ${personIndex}, 人员ID: ${current.userId}`);
+  console.log(form);
+
+  const currentGroup = form[role][configIndex];
+  // 未选专业/人员时不校验
+  if (!currentGroup.userMajor || !current.userId) return;
+
+  // 生成当前「专业+人员」唯一标识
+  const currentKey = `${currentGroup.userMajor}-${current.userId}`;
+  let duplicateItem = null;
+
+  // 1. 检查当前专业配置行内是否有重复人员
+  duplicateItem = currentGroup.persons.find((item, idx) => {
+    return idx !== personIndex && item.userId == current.userId;
+  });
+  if (duplicateItem) {
+    ElMessage.warning(`当前专业下「${getUserName(current.userId)}」已存在，请重新选择`);
+    current.userId = null;
+    return;
+  }
+
+  // 2. 检查同一角色内其他专业配置行是否有重复（专业+人员唯一）
+  form[role].forEach((group, gIdx) => {
+    if (gIdx == configIndex) return; // 跳过当前配置行
+    group.persons.forEach((item) => {
+      if (`${group.userMajor}-${item.userId}` == currentKey) {
+        duplicateItem = item;
+      }
+    });
+  });
+
+  if (duplicateItem) {
+    ElMessage.warning(`「${getMajorLabel(currentGroup.userMajor)}+${getUserName(current.userId)}」组合已存在，请重新选择`);
+    current.userId = null;
+  }
+};
+
+/** 辅助函数：通过专业值获取专业名称 */
+const getMajorLabel = (majorValue: string | null) => {
+  if (!majorValue || !des_user_major.value) return '';
+  const major = des_user_major.value.find((item: any) => item.value == majorValue);
+  return major ? major.label : majorValue;
+};
+
+/** 辅助函数：通过用户ID获取用户名 */
+const getUserName = (userId: number | null) => {
+  if (!userId || !userList.value.length) return '';
+  const user = userList.value.find((item: any) => item.userId == userId);
+  return user ? user.nickName : userId;
+};
+
+/** 提交表单（保持原有数据结构） */
+const submitForm = async () => {
+  if (!leaveFormRef.value) return;
+  try {
+    // 1. 基础表单验证
+    await leaveFormRef.value.validate();
+    // 2. 提交前二次校验：「专业+人员」组合唯一性
+    let hasDuplicate = false;
+    const allKeys: string[] = [];
+
+    // 收集所有「专业+人员」组合（设计+校审分开校验）
+    const collectKeys = (roleGroups: MajorGroup[], roleName: string) => {
+      roleGroups.forEach((group) => {
+        if (!group.userMajor) return;
+        group.persons.forEach((person) => {
+          if (!person.userId) return;
+          const key = `${group.userMajor}-${person.userId}`;
+          if (allKeys.includes(key)) {
+            hasDuplicate = true;
+            ElMessage.error(`${roleName}中存在重复的「专业+人员」组合，请检查`);
+          }
+          allKeys.push(key);
+        });
+      });
+    };
+
+    // 校验设计人员
+    collectKeys(form.designers, '设计人员');
+    if (hasDuplicate) return;
+
+    // 清空临时数组，校验校审人员（不校验设计与校审之间）
+    allKeys.length = 0;
+    collectKeys(form.reviewers, '校审人员');
+    if (hasDuplicate) return;
+
+    // 3. 构建提交数据（适配后端原有数据格式）
+    const submitData = {
+      projectId: form.projectId,
+      personnel: [
+        // 设计负责人
+        {
+          userId: form.designLeader,
+          userType: 'designLeader',
+          userMajor: null
+        },
+        // 设计人员：展开专业分组，每个人员单独作为一条数据
+        ...form.designers.flatMap((group) =>
+          group.persons.map((person) => ({
+            userId: person.userId,
+            userType: 'designer',
+            userMajor: group.userMajor
+          }))
+        ),
+        // 校审人员：展开专业分组，每个人员单独作为一条数据
+        ...form.reviewers.flatMap((group) =>
+          group.persons.map((person) => ({
+            userId: person.userId,
+            userType: 'reviewer',
+            userMajor: group.userMajor
+          }))
+        )
+      ]
+    };
+    // 4. 数据处理（保持原有逻辑不变）
+    const arr = [];
+    userList.value.forEach((item) => {
+      submitData.personnel.forEach((item1) => {
+        if (item1.userId == item.userId) {
+          let userType = 1;
+          if (item1.userType == 'designer') userType = 2;
+          else if (item1.userType == 'reviewer') userType = 3;
+          arr.push({
+            userName: item.nickName,
+            projectId: submitData.projectId,
+            userId: item1.userId,
+            userType: userType,
+            userMajor: item1.userMajor
+          });
+        }
+      });
+    });
+
+    // 5. 提交到后端（保持原有逻辑不变）
+    const loading = ElLoading.service({ text: '提交中...', background: 'rgba(255,255,255,0.7)' });
+    const res = await designUserAdd({
+      list: arr,
+      projectId: currentProject.value?.id
+    });
+    if (res.code == 200) {
+      disabledForm.value = true;
+      loading.close();
+      ElMessage.success('提交成功');
+    } else {
+      ElMessage.error(res.msg || '提交失败');
+    }
+  } catch (error) {
+    ElMessage.error('请完善表单信息后再提交');
+  } finally {
+    // ElLoading.service().close();
+  }
+};
+
+/** 重置表单（适配新数据结构） */
+const resetForm = () => {
+  if (leaveFormRef.value) {
+    leaveFormRef.value.resetFields();
+    // 重置为默认空状态（1个专业分组，每组1个空人员）
+    form.designers = [createEmptyMajorGroup()];
+    form.reviewers = [createEmptyMajorGroup()];
+    ElMessage.info('表单已重置');
+  }
+};
+
+// 监听项目ID刷新数据
+const listeningProject: WatchStopHandle = watch(
+  () => currentProject.value?.id,
+  () => {
+    getDeptAllUser(userStore.deptId).then(() => {
+      designUser();
+    });
+  }
+);
+
+// 页面生命周期
+onUnmounted(() => {
+  listeningProject();
+});
+onMounted(() => {
+  getDeptAllUser(userStore.deptId).then(() => {
+    designUser();
+  });
+});
+</script>
+
+<style lang="scss" scoped>
+.appointment {
+  width: 70vw;
+  max-width: 1600px;
+
+  .el-select__wrapper {
+    width: 100% !important;
+  }
+
+  .el-button--small {
+    margin-bottom: 0;
+  }
+
+  .fonts {
+    .el-form-item--default .el-form-item__label {
+      font-size: 18px !important;
+    }
+  }
+}
+
+// 自定义动画
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.animate-fadeIn {
+  animation: fadeIn 0.3s ease-out forwards;
+}
+
+// 表单样式优化
+::v-deep .el-form {
+  --el-form-item-margin-bottom: 0;
+}
+
+::v-deep .el-form-item {
+  margin-bottom: 0;
+
+  &__label {
+    font-weight: 500;
+    color: #4e5969;
+  }
+
+  &__content {
+    padding: 0;
+  }
+}
+
+::v-deep .el-select {
+  width: 100%;
+
+  .el-input__inner {
+    border-radius: 6px;
+    transition: all 0.3s ease;
+  }
+
+  &:hover .el-input__inner {
+    border-color: #66b1ff;
+  }
+
+  &.el-select-focus .el-input__inner {
+    border-color: #409eff;
+    box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
+  }
+}
+
+::v-deep .el-button {
+  border-radius: 6px;
+  padding: 8px 16px;
+
+  &--primary {
+    background-color: #409eff;
+    border-color: #409eff;
+
+    &:hover {
+      background-color: #66b1ff;
+      border-color: #66b1ff;
+    }
+  }
+
+  &--success {
+    background-color: #67c23a;
+    border-color: #67c23a;
+
+    &:hover {
+      background-color: #85ce61;
+      border-color: #85ce61;
+    }
+
+    &:disabled {
+      background-color: #b3e099;
+      border-color: #b3e099;
+    }
+  }
+
+  &--danger {
+    background-color: #f56c6c;
+    border-color: #f56c6c;
+
+    &:hover {
+      background-color: #f78989;
+      border-color: #f78989;
+    }
+
+    &:disabled {
+      background-color: #ffcccc;
+      border-color: #ffbbbb;
+      cursor: not-allowed;
+    }
+  }
+
+  &--text {
+    color: #f56c6c;
+
+    &:hover {
+      color: #f78989;
+      background-color: rgba(245, 108, 108, 0.05);
+    }
+  }
+}
+
+// 响应式网格布局
+.grid {
+  display: grid;
+}
+
+.grid-cols-1 {
+  grid-template-columns: repeat(1, minmax(0, 1fr));
+}
+
+.md\:grid-cols-2 {
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
+.gap-4 {
+  gap: 1rem;
+}
+
+// 适配小屏幕（小于768px时，垂直排列）
+@media (max-width: 768px) {
+  .appWidth {
+    width: 95vw;
+  }
+
+  ::v-deep .el-form {
+    padding: 4px;
+  }
+
+  ::v-deep .el-form-item__label {
+    width: 100px;
+  }
+
+  // 小屏幕下各列上下间距
+  ::v-deep .el-col-xs-24 + .el-col-xs-24 {
+    margin-top: 12px;
+  }
+}
+</style>
diff --git a/src/views/design/appointment/index.vue b/src/views/design/appointment/index.vue
index 7e58d1f..644b26b 100644
--- a/src/views/design/appointment/index.vue
+++ b/src/views/design/appointment/index.vue
@@ -1,251 +1,365 @@
 <template>
   <div class="p-6 bg-gray-50">
-    <div class="appointment mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
-      <!-- 表单标题区域 -->
-      <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
-        <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
-        <p class="text-blue-100 mt-2 opacity-90">请配置项目相关负责人员信息</p>
-        <el-button @click="disabledForm = false" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="disabledForm">
-          点击编辑
-        </el-button>
-      </div>
-      <!-- 表单内容区域 -->
-      <el-form ref="leaveFormRef" :model="form" :disabled="disabledForm" :rules="rules" label-width="120px" class="p-6 space-y-6">
-        <!-- 设计负责人 -->
-        <div class="fonts">
-          <el-row>
-            <el-col :span="8"
-              ><el-form-item label="设计负责人" prop="designLeader" class="mb-4">
-                <el-select
-                  v-model="form.designLeader"
-                  placeholder="请选择设计负责人"
-                  class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
-                >
-                  <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
+    <!-- 外层容器添加横向滚动支持 -->
+    <div class="overflow-x-auto">
+      <div class="appointment mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md min-w-[1200px]">
+        <!-- 表单标题区域 -->
+        <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
+          <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
+          <p class="text-blue-100 mt-2 opacity-90">请配置项目相关负责人员信息</p>
+          <el-button @click="disabledForm = false" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="disabledForm">
+            点击编辑
+          </el-button>
         </div>
 
-        <!-- 专业人员配置：专业 + 设计人员 + 校审人员 横向排列 -->
-        <div class="border border-gray-200 rounded-lg p-5 transition-all duration-300 hover:shadow-md bg-gray-50">
-          <div class="flex justify-between items-center mb-5">
-            <h3 class="text-lg font-semibold text-gray-700 flex items-center"><i class="el-icon-users mr-2 text-blue-500"></i>专业人员配置</h3>
-            <div class="flex gap-3">
-              <!-- 新增专业按钮 -->
-              <el-button type="primary" size="small" :disabled="disabledForm" @click="addMajor">
-                <i class="el-icon-plus mr-1"></i>新增专业
-              </el-button>
-            </div>
-          </div>
-
-          <!-- 表头 -->
-          <el-row :gutter="20" class="mb-3 font-medium text-gray-700">
-            <el-col :span="6" :xs="24" :sm="8">专业</el-col>
-            <el-col :span="9" :xs="24" :sm="8">设计人员（可多选）</el-col>
-            <el-col :span="9" :xs="24" :sm="8">校审人员（可多选）</el-col>
-          </el-row>
-
-          <!-- 分割线 -->
-          <el-divider class="my-4" />
-
-          <!-- 专业配置行：专业（左）+ 设计人员（中）+ 校审人员（右） 横向排列 -->
-          <div
-            v-for="(majorConfig, configIndex) in combinedConfigs"
-            :key="configIndex"
-            style="background: aliceblue; border-radius: 10px"
-            class="mb-5 animate-fadeIn"
-          >
-            <el-row :gutter="20" class="items-top">
-              <!-- 左侧：专业选择 -->
-              <el-col :span="6" :xs="24" :sm="8" class="mb-4 sm:mb-0" style="margin-top: 8px">
-                <el-form-item
-                  :prop="`designers.${configIndex}.userMajor`"
-                  :rules="{ required: true, message: '请选择专业', trigger: 'change' }"
-                  class="mb-0"
-                  label-width="80px"
-                  label="专业"
-                >
-                  <!-- 专业选择下拉框 -->
+        <!-- 表单内容区域 -->
+        <el-form ref="leaveFormRef" :model="form" :disabled="disabledForm" :rules="rules" label-width="120px" class="p-6 space-y-6">
+          <!-- 设计负责人 -->
+          <div class="fonts">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="设计负责人" prop="designLeader" class="mb-4">
                   <el-select
-                    v-model="form.designers[configIndex].userMajor"
-                    placeholder="请选择专业"
-                    class="w-full transition-all duration-300 border-gray-300"
-                    @change="(val) => handleMajorChange(val, configIndex)"
+                    v-model="form.designLeader"
+                    placeholder="请选择设计负责人"
+                    class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
                   >
-                    <!-- 临时添加调试显示 -->
-                    <template v-if="des_user_major && des_user_major.length > 0">
-                      <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
-                    </template>
-                    <template v-else>
-                      <el-option label="无专业数据" value="" disabled />
-                    </template>
+                    <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
                   </el-select>
                 </el-form-item>
               </el-col>
-
-              <!-- 中间：设计人员 -->
-              <el-col :span="9" :xs="24" :sm="8" class="mb-4 sm:mb-0">
-                <div class="pl-0 sm:pl-4 border-l-0 sm:border-l-2 border-blue-200 py-0 sm:py-2">
-                  <!-- 设计人员列表 -->
-                  <div class="space-y-3">
-                    <div v-for="(person, personIndex) in majorConfig.designPersons" :key="personIndex" class="flex items-center">
-                      <el-form-item
-                        :prop="`designers.${configIndex}.persons.${personIndex}.userId`"
-                        :rules="{ required: true, message: '请选择人员', trigger: 'change' }"
-                        class="flex-1 mr-3 mb-0"
-                        label="设计人员"
-                        label-width="80px"
-                      >
-                        <el-select
-                          v-model="person.userId"
-                          placeholder="请选择设计人员"
-                          class="w-full transition-all duration-300 border-gray-300"
-                          @change="() => checkDuplicate(person, 'designers', configIndex, personIndex)"
-                        >
-                          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
-                        </el-select>
-                      </el-form-item>
-                      <div>
-                        <el-button
-                          type="danger"
-                          size="small"
-                          @click="removePerson('designers', configIndex, personIndex)"
-                          class="transition-all duration-300 hover:bg-red-600"
-                          :disabled="majorConfig.designPersons.length <= 1 || disabledForm"
-                        >
-                          <el-icon :size="16">
-                            <Delete />
-                          </el-icon>
-                        </el-button>
-                        <el-button
-                          type="success"
-                          size="small"
-                          @click="addPerson('designers', configIndex)"
-                          class="transition-all duration-300 transform hover:scale-105"
-                          :disabled="!majorConfig.userMajor || disabledForm"
-                        >
-                          <el-icon :size="16">
-                            <Plus />
-                          </el-icon>
-                        </el-button>
-                      </div>
-                    </div>
-                  </div>
-
-                  <!-- 空状态提示 -->
-                  <div
-                    v-if="majorConfig.designPersons.length == 0"
-                    class="text-gray-500 text-sm py-2 bg-gray-100 rounded-lg border border-dashed border-gray-200 mt-1"
-                  >
-                    暂无设计人员，请点击"添加设计人员"
-                  </div>
-                </div>
-              </el-col>
-
-              <!-- 右侧：校审人员 -->
-              <el-col :span="9" :xs="24" :sm="8">
-                <div class="pl-0 sm:pl-4 border-l-0 sm:border-l-2 border-green-200 py-0 sm:py-2">
-                  <!-- 校审人员列表 -->
-                  <div class="space-y-3">
-                    <div v-for="(person, personIndex) in majorConfig.reviewPersons" :key="personIndex" class="flex items-center">
-                      <el-form-item
-                        :prop="`reviewers.${configIndex}.persons.${personIndex}.userId`"
-                        :rules="{ required: true, message: '请选择人员', trigger: 'change' }"
-                        class="flex-1 mr-3 mb-0"
-                        label="校审人员"
-                        label-width="80px"
-                      >
-                        <el-select
-                          v-model="person.userId"
-                          placeholder="请选择校审人员"
-                          class="w-full transition-all duration-300 border-gray-300"
-                          @change="() => checkDuplicate(person, 'reviewers', configIndex, personIndex)"
-                        >
-                          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
-                        </el-select>
-                      </el-form-item>
-                      <div>
-                        <el-button
-                          type="danger"
-                          size="small"
-                          @click="removePerson('reviewers', configIndex, personIndex)"
-                          class="transition-all duration-300 hover:bg-red-600"
-                          :disabled="majorConfig.reviewPersons.length <= 1 || disabledForm"
-                        >
-                          <el-icon :size="16">
-                            <Delete />
-                          </el-icon>
-                        </el-button>
-                        <el-button
-                          type="success"
-                          size="small"
-                          @click="addPerson('reviewers', configIndex)"
-                          class="transition-all duration-300 transform hover:scale-105"
-                          :disabled="!majorConfig.userMajor || disabledForm"
-                        >
-                          <el-icon :size="16">
-                            <Plus />
-                          </el-icon>
-                        </el-button>
-                      </div>
-                    </div>
-                  </div>
-
-                  <!-- 空状态提示 -->
-                  <div
-                    v-if="majorConfig.reviewPersons.length == 0"
-                    class="text-gray-500 text-sm py-2 bg-gray-100 rounded-lg border border-dashed border-gray-200 mt-1"
-                  >
-                    暂无校审人员，请点击"添加校审人员"
-                  </div>
-                </div>
-              </el-col>
-            </el-row>
-            <!-- 删除专业配置行 -->
-            <el-row class="mt-2">
-              <el-col :span="24" class="text-right pr-4">
-                <el-button
-                  type="text"
-                  class="text-red-500 hover:text-red-700 transition-colors"
-                  @click="removeMajor(configIndex)"
-                  :disabled="combinedConfigs.length <= 1 || disabledForm"
-                >
-                  <i class="el-icon-delete mr-1"></i>删除专业
-                </el-button>
-              </el-col>
             </el-row>
           </div>
-        </div>
 
-        <!-- 提交按钮区域 -->
-        <div v-if="!disabledForm" class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
-          <el-button
-            type="primary"
-            size="large"
-            v-hasPermi="['design:user:batch']"
-            @click="submitForm"
-            class="px-8 py-2.5 transition-all duration-300 transform hover:scale-105 bg-blue-500 hover:bg-blue-600 text-white font-medium"
-          >
-            <i class="el-icon-check mr-2"></i>确认提交
-          </el-button>
-          <el-button size="large" @click="resetForm" class="px-8 py-2.5 transition-all duration-300 border-gray-300 hover:bg-gray-100 font-medium">
-            <i class="el-icon-refresh mr-2"></i>重置
-          </el-button>
-        </div>
-      </el-form>
+          <!-- 专业人员配置：专业 + 设计 + 校审 + 审定 + 审核 横向排列 -->
+          <div class="border border-gray-200 rounded-lg p-5 transition-all duration-300 hover:shadow-md bg-gray-50">
+            <div class="flex justify-between items-center mb-5">
+              <h3 class="text-lg font-semibold text-gray-700 flex items-center"><i class="el-icon-users mr-2 text-blue-500"></i>专业人员配置</h3>
+              <div class="flex gap-3">
+                <!-- 新增专业按钮 -->
+                <el-button type="primary" size="small" :disabled="disabledForm" @click="addMajor">
+                  <i class="el-icon-plus mr-1"></i>新增专业
+                </el-button>
+              </div>
+            </div>
+
+            <!-- 表头：总和24确保一行显示 -->
+            <el-row :gutter="8" class="mb-3 font-medium text-gray-700 whitespace-nowrap">
+              <el-col :span="4">专业</el-col>
+              <el-col :span="5">设计人员（可多选）</el-col>
+              <el-col :span="5">校审人员（可多选）</el-col>
+              <el-col :span="5">审定人员（可多选）</el-col>
+              <el-col :span="4">审核人员（可多选）</el-col>
+              <el-col :span="3"></el-col>
+            </el-row>
+
+            <!-- 分割线 -->
+            <el-divider class="my-4" />
+
+            <!-- 专业配置行：循环渲染 + 专业同步逻辑 -->
+            <div
+              v-for="(majorConfig, configIndex) in combinedConfigs"
+              :key="`major-${configIndex}`"
+              style="background: aliceblue; border-radius: 10px; padding: 12px 0"
+              class="mb-5 animate-fadeIn"
+            >
+              <el-row :gutter="8" class="items-top">
+                <!-- 1. 专业选择（核心：统一所有角色的专业来源） -->
+                <el-col :span="3" class="mb-4 sm:mb-0 pl-4">
+                  <el-form-item
+                    :prop="`designers.${configIndex}.userMajor`"
+                    :rules="[
+                      { required: true, message: '请选择专业', trigger: 'change' },
+                      { validator: validateMajor, trigger: 'change' }
+                    ]"
+                    class="mb-0"
+                    label-width="60px"
+                    label="专业"
+                  >
+                    <el-select
+                      v-model="form.designers[configIndex].userMajor"
+                      placeholder="请选择专业"
+                      class="w-full transition-all duration-300 border-gray-300"
+                      @change="(val) => handleMajorChange(val, configIndex)"
+                      clearable
+                    >
+                      <template v-if="des_user_major && des_user_major.length > 0">
+                        <el-option v-for="item in des_user_major" :key="`major-item-${item.value}`" :label="item.label" :value="item.value" />
+                      </template>
+                      <template v-else>
+                        <el-option label="无专业数据" value="" disabled />
+                      </template>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <!-- 2. 设计人员 -->
+                <el-col :span="4" class="mb-4 sm:mb-0">
+                  <div class="pl-2 border-l-2 border-blue-200 py-2">
+                    <div class="space-y-3">
+                      <div
+                        v-for="(person, personIndex) in majorConfig.designPersons"
+                        :key="`design-${configIndex}-${personIndex}`"
+                        class="flex items-center"
+                      >
+                        <el-form-item
+                          :prop="`designers.${configIndex}.persons.${personIndex}.userId`"
+                          :rules="{ required: true, message: '请选择设计人员', trigger: 'change' }"
+                          class="flex-1 mr-2 mb-0"
+                          label="设计"
+                          label-width="50px"
+                        >
+                          <el-select
+                            v-model="person.userId"
+                            placeholder="选择人员"
+                            class="w-full transition-all duration-300 border-gray-300"
+                            @change="() => checkDuplicate(person, 'designers', configIndex, personIndex)"
+                          >
+                            <el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
+                          </el-select>
+                        </el-form-item>
+                        <div class="flex gap-1">
+                          <el-button
+                            type="danger"
+                            size="small"
+                            @click="removePerson('designers', configIndex, personIndex)"
+                            class="transition-all duration-300 hover:bg-red-600"
+                            :disabled="majorConfig.designPersons.length <= 1 || disabledForm"
+                          >
+                            <el-icon :size="14"><Delete /></el-icon>
+                          </el-button>
+                          <el-button
+                            type="success"
+                            size="small"
+                            @click="addPerson('designers', configIndex)"
+                            class="transition-all duration-300 transform hover:scale-105"
+                            :disabled="!form.designers[configIndex].userMajor || disabledForm"
+                          >
+                            <el-icon :size="14"><Plus /></el-icon>
+                          </el-button>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      v-if="majorConfig.designPersons.length == 0"
+                      class="text-gray-500 text-xs py-2 bg-gray-100 rounded border border-dashed border-gray-200"
+                    >
+                      点击"添加"
+                    </div>
+                  </div>
+                </el-col>
+
+                <!-- 3. 校审人员 -->
+                <el-col :span="5" class="mb-4 sm:mb-0">
+                  <div class="pl-2 border-l-2 border-green-200 py-2">
+                    <div class="space-y-3">
+                      <div
+                        v-for="(person, personIndex) in majorConfig.reviewPersons"
+                        :key="`review-${configIndex}-${personIndex}`"
+                        class="flex items-center"
+                      >
+                        <el-form-item
+                          :prop="`reviewers.${configIndex}.persons.${personIndex}.userId`"
+                          :rules="{ required: true, message: '请选择校审人员', trigger: 'change' }"
+                          class="flex-1 mr-2 mb-0"
+                          label="校审"
+                          label-width="50px"
+                        >
+                          <el-select
+                            v-model="person.userId"
+                            placeholder="选择人员"
+                            class="w-full transition-all duration-300 border-gray-300"
+                            @change="() => checkDuplicate(person, 'reviewers', configIndex, personIndex)"
+                          >
+                            <el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
+                          </el-select>
+                        </el-form-item>
+                        <div class="flex gap-1">
+                          <el-button
+                            type="danger"
+                            size="small"
+                            @click="removePerson('reviewers', configIndex, personIndex)"
+                            class="transition-all duration-300 hover:bg-red-600"
+                            :disabled="majorConfig.reviewPersons.length <= 1 || disabledForm"
+                          >
+                            <el-icon :size="14"><Delete /></el-icon>
+                          </el-button>
+                          <el-button
+                            type="success"
+                            size="small"
+                            @click="addPerson('reviewers', configIndex)"
+                            class="transition-all duration-300 transform hover:scale-105"
+                            :disabled="!form.designers[configIndex].userMajor || disabledForm"
+                          >
+                            <el-icon :size="14"><Plus /></el-icon>
+                          </el-button>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      v-if="majorConfig.reviewPersons.length == 0"
+                      class="text-gray-500 text-xs py-2 bg-gray-100 rounded border border-dashed border-gray-200"
+                    >
+                      点击"添加"
+                    </div>
+                  </div>
+                </el-col>
+
+                <!-- 4. 审定人员 -->
+                <el-col :span="5" class="mb-4 sm:mb-0">
+                  <div class="pl-2 border-l-2 border-orange-200 py-2">
+                    <div class="space-y-3">
+                      <div
+                        v-for="(person, personIndex) in majorConfig.approvedPersons"
+                        :key="`approved-${configIndex}-${personIndex}`"
+                        class="flex items-center"
+                      >
+                        <el-form-item
+                          :prop="`approved.${configIndex}.persons.${personIndex}.userId`"
+                          :rules="{ required: true, message: '请选择审定人员', trigger: 'change' }"
+                          class="flex-1 mr-2 mb-0"
+                          label="审定"
+                          label-width="50px"
+                        >
+                          <el-select
+                            v-model="person.userId"
+                            placeholder="选择人员"
+                            class="w-full transition-all duration-300 border-gray-300"
+                            @change="() => checkDuplicate(person, 'approved', configIndex, personIndex)"
+                          >
+                            <el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
+                          </el-select>
+                        </el-form-item>
+                        <div class="flex gap-1">
+                          <el-button
+                            type="danger"
+                            size="small"
+                            @click="removePerson('approved', configIndex, personIndex)"
+                            class="transition-all duration-300 hover:bg-red-600"
+                            :disabled="majorConfig.approvedPersons.length <= 1 || disabledForm"
+                          >
+                            <el-icon :size="14"><Delete /></el-icon>
+                          </el-button>
+                          <el-button
+                            type="success"
+                            size="small"
+                            @click="addPerson('approved', configIndex)"
+                            class="transition-all duration-300 transform hover:scale-105"
+                            :disabled="!form.designers[configIndex].userMajor || disabledForm"
+                          >
+                            <el-icon :size="14"><Plus /></el-icon>
+                          </el-button>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      v-if="majorConfig.approvedPersons.length == 0"
+                      class="text-gray-500 text-xs py-2 bg-gray-100 rounded border border-dashed border-gray-200"
+                    >
+                      点击"添加"
+                    </div>
+                  </div>
+                </el-col>
+
+                <!-- 5. 审核人员 -->
+                <el-col :span="5" class="mb-4 sm:mb-0">
+                  <div class="pl-2 border-l-2 border-purple-200 py-2">
+                    <div class="space-y-3">
+                      <div
+                        v-for="(person, personIndex) in majorConfig.auditorPersons"
+                        :key="`auditor-${configIndex}-${personIndex}`"
+                        class="flex items-center"
+                      >
+                        <el-form-item
+                          :prop="`auditor.${configIndex}.persons.${personIndex}.userId`"
+                          :rules="{ required: true, message: '请选择审核人员', trigger: 'change' }"
+                          class="flex-1 mr-2 mb-0"
+                          label="审核"
+                          label-width="50px"
+                        >
+                          <el-select
+                            v-model="person.userId"
+                            placeholder="选择人员"
+                            class="w-full transition-all duration-300 border-gray-300"
+                            @change="() => checkDuplicate(person, 'auditor', configIndex, personIndex)"
+                          >
+                            <el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
+                          </el-select>
+                        </el-form-item>
+                        <div class="flex gap-1">
+                          <el-button
+                            type="danger"
+                            size="small"
+                            @click="removePerson('auditor', configIndex, personIndex)"
+                            class="transition-all duration-300 hover:bg-red-600"
+                            :disabled="majorConfig.auditorPersons.length <= 1 || disabledForm"
+                          >
+                            <el-icon :size="14"><Delete /></el-icon>
+                          </el-button>
+                          <el-button
+                            type="success"
+                            size="small"
+                            @click="addPerson('auditor', configIndex)"
+                            class="transition-all duration-300 transform hover:scale-105"
+                            :disabled="!form.designers[configIndex].userMajor || disabledForm"
+                          >
+                            <el-icon :size="14"><Plus /></el-icon>
+                          </el-button>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      v-if="majorConfig.auditorPersons.length == 0"
+                      class="text-gray-500 text-xs py-2 bg-gray-100 rounded border border-dashed border-gray-200"
+                    >
+                      点击"添加"
+                    </div>
+                  </div>
+                </el-col>
+
+                <!-- 操作列 -->
+                <el-col :span="2" class="text-right pr-4">
+                  <el-button
+                    type="text"
+                    class="text-red-500 hover:text-red-700 transition-colors"
+                    @click="removeMajor(configIndex)"
+                    :disabled="combinedConfigs.length <= 1 || disabledForm"
+                  >
+                    <i class="el-icon-delete mr-1"></i>删除专业
+                  </el-button>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+
+          <!-- 提交按钮区域 -->
+          <div v-if="!disabledForm" class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
+            <el-button
+              type="primary"
+              size="large"
+              v-hasPermi="['design:user:batch']"
+              @click="submitForm"
+              class="px-8 py-2.5 transition-all duration-300 transform hover:scale-105 bg-blue-500 hover:bg-blue-600 text-white font-medium"
+            >
+              <i class="el-icon-check mr-2"></i>确认提交
+            </el-button>
+            <el-button size="large" @click="resetForm" class="px-8 py-2.5 transition-all duration-300 border-gray-300 hover:bg-gray-100 font-medium">
+              <i class="el-icon-refresh mr-2"></i>重置
+            </el-button>
+          </div>
+        </el-form>
+      </div>
     </div>
   </div>
 </template>
 
 <script setup name="PersonnelForm" lang="ts">
-import { ref, reactive, computed, onMounted, toRefs, watch, WatchStopHandle } from 'vue';
+import { ref, reactive, computed, onMounted, toRefs, watch, WatchStopHandle, type FormItemRule } from 'vue';
 import { getCurrentInstance } from 'vue';
 import type { ComponentInternalInstance } from 'vue';
 import { useUserStoreHook } from '@/store/modules/user';
-import { ElMessage, ElLoading } from 'element-plus';
-import { Delete, Plus } from '@element-plus/icons-vue'; // 修复：添加Plus图标导入
+import { ElMessage, ElLoading, ElForm } from 'element-plus';
+import { Delete, Plus } from '@element-plus/icons-vue';
 import { designUserAdd, designUserList, systemUserList } from '@/api/design/appointment';
 
 // 获取当前实例
@@ -254,143 +368,214 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const userStore = useUserStoreHook();
 // 从 store 中获取当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-// 专业字典数据 - 增加默认空数组避免undefined
-const { des_user_major = ref([]) } = toRefs<any>(proxy?.useDict('des_user_major') || {});
+// 专业字典数据（确保默认空数组）
+const { des_user_major = ref<Array<{ label: string; value: string }>>([]) } = toRefs<any>(proxy?.useDict('des_user_major') || {});
 
-// 调试：打印专业数据
-onMounted(() => {
-  console.log('专业数据:', des_user_major.value);
-});
-
-// 表单数据：保持原有数据结构不变
+// 表单数据定义（明确类型）
+interface Person {
+  userId: number | null;
+}
 interface MajorGroup {
-  userMajor: string | null; // 专业
-  persons: Array<{ userId: number | null }>; // 该专业下的多个人员
+  userMajor: string | null; // 专业值（与字典value对应）
+  persons: Person[]; // 该专业下的人员
 }
 const form = reactive({
-  projectId: currentProject.value?.id,
-  designLeader: null, // 设计负责人
-  designers: [] as MajorGroup[], // 设计人员：按专业分组，每组含多个人员
-  reviewers: [] as MajorGroup[] // 校审人员：按专业分组，每组含多个人员
+  projectId: currentProject.value?.id || null,
+  designLeader: null as number | null, // 设计负责人
+  designers: [] as MajorGroup[], // 设计人员（userType=2）
+  reviewers: [] as MajorGroup[], // 校审人员（userType=3）
+  approved: [] as MajorGroup[], // 审定人员（userType=4）
+  auditor: [] as MajorGroup[] // 审核人员（userType=5）
 });
 
-// 组合配置用于视图展示（专业+设计人员+校审人员）
+// 组合配置：统一所有角色的专业和人员（确保长度一致）
 const combinedConfigs = computed(() => {
-  // 确保designers和reviewers数组长度一致
-  const maxLength = Math.max(form.designers.length, form.reviewers.length);
-  while (form.designers.length < maxLength) {
-    form.designers.push(createEmptyMajorGroup());
-  }
-  while (form.reviewers.length < maxLength) {
-    form.reviewers.push(createEmptyMajorGroup());
-  }
+  // 取所有角色的最大长度，确保数组长度统一
+  const maxLength = Math.max(form.designers.length, form.reviewers.length, form.approved.length, form.auditor.length);
 
-  // 组合数据用于视图展示
+  // 补全空分组（确保每个角色数组长度相同，避免渲染异常）
+  while (form.designers.length < maxLength) form.designers.push(createEmptyMajorGroup());
+  while (form.reviewers.length < maxLength) form.reviewers.push(createEmptyMajorGroup());
+  while (form.approved.length < maxLength) form.approved.push(createEmptyMajorGroup());
+  while (form.auditor.length < maxLength) form.auditor.push(createEmptyMajorGroup());
+
+  // 组合数据：所有角色共用designers的专业值（确保同步）
   return form.designers.map((designerGroup, index) => ({
-    userMajor: designerGroup.userMajor,
+    userMajor: designerGroup.userMajor, // 统一专业来源
     designPersons: designerGroup.persons,
-    reviewPersons: form.reviewers[index].persons
+    reviewPersons: form.reviewers[index].persons,
+    approvedPersons: form.approved[index].persons,
+    auditorPersons: form.auditor[index].persons
   }));
 });
 
-// 表单验证规则
+// 表单验证规则（新增专业有效性校验）
 const rules = reactive({
   designLeader: [{ required: true, message: '请选择设计负责人', trigger: 'change' }]
 });
 
-// 用户列表
-const userList = ref([]);
-
-// 表单引用
-const leaveFormRef = ref();
-const disabledForm = ref(false); //控制提交按钮状态
-
-/** 查询当前部门的所有用户 */
-const getDeptAllUser = async (deptId: any) => {
-  try {
-    const res = await systemUserList({ deptId });
-    userList.value = res.rows;
-  } catch (error) {
-    ElMessage.error('获取用户列表失败');
+// 自定义校验：确保专业值在字典中存在（避免无效值）
+const validateMajor: FormItemRule = (rule, value, callback) => {
+  if (!value) {
+    callback(new Error('请选择专业'));
+  } else {
+    // 检查专业值是否在字典中存在
+    const majorExists = des_user_major.value.some((item) => item.value == value);
+    if (majorExists) {
+      callback();
+    } else {
+      callback(new Error('选择的专业无效，请重新选择'));
+    }
   }
 };
 
-/** 查询当前表单数据并回显 */
+// 其他基础变量
+const userList = ref<Array<{ userId: number; nickName: string }>>([]);
+const leaveFormRef = ref<InstanceType<typeof ElForm> | null>(null);
+const disabledForm = ref(true); // 初始禁用表单（编辑时开启）
+
+/** 查询当前部门的所有用户（确保用户列表有效） */
+const getDeptAllUser = async (deptId: number | undefined) => {
+  if (!deptId) {
+    ElMessage.warning('请先选择部门');
+    return;
+  }
+  try {
+    const res = await systemUserList({ deptId });
+    userList.value = res.rows || [];
+    if (userList.value.length == 0) {
+      ElMessage.info('当前部门暂无用户数据，请先添加用户');
+    }
+  } catch (error) {
+    ElMessage.error('获取用户列表失败，请刷新重试');
+    console.error('获取用户列表异常：', error);
+  }
+};
+
+/** 查询当前表单数据并回显（确保专业值正确赋值） */
 const designUser = async () => {
-  if (!currentProject.value?.id) return;
+  const projectId = currentProject.value?.id;
+  if (!projectId) {
+    ElMessage.warning('请先选择项目');
+    return;
+  }
 
   const loading = ElLoading.service({
     lock: true,
     text: '加载配置数据中...',
     background: 'rgba(255, 255, 255, 0.7)'
   });
+
   try {
-    const res = await designUserList({ projectId: currentProject.value?.id });
-    // 清空现有数据
+    const res = await designUserList({ projectId });
+    // 清空现有数据（避免残留旧值）
     form.designLeader = null;
     form.designers = [];
     form.reviewers = [];
+    form.approved = [];
+    form.auditor = [];
 
-    if (res.code == 200 && res.rows && res.rows.length > 0) {
+    if (res.code == 200 && Array.isArray(res.rows) && res.rows.length > 0) {
       disabledForm.value = true;
-      // 1. 分类整理数据（按用户类型）
-      const designLeader = res.rows.find((item) => item.userType == 1);
-      const designerItems = res.rows.filter((item) => item.userType == 2);
-      const reviewerItems = res.rows.filter((item) => item.userType == 3);
+      // 1. 按用户类型分类数据（明确类型）
+      const designLeader = res.rows.find((item: any) => item.userType == 1);
+      const designerItems = res.rows.filter((item: any) => item.userType == 2);
+      const reviewerItems = res.rows.filter((item: any) => item.userType == 3);
+      const approvedItems = res.rows.filter((item: any) => item.userType == 4);
+      const auditorItems = res.rows.filter((item: any) => item.userType == 5);
 
       // 2. 回显设计负责人
       if (designLeader) form.designLeader = designLeader.userId;
 
-      // 3. 回显设计人员（按专业分组）
+      // 3. 按专业分组回显各角色人员（确保专业值非空）
       form.designers = groupPersonByMajor(designerItems);
-      // 4. 回显校审人员（按专业分组）
       form.reviewers = groupPersonByMajor(reviewerItems);
-    }
+      form.approved = groupPersonByMajor(approvedItems);
+      form.auditor = groupPersonByMajor(auditorItems);
 
-    // 补全默认空项（至少1个专业分组，每组至少1个人员）
-    if (form.designers.length == 0) form.designers.push(createEmptyMajorGroup());
-    if (form.reviewers.length == 0) form.reviewers.push(createEmptyMajorGroup());
+      // 4. 补全空分组（确保至少有一个专业）
+      if (form.designers.length == 0) form.designers.push(createEmptyMajorGroup());
+      // 同步其他角色的分组长度
+      while (form.reviewers.length < form.designers.length) form.reviewers.push(createEmptyMajorGroup());
+      while (form.approved.length < form.designers.length) form.approved.push(createEmptyMajorGroup());
+      while (form.auditor.length < form.designers.length) form.auditor.push(createEmptyMajorGroup());
+
+      // 5. 确保所有角色的专业值与designers同步（回显时可能存在差异）
+      form.designers.forEach((designerGroup, index) => {
+        if (designerGroup.userMajor) {
+          form.reviewers[index].userMajor = designerGroup.userMajor;
+          form.approved[index].userMajor = designerGroup.userMajor;
+          form.auditor[index].userMajor = designerGroup.userMajor;
+        }
+      });
+    } else {
+      // 无数据时初始化默认分组
+      form.designers = [createEmptyMajorGroup()];
+      form.reviewers = [createEmptyMajorGroup()];
+      form.approved = [createEmptyMajorGroup()];
+      form.auditor = [createEmptyMajorGroup()];
+    }
   } catch (error) {
-    ElMessage.error('获取配置数据失败');
-    // 异常时初始化默认空项
+    ElMessage.error('获取配置数据失败，请刷新重试');
+    console.error('获取配置数据异常：', error);
+    // 异常时初始化默认分组（避免页面空白）
     form.designers = [createEmptyMajorGroup()];
     form.reviewers = [createEmptyMajorGroup()];
+    form.approved = [createEmptyMajorGroup()];
+    form.auditor = [createEmptyMajorGroup()];
   } finally {
     loading.close();
   }
 };
 
-/** 辅助函数：创建空的专业分组（含1个空人员） */
+/** 辅助函数：创建空的专业分组（确保初始结构正确） */
 const createEmptyMajorGroup = (): MajorGroup => ({
   userMajor: null,
-  persons: [{ userId: null }]
+  persons: [{ userId: null }] // 初始一个空人员
 });
 
-/** 辅助函数：按专业分组整理人员数据（用于回显） */
+/** 辅助函数：按专业分组整理人员数据（确保专业值非空） */
 const groupPersonByMajor = (items: any[]): MajorGroup[] => {
   const groupMap: Record<string, MajorGroup> = {};
-  items.forEach((item) => {
-    const major = item.userMajor || '未分类';
-    // 不存在该专业分组则创建
+
+  // 过滤无效数据（确保item有userMajor和userId）
+  const validItems = items.filter((item) => item?.userMajor && item?.userId);
+  if (validItems.length == 0) {
+    return [createEmptyMajorGroup()];
+  }
+
+  validItems.forEach((item) => {
+    const major = item.userMajor;
+    // 初始化分组（确保不重复）
     if (!groupMap[major]) {
-      groupMap[major] = { userMajor: item.userMajor, persons: [] };
+      groupMap[major] = { userMajor: major, persons: [] };
+    }
+    // 添加人员（避免重复人员）
+    const personExists = groupMap[major].persons.some((p) => p.userId == item.userId);
+    if (!personExists) {
+      groupMap[major].persons.push({ userId: item.userId });
     }
-    // 添加当前人员到专业分组
-    groupMap[major].persons.push({ userId: item.userId });
   });
-  // 处理空分组（确保每组至少1个人员）
+
+  // 确保每个分组至少有一个人员
   Object.values(groupMap).forEach((group) => {
-    if (group.persons.length == 0) group.persons.push({ userId: null });
+    if (group.persons.length == 0) {
+      group.persons.push({ userId: null });
+    }
   });
+
   return Object.values(groupMap);
 };
 
-/** 新增专业配置行 */
+/** 新增专业配置行（确保所有角色同步新增） */
 const addMajor = () => {
-  form.designers.push(createEmptyMajorGroup());
-  form.reviewers.push(createEmptyMajorGroup());
+  const newGroup = createEmptyMajorGroup();
+  form.designers.push(newGroup);
+  form.reviewers.push({ ...newGroup }); // 深拷贝避免引用问题
+  form.approved.push({ ...newGroup });
+  form.auditor.push({ ...newGroup });
 
-  // 滚动到新增的专业配置行
+  // 滚动到新增行（提升用户体验）
   setTimeout(() => {
     const groups = document.querySelectorAll(`[data-v-${proxy?.$options.__scopeId}] .animate-fadeIn`);
     if (groups.length > 0) {
@@ -399,260 +584,368 @@ const addMajor = () => {
   }, 100);
 };
 
-/** 删除专业配置行 */
+/** 删除专业配置行（确保所有角色同步删除） */
 const removeMajor = (configIndex: number) => {
   if (form.designers.length <= 1) {
     ElMessage.warning('至少保留一个专业配置');
     return;
   }
+  // 同步删除所有角色的对应分组
   form.designers.splice(configIndex, 1);
   form.reviewers.splice(configIndex, 1);
+  form.approved.splice(configIndex, 1);
+  form.auditor.splice(configIndex, 1);
 };
 
-/** 给指定专业配置行添加人员 */
-const addPerson = (type: 'designers' | 'reviewers', configIndex: number) => {
+/** 给指定专业配置行添加人员（支持所有角色） */
+const addPerson = (type: 'designers' | 'reviewers' | 'approved' | 'auditor', configIndex: number) => {
+  // 确保分组存在
+  if (form[type].length <= configIndex) {
+    ElMessage.warning('专业配置不存在');
+    return;
+  }
+  // 添加空人员（后续选择）
   form[type][configIndex].persons.push({ userId: null });
 
   // 滚动到新增的人员选择框
   setTimeout(() => {
-    const personSelects = document.querySelectorAll(`[data-v-${proxy?.$options.__scopeId}] .el-select`);
-    if (personSelects.length > 0) {
-      personSelects[personSelects.length - 1].scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+    const selects = document.querySelectorAll(`[data-v-${proxy?.$options.__scopeId}] .el-select`);
+    if (selects.length > 0) {
+      selects[selects.length - 1].scrollIntoView({ behavior: 'smooth', block: 'nearest' });
     }
   }, 100);
 };
 
-/** 从指定专业配置行删除人员 */
-const removePerson = (type: 'designers' | 'reviewers', configIndex: number, personIndex: number) => {
+/** 从指定专业配置行删除人员（支持所有角色） */
+const removePerson = (type: 'designers' | 'reviewers' | 'approved' | 'auditor', configIndex: number, personIndex: number) => {
   const targetGroup = form[type][configIndex];
+  if (!targetGroup) {
+    ElMessage.warning('专业配置不存在');
+    return;
+  }
   if (targetGroup.persons.length <= 1) {
-    ElMessage.warning(`该专业至少保留一个${type == 'designers' ? '设计' : '校审'}人员`);
+    const roleNames = {
+      designers: '设计',
+      reviewers: '校审',
+      approved: '审定',
+      auditor: '审核'
+    };
+    ElMessage.warning(`该专业至少保留一个${roleNames[type]}人员`);
     return;
   }
   targetGroup.persons.splice(personIndex, 1);
 };
 
-/** 专业变更时：清空当前专业下的人员（避免专业与人员不匹配） */
-const handleMajorChange = (newMajor: string, configIndex: number) => {
-  // 直接修改原始数据源，确保响应式生效
-  form.designers[configIndex].userMajor = newMajor;
-  form.reviewers[configIndex].userMajor = newMajor;
-  form.designers[configIndex].persons = [{ userId: null }];
-  form.reviewers[configIndex].persons = [{ userId: null }];
-  // ElMessage.info(`已重置「${getMajorLabel(newMajor)}」专业下的人员，请重新选择`);
-};
-
-// ========== 核心：重复校验逻辑 ==========
-/**
- * 校验同一角色内（设计/校审）的「专业+人员」组合唯一性
- */
-const checkDuplicate = (current: { userId: number | null }, role: 'designers' | 'reviewers', configIndex: number, personIndex: number) => {
-  console.log(`校验触发 - 角色: ${role}, 专业索引: ${configIndex}, 人员索引: ${personIndex}, 人员ID: ${current.userId}`);
-  console.log(form);
-
-  const currentGroup = form[role][configIndex];
-  // 未选专业/人员时不校验
-  if (!currentGroup.userMajor || !current.userId) return;
-
-  // 生成当前「专业+人员」唯一标识
-  const currentKey = `${currentGroup.userMajor}-${current.userId}`;
-  let duplicateItem = null;
-
-  // 1. 检查当前专业配置行内是否有重复人员
-  duplicateItem = currentGroup.persons.find((item, idx) => {
-    return idx !== personIndex && item.userId == current.userId;
-  });
-  if (duplicateItem) {
-    ElMessage.warning(`当前专业下「${getUserName(current.userId)}」已存在，请重新选择`);
-    current.userId = null;
+/** 专业变更时：同步所有角色的专业值并重置人员（核心修复） */
+const handleMajorChange = (newMajor: string | null, configIndex: number) => {
+  // 过滤无效专业值
+  if (!newMajor || !des_user_major.value.some((item) => item.value == newMajor)) {
+    ElMessage.warning('选择的专业无效，请重新选择');
     return;
   }
 
-  // 2. 检查同一角色内其他专业配置行是否有重复（专业+人员唯一）
+  // 1. 同步所有角色的专业值（确保统一）
+  form.designers[configIndex].userMajor = newMajor;
+  form.reviewers[configIndex].userMajor = newMajor;
+  form.approved[configIndex].userMajor = newMajor;
+  form.auditor[configIndex].userMajor = newMajor;
+
+  // 2. 重置当前专业下的所有人员（避免专业与人员不匹配）
+  form.designers[configIndex].persons = [{ userId: null }];
+  form.reviewers[configIndex].persons = [{ userId: null }];
+  form.approved[configIndex].persons = [{ userId: null }];
+  form.auditor[configIndex].persons = [{ userId: null }];
+
+  ElMessage.success(`已切换为「${getMajorLabel(newMajor)}」专业，请重新选择人员`);
+};
+
+/** 重复校验：同一角色内「专业+人员」组合唯一 */
+const checkDuplicate = (
+  currentPerson: Person,
+  role: 'designers' | 'reviewers' | 'approved' | 'auditor',
+  configIndex: number,
+  personIndex: number
+) => {
+  const currentGroup = form[role][configIndex];
+  const currentMajor = form.designers[configIndex].userMajor; // 统一专业来源
+
+  // 未选专业/人员时不校验
+  if (!currentMajor || !currentPerson.userId) return;
+
+  const currentKey = `${currentMajor}-${currentPerson.userId}`;
+  let duplicateItem: Person | null = null;
+
+  // 1. 检查当前专业行内是否有重复人员
+  duplicateItem = currentGroup.persons.find((item, idx) => idx !== personIndex && item.userId == currentPerson.userId);
+  if (duplicateItem) {
+    ElMessage.warning(`当前专业下「${getUserName(currentPerson.userId)}」已存在，请重新选择`);
+    currentPerson.userId = null;
+    return;
+  }
+
+  // 2. 检查同一角色其他专业行是否有重复
   form[role].forEach((group, gIdx) => {
-    if (gIdx == configIndex) return; // 跳过当前配置行
+    if (gIdx == configIndex) return;
+    const groupMajor = form.designers[gIdx].userMajor;
+    if (!groupMajor) return;
     group.persons.forEach((item) => {
-      if (`${group.userMajor}-${item.userId}` == currentKey) {
+      if (item.userId && `${groupMajor}-${item.userId}` == currentKey) {
         duplicateItem = item;
       }
     });
   });
 
   if (duplicateItem) {
-    ElMessage.warning(`「${getMajorLabel(currentGroup.userMajor)}+${getUserName(current.userId)}」组合已存在，请重新选择`);
-    current.userId = null;
+    ElMessage.warning(`「${getMajorLabel(currentMajor)}+${getUserName(currentPerson.userId)}」组合已存在，请重新选择`);
+    currentPerson.userId = null;
   }
 };
 
-/** 辅助函数：通过专业值获取专业名称 */
+/** 辅助函数：通过专业值获取专业名称（避免显示value） */
 const getMajorLabel = (majorValue: string | null) => {
-  if (!majorValue || !des_user_major.value) return '';
-  const major = des_user_major.value.find((item: any) => item.value == majorValue);
+  if (!majorValue) return '';
+  const major = des_user_major.value.find((item) => item.value == majorValue);
   return major ? major.label : majorValue;
 };
 
 /** 辅助函数：通过用户ID获取用户名 */
 const getUserName = (userId: number | null) => {
-  if (!userId || !userList.value.length) return '';
-  const user = userList.value.find((item: any) => item.userId == userId);
-  return user ? user.nickName : userId;
+  if (!userId) return '';
+  const user = userList.value.find((item) => item.userId == userId);
+  return user ? user.nickName : `${userId}`;
 };
 
-/** 提交表单（保持原有数据结构） */
+/** 提交表单（核心：确保专业值正确传递） */
 const submitForm = async () => {
-  if (!leaveFormRef.value) return;
-  try {
-    // 1. 基础表单验证
-    await leaveFormRef.value.validate();
-    // 2. 提交前二次校验：「专业+人员」组合唯一性
-    let hasDuplicate = false;
-    const allKeys: string[] = [];
+  if (!leaveFormRef.value) {
+    ElMessage.warning('表单实例未加载，请刷新重试');
+    return;
+  }
 
-    // 收集所有「专业+人员」组合（设计+校审分开校验）
-    const collectKeys = (roleGroups: MajorGroup[], roleName: string) => {
-      roleGroups.forEach((group) => {
-        if (!group.userMajor) return;
+  try {
+    // 1. 基础表单验证（确保所有必填项已填）
+    await leaveFormRef.value.validate();
+
+    // 2. 提交前二次校验：专业值非空（双重保障）
+    const hasEmptyMajor = form.designers.some((group) => !group.userMajor);
+    if (hasEmptyMajor) {
+      ElMessage.error('存在未选择专业的配置，请完善后提交');
+      return;
+    }
+
+    // 3. 提交前二次校验：「专业+人员」组合唯一（所有角色）
+    let hasDuplicate = false;
+    const validateRoleDuplicate = (roleGroups: MajorGroup[], roleName: string) => {
+      const keys: string[] = [];
+      roleGroups.forEach((group, gIdx) => {
+        const major = form.designers[gIdx].userMajor;
+        if (!major) return;
         group.persons.forEach((person) => {
           if (!person.userId) return;
-          const key = `${group.userMajor}-${person.userId}`;
-          if (allKeys.includes(key)) {
+          const key = `${major}-${person.userId}`;
+          if (keys.includes(key)) {
             hasDuplicate = true;
             ElMessage.error(`${roleName}中存在重复的「专业+人员」组合，请检查`);
           }
-          allKeys.push(key);
+          keys.push(key);
         });
       });
     };
 
-    // 校验设计人员
-    collectKeys(form.designers, '设计人员');
+    validateRoleDuplicate(form.designers, '设计人员');
+    if (hasDuplicate) return;
+    validateRoleDuplicate(form.reviewers, '校审人员');
+    if (hasDuplicate) return;
+    validateRoleDuplicate(form.approved, '审定人员');
+    if (hasDuplicate) return;
+    validateRoleDuplicate(form.auditor, '审核人员');
     if (hasDuplicate) return;
 
-    // 清空临时数组，校验校审人员（不校验设计与校审之间）
-    allKeys.length = 0;
-    collectKeys(form.reviewers, '校审人员');
-    if (hasDuplicate) return;
-
-    // 3. 构建提交数据（适配后端原有数据格式）
+    // 4. 构建提交数据（确保专业值正确传递）
     const submitData = {
       projectId: form.projectId,
       personnel: [
-        // 设计负责人
-        {
-          userId: form.designLeader,
-          userType: 'designLeader',
-          userMajor: null
-        },
-        // 设计人员：展开专业分组，每个人员单独作为一条数据
-        ...form.designers.flatMap((group) =>
-          group.persons.map((person) => ({
-            userId: person.userId,
-            userType: 'designer',
-            userMajor: group.userMajor
-          }))
-        ),
-        // 校审人员：展开专业分组，每个人员单独作为一条数据
-        ...form.reviewers.flatMap((group) =>
-          group.persons.map((person) => ({
-            userId: person.userId,
-            userType: 'reviewer',
-            userMajor: group.userMajor
-          }))
-        )
-      ]
+        // 设计负责人（userType=1）
+        form.designLeader
+          ? {
+              userId: form.designLeader,
+              userType: 'designLeader',
+              userMajor: null
+            }
+          : null,
+
+        // 设计人员（userType=2）
+        ...form.designers.flatMap((group, gIdx) => {
+          const major = form.designers[gIdx].userMajor; // 统一专业来源
+          return group.persons
+            .filter((person) => person.userId) // 过滤空人员
+            .map((person) => ({
+              userId: person.userId,
+              userType: 'designer',
+              userMajor: major // 确保专业值非空
+            }));
+        }),
+
+        // 校审人员（userType=3）
+        ...form.reviewers.flatMap((group, gIdx) => {
+          const major = form.designers[gIdx].userMajor;
+          return group.persons
+            .filter((person) => person.userId)
+            .map((person) => ({
+              userId: person.userId,
+              userType: 'reviewer',
+              userMajor: major
+            }));
+        }),
+
+        // 审定人员（userType=4）
+        ...form.approved.flatMap((group, gIdx) => {
+          const major = form.designers[gIdx].userMajor;
+          return group.persons
+            .filter((person) => person.userId)
+            .map((person) => ({
+              userId: person.userId,
+              userType: 'approved',
+              userMajor: major
+            }));
+        }),
+
+        // 审核人员（userType=5）
+        ...form.auditor.flatMap((group, gIdx) => {
+          const major = form.designers[gIdx].userMajor;
+          return group.persons
+            .filter((person) => person.userId)
+            .map((person) => ({
+              userId: person.userId,
+              userType: 'auditor',
+              userMajor: major
+            }));
+        })
+      ].filter(Boolean) // 过滤null值（如未选设计负责人）
     };
-    // 4. 数据处理（保持原有逻辑不变）
-    const arr = [];
-    userList.value.forEach((item) => {
-      submitData.personnel.forEach((item1) => {
-        if (item1.userId == item.userId) {
-          let userType = 1;
-          if (item1.userType == 'designer') userType = 2;
-          else if (item1.userType == 'reviewer') userType = 3;
-          arr.push({
-            userName: item.nickName,
-            projectId: submitData.projectId,
-            userId: item1.userId,
-            userType: userType,
-            userMajor: item1.userMajor
-          });
-        }
-      });
+
+    // 5. 数据格式转换（适配后端userType定义）
+    const submitList = submitData.personnel.map((item: any) => {
+      let userType = 1; // 默认设计负责人
+      if (item.userType == 'designer') userType = 2;
+      else if (item.userType == 'reviewer') userType = 3;
+      else if (item.userType == 'approved') userType = 4;
+      else if (item.userType == 'auditor') userType = 5;
+
+      // 查找用户名（确保userName非空）
+      const user = userList.value.find((u) => u.userId == item.userId);
+      const userName = user ? user.nickName : `用户${item.userId}`;
+
+      return {
+        userName,
+        projectId: submitData.projectId,
+        userId: item.userId,
+        userType,
+        userMajor: item.userMajor // 最终传递的专业值（确保非空）
+      };
     });
 
-    // 5. 提交到后端（保持原有逻辑不变）
+    // 6. 提交到后端（确保参数正确）
     const loading = ElLoading.service({ text: '提交中...', background: 'rgba(255,255,255,0.7)' });
     const res = await designUserAdd({
-      list: arr,
-      projectId: currentProject.value?.id
+      list: submitList,
+      projectId: form.projectId
     });
+
     if (res.code == 200) {
       disabledForm.value = true;
-      loading.close();
-      ElMessage.success('提交成功');
+      ElMessage.success('提交成功，已保存人员配置');
+      // 提交成功后重新加载数据（确保回显正确）
+      await designUser();
     } else {
-      ElMessage.error(res.msg || '提交失败');
+      ElMessage.error(res.msg || '提交失败，请重试');
+    }
+  } catch (error: any) {
+    // 捕获表单验证错误或其他异常
+    if (error.name == 'ValidationError') {
+      ElMessage.error('请完善表单必填项后再提交');
+    } else {
+      ElMessage.error('提交过程异常，请刷新页面重试');
+      console.error('表单提交异常：', error);
     }
-  } catch (error) {
-    ElMessage.error('请完善表单信息后再提交');
   } finally {
-    // ElLoading.service().close();
+    ElLoading.service().close();
   }
 };
 
-/** 重置表单（适配新数据结构） */
-const resetForm = () => {
-  if (leaveFormRef.value) {
-    leaveFormRef.value.resetFields();
-    // 重置为默认空状态（1个专业分组，每组1个空人员）
-    form.designers = [createEmptyMajorGroup()];
-    form.reviewers = [createEmptyMajorGroup()];
-    ElMessage.info('表单已重置');
-  }
+/** 重置表单（确保恢复初始状态） */
+const resetForm = async () => {
+  if (!leaveFormRef.value) return;
+  // 重置表单字段
+  leaveFormRef.value.resetFields();
+  // 重置数据结构（恢复为初始空分组）
+  form.designers = [createEmptyMajorGroup()];
+  form.reviewers = [createEmptyMajorGroup()];
+  form.approved = [createEmptyMajorGroup()];
+  form.auditor = [createEmptyMajorGroup()];
+  form.designLeader = null;
+  ElMessage.info('表单已重置，请重新配置人员');
 };
 
-// 监听项目ID刷新数据
+/** 监听项目ID变化：刷新用户列表和表单数据 */
 const listeningProject: WatchStopHandle = watch(
   () => currentProject.value?.id,
-  () => {
-    getDeptAllUser(userStore.deptId).then(() => {
-      designUser();
-    });
-  }
+  async (newProjectId) => {
+    if (newProjectId) {
+      form.projectId = newProjectId;
+      // 先获取用户列表，再加载表单数据
+      await getDeptAllUser(userStore.deptId);
+      await designUser();
+    }
+  },
+  { immediate: true } // 初始加载时触发
+);
+
+/** 监听专业字典变化：确保专业下拉框数据最新 */
+watch(
+  () => des_user_major.value,
+  (newMajorList) => {
+    if (newMajorList.length == 0) {
+      ElMessage.warning('专业字典数据为空，请联系管理员配置');
+    }
+  },
+  { deep: true }
 );
 
 // 页面生命周期
 onUnmounted(() => {
+  // 清除监听
   listeningProject();
 });
-onMounted(() => {
-  getDeptAllUser(userStore.deptId).then(() => {
-    designUser();
-  });
+
+onMounted(async () => {
+  // 初始加载：先获取部门用户，再加载表单数据
+  await getDeptAllUser(userStore.deptId);
+  await designUser();
+  // 打印初始数据（调试用）
+  console.log('初始专业字典：', des_user_major.value);
+  console.log('初始用户列表：', userList.value);
 });
 </script>
 
 <style lang="scss" scoped>
 .appointment {
-  width: 70vw;
-  max-width: 1600px;
+  width: 100%;
+  max-width: 1800px;
 
   .el-select__wrapper {
     width: 100% !important;
   }
 
-  .el-button--small {
-    margin-bottom: 0;
-  }
-
   .fonts {
     .el-form-item--default .el-form-item__label {
       font-size: 18px !important;
+      font-weight: 600;
     }
   }
 }
 
-// 自定义动画
+// 自定义动画：新增专业行时的过渡效果
 @keyframes fadeIn {
   from {
     opacity: 0;
@@ -663,12 +956,11 @@ onMounted(() => {
     transform: translateY(0);
   }
 }
-
 .animate-fadeIn {
   animation: fadeIn 0.3s ease-out forwards;
 }
 
-// 表单样式优化
+// 表单样式优化：统一间距和字体
 ::v-deep .el-form {
   --el-form-item-margin-bottom: 0;
 }
@@ -679,19 +971,31 @@ onMounted(() => {
   &__label {
     font-weight: 500;
     color: #4e5969;
+    font-size: 14px;
   }
 
   &__content {
     padding: 0;
+    font-size: 14px;
+  }
+
+  // 表单验证错误提示样式
+  &__error {
+    font-size: 12px;
+    margin-top: 4px;
   }
 }
 
+// 选择器样式：统一高度和边框
 ::v-deep .el-select {
   width: 100%;
 
   .el-input__inner {
     border-radius: 6px;
     transition: all 0.3s ease;
+    padding: 0 12px;
+    height: 32px; // 统一高度，避免布局错乱
+    font-size: 14px;
   }
 
   &:hover .el-input__inner {
@@ -704,21 +1008,19 @@ onMounted(() => {
   }
 }
 
+// 按钮样式：统一大小和颜色
 ::v-deep .el-button {
-  border-radius: 6px;
-  padding: 8px 16px;
+  border-radius: 4px;
+  padding: 4px 8px;
+  font-size: 12px;
 
-  &--primary {
-    background-color: #409eff;
-    border-color: #409eff;
-
-    &:hover {
-      background-color: #66b1ff;
-      border-color: #66b1ff;
-    }
+  &--small {
+    padding: 2px 6px;
+    font-size: 12px;
   }
 
-  &--success {
+  // 角色区分色（提升视觉识别）
+  &.el-button--success {
     background-color: #67c23a;
     border-color: #67c23a;
 
@@ -733,7 +1035,7 @@ onMounted(() => {
     }
   }
 
-  &--danger {
+  &.el-button--danger {
     background-color: #f56c6c;
     border-color: #f56c6c;
 
@@ -745,11 +1047,10 @@ onMounted(() => {
     &:disabled {
       background-color: #ffcccc;
       border-color: #ffbbbb;
-      cursor: not-allowed;
     }
   }
 
-  &--text {
+  &.el-button--text {
     color: #f56c6c;
 
     &:hover {
@@ -759,40 +1060,35 @@ onMounted(() => {
   }
 }
 
-// 响应式网格布局
-.grid {
-  display: grid;
+// 确保表头不换行
+.whitespace-nowrap {
+  white-space: nowrap;
 }
 
-.grid-cols-1 {
-  grid-template-columns: repeat(1, minmax(0, 1fr));
+// 响应式处理：小屏幕横向滚动，避免挤压
+@media (max-width: 1200px) {
+  ::v-deep .el-row {
+    flex-wrap: nowrap !important; // 强制不换行
+  }
+
+  ::v-deep .el-col {
+    flex-shrink: 0 !important; // 禁止列收缩
+  }
+
+  .appointment {
+    width: 98vw;
+  }
+
+  // 小屏幕下调整标签宽度，节省空间
+  ::v-deep .el-form-item--default .el-form-item__label {
+    width: 50px !important;
+  }
 }
 
-.md\:grid-cols-2 {
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-}
-
-.gap-4 {
-  gap: 1rem;
-}
-
-// 适配小屏幕（小于768px时，垂直排列）
-@media (max-width: 768px) {
-  .appWidth {
-    width: 95vw;
-  }
-
-  ::v-deep .el-form {
-    padding: 4px;
-  }
-
-  ::v-deep .el-form-item__label {
-    width: 100px;
-  }
-
-  // 小屏幕下各列上下间距
-  ::v-deep .el-col-xs-24 + .el-col-xs-24 {
-    margin-top: 12px;
-  }
+// 空状态样式优化：统一视觉效果
+::v-deep .text-gray-500.text-xs {
+  text-align: center;
+  background-color: #f9fafb;
+  border-color: #e5e7eb;
 }
 </style>
diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue
index d744c51..7ec17a6 100644
--- a/src/views/design/designChange/index.vue
+++ b/src/views/design/designChange/index.vue
@@ -44,7 +44,7 @@
         <el-table-column label="卷册号" align="center" prop="volumeNo" width="150" />
         <el-table-column label="流程状态" align="center">
           <template #default="scope">
-            <dict-tag v-if="scope.row.fileId != null" :options="wf_business_status" :value="scope.row.status" />
+            <dict-tag v-if="scope.row.costEstimation > 0" :options="wf_business_status" :value="scope.row.status" />
           </template>
         </el-table-column>
         <el-table-column label="变更文件" align="center" width="150">
@@ -64,19 +64,16 @@
             <dict-tag :options="design_change_reason_type" :value="scope.row.changeReason ? scope.row.changeReason.split(',') : []" />
           </template>
         </el-table-column>
+        <el-table-column label="图纸状态" align="center">
+          <template #default="scope">
+            <dict-tag v-if="scope.row.fileId != null" :options="wf_business_status" :value="scope.row.auditStatus" />
+          </template>
+        </el-table-column>
         <el-table-column label="变更内容" align="center" prop="changeContent" width="150" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="150" />
         <el-table-column label="备注" align="center" prop="remark" width="200" />
         <el-table-column label="操作" align="center" fixed="right" width="300">
           <template #default="scope">
-            <el-button
-              type="primary"
-              link
-              icon="Upload"
-              @click="handleAddChange(scope.row)"
-              v-if="(scope.row.status == 'finish' || scope.row.costEstimation == '0') && scope.row.auditStatus == 'draft'"
-              >上传</el-button
-            >
             <el-button
               type="success"
               link
@@ -86,8 +83,31 @@
               @click="handleViewInfo(scope.row)"
               >查看</el-button
             >
-            <el-button type="success" link icon="View" v-hasPermi="['design:designChange:query']" @click="handleViewDetail(scope.row)"
-              >通知单</el-button
+            <el-button
+              type="primary"
+              v-if="scope.row.status == 'draft' && scope.row.costEstimation > 0"
+              link
+              icon="plus"
+              v-hasPermi="['design:designChange:query']"
+              @click="handleViewUpdate(scope.row)"
+              >审核通知单</el-button
+            >
+            <el-button
+              v-if="scope.row.status != 'draft'"
+              type="success"
+              link
+              icon="View"
+              v-hasPermi="['design:designChange:query']"
+              @click="handleViewDetail(scope.row)"
+              >查看通知单</el-button
+            >
+            <el-button
+              type="primary"
+              link
+              icon="Upload"
+              @click="handleAddChange(scope.row)"
+              v-if="(scope.row.status == 'finish' || scope.row.costEstimation == '0') && scope.row.auditStatus == 'draft'"
+              >上传图纸</el-button
             >
             <el-button
               type="warning"
@@ -210,6 +230,17 @@ const handleAdd = () => {
   });
 };
 /** 查看详情 */
+const handleViewUpdate = (row) => {
+  proxy.$tab.closePage(proxy.$route);
+  proxy.$router.push({
+    path: `/approval/designChange/indexEdit`,
+    query: {
+      id: row.id,
+      type: 'update'
+    }
+  });
+};
+/** 查看详情 */
 const handleViewDetail = (row) => {
   proxy.$tab.closePage(proxy.$route);
   proxy.$router.push({
diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue
index d10fdca..428be39 100644
--- a/src/views/design/designChange/indexEdit.vue
+++ b/src/views/design/designChange/indexEdit.vue
@@ -145,7 +145,7 @@
                 ></el-col>
                 <el-col :span="12">
                   <el-form-item label="费用" prop="costEstimation">
-                    <el-input v-model="form.costEstimation" type="number" placeholder="请输入费用" /> </el-form-item
+                    <el-input min="0" v-model="form.costEstimation" type="number" placeholder="请输入费用" /> </el-form-item
                 ></el-col>
                 <el-col :span="24">
                   <el-form-item label="变更费用估算表" label-width="110px" prop="costEstimationFile">
@@ -348,8 +348,11 @@ const getInfo = () => {
   loading.value = true;
   buttonLoading.value = false;
   nextTick(async () => {
-    const res = await getDesignChange(routeParams.value.id);
+    let id = routeParams.value.id.split('_')[0];
+    const res = await getDesignChange(id);
     Object.assign(form.value, res.data);
+    console.log(form.value);
+
     if (form.value.changeReason.length > 0) {
       form.value.changeReason = form.value.changeReason.split(',');
     }
@@ -374,24 +377,26 @@ const submitForm = (status1: string) => {
     if (form.value.saveFile && form.value.saveFile.length > 0) {
       saveFile = form.value.saveFile.join(',');
     }
-  }
-  leaveFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      var res;
-      res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
-      if (res.code == 200) {
-        if (form.value.costEstimation == '0') {
-          ElMessage.success('通知成功');
-          goBack();
+    leaveFormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        buttonLoading.value = true;
+        var res;
+        res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
+        if (res.code == 200) {
+          if (form.value.costEstimation == '0') {
+            ElMessage.success('通知成功');
+            goBack();
+          } else {
+            submit(status.value, res.data);
+          }
         } else {
-          submit(status.value, res.data);
+          ElMessage.error(res.msg);
         }
-      } else {
-        ElMessage.error(res.msg);
       }
-    }
-  });
+    });
+  } else {
+    submit(status.value, form.value);
+  }
 };
 
 const submitFlow = async () => {
@@ -429,14 +434,15 @@ const submitCallback = async () => {
 };
 //审批
 const approvalVerifyOpen = async () => {
-  submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
-  // submitVerifyRef.value.openDialog(routeParams.value.taskId);
+  // submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
 };
 // 图纸上传成功之后 开始提交
 const route = useRoute();
 const router = useRouter();
 const submit = async (status, data) => {
   form.value = data;
+  form.value.id = form.value.id + '_audit';
   if (status === 'draft') {
     buttonLoading.value = false;
     proxy?.$modal.msgSuccess('暂存成功');
diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue
index 0f5489d..42b1999 100644
--- a/src/views/design/drawing/indexEdit.vue
+++ b/src/views/design/drawing/indexEdit.vue
@@ -36,7 +36,7 @@
         </div>
       </el-card>
       <!-- 提交组件 -->
-      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <submitVerify ref="submitVerifyRef" :businessId1="form.id" :task-variables="taskVariables" @submit-callback="submitCallback" />
       <approvalRecord ref="approvalRecordRef"></approvalRecord>
       <!-- 流程选择对话框 -->
       <el-dialog
@@ -253,13 +253,16 @@ const submitCallback = async () => {
 };
 //审批
 const approvalVerifyOpen = async () => {
-  submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
-  // submitVerifyRef.value.openDialog(routeParams.value.taskId);
+  // 判断是否还需要设计验证
+  if (form.value.isWindow) {
+    submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
+  } else {
+    submitVerifyRef.value.openDialog(routeParams.value.taskId);
+  }
 };
 // 图纸上传成功之后 开始提交
 const submit = async (status, data) => {
   form.value = data;
-  form.value.id = routeParams.value.type == 'add' ? form.value.id + '_' : form.value.id.split('_')[0];
   form.value.status = data.auditStatus ? data.auditStatus : data.status;
   if (status === 'draft') {
     buttonLoading.value = false;
diff --git a/src/views/design/drawingreview/detailForm.vue b/src/views/design/drawingreview/detailForm.vue
index b836c41..e997e12 100644
--- a/src/views/design/drawingreview/detailForm.vue
+++ b/src/views/design/drawingreview/detailForm.vue
@@ -11,12 +11,17 @@
         <el-col :span="12">
           <el-form-item label="编号" prop="num">
             <!-- prop="num" 需与 rules 中键名一致 -->
-            <el-input v-model="formData.num" placeholder="请输入编号" />
+            <el-input v-model="formData.num" disabled placeholder="请输入编号" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="专业" prop="professional">
-            <el-input v-model="formData.professional" placeholder="请输入专业" />
+          <el-form-item label="专业" prop="professionalName">
+            <el-input v-model="formData.professionalName" disabled placeholder="请输入专业" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="卷册" prop="volume">
+            <el-input v-model="formData.volume" disabled placeholder="请输入卷册" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -24,14 +29,8 @@
             <el-input v-model="formData.stage" placeholder="请输入设计阶段" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="卷册" prop="volume">
-            <el-input v-model="formData.volume" placeholder="请输入卷册" />
-          </el-form-item>
-        </el-col>
       </el-row>
     </div>
-
     <!-- 项目信息区域 -->
     <div class="form-section">
       <div class="section-title">
@@ -54,7 +53,6 @@
         </el-col>
       </el-row>
     </div>
-
     <!-- 人员信息区域 -->
     <div class="form-section">
       <div class="section-title">
@@ -65,56 +63,77 @@
       <el-row :gutter="20" class="section-content">
         <el-col :span="12">
           <el-form-item label="设计人" prop="designer">
-            <el-input v-model="formData.designer" placeholder="请输入设计人" />
+            <el-input disabled v-model="formData.designerName" placeholder="请输入设计人" />
           </el-form-item>
         </el-col>
         <el-col :span="12"></el-col>
         <el-col :span="12">
           <el-form-item label="校审人员" prop="proofreading">
-            <el-input v-model="formData.proofreading" placeholder="请输入校审人员" />
+            <el-input disabled v-model="formData.proofreading" placeholder="请输入校审人员" />
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="12">
-          <el-form-item label="校审人员ID" prop="proofreadingId">
-            <el-input v-model="formData.proofreadingId" placeholder="请输入校审人员ID" />
-          </el-form-item>
-        </el-col> -->
         <el-col :span="12">
           <el-form-item label="校审时间" prop="proofreadingDate">
-            <el-date-picker v-model="formData.proofreadingDate" type="date" placeholder="选择校审时间" format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD" />
+            <el-date-picker
+              v-model="formData.proofreadingDate"
+              type="date"
+              disabled
+              placeholder="选择校审时间"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="审核人员" prop="audit">
-            <el-input v-model="formData.audit" placeholder="请输入审核人员" />
+            <el-input disabled v-model="formData.audit" placeholder="请输入审核人员" />
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="12">
-          <el-form-item label="审核人员ID" prop="auditId">
-            <el-input v-model="formData.auditId" placeholder="请输入审核人员ID" />
-          </el-form-item>
-        </el-col> -->
         <el-col :span="12">
           <el-form-item label="审核时间" prop="auditDate">
-            <el-date-picker v-model="formData.auditDate" type="date" placeholder="选择审核时间" format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD" />
+            <el-date-picker
+              disabled
+              v-model="formData.auditDate"
+              type="date"
+              placeholder="选择审核时间"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审定人员" prop="approve">
+            <el-input disabled v-model="formData.approve" placeholder="请输入审定人员" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审定时间" prop="approveDate">
+            <el-date-picker
+              disabled
+              v-model="formData.approveDate"
+              type="date"
+              placeholder="选择审定时间"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="执行人员" prop="executor">
-            <el-input v-model="formData.executor" placeholder="请输入执行人员" />
+            <el-select
+              v-model="formData.executorId"
+              @change="changeExecutor"
+              placeholder="选择执行人员"
+              class="w-full transition-all duration-300 border-gray-300"
+            >
+              <el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.userName" :value="item.userId" />
+            </el-select>
+            <!-- <el-input v-model="formData.executor" placeholder="请输入执行人员" /> -->
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="12">
-          <el-form-item label="执行人员ID" prop="executorId">
-            <el-input v-model="formData.executorId" placeholder="请输入执行人员ID" />
-          </el-form-item>
-        </el-col> -->
         <el-col :span="12">
           <el-form-item label="执行时间" prop="executorDate">
-            <el-date-picker v-model="formData.executorDate" type="date" placeholder="选择执行时间" format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD" />
+            <el-date-picker v-model="formData.executorDate" type="date" placeholder="选择执行时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -151,17 +170,20 @@
 <script setup name="ExamineForm" lang="ts">
 import { ref, watch, reactive } from 'vue';
 import { fillOutTheDesignVerificationForm, drawingreviewReceipts } from '@/api/design/drawingreview';
-import type { FormInstance, FormRules } from 'element-plus';
+import { dayjs, type FormInstance, type FormRules } from 'element-plus';
 import { useUserStoreHook } from '@/store/modules/user';
 import { computed } from 'vue';
-import { subProjectListAll } from '@/api/design/drawingreview';
+import { subProjectListAll, getDrawingreviewReceipts } from '@/api/design/drawingreview';
+import { desUserList } from '@/api/design/appointment';
 
 // 获取用户 store
 const userStore = useUserStoreHook();
+const userList = ref([]);
+const userMap = new Map();
 // 从 store 中获取当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-console.log(currentProject.value);
 const subProjectList = ref([]);
+const Drawingreview = ref({});
 let subProjectMap = new Map();
 // 定义表单数据类型
 interface FormData {
@@ -193,9 +215,9 @@ const rules: FormRules = {
   num: [{ required: true, message: '请输入编号', trigger: 'blur' }],
   professional: [{ required: true, message: '请输入专业', trigger: 'blur' }]
 };
-
+const userName = userStore.nickname;
 // 表单数据 - 直接在组件内定义，不再通过Props接收
-const formData = reactive<FormData>({
+const formData = ref({
   num: '',
   professional: '',
   stage: '',
@@ -228,8 +250,8 @@ watch(
   (newVal) => {
     if (newVal) {
       // 根据实际项目结构调整赋值字段
-      formData.projectId = newVal.id || '';
-      formData.projectName = newVal.name || '';
+      formData.value.projectId = newVal.id || '';
+      formData.value.projectName = newVal.name || '';
     }
   },
   { immediate: true, deep: true }
@@ -259,12 +281,12 @@ const resetFields = () => {
 
 // 获取表单数据
 const getFormData = (): FormData => {
-  return { ...formData };
+  return { ...formData.value };
 };
 
 // 设置表单数据
 const setFormData = (data: Partial<FormData>) => {
-  Object.assign(formData, data);
+  Object.assign(formData.value, data);
 };
 
 // 提交表单
@@ -279,12 +301,10 @@ const submit = async (businessId, cb) => {
     background: 'rgba(0, 0, 0, 0.7)'
   });
 
-  formData.subprojectName = subProjectMap.get(formData.subprojectId);
-  // formData.drawingreviewId = businessId;
+  formData.value.subprojectName = subProjectMap.get(formData.value.subprojectId);
   console.log(businessId);
-  // businessId 设置 如果有下滑线去掉后面及下划线
-  formData.drawingreviewId = businessId.replace(/_/g, '');
-  const res = await drawingreviewReceipts(formData);
+  formData.value.drawingreviewId = businessId.replace(/_/g, '');
+  const res = await drawingreviewReceipts(formData.value);
   if (res.code === 200) {
     // 提交成功处理逻辑
     console.log('提交成功');
@@ -292,6 +312,52 @@ const submit = async (businessId, cb) => {
   // 关闭
   ElLoading.service().close();
 };
+// 获取单据
+const getInfo = async (id) => {
+  // 获取单据
+  console.log(id);
+
+  await getDeptAllUser();
+  let res = await getDrawingreviewReceipts(id);
+  console.log(res);
+  formData.value = res.data;
+  console.log(formData);
+  // 设计人  名称 designerName  id：designer
+  // 校审人员  名称 proofreading id: proofreadingId  校审时间 proofreadingDate
+  // 审定人员  名称 approve  id：approveId  审定时间 approveDate
+  // 审核人员  名称 audit  id：auditId  审核时间 auditDate
+  // userStore.nickname //用户名
+  // userStore.userId //用户id
+  if (formData.value.approve) {
+  } else if (formData.value.audit) {
+    // 说明流程在第三步
+    formData.value.approve = userStore.nickname;
+    formData.value.approveId = userStore.userId;
+    formData.value.approveDate = dayjs().format('YYYY-MM-DD');
+  } else if (formData.value.proofreading) {
+    // 说明流程在第二步
+    formData.value.audit = userStore.nickname;
+    formData.value.auditId = userStore.userId;
+    formData.value.auditDate = dayjs().format('YYYY-MM-DD');
+  } else if (formData.value.designerName) {
+    // 说明流程在第一步
+    formData.value.proofreading = userStore.nickname;
+    formData.value.proofreadingId = userStore.userId;
+    formData.value.proofreadingDate = dayjs().format('YYYY-MM-DD');
+  }
+};
+/** 获取当前设计用户 */
+const getDeptAllUser = async () => {
+  const res = await desUserList({ projectId: currentProject.value?.id, userType: '2' });
+  userList.value = res.data || [];
+  for (let i = 0; i < userList.value.length; i++) {
+    userMap.set(userList.value[i].userId, userList.value[i].userName);
+  }
+};
+const changeExecutor = (val) => {
+  formData.value.executor = userMap.get(val);
+  formData.value.executorDate = dayjs().format('YYYY-MM-DD');
+};
 onMounted(() => {
   getSubProject();
 });
@@ -301,7 +367,8 @@ defineExpose({
   resetFields,
   getFormData,
   setFormData,
-  submit
+  submit,
+  getInfo
 });
 </script>
 
diff --git a/src/views/design/volumeCatalog/blueprintEdit.vue b/src/views/design/volumeCatalog/blueprintEdit.vue
index e36ef92..41a4d6d 100644
--- a/src/views/design/volumeCatalog/blueprintEdit.vue
+++ b/src/views/design/volumeCatalog/blueprintEdit.vue
@@ -39,7 +39,7 @@
         </div>
       </el-card>
       <!-- 提交组件 -->
-      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <submitVerify ref="submitVerifyRef" :businessId1="form.id" :task-variables="taskVariables" @submit-callback="submitCallback" />
       <approvalRecord ref="approvalRecordRef"></approvalRecord>
       <!-- 流程选择对话框 -->
       <el-dialog
@@ -202,8 +202,14 @@ const submitCallback = async () => {
 };
 //审批
 const approvalVerifyOpen = async () => {
-  // 图纸评审验证
-  submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
+  // 图纸评审验证 判断是否需要设计验证
+  if (form.value.isWindow) {
+    console.log(routeParams.value.businessId);
+    
+    submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
+  } else {
+    submitVerifyRef.value.openDialog(routeParams.value.taskId);
+  }
 };
 const submit = async (status, data) => {
   form.value = data;
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index 93e36e9..35fde86 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -541,7 +541,6 @@ const onSubmit = async () => {
     buttonLoading.value = false;
   }
 };
-
 /** 删除按钮操作 */
 const handleDelete = async (row?: VolumeCatalogVO) => {
   const _ids = row?.design || ids.value;
diff --git a/src/views/design/volumeCatalog/indexEdit.vue b/src/views/design/volumeCatalog/indexEdit.vue
index ecf0b5f..095104c 100644
--- a/src/views/design/volumeCatalog/indexEdit.vue
+++ b/src/views/design/volumeCatalog/indexEdit.vue
@@ -20,16 +20,12 @@
         </div>
         <div class="p-6">
           <div class="grid grid-cols-1 gap-4">
-            <el-form
-              ref="leaveFormRef"
-              :disabled="routeParams.type === 'view' || form.auditStatus == 'waiting'"
-              :model="form"
-              :rules="rules"
-              label-width="100px"
-              class="space-y-4"
-            >
+            <el-form ref="leaveFormRef" :model="form" :rules="rules" label-width="100px" class="space-y-4">
               <el-form-item label="图纸文件" prop="fileId" class="mb-2 md:col-span-2">
-                <el-input v-model="form.fileName" disabled placeholder="图纸名称" />
+                <!-- <el-input v-model="form.fileName" disabled placeholder="图纸名称" /> -->
+                <el-link :href="form.fileUrl" target="_blank" type="primary" :underline="false">
+                  {{ form.fileName }}
+                </el-link>
               </el-form-item>
             </el-form>
           </div>
@@ -199,7 +195,7 @@ const submitCallback = async () => {
 //审批
 const approvalVerifyOpen = async () => {
   // 图纸评审验证
-  submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
 };
 const submit = async (status, data) => {
   form.value = data;
diff --git a/src/views/materials/materialsEquipment/materialIssue/index.vue b/src/views/materials/materialsEquipment/materialIssue/index.vue
index 31175fc..1a0e899 100644
--- a/src/views/materials/materialsEquipment/materialIssue/index.vue
+++ b/src/views/materials/materialsEquipment/materialIssue/index.vue
@@ -56,7 +56,7 @@
         <el-table-column label="操作" align="center" min-width="150" fixed="right">
           <template #default="scope">
             <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['materials:materialIssue:query']">查看</el-button>
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialIssue:edit']">修改</el-button>
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialIssue:edit']">修改</el-button> -->
             <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['materials:materialIssue:remove']"
               >删除</el-button
             >
@@ -130,8 +130,8 @@
                       :prop="`itemList.${index}.name`"
                       :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]"
                     >
-                      <el-select v-model="item.name" placeholder="请选择名称" @change="(value) => getNameChange(value, index, item)">
-                        <el-option v-for="opt in optionsName" :key="opt.id" :label="opt.materialsName" :value="opt.materialsName" />
+                      <el-select v-model="item.inventoryId" placeholder="请选择名称" @change="(value) => getNameChange(value, index, item)">
+                        <el-option v-for="opt in optionsName" :key="opt.id" :label="opt.materialsName" :value="opt.id" />
                       </el-select>
                     </el-form-item>
                   </el-col>
@@ -141,7 +141,7 @@
                       :prop="`itemList.${index}.specification`"
                       :rules="[{ required: true, message: '规格不能为空', trigger: 'blur' }]"
                     >
-                      <el-input v-model="item.specification" placeholder="请输入规格" />
+                      <el-input disabled v-model="item.specification" placeholder="请输入规格" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -150,10 +150,10 @@
                       :prop="`itemList.${index}.unit`"
                       :rules="[{ required: true, message: '单位不能为空', trigger: 'blur' }]"
                     >
-                      <el-input v-model="item.unit" placeholder="请输入单位" />
+                      <el-input disabled v-model="item.unit" placeholder="请输入单位" />
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item
                       label="库存"
                       :prop="`itemList.${index}.stockQuantity`"
@@ -169,29 +169,19 @@
                         @blur="handleStockChange(index)"
                       />
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                   <el-col :span="12">
-                    <el-form-item
-                      label="领取"
-                      :prop="`itemList.${index}.issuedQuantity`"
-                      :rules="[
-                        { required: true, message: '领取数量不能为空', trigger: 'blur' },
-                        { type: 'number', min: 0, message: '领取数量不能小于0', trigger: ['blur', 'change'] },
-                        {
-                          validator: (rule, value, callback) => validateIssuedQuantity(rule, value, callback, index),
-                          trigger: ['blur', 'change']
-                        }
-                      ]"
-                    >
+                    <el-form-item label="领取" :prop="`itemList.${index}.issuedQuantity`">
                       <el-input
                         v-model.number="item.issuedQuantity"
+                        disabled
                         placeholder="请输入领取数量"
                         @input="handleIssuedChange(index)"
                         @blur="handleIssuedChange(index)"
                       />
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item
                       label="剩余"
                       :prop="`itemList.${index}.remainingQuantity`"
@@ -204,7 +194,7 @@
                     <el-form-item label="备注" :prop="`itemList.${index}.remark`">
                       <el-input v-model="item.remark" placeholder="请输入内容" />
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                   <el-col :span="12" v-if="form.itemList.length > 1">
                     <div class="item-actions">
                       <el-button type="danger" link @click="removeItem(index)" icon="Delete">删除</el-button>
@@ -263,6 +253,7 @@ import {
   delMaterialIssue,
   addMaterialIssue,
   updateMaterialIssue,
+  inventoryList,
   getMaterialName
 } from '@/api/materials/materialIssue';
 
@@ -399,7 +390,9 @@ const getList = async () => {
 // 获取材料名称列表
 const getName = async () => {
   try {
-    const res = await getMaterialName(currentProject.value.id);
+    const res = await inventoryList(currentProject.value.id);
+    console.log(res);
+
     if (res.code == 200) {
       optionsName.value = res.data;
     }
@@ -410,14 +403,15 @@ const getName = async () => {
 
 // 材料名称选择变化处理（修改select的value为名称，而非ID）
 const getNameChange = (value, index, item) => {
-  const selected = optionsName.value.find((opt) => opt.materialsName === value);
+  const selected = optionsName.value.find((opt) => opt.id === value);
   if (selected) {
     item.name = selected.materialsName; // 直接赋值名称
     item.materialsId = selected.id; // 保留ID用于后端
     item.specification = selected.typeSpecificationName;
     item.unit = selected.weightId;
+    item.issuedQuantity = selected.number;
     item.stockQuantity = Number(selected.inventoryNumber) || 0;
-    calculateRemaining(index); // 计算剩余数量
+    // calculateRemaining(index); // 计算剩余数量
   }
 };
 
@@ -504,14 +498,14 @@ const watchItemChanges = (index: number) => {
     itemWatchStopFns.value[index]();
   }
 
-  // 监听库存和领取数量变化
-  const stop = watch(
-    () => [form.value.itemList[index].stockQuantity, form.value.itemList[index].issuedQuantity],
-    () => {
-      calculateRemaining(index);
-    },
-    { immediate: true }
-  );
+  // // 监听库存和领取数量变化
+  // const stop = watch(
+  //   () => [form.value.itemList[index].stockQuantity, form.value.itemList[index].issuedQuantity],
+  //   () => {
+  //     calculateRemaining(index);
+  //   },
+  //   { immediate: true }
+  // );
 
   itemWatchStopFns.value[index] = stop;
 };
diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue
index b1523aa..a1bc27a 100644
--- a/src/views/materials/purchaseDoc/index.vue
+++ b/src/views/materials/purchaseDoc/index.vue
@@ -133,8 +133,8 @@
           ></el-col>
           <el-col :span="12" :offset="0"
             ><el-form-item label="供应商" prop="supplier">
-              <el-select v-model="form.supplier" value-key="id" placeholder="请选择供应商" clearable filterable @change="">
-                <el-option v-for="item in supplierOptions" :key="item.id" :label="item.name" :value="item.name"> </el-option>
+              <el-select v-model="form.supplierId" value-key="id" placeholder="请选择供应商" clearable filterable @change="">
+                <el-option v-for="item in supplierOptions" :key="item.id" :label="item.supplierName" :value="item.id"> </el-option>
               </el-select> </el-form-item
           ></el-col>
           <el-col :span="12" :offset="0"
@@ -268,6 +268,7 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { getToken } from '@/utils/auth';
 import logisticsDetail from './comm/logisticsDetail.vue';
 import { FormRules } from 'element-plus';
+import { listSupplierInput } from '@/api/supplierInput/supplierInput';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
@@ -307,6 +308,8 @@ const initFormData: any = {
   docCode: undefined,
   supplier: undefined,
   reason: undefined,
+  supplierId: undefined,
+
   name: undefined,
   arrivalDate: undefined,
   designDirectorTel: undefined,
@@ -479,6 +482,7 @@ const submitForm = () => {
       form.value.associationList = form.value.planId?.map((item: any) => ({
         planId: item
       }));
+      form.value.supplier = supplierOptions.value.find((item) => item.id == form.value.supplierId)?.supplierName;
 
       if (form.value.id) {
         await updatePurchaseDoc(form.value).finally(() => (buttonLoading.value = false));
@@ -514,10 +518,10 @@ const getBatchList = async () => {
 };
 
 const getSupplierList = async () => {
-  const res = await listContractor({
+  const res = await listSupplierInput({
     projectId: currentProject.value?.id,
     pageNum: 1,
-    contractorType: 4,
+    state: 'finish',
     pageSize: 10000
   });
   supplierOptions.value = res.rows;
diff --git a/src/views/project/contractor/index.vue b/src/views/project/contractor/index.vue
index 4bfcdc8..6b8953b 100644
--- a/src/views/project/contractor/index.vue
+++ b/src/views/project/contractor/index.vue
@@ -81,6 +81,11 @@
         <el-form-item label="公司名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入公司名称" />
         </el-form-item>
+        <el-form-item label="供应商" prop="supplier">
+          <el-select v-model="form.supplierId" value-key="id" placeholder="请选择供应商" clearable filterable @change="">
+            <el-option v-for="item in supplierOptions" :key="item.id" :label="item.supplierName" :value="item.id"> </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="负责人" prop="principal">
           <el-input v-model="form.principal" placeholder="请输入负责人" />
         </el-form-item>
@@ -121,6 +126,7 @@ import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/con
 import ContractorFileDialog from '@/views/project/contractor/component/ContractorFileDialog.vue';
 import { useUserStoreHook } from '@/store/modules/user';
 import { getDicts, listData } from '@/api/system/dict/data';
+import { listSupplierInput } from '@/api/supplierInput/supplierInput';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -152,6 +158,8 @@ const initFormData: ContractorForm = {
   principalPhone: undefined,
   custodian: undefined,
   custodianPhone: undefined,
+  supplierId: undefined,
+  supplier: undefined,
   contractorType: undefined,
   fileMap: undefined,
   remark: undefined,
@@ -257,6 +265,8 @@ const submitForm = () => {
     if (valid) {
       form.value.projectId = currentProject.value?.id;
       buttonLoading.value = true;
+      form.value.supplier = supplierOptions.value.find((item) => item.id == form.value.supplierId)?.supplierName;
+
       if (form.value.id) {
         await updateContractor(form.value).finally(() => (buttonLoading.value = false));
       } else {
@@ -278,15 +288,16 @@ const handleDelete = async (row?: ContractorVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'project/contractor/export',
-    {
-      ...queryParams.value
-    },
-    `contractor_${new Date().getTime()}.xlsx`
-  );
+/** 获取供应商 */
+const supplierOptions = ref([]);
+const getSupplierList = async () => {
+  const res = await listSupplierInput({
+    projectId: currentProject.value?.id,
+    pageNum: 1,
+    state: 'finish',
+    pageSize: 10000
+  });
+  supplierOptions.value = res.rows;
 };
 
 /** 文件操作 **/
@@ -304,6 +315,7 @@ const listeningProject = watch(
     queryParams.value.projectId = nid;
     form.value.projectId = nid;
     console.log('监听项目id', queryParams.value.projectId, form.value.projectId);
+    getSupplierList();
     getList();
   }
 );
@@ -314,5 +326,6 @@ onUnmounted(() => {
 onMounted(() => {
   getDictList();
   getList();
+  getSupplierList();
 });
 </script>
diff --git a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
index bebbe31..c9bb0f4 100644
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
@@ -1,8 +1,37 @@
 <template>
-  <div class="p-2">
+  <div class="p-2 detailbox">
+    <div class="box1">
+      <div>
+        <div>
+          <span>设计面积</span>
+          <span>{{ detailInfo.designArea }} 亩</span>
+        </div>
+        <el-icon :size="50" color="#3176ff">
+          <Postcard />
+        </el-icon>
+      </div>
+      <div>
+        <div>
+          <span>已流转面积</span>
+          <span>{{ detailInfo.transferAea }} 亩</span>
+        </div>
+        <el-icon :size="50" color="#3176ff">
+          <Postcard />
+        </el-icon>
+      </div>
+      <div>
+        <div>
+          <span>租金</span>
+          <span>{{ detailInfo.landRent / 1000 }} 万元</span>
+        </div>
+        <el-icon :size="50" color="#3176ff">
+          <Postcard />
+        </el-icon>
+      </div>
+    </div>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
+        <el-card shadow="never">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="110px">
             <el-form-item label="对应地块" prop="landBlockId">
               <el-select v-model="queryParams.landBlockId" clearable placeholder="请选择对应地块">
@@ -33,21 +62,6 @@
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['land:landTransferLedger:add']">新增</el-button>
           </el-col>
           <el-col :span="6"></el-col>
-          <el-col :span="1.5">
-            <el-tag size="large" type="primary"
-              ><span style="font-size: 20px">设计面积：{{ detailInfo.designArea }} 亩</span></el-tag
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-tag size="large" type="success"
-              ><span style="font-size: 20px">已流转面积：{{ detailInfo.transferAea }} 亩</span></el-tag
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-tag size="large" type="warning"
-              ><span style="font-size: 20px">租金：{{ detailInfo.landRent / 1000 }} 万元</span></el-tag
-            >
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -562,3 +576,36 @@ onMounted(() => {
   Promise.all([getLandBlockList(), getListLand(), getList()]);
 });
 </script>
+<style lang="scss">
+.detailbox {
+  width: 100%;
+  .box1 {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    margin: 20px 0;
+    > div {
+      width: 300px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 20px 15px;
+      border: 1px solid #e7e7e7;
+      margin: 0 20px;
+      border-radius: 6px;
+      > div {
+        display: flex;
+        flex-direction: column;
+        > span:first-child {
+          font-size: 16px;
+          margin-bottom: 10px;
+        }
+        > span:last-child {
+          font-size: 24px;
+          /* font-weight: bold; */
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index c9d9247..e8c763e 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -9,13 +8,11 @@
               <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="类别编码" prop="deptCategory">
-              <el-input v-model="queryParams.deptCategory" placeholder="请输入类别编码" clearable style="width: 240px"
-                @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.deptCategory" placeholder="请输入类别编码" clearable style="width: 240px" @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -31,8 +28,7 @@
       <template #header>
         <el-row :gutter="10">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:dept:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增
-            </el-button>
+            <el-button v-hasPermi="['system:dept:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@@ -41,8 +37,14 @@
         </el-row>
       </template>
 
-      <el-table ref="deptTableRef" v-loading="loading" :data="deptList" row-key="deptId"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :default-expand-all="isExpandAll">
+      <el-table
+        ref="deptTableRef"
+        v-loading="loading"
+        :data="deptList"
+        row-key="deptId"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        :default-expand-all="isExpandAll"
+      >
         <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
         <el-table-column prop="deptCategory" align="center" label="类别编码" width="200"></el-table-column>
         <el-table-column prop="deptType" align="center" label="部门类型" width="200">
@@ -64,16 +66,13 @@
         <el-table-column fixed="right" align="center" label="操作">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:dept:edit']" link type="primary" icon="Edit"
-                @click="handleUpdate(scope.row)" />
+              <el-button v-hasPermi="['system:dept:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />
             </el-tooltip>
-            <el-tooltip content="新增" placement="top" v-if="scope.row.deptType != '2' && scope.row.deptType != '5'">
-              <el-button v-hasPermi="['system:dept:add']" link type="primary" icon="Plus"
-                @click="handleAdd(scope.row)" />
+            <el-tooltip content="新增" placement="top">
+              <el-button v-hasPermi="['system:dept:add']" link type="primary" icon="Plus" @click="handleAdd(scope.row)" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:dept:remove']" link type="primary" icon="Delete"
-                @click="handleDelete(scope.row)" />
+              <el-button v-hasPermi="['system:dept:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -85,9 +84,14 @@
         <el-row>
           <el-col v-if="form.parentId !== 0" :span="24">
             <el-form-item label="上级部门" prop="parentId">
-              <el-tree-select v-model="form.parentId" :data="deptOptions"
-                :props="{ value: 'deptId', label: 'deptName', children: 'children' }" value-key="deptId"
-                placeholder="选择上级部门" check-strictly />
+              <el-tree-select
+                v-model="form.parentId"
+                :data="deptOptions"
+                :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
+                value-key="deptId"
+                placeholder="选择上级部门"
+                check-strictly
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -108,8 +112,7 @@
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
               <el-select v-model="form.leader" placeholder="请选择负责人">
-                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName"
-                  :value="item.userId" />
+                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -126,32 +129,17 @@
           <el-col :span="12">
             <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
-                }}</el-radio>
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="部门类型">
-              <el-select v-model="form.deptType" placeholder="请选择部门类型" @change="changeProject">
+              <el-select v-model="form.deptType" placeholder="请选择部门类型">
                 <el-option v-for="dict in sys_dept_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="form.deptType == '4'">
-            <el-form-item label="所属项目" prop="projectId">
-              <el-select v-model="form.projectId" placeholder="请选择所属项目">
-                <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="form.deptType == '5'">
-            <el-form-item label="分包单位" prop="contractorId">
-              <el-select v-model="form.contractorId" placeholder="请选择分包单位">
-                <el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
       <template #footer>
@@ -336,16 +324,6 @@ const handleUpdate = async (row: DeptVO) => {
   dialog.title = '修改部门';
 };
 
-const changeProject = async (val: any) => {
-  if (val == '4' && (!projectList.value || !projectList.value.length)) {
-    const res = await getDeptList();
-    projectList.value = res.data;
-  } else if (val == '5' && (!contractorList.value || !contractorList.value.length)) {
-    const res = await optionProjectSelect(form.value.rowProjectId);
-    contractorList.value = res;
-  }
-};
-
 /** 提交按钮 */
 const submitForm = () => {
   deptFormRef.value?.validate(async (valid: boolean) => {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 3fcf274..da397cf 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -324,6 +324,7 @@ import { globalHeaders } from '@/utils/request';
 import { to } from 'await-to-js';
 import { getProjectByDeptId, getRoleList, optionselect } from '@/api/system/post';
 import ShuttleFrame from '../../project/projectRelevancy/component/ShuttleFrame.vue';
+import { listProject } from '@/api/project/project';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -484,6 +485,8 @@ const getDeptTree = async () => {
   const res = await api.deptTreeSelect({ isShow: '1' });
   deptOptions.value = res.data;
   enabledDeptOptions.value = filterDisabledDept(res.data);
+  const projectList = await listProject();
+  projectOptions.value = projectList.rows;
 };
 
 /** 过滤禁用的部门 */
@@ -672,8 +675,6 @@ const handleUpdate = async (row?: UserForm) => {
   form.value.projectRoles = data.projectRoles;
   form.value.password = '';
   const roleList = await getRoleList(form.value.deptId);
-  const projectList = await getProjectByDeptId(form.value.deptId);
-  projectOptions.value = projectList.data;
 
   roleOptions.value = roleList.data;
 };
@@ -736,8 +737,6 @@ onMounted(() => {
 async function handleDeptChange(value: number | string) {
   const response = await optionselect(value);
   const roleList = await getRoleList(value);
-  const projectList = await getProjectByDeptId(value);
-  projectOptions.value = projectList.data;
 
   roleOptions.value = roleList.data;
   postOptions.value = response.data;
diff --git a/src/views/tender/supplierInput/index.vue b/src/views/tender/supplierInput/index.vue
index bbebc86..680aaf1 100644
--- a/src/views/tender/supplierInput/index.vue
+++ b/src/views/tender/supplierInput/index.vue
@@ -275,6 +275,7 @@
         <el-row class="mb-4">
           <el-col :span="24">
             <el-form-item label="入库资料" prop="inputFile">
+              <template #label> <span class="text-red">*</span> 入库资料 </template>
               <file-upload
                 v-model="form.inputFile"
                 :fileType="['doc', 'docx', 'pdf']"
diff --git a/vite.config.ts.timestamp-1756395377501-e6f009967ecc8.mjs b/vite.config.ts.timestamp-1756395377501-e6f009967ecc8.mjs
new file mode 100644
index 0000000..ec49d52
--- /dev/null
+++ b/vite.config.ts.timestamp-1756395377501-e6f009967ecc8.mjs
@@ -0,0 +1,230 @@
+// vite.config.ts
+import { loadEnv, defineConfig } from "file:///E:/XNY/new-project/node_modules/vite/dist/node/index.js";
+
+// vite/plugins/index.ts
+import vue from "file:///E:/XNY/new-project/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+
+// vite/plugins/unocss.ts
+import UnoCss from "file:///E:/XNY/new-project/node_modules/unocss/dist/vite.mjs";
+var unocss_default = () => {
+  return UnoCss({
+    hmrTopLevelAwait: false
+    // unocss默认是true，低版本浏览器是不支持的，启动后会报错
+  });
+};
+
+// vite/plugins/auto-import.ts
+import AutoImport from "file:///E:/XNY/new-project/node_modules/unplugin-auto-import/dist/vite.js";
+import { ElementPlusResolver } from "file:///E:/XNY/new-project/node_modules/unplugin-vue-components/dist/resolvers.js";
+import IconsResolver from "file:///E:/XNY/new-project/node_modules/unplugin-icons/dist/resolver.js";
+var __vite_injected_original_dirname = "E:\\XNY\\new-project\\vite\\plugins";
+var auto_import_default = (path3) => {
+  return AutoImport({
+    // 自动导入 Vue 相关函数
+    imports: ["vue", "vue-router", "@vueuse/core", "pinia"],
+    eslintrc: {
+      enabled: false,
+      filepath: "./.eslintrc-auto-import.json",
+      globalsPropValue: true
+    },
+    resolvers: [
+      // 自动导入 Element Plus 相关函数ElMessage, ElMessageBox... (带样式)
+      ElementPlusResolver(),
+      IconsResolver({
+        prefix: "Icon"
+      })
+    ],
+    vueTemplate: true,
+    // 是否在 vue 模板中自动导入
+    dts: path3.resolve(path3.resolve(__vite_injected_original_dirname, "../../src"), "types", "auto-imports.d.ts")
+  });
+};
+
+// vite/plugins/components.ts
+import Components from "file:///E:/XNY/new-project/node_modules/unplugin-vue-components/dist/vite.js";
+import { ElementPlusResolver as ElementPlusResolver2 } from "file:///E:/XNY/new-project/node_modules/unplugin-vue-components/dist/resolvers.js";
+import IconsResolver2 from "file:///E:/XNY/new-project/node_modules/unplugin-icons/dist/resolver.js";
+var __vite_injected_original_dirname2 = "E:\\XNY\\new-project\\vite\\plugins";
+var components_default = (path3) => {
+  return Components({
+    resolvers: [
+      // 自动导入 Element Plus 组件
+      ElementPlusResolver2(),
+      // 自动注册图标组件
+      IconsResolver2({
+        enabledCollections: ["ep"]
+      })
+    ],
+    dts: path3.resolve(path3.resolve(__vite_injected_original_dirname2, "../../src"), "types", "components.d.ts")
+  });
+};
+
+// vite/plugins/icons.ts
+import Icons from "file:///E:/XNY/new-project/node_modules/unplugin-icons/dist/vite.js";
+var icons_default = () => {
+  return Icons({
+    // 自动安装图标库
+    autoInstall: true
+  });
+};
+
+// vite/plugins/svg-icon.ts
+import { createSvgIconsPlugin } from "file:///E:/XNY/new-project/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+var __vite_injected_original_dirname3 = "E:\\XNY\\new-project\\vite\\plugins";
+var svg_icon_default = (path3, isBuild) => {
+  return createSvgIconsPlugin({
+    // 指定需要缓存的图标文件夹
+    iconDirs: [path3.resolve(path3.resolve(__vite_injected_original_dirname3, "../../src"), "assets/icons/svg")],
+    // 指定symbolId格式
+    symbolId: "icon-[dir]-[name]",
+    svgoOptions: isBuild
+  });
+};
+
+// vite/plugins/compression.ts
+import compression from "file:///E:/XNY/new-project/node_modules/vite-plugin-compression/dist/index.mjs";
+var compression_default = (env) => {
+  const { VITE_BUILD_COMPRESS } = env;
+  const plugin = [];
+  if (VITE_BUILD_COMPRESS) {
+    const compressList = VITE_BUILD_COMPRESS.split(",");
+    if (compressList.includes("gzip")) {
+      plugin.push(
+        compression({
+          ext: ".gz",
+          deleteOriginFile: false
+        })
+      );
+    }
+    if (compressList.includes("brotli")) {
+      plugin.push(
+        compression({
+          ext: ".br",
+          algorithm: "brotliCompress",
+          deleteOriginFile: false
+        })
+      );
+    }
+  }
+  return plugin;
+};
+
+// vite/plugins/setup-extend.ts
+import setupExtend from "file:///E:/XNY/new-project/node_modules/unplugin-vue-setup-extend-plus/dist/vite.js";
+var setup_extend_default = () => {
+  return setupExtend({});
+};
+
+// vite/plugins/index.ts
+import path from "path";
+var plugins_default = (viteEnv, isBuild = false) => {
+  const vitePlugins = [];
+  vitePlugins.push(vue());
+  vitePlugins.push(unocss_default());
+  vitePlugins.push(auto_import_default(path));
+  vitePlugins.push(components_default(path));
+  vitePlugins.push(compression_default(viteEnv));
+  vitePlugins.push(icons_default());
+  vitePlugins.push(svg_icon_default(path, isBuild));
+  vitePlugins.push(setup_extend_default());
+  return vitePlugins;
+};
+
+// vite.config.ts
+import path2 from "path";
+var __vite_injected_original_dirname4 = "E:\\XNY\\new-project";
+var vite_config_default = defineConfig(({ mode, command }) => {
+  const env = loadEnv(mode, process.cwd());
+  return {
+    // 部署生产环境和开发环境下的URL。
+    // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
+    // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+    base: env.VITE_APP_CONTEXT_PATH,
+    resolve: {
+      alias: {
+        "~": path2.resolve(__vite_injected_original_dirname4, "./"),
+        "@": path2.resolve(__vite_injected_original_dirname4, "./src")
+      },
+      extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue", ".tif"]
+    },
+    // https://cn.vitejs.dev/config/#resolve-extensions
+    plugins: plugins_default(env, command === "build"),
+    server: {
+      host: "0.0.0.0",
+      port: Number(env.VITE_APP_PORT),
+      open: true,
+      proxy: {
+        [env.VITE_APP_BASE_API]: {
+          target: "http://localhost:8899",
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/warm-flow-ui": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/warm-flow": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/workflow": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/auth": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        }
+      }
+    },
+    css: {
+      preprocessorOptions: {
+        scss: {
+          javascriptEnabled: true
+        }
+      },
+      postcss: {
+        plugins: [
+          {
+            postcssPlugin: "internal:charset-removal",
+            AtRule: {
+              charset: (atRule) => {
+                if (atRule.name === "charset") {
+                  atRule.remove();
+                }
+              }
+            }
+          }
+        ]
+      }
+    },
+    // 预编译
+    optimizeDeps: {
+      include: [
+        "vue",
+        "vue-router",
+        "pinia",
+        "axios",
+        "@vueuse/core",
+        "echarts",
+        "vue-i18n",
+        "@vueup/vue-quill",
+        "image-conversion",
+        "element-plus/es/components/**/css"
+      ]
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts", "vite/plugins/index.ts", "vite/plugins/unocss.ts", "vite/plugins/auto-import.ts", "vite/plugins/components.ts", "vite/plugins/icons.ts", "vite/plugins/svg-icon.ts", "vite/plugins/compression.ts", "vite/plugins/setup-extend.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\XNY\\\\new-project\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\new-project\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/new-project/vite.config.ts\";import { UserConfig, ConfigEnv, loadEnv, defineConfig } from 'vite';\r\n\r\nimport createPlugins from './vite/plugins';\r\n\r\nimport path from 'path';\r\nexport default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {\r\n  const env = loadEnv(mode, process.cwd());\r\n  return {\r\n    // \u90E8\u7F72\u751F\u4EA7\u73AF\u5883\u548C\u5F00\u53D1\u73AF\u5883\u4E0B\u7684URL\u3002\r\n    // \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0Cvite \u4F1A\u5047\u8BBE\u4F60\u7684\u5E94\u7528\u662F\u88AB\u90E8\u7F72\u5728\u4E00\u4E2A\u57DF\u540D\u7684\u6839\u8DEF\u5F84\u4E0A\r\n    // \u4F8B\u5982 https://www.ruoyi.vip/\u3002\u5982\u679C\u5E94\u7528\u88AB\u90E8\u7F72\u5728\u4E00\u4E2A\u5B50\u8DEF\u5F84\u4E0A\uFF0C\u4F60\u5C31\u9700\u8981\u7528\u8FD9\u4E2A\u9009\u9879\u6307\u5B9A\u8FD9\u4E2A\u5B50\u8DEF\u5F84\u3002\u4F8B\u5982\uFF0C\u5982\u679C\u4F60\u7684\u5E94\u7528\u88AB\u90E8\u7F72\u5728 https://www.ruoyi.vip/admin/\uFF0C\u5219\u8BBE\u7F6E baseUrl \u4E3A /admin/\u3002\r\n    base: env.VITE_APP_CONTEXT_PATH,\r\n    resolve: {\r\n      alias: {\r\n        '~': path.resolve(__dirname, './'),\r\n        '@': path.resolve(__dirname, './src')\r\n      },\r\n      extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue', '.tif']\r\n    },\r\n    // https://cn.vitejs.dev/config/#resolve-extensions\r\n    plugins: createPlugins(env, command === 'build'),\r\n    server: {\r\n      host: '0.0.0.0',\r\n      port: Number(env.VITE_APP_PORT),\r\n      open: true,\r\n      proxy: {\r\n        [env.VITE_APP_BASE_API]: {\r\n          target: 'http://localhost:8899',\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/warm-flow-ui': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/warm-flow': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/workflow': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n         '/auth': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        }\r\n      }\r\n    },\r\n    css: {\r\n      preprocessorOptions: {\r\n        scss: {\r\n          javascriptEnabled: true\r\n        }\r\n      },\r\n      postcss: {\r\n        plugins: [\r\n          {\r\n            postcssPlugin: 'internal:charset-removal',\r\n            AtRule: {\r\n              charset: (atRule) => {\r\n                if (atRule.name === 'charset') {\r\n                  atRule.remove();\r\n                }\r\n              }\r\n            }\r\n          }\r\n        ]\r\n      }\r\n    },\r\n    // \u9884\u7F16\u8BD1\r\n    optimizeDeps: {\r\n      include: [\r\n        'vue',\r\n        'vue-router',\r\n        'pinia',\r\n        'axios',\r\n        '@vueuse/core',\r\n        'echarts',\r\n        'vue-i18n',\r\n        '@vueup/vue-quill',\r\n        'image-conversion',\r\n        'element-plus/es/components/**/css'\r\n      ]\r\n    }\r\n  };\r\n});\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\\\\index.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/new-project/vite/plugins/index.ts\";import vue from '@vitejs/plugin-vue';\r\nimport createUnoCss from './unocss';\r\nimport createAutoImport from './auto-import';\r\nimport createComponents from './components';\r\nimport createIcons from './icons';\r\nimport createSvgIconsPlugin from './svg-icon';\r\nimport createCompression from './compression';\r\nimport createSetupExtend from './setup-extend';\r\nimport path from 'path';\r\n\r\nexport default (viteEnv: any, isBuild = false): [] => {\r\n  const vitePlugins: any = [];\r\n  vitePlugins.push(vue());\r\n  vitePlugins.push(createUnoCss());\r\n  vitePlugins.push(createAutoImport(path));\r\n  vitePlugins.push(createComponents(path));\r\n  vitePlugins.push(createCompression(viteEnv));\r\n  vitePlugins.push(createIcons());\r\n  vitePlugins.push(createSvgIconsPlugin(path, isBuild));\r\n  vitePlugins.push(createSetupExtend());\r\n  return vitePlugins;\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\\\\unocss.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/new-project/vite/plugins/unocss.ts\";import UnoCss from 'unocss/vite';\r\n\r\nexport default () => {\r\n  return UnoCss({\r\n    hmrTopLevelAwait: false // unocss\u9ED8\u8BA4\u662Ftrue\uFF0C\u4F4E\u7248\u672C\u6D4F\u89C8\u5668\u662F\u4E0D\u652F\u6301\u7684\uFF0C\u542F\u52A8\u540E\u4F1A\u62A5\u9519\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\\\\auto-import.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/new-project/vite/plugins/auto-import.ts\";import AutoImport from 'unplugin-auto-import/vite';\r\nimport { ElementPlusResolver } from 'unplugin-vue-components/resolvers';\r\nimport IconsResolver from 'unplugin-icons/resolver';\r\n\r\nexport default (path: any) => {\r\n  return AutoImport({\r\n    // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\r\n    imports: ['vue', 'vue-router', '@vueuse/core', 'pinia'],\r\n    eslintrc: {\r\n      enabled: false,\r\n      filepath: './.eslintrc-auto-import.json',\r\n      globalsPropValue: true\r\n    },\r\n    resolvers: [\r\n      // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570ElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\r\n      ElementPlusResolver(),\r\n      IconsResolver({\r\n        prefix: 'Icon'\r\n      })\r\n    ],\r\n    vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\r\n    dts: path.resolve(path.resolve(__dirname, '../../src'), 'types', 'auto-imports.d.ts')\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\\\\components.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/new-project/vite/plugins/components.ts\";import Components from 'unplugin-vue-components/vite';\r\nimport { ElementPlusResolver } from 'unplugin-vue-components/resolvers';\r\nimport IconsResolver from 'unplugin-icons/resolver';\r\n\r\nexport default (path: any) => {\r\n  return Components({\r\n    resolvers: [\r\n      // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\r\n      ElementPlusResolver(),\r\n      // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\r\n      IconsResolver({\r\n        enabledCollections: ['ep']\r\n      })\r\n    ],\r\n    dts: path.resolve(path.resolve(__dirname, '../../src'), 'types', 'components.d.ts')\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\\\\icons.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/new-project/vite/plugins/icons.ts\";import Icons from 'unplugin-icons/vite';\r\n\r\nexport default () => {\r\n  return Icons({\r\n    // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\r\n    autoInstall: true\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\\\\svg-icon.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/new-project/vite/plugins/svg-icon.ts\";import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';\r\nexport default (path: any, isBuild: boolean) => {\r\n  return createSvgIconsPlugin({\r\n    // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\r\n    iconDirs: [path.resolve(path.resolve(__dirname, '../../src'), 'assets/icons/svg')],\r\n    // \u6307\u5B9AsymbolId\u683C\u5F0F\r\n    symbolId: 'icon-[dir]-[name]',\r\n    svgoOptions: isBuild\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\\\\compression.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/new-project/vite/plugins/compression.ts\";import compression from 'vite-plugin-compression';\r\n\r\nexport default (env: any) => {\r\n  const { VITE_BUILD_COMPRESS } = env;\r\n  const plugin: any[] = [];\r\n  if (VITE_BUILD_COMPRESS) {\r\n    const compressList = VITE_BUILD_COMPRESS.split(',');\r\n    if (compressList.includes('gzip')) {\r\n      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#\u4F7F\u7528gzip\u89E3\u538B\u7F29\u9759\u6001\u6587\u4EF6\r\n      plugin.push(\r\n        compression({\r\n          ext: '.gz',\r\n          deleteOriginFile: false\r\n        })\r\n      );\r\n    }\r\n    if (compressList.includes('brotli')) {\r\n      plugin.push(\r\n        compression({\r\n          ext: '.br',\r\n          algorithm: 'brotliCompress',\r\n          deleteOriginFile: false\r\n        })\r\n      );\r\n    }\r\n  }\r\n  return plugin;\r\n};\r\n", "const __vite_injected_original_dirname = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\XNY\\\\new-project\\\\vite\\\\plugins\\\\setup-extend.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/XNY/new-project/vite/plugins/setup-extend.ts\";import setupExtend from 'unplugin-vue-setup-extend-plus/vite';\r\n\r\nexport default () => {\r\n  return setupExtend({});\r\n};\r\n"],
  "mappings": ";AAA8O,SAAgC,SAAS,oBAAoB;;;ACA9B,OAAO,SAAS;;;ACAd,OAAO,YAAY;AAElS,IAAO,iBAAQ,MAAM;AACnB,SAAO,OAAO;AAAA,IACZ,kBAAkB;AAAA;AAAA,EACpB,CAAC;AACH;;;ACNyR,OAAO,gBAAgB;AAChT,SAAS,2BAA2B;AACpC,OAAO,mBAAmB;AAF1B,IAAM,mCAAmC;AAIzC,IAAO,sBAAQ,CAACA,UAAc;AAC5B,SAAO,WAAW;AAAA;AAAA,IAEhB,SAAS,CAAC,OAAO,cAAc,gBAAgB,OAAO;AAAA,IACtD,UAAU;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA,MACV,kBAAkB;AAAA,IACpB;AAAA,IACA,WAAW;AAAA;AAAA,MAET,oBAAoB;AAAA,MACpB,cAAc;AAAA,QACZ,QAAQ;AAAA,MACV,CAAC;AAAA,IACH;AAAA,IACA,aAAa;AAAA;AAAA,IACb,KAAKA,MAAK,QAAQA,MAAK,QAAQ,kCAAW,WAAW,GAAG,SAAS,mBAAmB;AAAA,EACtF,CAAC;AACH;;;ACvBuR,OAAO,gBAAgB;AAC9S,SAAS,uBAAAC,4BAA2B;AACpC,OAAOC,oBAAmB;AAF1B,IAAMC,oCAAmC;AAIzC,IAAO,qBAAQ,CAACC,UAAc;AAC5B,SAAO,WAAW;AAAA,IAChB,WAAW;AAAA;AAAA,MAETC,qBAAoB;AAAA;AAAA,MAEpBC,eAAc;AAAA,QACZ,oBAAoB,CAAC,IAAI;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,IACA,KAAKF,MAAK,QAAQA,MAAK,QAAQG,mCAAW,WAAW,GAAG,SAAS,iBAAiB;AAAA,EACpF,CAAC;AACH;;;AChB6Q,OAAO,WAAW;AAE/R,IAAO,gBAAQ,MAAM;AACnB,SAAO,MAAM;AAAA;AAAA,IAEX,aAAa;AAAA,EACf,CAAC;AACH;;;ACPmR,SAAS,4BAA4B;AAAxT,IAAMC,oCAAmC;AACzC,IAAO,mBAAQ,CAACC,OAAW,YAAqB;AAC9C,SAAO,qBAAqB;AAAA;AAAA,IAE1B,UAAU,CAACA,MAAK,QAAQA,MAAK,QAAQC,mCAAW,WAAW,GAAG,kBAAkB,CAAC;AAAA;AAAA,IAEjF,UAAU;AAAA,IACV,aAAa;AAAA,EACf,CAAC;AACH;;;ACTyR,OAAO,iBAAiB;AAEjT,IAAO,sBAAQ,CAAC,QAAa;AAC3B,QAAM,EAAE,oBAAoB,IAAI;AAChC,QAAM,SAAgB,CAAC;AACvB,MAAI,qBAAqB;AACvB,UAAM,eAAe,oBAAoB,MAAM,GAAG;AAClD,QAAI,aAAa,SAAS,MAAM,GAAG;AAEjC,aAAO;AAAA,QACL,YAAY;AAAA,UACV,KAAK;AAAA,UACL,kBAAkB;AAAA,QACpB,CAAC;AAAA,MACH;AAAA,IACF;AACA,QAAI,aAAa,SAAS,QAAQ,GAAG;AACnC,aAAO;AAAA,QACL,YAAY;AAAA,UACV,KAAK;AAAA,UACL,WAAW;AAAA,UACX,kBAAkB;AAAA,QACpB,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;;;AC3B2R,OAAO,iBAAiB;AAEnT,IAAO,uBAAQ,MAAM;AACnB,SAAO,YAAY,CAAC,CAAC;AACvB;;;APIA,OAAO,UAAU;AAEjB,IAAO,kBAAQ,CAAC,SAAc,UAAU,UAAc;AACpD,QAAM,cAAmB,CAAC;AAC1B,cAAY,KAAK,IAAI,CAAC;AACtB,cAAY,KAAK,eAAa,CAAC;AAC/B,cAAY,KAAK,oBAAiB,IAAI,CAAC;AACvC,cAAY,KAAK,mBAAiB,IAAI,CAAC;AACvC,cAAY,KAAK,oBAAkB,OAAO,CAAC;AAC3C,cAAY,KAAK,cAAY,CAAC;AAC9B,cAAY,KAAK,iBAAqB,MAAM,OAAO,CAAC;AACpD,cAAY,KAAK,qBAAkB,CAAC;AACpC,SAAO;AACT;;;ADjBA,OAAOC,WAAU;AAJjB,IAAMC,oCAAmC;AAKzC,IAAO,sBAAQ,aAAa,CAAC,EAAE,MAAM,QAAQ,MAA6B;AACxE,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,SAAO;AAAA;AAAA;AAAA;AAAA,IAIL,MAAM,IAAI;AAAA,IACV,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAKC,MAAK,QAAQC,mCAAW,IAAI;AAAA,QACjC,KAAKD,MAAK,QAAQC,mCAAW,OAAO;AAAA,MACtC;AAAA,MACA,YAAY,CAAC,QAAQ,OAAO,OAAO,QAAQ,QAAQ,SAAS,QAAQ,MAAM;AAAA,IAC5E;AAAA;AAAA,IAEA,SAAS,gBAAc,KAAK,YAAY,OAAO;AAAA,IAC/C,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,OAAO,IAAI,aAAa;AAAA,MAC9B,MAAM;AAAA,MACN,OAAO;AAAA,QACL,CAAC,IAAI,iBAAiB,GAAG;AAAA,UACvB,QAAQ;AAAA,UACR,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACD,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,iBAAiB;AAAA,UACf,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,cAAc;AAAA,UACZ,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,aAAa;AAAA,UACX,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACC,SAAS;AAAA,UACR,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,MACF;AAAA,IACF;AAAA,IACA,KAAK;AAAA,MACH,qBAAqB;AAAA,QACnB,MAAM;AAAA,UACJ,mBAAmB;AAAA,QACrB;AAAA,MACF;AAAA,MACA,SAAS;AAAA,QACP,SAAS;AAAA,UACP;AAAA,YACE,eAAe;AAAA,YACf,QAAQ;AAAA,cACN,SAAS,CAAC,WAAW;AACnB,oBAAI,OAAO,SAAS,WAAW;AAC7B,yBAAO,OAAO;AAAA,gBAChB;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA;AAAA,IAEA,cAAc;AAAA,MACZ,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path", "ElementPlusResolver", "IconsResolver", "__vite_injected_original_dirname", "path", "ElementPlusResolver", "IconsResolver", "__vite_injected_original_dirname", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname"]
}
