diff --git a/src/apis/project/type.ts b/src/apis/project/type.ts
index c15d7e8..cbdb186 100644
--- a/src/apis/project/type.ts
+++ b/src/apis/project/type.ts
@@ -156,14 +156,14 @@ export interface ProjectDetailResp extends ProjectCard {
 export interface TeamMemberResp {
   id: string | number
   name: string
-  position: string
+  roleType: string
   phone?: string
   email?: string
   avatar?: string
   joinDate?: string
   performance?: number
   remark?: string
-  status?: 'available' | 'busy' | 'offline'
+  status?: 'ACTIVE' | 'SUSPENDED' | 'INACTIVE'
 }
 
 /** 后端返回的团队成员数据结构 */
@@ -182,7 +182,7 @@ export interface BackendTeamMemberResp {
   phone: string | null
   email: string | null
   position: string
-  status: 'ACTIVE' | 'BUSY' | 'OFFLINE'
+  status: 'ACTIVE' | 'SUSPENDED' | 'INACTIVE'
   skills: string
   joinDate: string
   remark: string
@@ -201,11 +201,11 @@ export interface BackendTeamMemberResp {
 export interface TeamMemberQuery extends PageQuery {
   projectId: string | number
   name?: string // 姓名搜索
-  position?: string // 岗位筛选
+  position?: string // 项目岗位筛选
   status?: string // 状态筛选
   joinDateStart?: string // 入职日期开始
   joinDateEnd?: string // 入职日期结束
-  sortBy?: 'name' | 'position' | 'joinDate' | 'status' // 排序字段
+  sortBy?: 'name' | 'roleType' | 'joinDate' | 'status' // 排序字段
   sortOrder?: 'asc' | 'desc' // 排序方向
 }
 
@@ -213,33 +213,33 @@ export interface TeamMemberQuery extends PageQuery {
 export interface TeamMemberExportQuery {
   projectId: string | number
   name?: string // 姓名搜索
-  position?: string // 岗位筛选
+  position?: string // 项目岗位筛选
   status?: string // 状态筛选
   joinDateStart?: string // 入职日期开始
   joinDateEnd?: string // 入职日期结束
-  sortBy?: 'name' | 'position' | 'joinDate' | 'status' // 排序字段
+  sortBy?: 'name' | 'roleType' | 'joinDate' | 'status' // 排序字段
   sortOrder?: 'asc' | 'desc' // 排序方向
 }
 
 /** 创建团队成员表单 */
 export interface CreateTeamMemberForm {
   projectId: string | number
+  roleType: string // 项目岗位
   name: string
   phone: string
   email?: string
-  position: string
-  status?: 'available' | 'busy' | 'offline'
+  status?: 'ACTIVE' | 'SUSPENDED' | 'INACTIVE'
   joinDate?: string
   remark?: string
 }
 
 /** 更新团队成员表单 */
 export interface UpdateTeamMemberForm {
+  roleType?: string // 项目岗位
   name?: string
   phone?: string
   email?: string
-  position?: string
-  status?: 'available' | 'busy' | 'offline'
+  status?: 'ACTIVE' | 'SUSPENDED' | 'INACTIVE'
   joinDate?: string
   remark?: string
 }
@@ -250,7 +250,7 @@ export interface UpdateTeamMemberForm {
 export interface BatchOperationForm {
   ids: (string | number)[]
   operation: 'delete' | 'updateStatus'
-  status?: 'available' | 'busy' | 'offline'
+  status?: 'ACTIVE' | 'SUSPENDED' | 'INACTIVE'
 }
 
 /** 导入结果响应 */
diff --git a/src/apis/system/user.ts b/src/apis/system/user.ts
index 921d118..59257e1 100644
--- a/src/apis/system/user.ts
+++ b/src/apis/system/user.ts
@@ -3,9 +3,10 @@ import http from '@/utils/http'
 
 const BASE_URL = '/user'
 
-/** @desc 查询用户列表 */
+/** @desc 分页查询用户列表 */
 export function listUser(query: T.UserPageQuery) {
-  return http.get<PageRes<T.UserResp[]>>(`${BASE_URL}`, query)
+  // 后端分页接口为 /user/page
+  return http.get<PageRes<T.UserResp[]>>(`${BASE_URL}/page`, query)
 }
 
 /** @desc 查询所有用户列表 */
diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts
index 369aad4..eab6be6 100644
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
@@ -70,6 +70,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 14a0fe7..2c3bca4 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -7,8 +7,68 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
+    ApprovalAssistant: typeof import('./../components/ApprovalAssistant/index.vue')['default']
+    Avatar: typeof import('./../components/Avatar/index.vue')['default']
+    Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default']
+    CellCopy: typeof import('./../components/CellCopy/index.vue')['default']
+    Chart: typeof import('./../components/Chart/index.vue')['default']
+    ColumnSetting: typeof import('./../components/GiTable/src/components/ColumnSetting.vue')['default']
+    CronForm: typeof import('./../components/GenCron/CronForm/index.vue')['default']
+    CronModal: typeof import('./../components/GenCron/CronModal/index.vue')['default']
+    DateRangePicker: typeof import('./../components/DateRangePicker/index.vue')['default']
+    DayForm: typeof import('./../components/GenCron/CronForm/component/day-form.vue')['default']
+    FilePreview: typeof import('./../components/FilePreview/index.vue')['default']
+    GiCellAvatar: typeof import('./../components/GiCell/GiCellAvatar.vue')['default']
+    GiCellGender: typeof import('./../components/GiCell/GiCellGender.vue')['default']
+    GiCellStatus: typeof import('./../components/GiCell/GiCellStatus.vue')['default']
+    GiCellTag: typeof import('./../components/GiCell/GiCellTag.vue')['default']
+    GiCellTags: typeof import('./../components/GiCell/GiCellTags.vue')['default']
+    GiCodeView: typeof import('./../components/GiCodeView/index.vue')['default']
+    GiDot: typeof import('./../components/GiDot/index.tsx')['default']
+    GiEditTable: typeof import('./../components/GiEditTable/GiEditTable.vue')['default']
+    GiFooter: typeof import('./../components/GiFooter/index.vue')['default']
+    GiForm: typeof import('./../components/GiForm/src/GiForm.vue')['default']
+    GiIconBox: typeof import('./../components/GiIconBox/index.vue')['default']
+    GiIconSelector: typeof import('./../components/GiIconSelector/index.vue')['default']
+    GiIframe: typeof import('./../components/GiIframe/index.vue')['default']
+    GiOption: typeof import('./../components/GiOption/index.vue')['default']
+    GiOptionItem: typeof import('./../components/GiOptionItem/index.vue')['default']
+    GiPageLayout: typeof import('./../components/GiPageLayout/index.vue')['default']
+    GiSpace: typeof import('./../components/GiSpace/index.vue')['default']
+    GiSplitButton: typeof import('./../components/GiSplitButton/index.vue')['default']
+    GiSplitPane: typeof import('./../components/GiSplitPane/index.vue')['default']
+    GiSplitPaneFlexibleBox: typeof import('./../components/GiSplitPane/components/GiSplitPaneFlexibleBox.vue')['default']
+    GiSvgIcon: typeof import('./../components/GiSvgIcon/index.vue')['default']
+    GiTable: typeof import('./../components/GiTable/src/GiTable.vue')['default']
+    GiTag: typeof import('./../components/GiTag/index.tsx')['default']
+    GiThemeBtn: typeof import('./../components/GiThemeBtn/index.vue')['default']
+    HourForm: typeof import('./../components/GenCron/CronForm/component/hour-form.vue')['default']
+    Icon403: typeof import('./../components/icons/Icon403.vue')['default']
+    Icon404: typeof import('./../components/icons/Icon404.vue')['default']
+    Icon500: typeof import('./../components/icons/Icon500.vue')['default']
+    IconBorders: typeof import('./../components/icons/IconBorders.vue')['default']
+    IconTableSize: typeof import('./../components/icons/IconTableSize.vue')['default']
+    IconTreeAdd: typeof import('./../components/icons/IconTreeAdd.vue')['default']
+    IconTreeReduce: typeof import('./../components/icons/IconTreeReduce.vue')['default']
+    ImageImport: typeof import('./../components/ImageImport/index.vue')['default']
+    ImageImportWizard: typeof import('./../components/ImageImportWizard/index.vue')['default']
+    IndustrialImageList: typeof import('./../components/IndustrialImageList/index.vue')['default']
+    JsonPretty: typeof import('./../components/JsonPretty/index.vue')['default']
+    MinuteForm: typeof import('./../components/GenCron/CronForm/component/minute-form.vue')['default']
+    MonthForm: typeof import('./../components/GenCron/CronForm/component/month-form.vue')['default']
     NotificationCenter: typeof import('./../components/NotificationCenter/index.vue')['default']
+    ParentView: typeof import('./../components/ParentView/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    SecondForm: typeof import('./../components/GenCron/CronForm/component/second-form.vue')['default']
+    SplitPanel: typeof import('./../components/SplitPanel/index.vue')['default']
+    TextCopy: typeof import('./../components/TextCopy/index.vue')['default']
+    TurbineGrid: typeof import('./../components/TurbineGrid/index.vue')['default']
+    UserSelect: typeof import('./../components/UserSelect/index.vue')['default']
+    Verify: typeof import('./../components/Verify/index.vue')['default']
+    VerifyPoints: typeof import('./../components/Verify/Verify/VerifyPoints.vue')['default']
+    VerifySlide: typeof import('./../components/Verify/Verify/VerifySlide.vue')['default']
+    WeekForm: typeof import('./../components/GenCron/CronForm/component/week-form.vue')['default']
+    YearForm: typeof import('./../components/GenCron/CronForm/component/year-form.vue')['default']
   }
 }
diff --git a/src/views/project-management/contract/expense-contract/ContractEdit.vue b/src/views/project-management/contract/expense-contract/ContractEdit.vue
index 4ced636..d3d9c06 100644
--- a/src/views/project-management/contract/expense-contract/ContractEdit.vue
+++ b/src/views/project-management/contract/expense-contract/ContractEdit.vue
@@ -7,8 +7,16 @@
         </a-form-item>
       </a-col>
       <a-col :span="12">
-        <a-form-item field="projectName" label="项目名称">
-          <a-input v-model="contractData.projectName" />
+        <a-form-item field="projectId" label="项目">
+          <a-select v-model="contractData.projectId"
+                    :options="projectOptions"
+                    :loading="projectLoading"
+                    :virtual-list-props="virtualListProps"
+                    placeholder="请选择项目"
+                    allow-search allow-clear
+                    @focus="handleProjectFocus"
+                    @dropdown-visible-change="handleProjectDropdown"
+                    @search="handleProjectSearch" />
         </a-form-item>
       </a-col>
     </a-row>
@@ -66,8 +74,27 @@
         </a-form-item>
       </a-col>
       <a-col :span="12">
-        <a-form-item field="productService" label="产品或服务">
-          <a-input v-model="contractData.productService" />
+        <a-form-item field="departmentId" label="销售部门">
+          <a-tree-select v-model="contractData.departmentId"
+                         :data="deptTree"
+                         :loading="deptLoading"
+                         placeholder="请选择部门"
+                         allow-search allow-clear
+                         @dropdown-visible-change="handleDeptDropdown"
+                         @focus="handleDeptFocus"
+          />
+        </a-form-item>
+      </a-col>
+      <a-col :span="12">
+        <a-form-item field="salespersonId" label="销售人员">
+          <a-select v-model="contractData.salespersonId"
+                    :options="userOptions"
+                    :loading="userLoading"
+                    :virtual-list-props="userVirtualListProps"
+                    placeholder="请选择业务员"
+                    allow-search allow-clear
+                    @dropdown-visible-change="handleUserDropdown"
+                    @search="handleUserSearch" />
         </a-form-item>
       </a-col>
     </a-row>
@@ -88,6 +115,10 @@
 
 <script setup lang="ts">
 import { ref, watch } from 'vue'
+import { Message } from '@arco-design/web-vue'
+import { listProject, type ProjectResp } from '@/apis/project'
+import { getDeptTree } from '@/apis/system/dept'
+import { listUser } from '@/apis/system/user'
 import type { ContractItem } from './index.vue'
 
 const props = defineProps<{
@@ -100,6 +131,138 @@ const emit = defineEmits<{
 
 const contractData = ref({ ...props.contractData })
 
+// 项目选项与加载（支持无限滚动）
+const projectOptions = ref<{ label: string; value: string }[]>([])
+const projectLoading = ref(false)
+const projPage = ref(1)
+const pageSize = 20
+const hasMore = ref(true)
+const currentKeyword = ref('')
+let searchTimer: number | undefined
+
+const appendProjects = (list: ProjectResp[]) => {
+  const items = list.map(p => ({ label: p.projectName, value: String((p as any).projectId ?? (p as any).id) }))
+  projectOptions.value = projectOptions.value.concat(items)
+}
+
+const extractList = (data: any): ProjectResp[] => {
+  if (Array.isArray(data)) return data as ProjectResp[]
+  if (Array.isArray(data?.list)) return data.list as ProjectResp[]
+  if (Array.isArray(data?.rows)) return data.rows as ProjectResp[]
+  return []
+}
+
+const loadProjects = async (keyword = currentKeyword.value, reset = false) => {
+  try {
+    if (reset) {
+      projPage.value = 1
+      hasMore.value = true
+      projectOptions.value = []
+    }
+    if (!hasMore.value) return
+    projectLoading.value = true
+    const resp = await listProject({ page: projPage.value, size: pageSize, projectName: keyword } as any)
+    const list = extractList((resp as any).data)
+    appendProjects(list)
+    if (list.length < pageSize) hasMore.value = false
+    projPage.value += 1
+  } catch (e) {
+    Message.error('获取项目列表失败')
+    hasMore.value = false
+  } finally {
+    projectLoading.value = false
+  }
+}
+
+const virtualListProps = {
+  height: 240,
+  onReachBottom: () => {
+    if (hasMore.value && !projectLoading.value) loadProjects()
+  },
+}
+
+const handleProjectFocus = () => {
+  if (projectOptions.value.length === 0) loadProjects('', true)
+}
+const handleProjectDropdown = (visible: boolean) => {
+  if (visible && projectOptions.value.length === 0) loadProjects('', true)
+}
+const handleProjectSearch = (val: string) => {
+  if (searchTimer) window.clearTimeout(searchTimer)
+  currentKeyword.value = val || ''
+  searchTimer = window.setTimeout(() => loadProjects(currentKeyword.value, true), 300)
+}
+
+// 部门树
+const deptTree = ref([] as any[])
+const deptLoading = ref(false)
+const loadDept = async () => {
+  try {
+    deptLoading.value = true
+    const res = await getDeptTree()
+    const data = (res as any).data || []
+    // 转换为 a-tree-select 结构
+    const toTree = (arr: any[]): any[] => arr.map(i => ({
+      key: String(i.deptId),
+      title: i.deptName,
+      value: String(i.deptId),
+      children: Array.isArray(i.children) ? toTree(i.children) : [],
+    }))
+    deptTree.value = toTree(Array.isArray(data) ? data : (data.list || data.rows || []))
+  } finally {
+    deptLoading.value = false
+  }
+}
+const handleDeptDropdown = (visible: boolean) => { if (visible && deptTree.value.length === 0) loadDept() }
+const handleDeptFocus = () => { if (deptTree.value.length === 0) loadDept() }
+
+// 用户列表（分页 + 搜索 + 无限滚动）
+const userOptions = ref<{ label: string; value: string }[]>([])
+const userLoading = ref(false)
+const userPage = ref(1)
+const userHasMore = ref(true)
+const userPageSize = 20
+const userKeyword = ref('')
+
+const appendUsers = (rows: any[]) => {
+  userOptions.value = userOptions.value.concat(
+    rows.map(u => ({ label: u.name || u.nickname || u.username, value: String(u.userId || u.id) }))
+  )
+}
+const extractUsers = (data: any): any[] => {
+  if (Array.isArray(data)) return data
+  if (Array.isArray(data?.rows)) return data.rows
+  if (Array.isArray(data?.list)) return data.list
+  return []
+}
+const loadUsers = async (reset = false) => {
+  try {
+    if (reset) { userOptions.value = []; userPage.value = 1; userHasMore.value = true }
+    if (!userHasMore.value) return
+    userLoading.value = true
+    const resp = await listUser({ page: userPage.value, pageSize: userPageSize, name: userKeyword.value } as any)
+    const rows = extractUsers((resp as any).data)
+    appendUsers(rows)
+    if (rows.length < userPageSize) userHasMore.value = false
+    userPage.value += 1
+  } finally {
+    userLoading.value = false
+  }
+}
+const userVirtualListProps = {
+  height: 240,
+  onReachBottom: () => { if (userHasMore.value && !userLoading.value) loadUsers() }
+}
+const handleUserDropdown = (visible: boolean) => { if (visible && userOptions.value.length === 0) { userKeyword.value=''; loadUsers(true) } }
+const handleUserSearch = (val: string) => {
+  if (searchTimer) window.clearTimeout(searchTimer)
+  userKeyword.value = val || ''
+  searchTimer = window.setTimeout(() => loadUsers(true), 300)
+}
+
+// 初始化：首次展开项目/部门/用户时加载
+// 不在 mounted 直接加载，减少无效请求
+
 // 监听props变化更新内部数据
 watch(
   () => props.contractData,
diff --git a/src/views/project-management/contract/expense-contract/index.vue b/src/views/project-management/contract/expense-contract/index.vue
index a0c3eaf..ccae4f8 100644
--- a/src/views/project-management/contract/expense-contract/index.vue
+++ b/src/views/project-management/contract/expense-contract/index.vue
@@ -55,11 +55,9 @@
 
       <template #action="{ record }">
         <a-space>
-          <a-link @click="viewDetail(record)">详情</a-link>
-          <a-link v-if="record.contractStatus === '未确认'" @click="editRecord(record)">编辑</a-link>
-          <a-link v-if="record.contractStatus === '待审批'" @click="approveContract(record)">审批</a-link>
-          <a-link @click="viewPayment(record)">收款记录</a-link>
-          <a-link v-if="record.contractStatus !== '已签署' && record.contractStatus !== '已完成'" @click="deleteContract(record)">删除</a-link>
+          <a-link @click="viewDetail(record)">查看</a-link>
+          <a-link @click="editRecord(record)">编辑</a-link>
+          <a-link status="danger" @click="deleteContract(record)">删除</a-link>
         </a-space>
       </template>
     </GiTable>
@@ -89,6 +87,21 @@
           @update:contract-data="handleContractDataUpdate"
       />
     </a-modal>
+
+    <!-- 新建合同弹窗 -->
+    <a-modal
+        v-model:visible="showAddModal"
+        title="新建合同"
+        :width="800"
+        @cancel="closeAddModal"
+        @before-ok="handleAddSubmit"
+    >
+      <ContractEdit
+          v-if="showAddModal"
+          :contract-data="newContractData"
+          @update:contract-data="handleNewContractDataUpdate"
+      />
+    </a-modal>
   </GiPageLayout>
 </template>
 
@@ -135,25 +148,16 @@ interface ContractItem {
 
 // 搜索表单
 const searchForm = reactive({
-  contractName: '',
   contractCode: '',
   client: '',
   status: '',
-  signDate: '',
+  signDateRange: [] as [string, string] | [],
   page: 1,
   size: 10,
 })
 
 // 查询条件配置
 const queryFormColumns = [
-  {
-    field: 'contractName',
-    label: '合同名称',
-    type: 'input' as const,
-    props: {
-      placeholder: '请输入合同名称',
-    },
-  },
   {
     field: 'client',
     label: '客户',
@@ -178,6 +182,16 @@ const queryFormColumns = [
       ],
     },
   },
+  {
+    field: 'signDateRange',
+    label: '签署时间',
+    type: 'range-picker' as const,
+    props: {
+      placeholder: ['开始时间', '结束时间'],
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+    },
+  },
 ]
 
 // 表格列配置
@@ -209,27 +223,43 @@ const fetchContractList = async () => {
     const params = {
       page: searchForm.page,
       pageSize: searchForm.size,
-      contractName: searchForm.contractName,
       code: searchForm.contractCode,
       customer: searchForm.client,
       contractStatus: searchForm.status,
-      signDate: searchForm.signDate,
+      signDateStart: Array.isArray(searchForm.signDateRange) && searchForm.signDateRange.length === 2 ? searchForm.signDateRange[0] : undefined,
+      signDateEnd: Array.isArray(searchForm.signDateRange) && searchForm.signDateRange.length === 2 ? searchForm.signDateRange[1] : undefined,
     }
 
     const response = await http.get('/contract/list', params)
 
     if (response.code === 200) {
-      // 过滤出类型为"收入合同"的数据
+      // 过滤出类型为"支出合同"的数据
       const allContracts = response.rows || []
-      const revenueContracts = allContracts.filter((item: ContractItem) => item.type === '支出合同')
+      let filtered = allContracts.filter((item: ContractItem) => item.type === '支出合同')
+
+      // 如果后端未按时间段过滤，则在前端按签署时间范围再次过滤
+      const range = Array.isArray(searchForm.signDateRange) && searchForm.signDateRange.length === 2 ? searchForm.signDateRange : null
+      if (range) {
+        const [start, end] = range
+        const startTime = new Date(start as any).getTime()
+        const endTime = new Date(end as any).getTime()
+        if (!Number.isNaN(startTime) && !Number.isNaN(endTime)) {
+          filtered = filtered.filter((item: ContractItem) => {
+            if (!item.signDate) return false
+            const t = new Date(item.signDate as any).getTime()
+            return !Number.isNaN(t) && t >= startTime && t <= endTime
+          })
+        }
+      }
 
       // 计算未收款金额
-      dataList.value = revenueContracts.map((item: ContractItem) => ({
+      dataList.value = filtered.map((item: ContractItem) => ({
         ...item,
         pendingAmount: (item.amount || 0) - (item.receivedAmount || 0),
       }))
 
-      pagination.total = Number.parseInt(response.total) || 0
+      // 更新分页总数（前端过滤后以过滤结果数为准）
+      pagination.total = dataList.value.length
     } else {
       Message.error(response.msg || '获取合同列表失败')
       dataList.value = []
@@ -277,11 +307,10 @@ const search = async () => {
 
 const reset = () => {
   Object.assign(searchForm, {
-    contractName: '',
     contractCode: '',
     client: '',
     status: '',
-    signDate: '',
+    signDateRange: [],
     page: 1,
     size: 10,
   })
@@ -305,8 +334,131 @@ const onPageSizeChange = (size: number) => {
 }
 
 // 操作方法
+const showAddModal = ref(false)
+const newContractData = ref<ContractItem>({
+  contractId: '',
+  customer: '',
+  code: '',
+  projectId: '',
+  type: '支出合同',
+  productService: '',
+  paymentDate: null,
+  performanceDeadline: null,
+  paymentAddress: '',
+  amount: 0,
+  accountNumber: '',
+  notes: '',
+  contractStatus: '未确认',
+  contractText: '',
+  projectName: '',
+  salespersonName: null,
+  salespersonDeptName: '',
+  settlementAmount: null,
+  receivedAmount: null,
+  contractStatusLabel: null,
+  createBy: null,
+  updateBy: null,
+  createTime: '',
+  updateTime: '',
+  page: 1,
+  pageSize: 10,
+  signDate: '',
+  duration: '',
+})
+
 const openAddModal = () => {
-  Message.info('新建合同功能开发中...')
+  // 重置默认值
+  newContractData.value = {
+    contractId: '',
+    customer: '',
+    code: '',
+    projectId: '',
+    type: '支出合同',
+    productService: '',
+    paymentDate: null,
+    performanceDeadline: null,
+    paymentAddress: '',
+    amount: 0,
+    accountNumber: '',
+    notes: '',
+    contractStatus: '未确认',
+    contractText: '',
+    projectName: '',
+    salespersonName: null,
+    salespersonDeptName: '',
+    settlementAmount: null,
+    receivedAmount: null,
+    contractStatusLabel: null,
+    createBy: null,
+    updateBy: null,
+    createTime: '',
+    updateTime: '',
+    page: 1,
+    pageSize: 10,
+    signDate: '',
+    duration: '',
+  }
+  showAddModal.value = true
+}
+
+const closeAddModal = () => {
+  showAddModal.value = false
+}
+
+const handleNewContractDataUpdate = (data: ContractItem) => {
+  // 不更换引用，避免子组件watch到props变更导致重渲染丢失焦点
+  Object.assign(newContractData.value, data)
+}
+
+const handleAddSubmit = async () => {
+  try {
+    const payload: any = {
+      accountNumber: newContractData.value.accountNumber || '',
+      amount: newContractData.value.amount || 0,
+      code: newContractData.value.code || '',
+      contractStatus: newContractData.value.contractStatus || '',
+      contractText: newContractData.value.contractText || '',
+      customer: newContractData.value.customer || '',
+      departmentId: (newContractData.value as any).departmentId || '',
+      duration: newContractData.value.duration || '',
+      notes: newContractData.value.notes || '',
+      paymentAddress: newContractData.value.paymentAddress || '',
+      paymentDate: newContractData.value.paymentDate || null,
+      performanceDeadline: newContractData.value.performanceDeadline || null,
+      productService: newContractData.value.productService || '',
+      projectId: newContractData.value.projectId || '',
+      salespersonId: (newContractData.value as any).salespersonId || '',
+      signDate: newContractData.value.signDate || null,
+      type: newContractData.value.type || '支出合同',
+    }
+
+    // 如果没有合同ID则不传
+    if (!newContractData.value.contractId) delete payload.contractId
+
+    const response = await http.post('/contract', payload)
+
+    if ((response as any).status === 200 && response.code === 200) {
+      Message.success('新建合同成功')
+      closeAddModal()
+      search()
+      return true
+    }
+
+    // 某些接口只返回 code/msg
+    if (response.code === 200) {
+      Message.success('新建合同成功')
+      closeAddModal()
+      search()
+      return true
+    }
+
+    Message.error(response.msg || '新建合同失败')
+    return false
+  } catch (error: any) {
+    console.error('新建合同失败:', error)
+    Message.error('新建合同失败: ' + (error?.message || '请稍后再试'))
+    return false
+  }
 }
 
 const exportContract = () => {
@@ -339,7 +491,12 @@ const closeEditModal = () => {
 }
 
 const handleContractDataUpdate = (data: ContractItem) => {
-  editedContractData.value = data
+  // 避免替换引用导致子组件重建，保持编辑输入流畅
+  if (!editedContractData.value) {
+    editedContractData.value = { ...(data as any) } as ContractItem
+  } else {
+    Object.assign(editedContractData.value, data)
+  }
 }
 
 const handleEditSubmit = async () => {
@@ -391,28 +548,29 @@ const handleEditSubmit = async () => {
 }
 
 
-// 删除合同
-const deleteContract = async (record: ContractItem) => {
-  try {
-    await Modal.confirm({
-      title: '确认删除',
-      content: `确定要删除合同 "${record.projectName}" 吗？`,
-    })
-
-    const response = await http.delete(`/contract/${record.contractId}`)
-    if (response.code === 200) {
-      Message.success('合同删除成功')
-      search() // 刷新列表
-    } else {
-      Message.error(response.msg || '合同删除失败')
-    }
-  } catch (error) {
-    // 用户取消删除或请求失败
-    if (error !== 'cancel') {
-      console.error('合同删除失败:', error)
-      Message.error('合同删除失败')
-    }
-  }
+// 删除合同：只有在确认框点击确定后才执行删除
+const deleteContract = (record: ContractItem) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: `确定要删除合同 "${record.projectName}" 吗？`,
+    async onOk() {
+      try {
+        const response = await http.del(`/contract/${record.contractId}`)
+        if (response.code === 200) {
+          Message.success('合同删除成功')
+          search()
+          return true
+        } else {
+          Message.error(response.msg || '合同删除失败')
+          return false
+        }
+      } catch (error) {
+        console.error('合同删除失败:', error)
+        Message.error('合同删除失败')
+        return false
+      }
+    },
+  })
 }
 
 // 显示合同详情弹窗
diff --git a/src/views/project-management/contract/revenue-contract/ContractEdit.vue b/src/views/project-management/contract/revenue-contract/ContractEdit.vue
index 4ced636..caf1c1c 100644
--- a/src/views/project-management/contract/revenue-contract/ContractEdit.vue
+++ b/src/views/project-management/contract/revenue-contract/ContractEdit.vue
@@ -7,8 +7,16 @@
         </a-form-item>
       </a-col>
       <a-col :span="12">
-        <a-form-item field="projectName" label="项目名称">
-          <a-input v-model="contractData.projectName" />
+        <a-form-item field="projectId" label="项目">
+          <a-select v-model="contractData.projectId"
+                    :options="projectOptions"
+                    :loading="projectLoading"
+                    :virtual-list-props="virtualListProps"
+                    placeholder="请选择项目"
+                    allow-search allow-clear
+                    @focus="handleProjectFocus"
+                    @dropdown-visible-change="handleProjectDropdown"
+                    @search="handleProjectSearch" />
         </a-form-item>
       </a-col>
     </a-row>
@@ -66,8 +74,27 @@
         </a-form-item>
       </a-col>
       <a-col :span="12">
-        <a-form-item field="productService" label="产品或服务">
-          <a-input v-model="contractData.productService" />
+        <a-form-item field="departmentId" label="销售部门">
+          <a-tree-select v-model="contractData.departmentId"
+                         :data="deptTree"
+                         :loading="deptLoading"
+                         placeholder="请选择部门"
+                         allow-search allow-clear
+                         @dropdown-visible-change="handleDeptDropdown"
+                         @focus="handleDeptFocus"
+          />
+        </a-form-item>
+      </a-col>
+      <a-col :span="12">
+        <a-form-item field="salespersonId" label="销售人员">
+          <a-select v-model="contractData.salespersonId"
+                    :options="userOptions"
+                    :loading="userLoading"
+                    :virtual-list-props="userVirtualListProps"
+                    placeholder="请选择业务员"
+                    allow-search allow-clear
+                    @dropdown-visible-change="handleUserDropdown"
+                    @search="handleUserSearch" />
         </a-form-item>
       </a-col>
     </a-row>
@@ -88,6 +115,10 @@
 
 <script setup lang="ts">
 import { ref, watch } from 'vue'
+import { Message } from '@arco-design/web-vue'
+import { listProject, type ProjectResp } from '@/apis/project'
+import { getDeptTree } from '@/apis/system/dept'
+import { listUser } from '@/apis/system/user'
 import type { ContractItem } from './index.vue'
 
 const props = defineProps<{
@@ -100,6 +131,134 @@ const emit = defineEmits<{
 
 const contractData = ref({ ...props.contractData })
 
+// 项目选项与加载（支持无限滚动）
+const projectOptions = ref<{ label: string; value: string }[]>([])
+const projectLoading = ref(false)
+const projPage = ref(1)
+const pageSize = 20
+const hasMore = ref(true)
+const currentKeyword = ref('')
+let searchTimer: number | undefined
+
+const appendProjects = (list: ProjectResp[]) => {
+  const items = list.map(p => ({ label: p.projectName, value: String((p as any).projectId ?? (p as any).id) }))
+  projectOptions.value = projectOptions.value.concat(items)
+}
+
+const extractList = (data: any): ProjectResp[] => {
+  if (Array.isArray(data)) return data as ProjectResp[]
+  if (Array.isArray(data?.list)) return data.list as ProjectResp[]
+  if (Array.isArray(data?.rows)) return data.rows as ProjectResp[]
+  return []
+}
+
+const loadProjects = async (keyword = currentKeyword.value, reset = false) => {
+  try {
+    if (reset) {
+      projPage.value = 1
+      hasMore.value = true
+      projectOptions.value = []
+    }
+    if (!hasMore.value) return
+    projectLoading.value = true
+    const resp = await listProject({ page: projPage.value, size: pageSize, projectName: keyword } as any)
+    const list = extractList((resp as any).data)
+    appendProjects(list)
+    if (list.length < pageSize) hasMore.value = false
+    projPage.value += 1
+  } catch (e) {
+    Message.error('获取项目列表失败')
+    hasMore.value = false
+  } finally {
+    projectLoading.value = false
+  }
+}
+
+const virtualListProps = {
+  height: 240,
+  onReachBottom: () => {
+    if (hasMore.value && !projectLoading.value) loadProjects()
+  },
+}
+
+const handleProjectFocus = () => {
+  if (projectOptions.value.length === 0) loadProjects('', true)
+}
+const handleProjectDropdown = (visible: boolean) => {
+  if (visible && projectOptions.value.length === 0) loadProjects('', true)
+}
+const handleProjectSearch = (val: string) => {
+  if (searchTimer) window.clearTimeout(searchTimer)
+  currentKeyword.value = val || ''
+  searchTimer = window.setTimeout(() => loadProjects(currentKeyword.value, true), 300)
+}
+
+// 部门树
+const deptTree = ref([] as any[])
+const deptLoading = ref(false)
+const loadDept = async () => {
+  try {
+    deptLoading.value = true
+    const res = await getDeptTree()
+    const data = (res as any).data || []
+    const toTree = (arr: any[]): any[] => arr.map(i => ({
+      key: String(i.deptId),
+      title: i.deptName,
+      value: String(i.deptId),
+      children: Array.isArray(i.children) ? toTree(i.children) : [],
+    }))
+    deptTree.value = toTree(Array.isArray(data) ? data : (data.list || data.rows || []))
+  } finally {
+    deptLoading.value = false
+  }
+}
+const handleDeptDropdown = (visible: boolean) => { if (visible && deptTree.value.length === 0) loadDept() }
+const handleDeptFocus = () => { if (deptTree.value.length === 0) loadDept() }
+
+// 用户列表（分页 + 搜索 + 无限滚动）
+const userOptions = ref<{ label: string; value: string }[]>([])
+const userLoading = ref(false)
+const userPage = ref(1)
+const userHasMore = ref(true)
+const userPageSize = 20
+const userKeyword = ref('')
+
+const appendUsers = (rows: any[]) => {
+  userOptions.value = userOptions.value.concat(
+    rows.map(u => ({ label: u.name || u.nickname || u.username, value: String(u.userId || u.id) }))
+  )
+}
+const extractUsers = (data: any): any[] => {
+  if (Array.isArray(data)) return data
+  if (Array.isArray(data?.rows)) return data.rows
+  if (Array.isArray(data?.list)) return data.list
+  return []
+}
+const loadUsers = async (reset = false) => {
+  try {
+    if (reset) { userOptions.value = []; userPage.value = 1; userHasMore.value = true }
+    if (!userHasMore.value) return
+    userLoading.value = true
+    const resp = await listUser({ page: userPage.value, pageSize: userPageSize, name: userKeyword.value } as any)
+    const rows = extractUsers((resp as any).data)
+    appendUsers(rows)
+    if (rows.length < userPageSize) userHasMore.value = false
+    userPage.value += 1
+  } finally {
+    userLoading.value = false
+  }
+}
+const userVirtualListProps = {
+  height: 240,
+  onReachBottom: () => { if (userHasMore.value && !userLoading.value) loadUsers() }
+}
+const handleUserDropdown = (visible: boolean) => { if (visible && userOptions.value.length === 0) { userKeyword.value=''; loadUsers(true) } }
+const handleUserSearch = (val: string) => {
+  if (searchTimer) window.clearTimeout(searchTimer)
+  userKeyword.value = val || ''
+  searchTimer = window.setTimeout(() => loadUsers(true), 300)
+}
+
 // 监听props变化更新内部数据
 watch(
   () => props.contractData,
diff --git a/src/views/project-management/contract/revenue-contract/index.vue b/src/views/project-management/contract/revenue-contract/index.vue
index 28d7b37..1c80b57 100644
--- a/src/views/project-management/contract/revenue-contract/index.vue
+++ b/src/views/project-management/contract/revenue-contract/index.vue
@@ -55,11 +55,9 @@
 
       <template #action="{ record }">
         <a-space>
-          <a-link @click="viewDetail(record)">详情</a-link>
-          <a-link v-if="record.contractStatus === '未确认'" @click="editRecord(record)">编辑</a-link>
-          <a-link v-if="record.contractStatus === '待审批'" @click="approveContract(record)">审批</a-link>
-          <a-link @click="viewPayment(record)">收款记录</a-link>
-          <a-link v-if="record.contractStatus !== '已签署' && record.contractStatus !== '已完成'" @click="deleteContract(record)">删除</a-link>
+          <a-link @click="viewDetail(record)">查看</a-link>
+          <a-link @click="editRecord(record)">编辑</a-link>
+          <a-link status="danger" @click="deleteContract(record)">删除</a-link>
         </a-space>
       </template>
     </GiTable>
@@ -90,6 +88,21 @@
       />
     </a-modal>
   </GiPageLayout>
+
+    <!-- 新建合同弹窗 -->
+    <a-modal
+      v-model:visible="showAddModal"
+      title="新建合同"
+      :width="800"
+      @cancel="closeAddModal"
+      @before-ok="handleAddSubmit"
+    >
+      <ContractEdit
+        v-if="showAddModal"
+        :contract-data="newContractData"
+        @update:contract-data="handleNewContractDataUpdate"
+      />
+    </a-modal>
 </template>
 
 <script setup lang="ts">
@@ -305,14 +318,71 @@ const onPageSizeChange = (size: number) => {
 }
 
 // 操作方法
+const showAddModal = ref(false)
+const newContractData = ref<ContractItem>({
+  contractId: '', customer: '', code: '', projectId: '', type: '收入合同',
+  productService: '', paymentDate: null, performanceDeadline: null,
+  paymentAddress: '', amount: 0, accountNumber: '', notes: '',
+  contractStatus: '未确认', contractText: '', projectName: '',
+  salespersonName: null, salespersonDeptName: '', settlementAmount: null,
+  receivedAmount: null, contractStatusLabel: null, createBy: null, updateBy: null,
+  createTime: '', updateTime: '', page: 1, pageSize: 10, signDate: '', duration: '',
+} as any)
+
 const openAddModal = () => {
-  Message.info('新建合同功能开发中...')
+  Object.assign(newContractData.value, {
+    contractId: '', customer: '', code: '', projectId: '', type: '收入合同',
+    productService: '', paymentDate: null, performanceDeadline: null,
+    paymentAddress: '', amount: 0, accountNumber: '', notes: '',
+    contractStatus: '未确认', contractText: '', projectName: '',
+    salespersonName: null, salespersonDeptName: '', settlementAmount: null,
+    receivedAmount: null, contractStatusLabel: null, createBy: null, updateBy: null,
+    createTime: '', updateTime: '', page: 1, pageSize: 10, signDate: '', duration: '',
+  })
+  showAddModal.value = true
 }
 
-const exportContract = () => {
-  Message.info('导出合同功能开发中...')
+const closeAddModal = () => { showAddModal.value = false }
+
+const handleNewContractDataUpdate = (data: ContractItem) => { Object.assign(newContractData.value, data) }
+
+const handleAddSubmit = async () => {
+  try {
+    const payload: any = {
+      accountNumber: newContractData.value.accountNumber || '',
+      amount: newContractData.value.amount || 0,
+      code: newContractData.value.code || '',
+      contractStatus: newContractData.value.contractStatus || '',
+      contractText: newContractData.value.contractText || '',
+      customer: newContractData.value.customer || '',
+      departmentId: (newContractData.value as any).departmentId || '',
+      duration: newContractData.value.duration || '',
+      notes: newContractData.value.notes || '',
+      paymentAddress: newContractData.value.paymentAddress || '',
+      paymentDate: newContractData.value.paymentDate || null,
+      performanceDeadline: newContractData.value.performanceDeadline || null,
+      productService: newContractData.value.productService || '',
+      projectId: newContractData.value.projectId || '',
+      salespersonId: (newContractData.value as any).salespersonId || '',
+      signDate: newContractData.value.signDate || null,
+      type: newContractData.value.type || '收入合同',
+    }
+    if (!newContractData.value.contractId) delete payload.contractId
+    const response = await http.post('/contract', payload)
+    if ((response as any).status === 200 && response.code === 200) {
+      Message.success('新建合同成功'); closeAddModal(); search(); return true
+    }
+    if (response.code === 200) { Message.success('新建合同成功'); closeAddModal(); search(); return true }
+    Message.error(response.msg || '新建合同失败'); return false
+  } catch (error: any) {
+    console.error('新建合同失败:', error)
+    Message.error('新建合同失败: ' + (error?.message || '请稍后再试'))
+    return false
+  }
 }
 
+const exportContract = () => { Message.info('导出合同功能开发中...') }
+
 // 显示合同编辑弹窗
 const showEditModal = ref(false)
 const selectedContractData = ref<ContractItem | null>(null)
@@ -391,28 +461,29 @@ const handleEditSubmit = async () => {
 }
 
 
-// 删除合同
-const deleteContract = async (record: ContractItem) => {
-  try {
-    await Modal.confirm({
-      title: '确认删除',
-      content: `确定要删除合同 "${record.projectName}" 吗？`,
-    })
-
-    const response = await http.delete(`/contract/${record.contractId}`)
-    if (response.code === 200) {
-      Message.success('合同删除成功')
-      search() // 刷新列表
-    } else {
-      Message.error(response.msg || '合同删除失败')
-    }
-  } catch (error) {
-    // 用户取消删除或请求失败
-    if (error !== 'cancel') {
-      console.error('合同删除失败:', error)
-      Message.error('合同删除失败')
-    }
-  }
+// 删除合同：只有在确认框点击确定后才执行删除
+const deleteContract = (record: ContractItem) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: `确定要删除合同 "${record.projectName}" 吗？`,
+    async onOk() {
+      try {
+        const response = await http.del(`/contract/${record.contractId}`)
+        if (response.code === 200) {
+          Message.success('合同删除成功')
+          search()
+          return true
+        } else {
+          Message.error(response.msg || '合同删除失败')
+          return false
+        }
+      } catch (error) {
+        console.error('合同删除失败:', error)
+        Message.error('合同删除失败')
+        return false
+      }
+    },
+  })
 }
 
 // 显示合同详情弹窗
diff --git a/src/views/project-management/personnel-dispatch/construction-personnel.vue b/src/views/project-management/personnel-dispatch/construction-personnel.vue
index 7bf428c..7deaaf4 100644
--- a/src/views/project-management/personnel-dispatch/construction-personnel.vue
+++ b/src/views/project-management/personnel-dispatch/construction-personnel.vue
@@ -41,6 +41,20 @@
     <!-- 简洁搜索区域 -->
     <div class="search-section">
       <a-card :bordered="false" class="search-card">
+        <!-- 搜索状态提示 -->
+        <div v-if="hasActiveFilters" class="search-status">
+          <icon-info-circle style="color: #667eea; margin-right: 8px;" />
+          <span>当前应用了搜索筛选条件</span>
+          <a-button 
+            type="text" 
+            size="small" 
+            @click="handleReset"
+            style="margin-left: 8px; color: #667eea;"
+          >
+            清除所有筛选
+          </a-button>
+        </div>
+        
         <a-form layout="inline" :model="searchForm">
           <a-form-item label="姓名">
             <a-input 
@@ -49,17 +63,19 @@
               style="width: 180px"
               allow-clear
               @press-enter="handleSearch"
+              @clear="handleSearch"
             />
           </a-form-item>
-          <a-form-item label="岗位">
+          <a-form-item label="项目岗位">
             <a-select 
-              v-model="searchForm.position" 
-              placeholder="请选择岗位" 
+              v-model="searchForm.roleType" 
+              placeholder="请选择项目岗位" 
               style="width: 150px"
               allow-clear
+              @change="handleSearch"
             >
               <a-option 
-                v-for="option in POSITION_OPTIONS" 
+                v-for="option in ROLE_TYPE_OPTIONS" 
                 :key="option.value" 
                 :value="option.value"
               >
@@ -73,6 +89,7 @@
               placeholder="请选择状态" 
               style="width: 120px"
               allow-clear
+              @change="handleSearch"
             >
               <a-option 
                 v-for="option in STATUS_OPTIONS" 
@@ -85,7 +102,12 @@
           </a-form-item>
           <a-form-item>
             <a-space>
-              <a-button type="primary" @click="handleSearch">
+              <a-button 
+                type="primary" 
+                @click="handleSearch"
+                :loading="loading"
+                :disabled="!hasActiveFilters"
+              >
                 <template #icon><icon-search /></template>
                 搜索
               </a-button>
@@ -99,24 +121,49 @@
       </a-card>
     </div>
 
+
     <!-- 数据表格 -->
     <GiTable
       row-key="id"
       :data="dataList"
       :columns="tableColumns"
       :loading="loading"
-      :scroll="{ x: '100%', minWidth: 1200 }"
+      :scroll="{ x: '100%', y: 'calc(100vh - 400px)', minWidth: 1200 }"
       :pagination="pagination"
       :disabled-tools="['size']"
       @page-change="onPageChange"
       @page-size-change="onPageSizeChange"
       @refresh="loadData"
     >
+      <!-- 空状态显示 -->
+      <template #empty>
+        <div class="empty-state">
+          <icon-user-group style="font-size: 48px; color: #c9cdd4; margin-bottom: 16px;" />
+          <div class="empty-text">
+            <h3>{{ hasActiveFilters ? '没有找到匹配的团队成员' : '暂无团队成员数据' }}</h3>
+            <p v-if="hasActiveFilters">
+              请尝试调整搜索条件或
+              <a-link @click="handleReset">清除所有筛选</a-link>
+            </p>
+            <p v-else>
+              点击右上角的"新增成员"按钮来添加第一个团队成员
+            </p>
+          </div>
+        </div>
+      </template>
+      
+      <!-- 项目岗位列 -->
+      <template #roleType="{ record }">
+        <span class="role-type-text">
+          {{ getRoleTypeText(record.roleType) }}
+        </span>
+      </template>
+
       <!-- 状态列 -->
       <template #status="{ record }">
-        <a-tag :color="getStatusColor(record.status || 'offline')">
-          {{ getStatusText(record.status || 'offline') }}
-        </a-tag>
+        <span class="status-tag" :class="`status-${record.status || 'INACTIVE'}`">
+          {{ getStatusText(record.status || 'INACTIVE') }}
+        </span>
       </template>
 
 
@@ -132,9 +179,31 @@
       <!-- 操作列 -->
       <template #action="{ record }">
         <a-space>
-          <a-link title="编辑" @click="openEditModal(record)">编辑</a-link>
-          <a-link title="状态调整" @click="openStatusModal(record)">状态</a-link>
-          <a-link status="danger" title="删除" @click="confirmDelete(record)">删除</a-link>
+          <a-link 
+            title="编辑" 
+            @click="openEditModal(record)"
+            class="action-link edit-link"
+          >
+            <template #icon><icon-edit /></template>
+            编辑
+          </a-link>
+          <a-link 
+            title="状态调整" 
+            @click="openStatusModal(record)"
+            class="action-link status-link"
+          >
+            <template #icon><icon-settings /></template>
+            状态
+          </a-link>
+          <a-link 
+            status="danger" 
+            title="删除" 
+            @click="confirmDelete(record)"
+            class="action-link delete-link"
+          >
+            <template #icon><icon-delete /></template>
+            删除
+          </a-link>
         </a-space>
       </template>
     </GiTable>
@@ -160,10 +229,10 @@
         </div>
         <div class="form-row">
           <div class="form-item">
-            <label>岗位 <span class="required">*</span></label>
-            <a-select v-model="memberForm.position" placeholder="请选择岗位">
+            <label>项目岗位 <span class="required">*</span></label>
+            <a-select v-model="memberForm.roleType" placeholder="请选择项目岗位">
               <a-option 
-                v-for="option in POSITION_OPTIONS" 
+                v-for="option in ROLE_TYPE_OPTIONS" 
                 :key="option.value" 
                 :value="option.value"
               >
@@ -293,24 +362,26 @@ import {
 const route = useRoute()
 const projectId = route.query.projectId as string
 
-// 选项数据常量
-const POSITION_OPTIONS = [
-  { label: '项目经理', value: '项目经理' },
-  { label: '技术负责人', value: '技术负责人' },
-  { label: '安全员', value: '安全员' },
-  { label: '质量员', value: '质量员' },
-  { label: '施工员', value: '施工员' },
-  { label: '材料员', value: '材料员' },
-  { label: '资料员', value: '资料员' },
-  { label: '实习生', value: '实习生' },
-  { label: '技术工人', value: '技术工人' },
-  { label: '普通工人', value: '普通工人' }
+// 选项数据常量 - 项目岗位选项
+
+const ROLE_TYPE_OPTIONS = [
+  { label: '项目经理', value: 'PROJECT_MANAGER' },
+  { label: '项目负责人', value: 'TEAM_LEADER' },
+  { label: '技术负责人', value: 'TECH_LEADER' },
+  { label: '安全员', value: 'SAFETY_OFFICER' },
+  { label: '质量员', value: 'QUALITY_OFFICER' },
+  { label: '施工员', value: 'CONSTRUCTOR' },
+  { label: '材料员', value: 'MATERIAL_MANAGER' },
+  { label: '资料员', value: 'DOCUMENT_MANAGER' },
+  { label: '实习生', value: 'INTERN' },
+  { label: '技术工人', value: 'TECH_WORKER' },
+  { label: '普通工人', value: 'WORKER' }
 ]
 
 const STATUS_OPTIONS = [
-  { label: '可用', value: 'available' },
-  { label: '忙碌', value: 'busy' },
-  { label: '离线', value: 'offline' }
+  { label: '可用', value: 'ACTIVE' },
+  { label: '忙碌', value: 'SUSPENDED' },
+  { label: '离线', value: 'INACTIVE' }
 ]
 
 // 响应式数据
@@ -328,11 +399,11 @@ const pagination = reactive({
 // 搜索表单
 const searchForm = reactive<{
   name: string
-  position: string
+  roleType: string
   status: string
 }>({
   name: '',
-  position: '',
+  roleType: '',
   status: ''
 })
 
@@ -341,7 +412,7 @@ const tableColumns = [
   { title: '姓名', dataIndex: 'name', width: 100, fixed: 'left' },
   { title: '联系电话', dataIndex: 'phone', width: 120 },
   { title: '邮箱', dataIndex: 'email', width: 150 },
-  { title: '项目岗位', dataIndex: 'position', width: 120 },
+  { title: '项目岗位', dataIndex: 'roleType', width: 120, slotName: 'roleType' },
   { title: '状态', dataIndex: 'status', width: 100, slotName: 'status' },
   { title: '入职日期', dataIndex: 'joinDate', width: 120 },
   { title: '备注', dataIndex: 'remark', width: 200, slotName: 'remark' },
@@ -359,9 +430,9 @@ const memberForm = reactive<CreateTeamMemberForm & { id?: string | number }>({
   projectId: projectId,
   name: '',
   phone: '',
+  roleType: '', // 项目岗位
+  status: 'ACTIVE',
   email: '',
-  position: '',
-  status: 'available',
   joinDate: '',
   remark: ''
 })
@@ -370,12 +441,12 @@ const statusForm = reactive<{
   id: string | number
   name: string
   currentStatus: string
-  newStatus: 'available' | 'busy' | 'offline'
+  newStatus: 'ACTIVE' | 'SUSPENDED' | 'INACTIVE'
 }>({
   id: '',
   name: '',
   currentStatus: '',
-  newStatus: 'available'
+  newStatus: 'ACTIVE'
 })
 
 const fileList = ref<any[]>([])
@@ -392,56 +463,80 @@ const loadData = async () => {
   try {
     console.log('正在加载项目团队成员数据，项目ID:', projectId)
     
-    // 构建查询参数
+    // 构建查询参数，字段名要与后端接口匹配
     const queryParams: TeamMemberQuery = {
       projectId: projectId,
       page: pagination.current,
       pageSize: pagination.pageSize,
       name: searchForm.name || undefined,
-      position: searchForm.position || undefined,
+      position: searchForm.roleType || undefined, // 后端使用position字段
       status: searchForm.status || undefined
     }
     
+    console.log('查询参数:', queryParams)
+    
     const response = await getProjectTeamMembers(queryParams)
     
-    console.log('API响应数据:', response.data)
+    console.log('API响应数据:', response)
     
-    // 确保response.data是数组
-    const rawData = Array.isArray(response.data) ? response.data : [response.data]
+    // 处理后端返回的数据
+    let mappedData: TeamMemberResp[] = []
+    let total = 0
     
-    console.log('处理后的原始数据:', rawData)
-    
-    // 处理后端返回的数据，将后端字段映射到前端期望的字段
-    const mappedData = rawData.map((item: BackendTeamMemberResp) => {
-      const mappedItem: TeamMemberResp = {
+    if (response.data) {
+      // 如果后端返回的是分页数据
+      if (response.data.list && Array.isArray(response.data.list)) {
+        mappedData = response.data.list.map((item: BackendTeamMemberResp) => {
+          return {
         id: item.memberId,
         name: item.name || '',
         phone: item.phone || '',
         email: item.email || '',
-        position: item.position || '',
-        status: (item.status === 'ACTIVE' ? 'available' : item.status === 'BUSY' ? 'busy' : 'offline') as 'available' | 'busy' | 'offline',
+            roleType: item.roleType || item.position || '', // 优先使用roleType，fallback到position
+            status: (item.status === 'ACTIVE' ? 'ACTIVE' : item.status === 'SUSPENDED' ? 'SUSPENDED' : 'INACTIVE') as 'ACTIVE' | 'SUSPENDED' | 'INACTIVE',
         joinDate: item.joinDate || '',
         remark: item.remark || '',
         avatar: item.userAvatar || ''
       }
-      console.log('映射后的数据项:', mappedItem)
-      return mappedItem
-    })
+        })
+        total = response.data.total || mappedData.length
+      } 
+      // 如果后端直接返回数组
+      else if (Array.isArray(response.data)) {
+        mappedData = response.data.map((item: BackendTeamMemberResp) => {
+          return {
+            id: item.memberId,
+            name: item.name || '',
+            phone: item.phone || '',
+            email: item.email || '',
+            roleType: item.roleType || item.position || '',
+            status: (item.status === 'ACTIVE' ? 'ACTIVE' : item.status === 'SUSPENDED' ? 'SUSPENDED' : 'INACTIVE') as 'ACTIVE' | 'SUSPENDED' | 'INACTIVE',
+            joinDate: item.joinDate || '',
+            remark: item.remark || '',
+            avatar: item.userAvatar || ''
+          }
+        })
+        total = mappedData.length
+      }
+    }
     
     dataList.value = mappedData
-    pagination.total = mappedData.length
+    pagination.total = total
     
     console.log('团队成员数据加载完成，显示数据:', dataList.value.length, '条，总计:', pagination.total, '条')
     
   } catch (error) {
     console.error('团队成员数据加载失败:', error)
     Message.error('团队成员数据加载失败')
+    dataList.value = []
+    pagination.total = 0
   } finally {
     loading.value = false
   }
 }
 
 const handleSearch = async () => {
+  console.log('执行搜索，搜索条件:', searchForm)
   pagination.current = 1
   await loadData()
 }
@@ -450,19 +545,22 @@ const handleReset = () => {
   console.log('重置搜索表单')
   Object.assign(searchForm, {
     name: '',
-    position: '',
+    roleType: '',
     status: ''
   })
   pagination.current = 1
+  // 重置后自动加载数据
   loadData()
 }
 
 const onPageChange = (page: number) => {
+  console.log('页码变化:', page)
   pagination.current = page
   loadData()
 }
 
 const onPageSizeChange = (pageSize: number) => {
+  console.log('每页大小变化:', pageSize)
   pagination.pageSize = pageSize
   pagination.current = 1
   loadData()
@@ -481,9 +579,9 @@ const openEditModal = (record: TeamMemberResp) => {
     projectId: projectId,
     name: record.name,
     phone: record.phone || '',
+    roleType: record.roleType || '',
+    status: record.status || 'ACTIVE',
     email: record.email || '',
-    position: record.position,
-    status: record.status || 'available',
     joinDate: record.joinDate || '',
     remark: record.remark || ''
   })
@@ -491,7 +589,7 @@ const openEditModal = (record: TeamMemberResp) => {
 }
 
 const saveMember = async () => {
-  if (!memberForm.name || !memberForm.phone || !memberForm.position) {
+  if (!memberForm.name || !memberForm.phone || !memberForm.roleType) {
     Message.error('请填写必填项')
     return
   }
@@ -502,9 +600,9 @@ const saveMember = async () => {
       const updateData: UpdateTeamMemberForm = {
         name: memberForm.name,
         phone: memberForm.phone,
-        email: memberForm.email,
-        position: memberForm.position,
+        roleType: memberForm.roleType,
         status: memberForm.status,
+        email: memberForm.email,
         joinDate: memberForm.joinDate,
         remark: memberForm.remark
       }
@@ -516,9 +614,9 @@ const saveMember = async () => {
         projectId: projectId,
         name: memberForm.name,
         phone: memberForm.phone,
-        email: memberForm.email,
-        position: memberForm.position,
+        roleType: memberForm.roleType,
         status: memberForm.status,
+        email: memberForm.email,
         joinDate: memberForm.joinDate,
         remark: memberForm.remark
       }
@@ -545,9 +643,9 @@ const resetMemberForm = () => {
     projectId: projectId,
     name: '',
     phone: '',
+    roleType: '',
+    status: 'ACTIVE',
     email: '',
-    position: '',
-    status: 'available',
     joinDate: '',
     remark: ''
   })
@@ -557,8 +655,8 @@ const openStatusModal = (record: TeamMemberResp) => {
   Object.assign(statusForm, {
     id: record.id,
     name: record.name,
-    currentStatus: record.status || 'available',
-    newStatus: record.status || 'available'
+    currentStatus: record.status || 'ACTIVE',
+    newStatus: record.status || 'ACTIVE'
   })
   statusModalVisible.value = true
 }
@@ -566,7 +664,7 @@ const openStatusModal = (record: TeamMemberResp) => {
 const saveStatus = async () => {
   try {
     await updateTeamMember(statusForm.id, { 
-      status: statusForm.newStatus as 'available' | 'busy' | 'offline' 
+      status: statusForm.newStatus as 'ACTIVE' | 'SUSPENDED' | 'INACTIVE' 
     })
     Message.success('状态更新成功')
     statusModalVisible.value = false
@@ -655,7 +753,7 @@ const exportData = async () => {
     const queryParams: TeamMemberExportQuery = {
       projectId: projectId,
       name: searchForm.name || undefined,
-      position: searchForm.position || undefined,
+      position: searchForm.roleType || undefined,
       status: searchForm.status || undefined
     }
     
@@ -677,24 +775,34 @@ const exportData = async () => {
 }
 
 // 工具方法
+const getRoleTypeText = (roleType: string) => {
+  const option = ROLE_TYPE_OPTIONS.find(opt => opt.value === roleType)
+  return option ? option.label : roleType
+}
+
 const getStatusColor = (status: string) => {
   const colorMap: Record<string, string> = {
-    available: 'green',
-    busy: 'orange',
-    offline: 'gray'
+    ACTIVE: 'success',
+    SUSPENDED: 'warning',
+    INACTIVE: 'danger'
   }
-  return colorMap[status] || 'gray'
+  return colorMap[status] || 'danger'
 }
 
 const getStatusText = (status: string) => {
   const textMap: Record<string, string> = {
-    available: '可用',
-    busy: '忙碌',
-    offline: '离线'
+    ACTIVE: '可用',
+    SUSPENDED: '忙碌',
+    INACTIVE: '离线'
   }
   return textMap[status] || '未知'
 }
 
+// 计算属性：判断是否有激活的搜索条件
+const hasActiveFilters = computed(() => {
+  return searchForm.name || searchForm.roleType || searchForm.status
+})
+
 // 生命周期
 onMounted(() => {
   console.log('团队成员管理页面加载，项目ID:', projectId)
@@ -735,54 +843,138 @@ onMounted(() => {
 // 确保表格容器可以滚动
 :deep(.arco-table-container) {
   overflow-x: auto;
-  overflow-y: visible;
+  overflow-y: auto;
+}
+
+// 确保表格内容可以正常滚动
+:deep(.arco-table-body) {
+  overflow-y: auto !important;
+}
+
+:deep(.arco-table-tbody) {
+  overflow-y: auto !important;
+}
+
+// 确保分页器不会影响滚动
+:deep(.arco-pagination) {
+  margin-top: 16px;
+}
+
+// 操作链接样式
+.action-link {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  padding: 6px 12px;
+  border-radius: 6px;
+  font-weight: 500;
+  transition: all 0.3s ease;
+  text-decoration: none;
+  
+  &:hover {
+    transform: translateY(-1px);
+    text-decoration: none;
+  }
+  
+  &.edit-link {
+    color: #1677ff;
+    
+    &:hover {
+      background: rgba(22, 119, 255, 0.1);
+      color: #0958d9;
+    }
+  }
+  
+  &.status-link {
+    color: #52c41a;
+    
+    &:hover {
+      background: rgba(82, 196, 26, 0.1);
+      color: #389e0d;
+    }
+  }
+  
+  &.delete-link {
+    color: #ff4d4f;
+    
+    &:hover {
+      background: rgba(255, 77, 79, 0.1);
+      color: #d9363e;
+    }
+  }
 }
 .page-header {
   display: flex;
   justify-content: space-between;
   align-items: center;
   margin-bottom: 24px;
-  padding: 20px;
-  background: white;
-  border-radius: 8px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+  padding: 24px;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  border-radius: 16px;
+  box-shadow: 0 8px 32px rgba(102, 126, 234, 0.3);
+  position: relative;
+  overflow: hidden;
+  
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><defs><pattern id="grain" width="100" height="100" patternUnits="userSpaceOnUse"><circle cx="25" cy="25" r="1" fill="rgba(255,255,255,0.1)"/><circle cx="75" cy="75" r="1" fill="rgba(255,255,255,0.1)"/><circle cx="50" cy="10" r="0.5" fill="rgba(255,255,255,0.1)"/><circle cx="10" cy="60" r="0.5" fill="rgba(255,255,255,0.1)"/><circle cx="90" cy="40" r="0.5" fill="rgba(255,255,255,0.1)"/></pattern></defs><rect width="100" height="100" fill="url(%23grain)"/></svg>');
+    opacity: 0.3;
+  }
 
   .header-left {
     display: flex;
     align-items: center;
-    gap: 16px;
+    gap: 20px;
+    position: relative;
+    z-index: 1;
 
     .back-btn {
       border: none;
-      background: #f7f8fa;
-      color: #4e5969;
+      background: rgba(255, 255, 255, 0.2);
+      color: white;
+      backdrop-filter: blur(10px);
+      border-radius: 8px;
+      padding: 8px 16px;
+      transition: all 0.3s ease;
       
       &:hover {
-        background: #e5e6eb;
-        color: #1d2129;
+        background: rgba(255, 255, 255, 0.3);
+        transform: translateX(-2px);
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
       }
     }
 
     .header-title {
       display: flex;
       align-items: center;
-      gap: 8px;
+      gap: 12px;
 
       .title-icon {
-        font-size: 24px;
-        color: #667eea;
+        font-size: 28px;
+        color: white;
+        filter: drop-shadow(0 2px 4px rgba(0, 0, 0, 0.2));
       }
 
       h1 {
         margin: 0;
-        font-size: 20px;
-        font-weight: 600;
-        color: #1d2129;
+        font-size: 24px;
+        font-weight: 700;
+        color: white;
+        text-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
       }
 
       .project-info {
         font-size: 14px;
-        color: #969fa8;
+        color: rgba(255, 255, 255, 0.9);
+        background: rgba(255, 255, 255, 0.2);
+        padding: 6px 12px;
+        border-radius: 20px;
+        backdrop-filter: blur(10px);
       }
     }
   }
@@ -790,6 +982,19 @@ onMounted(() => {
   .header-actions {
     display: flex;
     gap: 12px;
+    position: relative;
+    z-index: 1;
+    
+    .arco-btn {
+      border-radius: 8px;
+      font-weight: 600;
+      transition: all 0.3s ease;
+      
+      &:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 6px 20px rgba(0, 0, 0, 0.2);
+      }
+    }
   }
 }
 
@@ -797,56 +1002,148 @@ onMounted(() => {
   margin-bottom: 16px;
   
   .search-card {
-    background: white;
-    border-radius: 8px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+    background: linear-gradient(135deg, #f8f9ff 0%, #f0f2ff 100%);
+    border-radius: 16px;
+    box-shadow: 0 4px 20px rgba(102, 126, 234, 0.1);
+    border: 1px solid rgba(102, 126, 234, 0.1);
     
     :deep(.arco-card-body) {
-      padding: 20px;
+      padding: 24px;
+    }
+    
+    // 搜索状态提示样式
+    .search-status {
+      display: flex;
+      align-items: center;
+      margin-bottom: 16px;
+      padding: 12px 16px;
+      background: rgba(102, 126, 234, 0.1);
+      border-radius: 8px;
+      border-left: 4px solid #667eea;
+      font-size: 14px;
+      color: #4e5969;
+      
+      .arco-btn {
+        padding: 2px 8px;
+        height: auto;
+        line-height: 1.4;
+        
+        &:hover {
+          background: rgba(102, 126, 234, 0.2);
+        }
+      }
     }
     
     :deep(.arco-form-item) {
       margin-bottom: 0;
-      margin-right: 16px;
+      margin-right: 20px;
     }
     
     :deep(.arco-form-item-label) {
-      font-weight: 500;
+      font-weight: 600;
       color: #4e5969;
+      font-size: 14px;
     }
     
     :deep(.arco-input),
     :deep(.arco-select) {
       width: 100%;
+      border-radius: 8px;
+      border: 1px solid rgba(102, 126, 234, 0.2);
+      transition: all 0.3s ease;
+      
+      &:hover {
+        border-color: rgba(102, 126, 234, 0.4);
+        box-shadow: 0 2px 8px rgba(102, 126, 234, 0.1);
+      }
+      
+      &:focus {
+        border-color: #667eea;
+        box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
+      }
+    }
+    
+    :deep(.arco-btn) {
+  border-radius: 8px;
+      font-weight: 600;
+      transition: all 0.3s ease;
+      
+      &:hover {
+        transform: translateY(-1px);
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+      }
+      
+      &:disabled {
+        opacity: 0.6;
+        cursor: not-allowed;
+        
+        &:hover {
+          transform: none;
+          box-shadow: none;
+        }
+      }
     }
   }
 }
 
-// 表格区域样式
-:deep(.gi-table) {
-  background: white;
-  border-radius: 8px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-  margin-bottom: 24px;
-  max-height: calc(100vh - 300px);
-  overflow: hidden;
+// 搜索结果统计样式
+.search-results-info {
+  margin-bottom: 16px;
   
-  .arco-table-container {
-    overflow-x: auto;
-    overflow-y: auto;
-    max-height: calc(100vh - 350px);
-  }
-  
-  .arco-table {
-    overflow: visible;
-  }
-  
-  .arco-table-body {
-    overflow-y: auto;
+  .results-card {
+    background: linear-gradient(135deg, #f8f9ff 0%, #f0f2ff 100%);
+    border-radius: 12px;
+    box-shadow: 0 2px 12px rgba(102, 126, 234, 0.1);
+    border: 1px solid rgba(102, 126, 234, 0.1);
+    
+    :deep(.arco-card-body) {
+      padding: 16px 20px;
+    }
+    
+    .results-summary {
+      display: flex;
+      align-items: center;
+      font-size: 14px;
+      color: #4e5969;
+      
+      strong {
+        color: #667eea;
+        font-weight: 600;
+      }
+    }
   }
 }
 
-
+// 空状态样式
+.empty-state {
+  text-align: center;
+  padding: 60px 20px;
+  color: #c9cdd4;
+  
+  .empty-text {
+    h3 {
+      margin: 0 0 12px 0;
+      font-size: 18px;
+      font-weight: 600;
+      color: #4e5969;
+    }
+    
+    p {
+      margin: 8px 0;
+      font-size: 14px;
+      line-height: 1.6;
+      
+      .arco-link {
+        color: #667eea;
+        font-weight: 500;
+        
+        &:hover {
+          color: #4c5fd9;
+        }
+      }
+    }
+  }
+}
 
 .remark-content {
   max-width: 180px;
@@ -854,11 +1151,101 @@ onMounted(() => {
   text-overflow: ellipsis;
   white-space: nowrap;
   color: #4e5969;
+  background: rgba(102, 126, 234, 0.05);
+  padding: 8px 12px;
+  border-radius: 8px;
+  border-left: 3px solid #667eea;
+  font-size: 13px;
+  line-height: 1.4;
+  transition: all 0.3s ease;
+  
+  &:hover {
+    background: rgba(102, 126, 234, 0.1);
+    transform: translateX(2px);
+    white-space: normal;
+    max-width: 250px;
+    z-index: 10;
+    position: relative;
+    box-shadow: 0 4px 16px rgba(102, 126, 234, 0.2);
+  }
 }
 
 .no-remark {
   color: #c9cdd4;
   font-style: italic;
+  background: rgba(201, 205, 212, 0.1);
+  padding: 8px 12px;
+  border-radius: 8px;
+  border: 1px dashed #c9cdd4;
+  text-align: center;
+  font-size: 13px;
+}
+
+.role-type-text {
+  display: inline-block;
+  padding: 6px 12px;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  color: white;
+  font-weight: 600;
+  font-size: 12px;
+  border-radius: 20px;
+  text-align: center;
+  min-width: 80px;
+  box-shadow: 0 2px 8px rgba(102, 126, 234, 0.3);
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+  transition: all 0.3s ease;
+  
+  &:hover {
+    transform: scale(1.05);
+    box-shadow: 0 4px 16px rgba(102, 126, 234, 0.4);
+  }
+}
+
+// 状态标签样式
+.status-tag {
+  display: inline-block;
+  padding: 6px 12px;
+  border-radius: 20px;
+  font-weight: 600;
+  font-size: 12px;
+  text-align: center;
+  min-width: 60px;
+  transition: all 0.3s ease;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  
+  &:hover {
+    transform: scale(1.05);
+  }
+  
+  &.status-ACTIVE {
+    background: linear-gradient(135deg, #52c41a 0%, #73d13d 100%);
+    color: white;
+    box-shadow: 0 2px 8px rgba(82, 196, 26, 0.3);
+    
+    &:hover {
+      box-shadow: 0 4px 16px rgba(82, 196, 26, 0.4);
+    }
+  }
+  
+  &.status-SUSPENDED {
+    background: linear-gradient(135deg, #faad14 0%, #ffc53d 100%);
+    color: white;
+    box-shadow: 0 2px 8px rgba(250, 173, 20, 0.3);
+    
+    &:hover {
+      box-shadow: 0 4px 16px rgba(250, 173, 20, 0.4);
+    }
+  }
+  
+  &.status-INACTIVE {
+    background: linear-gradient(135deg, #ff4d4f 0%, #ff7875 100%);
+    color: white;
+    box-shadow: 0 2px 8px rgba(255, 77, 79, 0.3);
+    
+    &:hover {
+      box-shadow: 0 4px 16px rgba(255, 77, 79, 0.4);
+    }
+  }
 }
 
 .member-form {
@@ -926,21 +1313,23 @@ onMounted(() => {
 
 // 页面滚动修复
 .construction-personnel-page {
-  height: 100vh;
-  overflow: hidden;
+  height: auto;
+  min-height: 100vh;
+  overflow: visible;
   display: flex;
   flex-direction: column;
   
   :deep(.gi-page-layout) {
-    height: 100%;
-    overflow: hidden;
+    height: auto;
+    min-height: 100vh;
+    overflow: visible;
     display: flex;
     flex-direction: column;
   }
   
   :deep(.gi-page-layout-content) {
     flex: 1;
-    overflow: hidden;
+    overflow: visible;
     display: flex;
     flex-direction: column;
   }
@@ -978,4 +1367,153 @@ onMounted(() => {
     }
   }
 }
+
+// 全局动画效果
+@keyframes fadeInUp {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+@keyframes slideInLeft {
+  from {
+    opacity: 0;
+    transform: translateX(-20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateX(0);
+  }
+}
+
+// 页面加载动画
+.construction-personnel-page {
+  animation: fadeInUp 0.6s ease-out;
+}
+
+.page-header {
+  animation: slideInLeft 0.8s ease-out;
+}
+
+.search-section {
+  animation: fadeInUp 0.8s ease-out 0.2s both;
+}
+
+:deep(.gi-table) {
+  animation: fadeInUp 0.8s ease-out 0.4s both;
+}
+
+// 表格行进入动画
+:deep(.arco-table-tbody .arco-table-tr) {
+  animation: fadeInUp 0.6s ease-out;
+  animation-fill-mode: both;
+  
+  @for $i from 1 through 20 {
+    &:nth-child(#{$i}) {
+      animation-delay: #{0.1 * $i}s;
+    }
+  }
+}
+
+// 悬停效果增强
+:deep(.arco-table-tbody .arco-table-tr:hover) {
+  .role-type-text {
+    transform: scale(1.05);
+  }
+  
+  .action-link {
+    transform: translateY(-2px);
+  }
+}
+
+// 状态标签悬停效果
+:deep(.arco-tag) {
+  transition: all 0.3s ease;
+  
+  &:hover {
+    transform: scale(1.05);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  }
+}
+
+// 表格区域样式
+:deep(.gi-table) {
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.08);
+  margin-bottom: 24px;
+  overflow: hidden;
+  
+  .arco-table-container {
+    overflow-x: auto;
+    overflow-y: auto;
+  }
+  
+  .arco-table {
+    overflow: visible;
+  }
+  
+  .arco-table-body {
+    overflow-y: auto;
+  }
+  
+  // 表格头部样式
+  .arco-table-thead {
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    
+    .arco-table-th {
+      background: transparent !important;
+      border-bottom: 2px solid rgba(255, 255, 255, 0.2);
+      
+      .arco-table-th-item-title {
+        color: white !important;
+        font-weight: 600;
+        font-size: 14px;
+        text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+      }
+    }
+  }
+  
+  // 表格行样式
+  .arco-table-tbody {
+    .arco-table-tr {
+      transition: all 0.3s ease;
+      
+      &:hover {
+        background: linear-gradient(135deg, #f8f9ff 0%, #f0f2ff 100%);
+        transform: translateY(-1px);
+        box-shadow: 0 4px 12px rgba(102, 126, 234, 0.1);
+      }
+      
+      .arco-table-td {
+        border-bottom: 1px solid #f0f0f0;
+        padding: 16px 12px;
+        vertical-align: middle;
+      }
+    }
+    
+    // 斑马纹效果
+    .arco-table-tr:nth-child(even) {
+      background: #fafbfc;
+      
+      &:hover {
+        background: linear-gradient(135deg, #f8f9ff 0%, #f0f2ff 100%);
+      }
+    }
+  }
+  
+  // 固定列样式
+  .arco-table-fixed-left,
+  .arco-table-fixed-right {
+    .arco-table-td {
+      background: white;
+      box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    }
+  }
+}
 </style> 
\ No newline at end of file
diff --git a/src/views/project-management/personnel-dispatch/index.vue b/src/views/project-management/personnel-dispatch/index.vue
index 8c9770e..dc86c4d 100644
--- a/src/views/project-management/personnel-dispatch/index.vue
+++ b/src/views/project-management/personnel-dispatch/index.vue
@@ -265,7 +265,7 @@
                 <div class="member-position">{{ member.position || '未设置岗位' }}</div>
                 <div class="member-details">
                   <span class="member-status" :class="member.status">
-                    {{ member.status === 'available' ? '在线' : '离线' }}
+                    {{ member.status === 'ACTIVE' ? '在线' : '离线' }}
                   </span>
                   <span class="member-date">入职: {{ member.joinDate || '未设置' }}</span>
                 </div>
@@ -468,7 +468,7 @@ const mapProjectRespToProjectCard = (projectResp: any): any => {
       position: member.roleTypeDesc || member.jobCodeDesc || '未设置岗位',
       phone: member.phone || '', // 后端数据中的电话字段
       email: member.email || '', // 后端数据中的邮箱字段
-      status: member.status === 'ACTIVE' ? 'available' : 'offline',
+      status: member.status === 'ACTIVE' ? 'ACTIVE' : 'INACTIVE',
       skills: [], // 后端数据中没有技能字段
       joinDate: member.joinDate || '未设置',
       remark: member.remark || member.jobDesc || '',
@@ -1326,13 +1326,13 @@ onMounted(async () => {
             text-transform: uppercase;
             letter-spacing: 0.5px;
 
-            &.available {
+            &.ACTIVE {
               background: linear-gradient(135deg, #e6f7ff 0%, #bae7ff 100%);
               color: #1890ff;
               border: 1px solid #91d5ff;
             }
 
-            &.offline {
+            &.INACTIVE {
               background: linear-gradient(135deg, #f5f5f5 0%, #e8e8e8 100%);
               color: #8c8c8c;
               border: 1px solid #d9d9d9;