移动端：新增人事管理模块

oa-ui-app/api/system/dept.js

@@ -17,6 +17,14 @@ export function treeselect() {
   })
 }
 
+// 查询部门下拉树结构（新版本）
+export function deptTreeSelectNew() {
+  return request({
+    url: '/system/dept/treeselect',
+    method: 'get'
+  })
+}
+
 // 查询部门列表（排除节点）
 export function listDeptExcludeChild(deptId) {
   return request({

oa-ui-app/pages.json

@@ -175,6 +175,14 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path" : "pages/oa/staff/staffList",
+			"style" : 
+			{
+				"navigationBarTitleText" : "人事管理",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path" : "pages/components/formInfo",
 			"style" : 

oa-ui-app/pages/oa/declare/declareList.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-08-04 11:04:25
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-04 14:50:13
+ * @LastEditTime: 2025-08-08 09:15:18
 -->
 <template>
   <view class="container">
@@ -95,6 +95,79 @@
         </view>
       </view>
     </mescroll-uni>
+
+    <!-- 修改对话框 -->
+    <uni-popup ref="updatePopup" type="center" :mask-click="false">
+      <view class="update-dialog">
+        <view class="dialog-header">
+          <text class="dialog-title">修改工作填报</text>
+          <text class="dialog-close" @click="closeUpdateDialog">×</text>
+        </view>
+
+        <view class="dialog-body">
+          <!-- 只读信息 -->
+          <view class="readonly-section">
+            <view class="info-item">
+              <text class="info-label">项目编号：</text>
+              <text class="info-value">{{ updateForm.projectNumber }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">项目名称：</text>
+              <text class="info-value">{{ updateForm.projectName }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">填报人：</text>
+              <text class="info-value">{{ updateForm.nickName }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">工作类别：</text>
+              <text class="info-value">{{ updateForm.workType }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">工作项目：</text>
+              <text class="info-value">{{ updateForm.workItem }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">工作内容：</text>
+              <text class="info-value">{{ updateForm.workContent }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">工作时间：</text>
+              <text class="info-value">{{ updateForm.beginDate }} ~ {{ updateForm.endDate }}</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">工天数量：</text>
+              <text class="info-value">{{ updateForm.workLoad }}天</text>
+            </view>
+            <view class="info-item">
+              <text class="info-label">工天单价：</text>
+              <text class="info-value">￥{{ updateForm.price }}</text>
+            </view>
+          </view>
+
+          <!-- 可修改的系数 -->
+          <view class="edit-section">
+            <view class="form-item">
+              <text class="form-label">系数：</text>
+              <uni-easyinput class="form-input" type="number" v-model="updateForm.coefficient"
+                @input="calculatePredictMoney" @confirm="confirmUpdate" placeholder="请输入系数" :clearable="false"
+                :trim="true" />
+            </view>
+
+            <!-- 预估绩效显示 -->
+            <view class="predict-section">
+              <text class="predict-label">预估绩效：</text>
+              <text class="predict-amount">￥{{ predictMoney(updateForm) }}</text>
+            </view>
+          </view>
+        </view>
+
+        <view class="dialog-footer">
+          <button class="dialog-btn cancel-btn" @click="closeUpdateDialog">取消</button>
+          <button class="dialog-btn confirm-btn" @click="confirmUpdate">确认修改</button>
+        </view>
+      </view>
+    </uni-popup>
   </view>
 </template>
 
@@ -126,6 +199,18 @@ export default {
         projectId: null,
         userId: null,
         submitTime: null
+      },
+      // 修改表单数据
+      updateForm: {
+        formId: null,
+        workType: '',
+        workItem: '',
+        workContent: '',
+        beginDate: '',
+        endDate: '',
+        workLoad: 0,
+        price: 0,
+        coefficient: 0
       }
     }
   },
@@ -220,8 +305,16 @@ export default {
 
     // 计算预估绩效
     predictMoney(row) {
-      let result = parseFloat(row.price * row.workLoad * row.coefficient)
-      return result.toFixed(2)
+      try {
+        const price = parseFloat(row.price) || 0
+        const workLoad = parseFloat(row.workLoad) || 0
+        const coefficient = parseFloat(row.coefficient) || 0
+        let result = price * workLoad * coefficient
+        return result.toFixed(2)
+      } catch (error) {
+        console.log('计算预估绩效失败:', error)
+        return '0.00'
+      }
     },
 
     // 时间解析函数
@@ -259,7 +352,6 @@ export default {
 
     // 打开表单信息
     openFormInfo(item) {
-      console.log(item)
       uni.navigateTo({
         url: `/pages/components/formInfo?formId=${item.formId}&formType=declare`
       });
@@ -267,7 +359,97 @@ export default {
 
     // 修改操作
     handleUpdate(item) {
-      
+      console.log(item)
+      // 填充修改表单数据
+      this.updateForm = {
+        formId: item.formId,
+        projectNumber: item.project.projectNumber,
+        projectName: item.project.projectName,
+        nickName: item.user.nickName,
+        workType: item.workType,
+        workItem: item.workItem,
+        workContent: item.workContent,
+        beginDate: item.beginDate,
+        endDate: item.endDate,
+        workLoad: item.workLoad,
+        price: item.price,
+        coefficient: item.coefficient
+      }
+
+      // 打开修改对话框
+      this.$refs.updatePopup.open()
+
+      // 延迟聚焦到系数输入框（移动端兼容）
+      this.$nextTick(() => {
+        setTimeout(() => {
+          try {
+            // 查找uni-easyinput内部的input元素
+            const input = document.querySelector('.form-input .uni-easyinput__content-input')
+            if (input && typeof input.focus === 'function') {
+              input.focus()
+            }
+          } catch (error) {
+            console.log('聚焦输入框失败:', error)
+          }
+        }, 300)
+      })
+    },
+
+    // 关闭修改对话框
+    closeUpdateDialog() {
+      this.$refs.updatePopup.close()
+    },
+
+    // 计算预估绩效（当系数改变时）
+    calculatePredictMoney() {
+      // 系数输入时自动触发计算，这里不需要额外处理
+      // 因为模板中已经绑定了 predictMoney(updateForm)
+    },
+
+    // 确认修改
+    async confirmUpdate() {
+      try {
+        // 验证系数
+        if (!this.updateForm.coefficient || this.updateForm.coefficient <= 0) {
+          uni.showToast({
+            title: '请输入有效的系数',
+            icon: 'none'
+          })
+          return
+        }
+
+        // 显示加载状态
+        uni.showLoading({
+          title: '修改中...'
+        })
+
+        // 调用更新接口
+        await updateDeclare(this.updateForm)
+
+        // 隐藏加载状态
+        uni.hideLoading()
+
+        uni.showToast({
+          title: '修改成功',
+          icon: 'success'
+        })
+
+        // 关闭对话框
+        this.closeUpdateDialog()
+
+        // 刷新列表
+        this.downCallback()
+
+      } catch (error) {
+        // 隐藏加载状态
+        uni.hideLoading()
+
+        console.error('修改失败:', error)
+        uni.showToast({
+          title: '修改失败，请重试',
+          icon: 'none'
+        })
+      }
     }
   }
 }
@@ -456,4 +638,145 @@ export default {
   background: #f4c542;
   color: #fff;
 }
+
+// 修改对话框样式
+.update-dialog {
+  background: #fff;
+  border-radius: 20rpx;
+  width: 600rpx;
+  max-height: 80vh;
+  overflow: hidden;
+}
+
+.dialog-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 32rpx 32rpx 24rpx 32rpx;
+  border-bottom: 1px solid #f0f0f0;
+  background: linear-gradient(90deg, #e0e7ff 0%, #f8fafc 100%);
+}
+
+.dialog-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #22223b;
+}
+
+.dialog-close {
+  font-size: 40rpx;
+  color: #64748b;
+  cursor: pointer;
+  padding: 8rpx;
+}
+
+.dialog-body {
+  padding: 32rpx;
+  max-height: 60vh;
+  overflow-y: auto;
+}
+
+.readonly-section {
+  margin-bottom: 32rpx;
+  padding-bottom: 24rpx;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.info-item {
+  display: flex;
+  margin-bottom: 16rpx;
+}
+
+.edit-section {
+  padding-top: 16rpx;
+}
+
+.form-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 24rpx;
+}
+
+.form-label {
+  color: #64748b;
+  font-size: 28rpx;
+  min-width: 120rpx;
+}
+
+// uni-easyinput 样式调整
+:deep(.uni-easyinput) {
+  flex: 1;
+
+  .uni-easyinput__content {
+    border: 1px solid #e2e8f0 !important;
+    border-radius: 8rpx !important;
+    background: #fff !important;
+    padding: 16rpx 20rpx !important;
+  }
+
+  .uni-easyinput__content-input {
+    border: none !important;
+    background: transparent !important;
+    font-size: 28rpx !important;
+    color: #22223b !important;
+  }
+
+  .uni-easyinput__content:focus-within {
+    border-color: #6366f1 !important;
+  }
+}
+
+.predict-section {
+  display: flex;
+  align-items: center;
+  background: #fef3c7;
+  padding: 20rpx;
+  border-radius: 12rpx;
+  margin-top: 16rpx;
+}
+
+.predict-label {
+  color: #d97706;
+  font-size: 28rpx;
+  font-weight: 500;
+}
+
+.predict-amount {
+  color: #d97706;
+  font-size: 32rpx;
+  font-weight: bold;
+  margin-left: 16rpx;
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 20rpx;
+  padding: 24rpx 32rpx 32rpx 32rpx;
+  border-top: 1px solid #f0f0f0;
+  background: #fafbfc;
+}
+
+.dialog-btn {
+  font-size: 28rpx;
+  border-radius: 8rpx;
+  border: none;
+  outline: none;
+  padding: 16rpx 32rpx;
+  cursor: pointer;
+}
+
+.cancel-btn {
+  background: #f1f5f9;
+  color: #64748b;
+}
+
+.confirm-btn {
+  background: #6366f1;
+  color: #fff;
+}
+
+.confirm-btn:hover {
+  background: #4f46e5;
+}
 </style>

oa-ui-app/pages/oa/device/instrumentsList.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-07-08 14:00:47
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-04 10:15:13
+ * @LastEditTime: 2025-08-12 09:32:32
 -->
 <template>
   <view class="device-container">
@@ -65,86 +65,67 @@
     </view>
 
     <!-- 设备列表 -->
-    <scroll-view :scroll-top="scrollTop" scroll-y="true" class="device-list" @scrolltoupper="upper"
-      @scrolltolower="lower" @scroll="scroll" :refresher-enabled="true" :refresher-triggered="isRefreshing"
-      @refresherrefresh="onRefresh" :lower-threshold="50" :upper-threshold="50">
-      <view class="content-wrapper">
-        <template v-if="deviceList.length > 0">
-          <view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="handleViewDetail(item)">
-            <view class="device-header">
-              <view class="device-info">
-                <text class="device-name">{{ item.name }}</text>
-                <text class="device-brand">{{ item.brand }}</text>
-              </view>
-              <view class="device-status">
-                <uni-tag :text="statusTypeText(item.status)" :type="statusTypeStyle(item.status)" size="small" />
-              </view>
+    <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+      :up="upOption" :fixed="false" :top="10" style="padding: 30rpx;">
+      <view>
+        <view v-for="(item, index) in deviceList" :key="index" class="device-card" @click="handleViewDetail(item)">
+          <view class="device-header">
+            <view class="device-info">
+              <text class="device-name">{{ item.name }}</text>
+              <text class="device-brand">{{ item.brand }}</text>
             </view>
-
-            <view class="device-content">
-              <view class="info-row">
-                <text class="info-label">设备编号：</text>
-                <text class="info-value">{{ item.deviceNumber || '暂无' }}</text>
-              </view>
-              <view class="info-row">
-                <text class="info-label">规格型号：</text>
-                <text class="info-value">{{ item.series || '暂无' }}</text>
-              </view>
-              <view class="info-row">
-                <text class="info-label">出厂编号：</text>
-                <text class="info-value">{{ item.code || '暂无' }}</text>
-              </view>
-              <view class="info-row">
-                <text class="info-label">购置时间：</text>
-                <text class="info-value">{{ formatDate(item.acquisitionTime) }}</text>
-              </view>
-              <view class="info-row">
-                <text class="info-label">购买价格：</text>
-                <text class="info-value price">¥{{ item.cost || '0' }}</text>
-              </view>
-              <view class="info-row">
-                <text class="info-label">单日成本：</text>
-                <text class="info-value cost">¥{{ item.dayCost || '0' }}</text>
-              </view>
+            <view class="device-status">
+              <uni-tag :text="statusTypeText(item.status)" :type="statusTypeStyle(item.status)" size="small" />
             </view>
+          </view>
 
-            <view class="device-actions">
-              <button class="action-btn view" @click.stop="handleViewDetail(item)">
-                <uni-icons type="eye" size="14" color="#007AFF"></uni-icons>
-                <text>查看</text>
-              </button>
-              <button class="action-btn edit" @click.stop="handleUpdate(item)" v-if="hasPermission('oa:device:edit')">
-                <uni-icons type="compose" size="14" color="#FF9500"></uni-icons>
-                <text>编辑</text>
-              </button>
-              <button class="action-btn delete" @click.stop="handleDelete(item)"
-                v-if="hasPermission('oa:device:remove')">
-                <uni-icons type="trash" size="14" color="#FF3B30"></uni-icons>
-                <text>删除</text>
-              </button>
+          <view class="device-content">
+            <view class="info-row">
+              <text class="info-label">设备编号：</text>
+              <text class="info-value">{{ item.deviceNumber || '暂无' }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">规格型号：</text>
+              <text class="info-value">{{ item.series || '暂无' }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">出厂编号：</text>
+              <text class="info-value">{{ item.code || '暂无' }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">购置时间：</text>
+              <text class="info-value">{{ formatDate(item.acquisitionTime) }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">购买价格：</text>
+              <text class="info-value price">¥{{ item.cost || '0' }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">单日成本：</text>
+              <text class="info-value cost">¥{{ item.dayCost || '0' }}</text>
             </view>
           </view>
 
-          <!-- 加载更多 -->
-          <view class="loading-more" v-if="hasMore">
-            <text class="loading-text">加载中...</text>
+          <view class="device-actions">
+            <button class="action-btn view" @click.stop="handleViewDetail(item)">
+              <uni-icons type="eye" size="14" color="#007AFF"></uni-icons>
+              <text>查看</text>
+            </button>
+            <button class="action-btn edit" @click.stop="handleUpdate(item)" v-show="checkPermi(['oa:device:edit'])">
+              <uni-icons type="compose" size="14" color="#FF9500"></uni-icons>
+              <text>编辑</text>
+            </button>
+            <button class="action-btn delete" @click.stop="handleDelete(item)" v-show="checkPermi(['oa:device:remove'])">
+              <uni-icons type="trash" size="14" color="#FF3B30"></uni-icons>
+              <text>删除</text>
+            </button>
           </view>
-          <view class="no-more" v-else>
-            <text class="no-more-text">没有更多数据了</text>
-          </view>
-        </template>
-
-        <!-- 空状态 -->
-        <view v-else class="empty-state">
-          <image src="/static/images/empty.png" mode="aspectFit" class="empty-image"></image>
-          <text class="empty-text">暂无设备数据</text>
-          <text class="empty-subtext">点击下方按钮添加设备</text>
         </view>
       </view>
-    </scroll-view>
+    </mescroll-uni>
 
     <!-- 悬浮按钮 -->
-    <view class="fab-button" @click="handleAdd" v-if="hasPermission('oa:device:add')">
+    <view class="fab-button" @click="handleAdd" v-if="checkPermi(['oa:device:add'])">
       <uni-icons type="plusempty" size="24" color="#fff"></uni-icons>
     </view>
 
@@ -297,15 +278,28 @@
 
 <script>
 import { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/oa/device/device";
+import { checkPermi, checkRole } from "@/utils/permission";
+import MescrollMixin from '@/uni_modules/mescroll/components/mescroll-uni/mescroll-mixins.js'
 
 export default {
   name: "InstrumentsList",
+  mixins: [MescrollMixin],
   data() {
     return {
-      // 滚动相关
-      scrollTop: 0,
-      isRefreshing: false,
-      hasMore: true,
+      // mescroll相关
+      mescroll: null, // mescroll实例
+      downOption: {
+        auto: true,
+        textOutOffset: '下拉刷新',
+        textLoading: '加载中...'
+      },
+      upOption: {
+        auto: false,
+        page: { num: 1, size: 20 },
+        noMoreSize: 5,
+        empty: { tip: '暂无设备数据' },
+        textNoMore: '~ 没有更多数据了 ~'
+      },
 
       // 筛选相关
       showFilter: false,
@@ -349,12 +343,55 @@ export default {
   },
 
   onLoad() {
-    this.getList();
     this.getDeptOptions();
   },
 
   methods: {
-    // 获取设备列表
+    checkPermi,
+    checkRole,
+
+    // 加载数据
+    async loadData() {
+      try {
+        const response = await listDevice(this.queryParams);
+        return { data: response.rows || [], total: response.total || 0 };
+      } catch (error) {
+        console.error('获取设备列表失败:', error);
+        return { data: [], error: true };
+      }
+    },
+
+    mescrollInit(mescroll) {
+      this.mescroll = mescroll;
+    },
+
+    // mescroll下拉刷新回调
+    async downCallback() {
+      this.deviceList = []; // 清空列表
+      this.queryParams.pageNum = 1;
+      const res = await this.loadData();
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.deviceList = res.data;
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+      uni.stopPullDownRefresh();
+    },
+
+    // mescroll上拉加载回调
+    async upCallback(page) {
+      this.queryParams.pageNum = page.num;
+      const res = await this.loadData();
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.deviceList = this.deviceList.concat(res.data);
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+    },
+
+    // 获取设备列表（保留原有方法，用于其他操作后刷新）
     async getList() {
       try {
         const response = await listDevice(this.queryParams);
@@ -364,7 +401,6 @@ export default {
           this.deviceList = [...this.deviceList, ...(response.rows || [])];
         }
         this.total = response.total || 0;
-        this.hasMore = this.deviceList.length < this.total;
       } catch (error) {
         console.error('获取设备列表失败:', error);
         uni.showToast({
@@ -395,7 +431,7 @@ export default {
 
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.getList();
+      this.downCallback();
     },
 
     clearSearch() {
@@ -407,29 +443,6 @@ export default {
       this.showFilter = !this.showFilter;
     },
 
-    // 滚动相关方法
-    upper() {
-      // 下拉刷新
-    },
-
-    lower() {
-      if (this.hasMore) {
-        this.queryParams.pageNum++;
-        this.getList();
-      }
-    },
-
-    scroll(e) {
-      this.scrollTop = e.detail.scrollTop;
-    },
-
-    async onRefresh() {
-      this.isRefreshing = true;
-      this.queryParams.pageNum = 1;
-      await this.getList();
-      this.isRefreshing = false;
-    },
-
     // 设备操作方法
     handleViewDetail(item) {
       this.currentDevice = item;
@@ -442,7 +455,6 @@ export default {
 
     handleViewLogs() {
       this.closeDetailPopup();
-
     },
 
     handleAdd() {
@@ -482,7 +494,7 @@ export default {
                 title: '删除成功',
                 icon: 'success'
               });
-              this.getList();
+              this.downCallback(); // 使用mescroll刷新
             } catch (error) {
               console.error('删除设备失败:', error);
               uni.showToast({
@@ -550,7 +562,7 @@ export default {
         }
 
         this.closeFormPopup();
-        this.getList();
+        this.downCallback(); // 使用mescroll刷新
       } catch (error) {
         console.error('保存设备失败:', error);
         uni.showToast({
@@ -697,14 +709,6 @@ export default {
   padding: 8px;
 }
 
-.device-list {
-  flex: 1;
-}
-
-.content-wrapper {
-  padding: 15px;
-}
-
 .device-card {
   background: #fff;
   border-radius: 12px;
@@ -802,41 +806,6 @@ export default {
   }
 }
 
-.loading-more,
-.no-more {
-  text-align: center;
-  padding: 20px;
-
-  .loading-text,
-  .no-more-text {
-    font-size: 14px;
-    color: #999;
-  }
-}
-
-.empty-state {
-  text-align: center;
-  padding: 60px 20px;
-
-  .empty-image {
-    width: 120px;
-    height: 120px;
-    margin-bottom: 20px;
-  }
-
-  .empty-text {
-    font-size: 16px;
-    color: #666;
-    display: block;
-    margin-bottom: 8px;
-  }
-
-  .empty-subtext {
-    font-size: 14px;
-    color: #999;
-  }
-}
-
 .fab-button {
   position: fixed;
   right: 20px;
@@ -925,37 +894,37 @@ export default {
       border-radius: 8px !important;
       background: #f8f8f8 !important;
       transition: all 0.3s ease;
-      
+
       &:focus-within {
         border-color: #667eea !important;
         background: #fff !important;
         box-shadow: 0 0 0 2px rgba(102, 126, 234, 0.1) !important;
       }
     }
-    
+
     .uni-easyinput__content-input {
       padding: 0 12px !important;
       font-size: 14px !important;
       color: #333 !important;
-      
+
       &::placeholder {
         color: #999 !important;
       }
     }
-    
+
     // textarea 样式
     &.uni-easyinput--textarea {
       .uni-easyinput__content {
         height: auto !important;
         min-height: 80px !important;
       }
-      
+
       .uni-easyinput__content-textarea {
         padding: 12px !important;
         font-size: 14px !important;
         color: #333 !important;
         min-height: 60px !important;
-        
+
         &::placeholder {
           color: #999 !important;
         }

oa-ui-app/pages/oa/staff/README.md

@@ -0,0 +1,96 @@
+# 员工管理模块
+
+## 功能概述
+
+移动端员工管理模块提供了完整的员工信息管理功能，包括员工列表查看、详情查看、信息编辑等。
+
+## 页面结构
+
+### 1. 员工列表页面 (staffList.vue)
+- **功能**: 展示员工列表，支持搜索、筛选、分页加载
+- **主要特性**:
+  - 搜索栏：支持按姓名搜索
+  - 部门筛选：横向滚动的部门选择器
+  - 高级筛选：职称、职业资格、学历、状态等筛选条件
+  - 员工卡片：展示员工基本信息和头像
+  - 下拉刷新和上拉加载更多
+
+### 2. 员工详情页面 (staffDetail.vue)
+- **功能**: 展示员工的完整详细信息
+- **主要特性**:
+  - 头部信息：头像、姓名、部门、状态
+  - 基本信息：年龄、性别、手机、身份证等
+  - 工作信息：部门、职务、职称、职业资格、岗级等
+  - 教育背景：最高学历、初始学历相关信息
+  - 其他信息：家庭住址、紧急联系人等
+
+### 3. 员工编辑页面 (staffEdit.vue)
+- **功能**: 新增或编辑员工信息
+- **主要特性**:
+  - 表单验证：必填字段验证、格式验证
+  - 分类管理：基本信息、工作信息、教育背景、其他信息
+  - 多选支持：政治面貌、职业资格等多选字段
+  - 日期选择：入职时间、合同时间等日期字段
+
+## 技术特性
+
+### 移动端适配
+- 使用 uView UI 组件库
+- 响应式设计，适配不同屏幕尺寸
+- 触摸友好的交互设计
+
+### 数据管理
+- 使用 mescroll-uni 实现下拉刷新和上拉加载
+- 分页加载，优化性能
+- 本地缓存和状态管理
+
+### 用户体验
+- 加载状态提示
+- 错误处理和用户反馈
+- 流畅的页面切换动画
+
+## API 接口
+
+### 员工相关接口
+- `listUser`: 获取员工列表
+- `getUser`: 获取员工详情
+- `addUser`: 新增员工
+- `updateUser`: 更新员工信息
+- `delUser`: 删除员工
+
+### 部门相关接口
+- `deptTreeSelectNew`: 获取部门树结构
+
+## 使用说明
+
+### 1. 查看员工列表
+1. 进入员工列表页面
+2. 使用搜索栏按姓名搜索
+3. 点击部门标签筛选特定部门员工
+4. 点击筛选按钮进行高级筛选
+5. 下拉刷新或上拉加载更多
+
+### 2. 查看员工详情
+1. 在员工列表中点击员工卡片
+2. 查看员工的完整信息
+3. 点击"编辑信息"按钮进入编辑页面
+
+### 3. 编辑员工信息
+1. 在员工详情页面点击"编辑信息"
+2. 或直接进入编辑页面新增员工
+3. 填写表单信息
+4. 点击"保存"提交更改
+
+## 注意事项
+
+1. **权限控制**: 确保用户有相应的操作权限
+2. **数据验证**: 表单提交前会进行数据验证
+3. **网络处理**: 网络异常时会显示相应的错误提示
+4. **性能优化**: 大量数据时使用分页加载
+
+## 样式规范
+
+- 使用 SCSS 预处理器
+- 遵循移动端设计规范
+- 统一的颜色和字体规范
+- 响应式布局设计

oa-ui-app/pages/oa/staff/staffDetail.vue

@@ -0,0 +1,420 @@
+<template>
+  <view class="container">
+    <!-- 头部信息 -->
+    <view class="header-section">
+      <view class="avatar-section">
+        <uv-avatar 
+          :src="staffInfo.avatar || '/static/images/user.png'"
+          size="120"
+        />
+      </view>
+      <view class="basic-info">
+        <view class="name">{{ staffInfo.nickName }}</view>
+        <view class="dept">{{ staffInfo.dept?.deptName || '未分配部门' }}</view>
+        <view class="status">
+          <uv-tag 
+            :text="getStatusText(staffInfo.status)" 
+            :type="getStatusType(staffInfo.status)"
+          />
+        </view>
+      </view>
+    </view>
+
+    <!-- 基本信息 -->
+    <view class="info-section">
+      <view class="section-title">基本信息</view>
+      <view class="info-grid">
+        <view class="info-item">
+          <text class="label">姓名</text>
+          <text class="value">{{ staffInfo.nickName }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">年龄</text>
+          <text class="value">{{ String(getAgeByIdCard(staffInfo.idCard)).slice(0,2) }}岁</text>
+        </view>
+        <view class="info-item">
+          <text class="label">性别</text>
+          <text class="value">{{ staffInfo.sex == 0 ? '男' : '女' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">手机号码</text>
+          <text class="value">{{ staffInfo.phonenumber || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">身份证</text>
+          <text class="value">{{ staffInfo.idCard || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">籍贯</text>
+          <text class="value">{{ staffInfo.nativePlace || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">民族</text>
+          <text class="value">{{ staffInfo.ethnic || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">政治面貌</text>
+          <text class="value">{{ getPoliticalText(staffInfo.politicalAffiliation) || '未填写' }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 工作信息 -->
+    <view class="info-section">
+      <view class="section-title">工作信息</view>
+      <view class="info-grid">
+        <view class="info-item">
+          <text class="label">部门</text>
+          <text class="value">{{ staffInfo.dept?.deptName || '未分配部门' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">职务</text>
+          <text class="value">{{ staffInfo.postNames || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">职称</text>
+          <text class="value">{{ getTitleText(staffInfo.titles) || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">职业资格</text>
+          <text class="value">{{ getCertificateText(staffInfo.certificates) || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">岗级</text>
+          <text class="value">{{ getPostLevelText(staffInfo.postLevel, staffInfo.salaryLevel) || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">入职时间</text>
+          <text class="value">{{ formatDate(staffInfo.entryDate) || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">合同签订</text>
+          <text class="value">{{ formatDate(staffInfo.contractSign) || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">合同期满</text>
+          <text class="value">{{ formatDate(staffInfo.contractExpire) || '未填写' }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 教育背景 -->
+    <view class="info-section">
+      <view class="section-title">教育背景</view>
+      <view class="info-grid">
+        <view class="info-item">
+          <text class="label">最高学历</text>
+          <text class="value">{{ getDegreeText(staffInfo.degree) || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">最高学历专业</text>
+          <text class="value">{{ staffInfo.major || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">最高学历毕业院校</text>
+          <text class="value">{{ staffInfo.graduateSchool || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">初始学历</text>
+          <text class="value">{{ getDegreeText(staffInfo.initialDegree) || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">初始学历专业</text>
+          <text class="value">{{ staffInfo.initialMajor || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">初始学历毕业院校</text>
+          <text class="value">{{ staffInfo.initialSchool || '未填写' }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 其他信息 -->
+    <view class="info-section">
+      <view class="section-title">其他信息</view>
+      <view class="info-grid">
+        <view class="info-item">
+          <text class="label">家庭住址</text>
+          <text class="value">{{ staffInfo.homePlace || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">紧急联系人</text>
+          <text class="value">{{ staffInfo.contact || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">紧急联系电话</text>
+          <text class="value">{{ staffInfo.telephone || '未填写' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">备注</text>
+          <text class="value">{{ staffInfo.remark || '无' }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 操作按钮 -->
+    <view class="action-section">
+      <uv-button type="primary" @click="handleEdit">编辑信息</uv-button>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getUser } from "@/api/system/user";
+
+export default {
+  data() {
+    return {
+      staffInfo: {},
+      userId: '',
+      nickName: ''
+    }
+  },
+  
+  onLoad(options) {
+    this.userId = options.userId;
+    this.nickName = options.nickName;
+    this.getStaffInfo();
+  },
+  
+  methods: {
+    // 获取员工信息
+    async getStaffInfo() {
+      try {
+        const res = await getUser(this.userId);
+        this.staffInfo = res.data;
+      } catch (error) {
+        console.error('获取员工信息失败:', error);
+        uni.showToast({
+          title: '获取员工信息失败',
+          icon: 'none'
+        });
+      }
+    },
+    
+    // 获取状态文本
+    getStatusText(status) {
+      const statusMap = {
+        '0': '在职',
+        '1': '离职',
+        '2': '退休',
+        '3': '试用',
+        '4': '返聘'
+      };
+      return statusMap[status] || '未知';
+    },
+    
+    // 获取状态类型
+    getStatusType(status) {
+      const typeMap = {
+        '0': 'success',
+        '1': 'error',
+        '2': 'warning',
+        '3': 'primary',
+        '4': 'info'
+      };
+      return typeMap[status] || 'default';
+    },
+    
+    // 获取职称文本
+    getTitleText(titles) {
+      const titleMap = {
+        '1': '高级工程师',
+        '2': '工程师',
+        '3': '助理工程师',
+        '4': '技术员'
+      };
+      return titleMap[titles] || '';
+    },
+    
+    // 获取职业资格文本
+    getCertificateText(certificates) {
+      if (!certificates) return '';
+      const certificateMap = {
+        '1': '注册测绘师',
+        '2': '注册建筑师',
+        '3': '注册结构师',
+        '4': '注册造价师'
+      };
+      const certArray = certificates.split(',');
+      return certArray.map(cert => certificateMap[cert] || cert).join('、');
+    },
+    
+    // 获取学历文本
+    getDegreeText(degree) {
+      const degreeMap = {
+        '1': '博士',
+        '2': '硕士',
+        '3': '本科',
+        '4': '专科',
+        '5': '高中'
+      };
+      return degreeMap[degree] || '';
+    },
+    
+    // 获取政治面貌文本
+    getPoliticalText(politicalAffiliation) {
+      if (!politicalAffiliation) return '';
+      const politicalMap = {
+        '1': '中共党员',
+        '2': '中共预备党员',
+        '3': '共青团员',
+        '4': '民革党员',
+        '5': '民盟盟员',
+        '6': '民建会员',
+        '7': '民进会员',
+        '8': '农工党党员',
+        '9': '致公党党员',
+        '10': '九三学社社员',
+        '11': '台盟盟员',
+        '12': '无党派人士',
+        '13': '群众'
+      };
+      const politicalArray = politicalAffiliation.split(',');
+      return politicalArray.map(political => politicalMap[political] || political).join('、');
+    },
+    
+    // 获取岗级文本
+    getPostLevelText(postLevel, salaryLevel) {
+      const postLevelMap = {
+        '1': '一级',
+        '2': '二级',
+        '3': '三级',
+        '4': '四级',
+        '5': '五级'
+      };
+      const salaryLevelMap = {
+        '1': 'A',
+        '2': 'B',
+        '3': 'C',
+        '4': 'D',
+        '5': 'E'
+      };
+      const postText = postLevelMap[postLevel] || '';
+      const salaryText = salaryLevelMap[salaryLevel] || '';
+      return postText && salaryText ? `${postText}${salaryText}` : '';
+    },
+    
+    // 根据身份证计算年龄
+    getAgeByIdCard(idCard) {
+      if (!idCard) return 0;
+      const birthStr = idCard.substring(6, 14);
+      const birthYear = parseInt(birthStr.substring(0, 4), 10);
+      const birthMonth = parseInt(birthStr.substring(4, 6), 10) - 1;
+      const birthDay = parseInt(birthStr.substring(6, 8), 10);
+      const birthDate = new Date(birthYear, birthMonth, birthDay);
+      const now = new Date();
+      let age = now.getFullYear() - birthDate.getFullYear();
+      const monthDiff = now.getMonth() - birthDate.getMonth();
+      if (monthDiff < 0 || (monthDiff === 0 && now.getDate() < birthDate.getDate())) {
+        age--;
+      }
+      return age;
+    },
+    
+    // 格式化日期
+    formatDate(dateStr) {
+      if (!dateStr) return '';
+      const date = new Date(dateStr);
+      return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+    },
+    
+    // 编辑信息
+    handleEdit() {
+      uni.navigateTo({
+        url: `/pages/oa/staff/staffEdit?userId=${this.userId}`
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  background-color: #f5f5f5;
+  min-height: 100vh;
+  padding-bottom: 120rpx;
+}
+
+.header-section {
+  background-color: #fff;
+  padding: 40rpx 30rpx;
+  display: flex;
+  align-items: center;
+  margin-bottom: 20rpx;
+  
+  .avatar-section {
+    margin-right: 30rpx;
+  }
+  
+  .basic-info {
+    flex: 1;
+    
+    .name {
+      font-size: 36rpx;
+      font-weight: bold;
+      color: #333;
+      margin-bottom: 10rpx;
+    }
+    
+    .dept {
+      font-size: 28rpx;
+      color: #666;
+      margin-bottom: 15rpx;
+    }
+    
+    .status {
+      display: inline-block;
+    }
+  }
+}
+
+.info-section {
+  background-color: #fff;
+  margin-bottom: 20rpx;
+  padding: 30rpx;
+  
+  .section-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 30rpx;
+    border-left: 6rpx solid #007aff;
+    padding-left: 20rpx;
+  }
+  
+  .info-grid {
+    .info-item {
+      display: flex;
+      margin-bottom: 25rpx;
+      
+      .label {
+        width: 200rpx;
+        font-size: 28rpx;
+        color: #666;
+      }
+      
+      .value {
+        flex: 1;
+        font-size: 28rpx;
+        color: #333;
+        word-break: break-all;
+      }
+    }
+  }
+}
+
+.action-section {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: #fff;
+  padding: 20rpx 30rpx;
+  border-top: 1rpx solid #eee;
+  
+  .uv-button {
+    width: 100%;
+  }
+}
+</style>

oa-ui-app/pages/oa/staff/staffEdit.vue

@@ -0,0 +1,419 @@
+<template>
+  <view class="container">
+    <uv-form ref="form" :model="form" :rules="rules" label-width="200rpx">
+      <!-- 基本信息 -->
+      <view class="form-section">
+        <view class="section-title">基本信息</view>
+        <view class="form-item">
+          <uv-form-item label="姓名" prop="nickName">
+            <uv-input v-model="form.nickName" placeholder="请输入姓名" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="性别">
+            <uv-radio-group v-model="form.sex">
+              <uv-radio label="0">男</uv-radio>
+              <uv-radio label="1">女</uv-radio>
+            </uv-radio-group>
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="手机号码" prop="phonenumber">
+            <uv-input v-model="form.phonenumber" placeholder="请输入手机号码" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="身份证" prop="idCard">
+            <uv-input v-model="form.idCard" placeholder="请输入身份证号码" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="籍贯">
+            <uv-input v-model="form.nativePlace" placeholder="请输入籍贯" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="民族">
+            <uv-input v-model="form.ethnic" placeholder="请输入民族" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="政治面貌">
+            <uv-select v-model="form.politicalAffiliation" :options="politicalOptions" placeholder="请选择政治面貌" multiple />
+          </uv-form-item>
+        </view>
+      </view>
+
+      <!-- 工作信息 -->
+      <view class="form-section">
+        <view class="section-title">工作信息</view>
+        <view class="form-item">
+          <uv-form-item label="归属部门" prop="deptId">
+            <uv-select v-model="form.deptId" :options="deptOptions" placeholder="请选择归属部门" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="入职时间">
+            <uv-datetime-picker v-model="form.entryDate" mode="date" placeholder="请选择入职时间" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="合同签订">
+            <uv-datetime-picker v-model="form.contractSign" mode="date" placeholder="请选择合同签订时间" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="合同期满">
+            <uv-datetime-picker v-model="form.contractExpire" mode="date" placeholder="请选择合同期满时间" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="技术职称">
+            <uv-select v-model="form.titles" :options="titleOptions" placeholder="请选择技术职称" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="职称专业">
+            <uv-input v-model="form.titleProfession" placeholder="请输入职称专业" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="职业资格">
+            <uv-select v-model="form.certificates" :options="certificateOptions" placeholder="请选择职业资格" multiple />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="岗级">
+            <view class="level-group">
+              <uv-select v-model="form.postLevel" :options="postLevelOptions" placeholder="请选择岗级" />
+              <uv-select v-model="form.salaryLevel" :options="salaryLevelOptions" placeholder="请选择薪级" />
+            </view>
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="状态">
+            <uv-radio-group v-model="form.status">
+              <uv-radio label="0">在职</uv-radio>
+              <uv-radio label="1">离职</uv-radio>
+              <uv-radio label="2">退休</uv-radio>
+              <uv-radio label="3">试用</uv-radio>
+              <uv-radio label="4">返聘</uv-radio>
+            </uv-radio-group>
+          </uv-form-item>
+        </view>
+      </view>
+
+      <!-- 教育背景 -->
+      <view class="form-section">
+        <view class="section-title">教育背景</view>
+        <view class="form-item">
+          <uv-form-item label="最高学历">
+            <uv-select v-model="form.degree" :options="degreeOptions" placeholder="请选择最高学历" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="最高学历专业">
+            <uv-input v-model="form.major" placeholder="请输入最高学历专业" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="最高学历毕业学校">
+            <uv-input v-model="form.graduateSchool" placeholder="请输入最高学历毕业学校" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="初始学历">
+            <uv-select v-model="form.initialDegree" :options="degreeOptions" placeholder="请选择初始学历" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="初始学历专业">
+            <uv-input v-model="form.initialMajor" placeholder="请输入初始学历专业" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="初始学历毕业学校">
+            <uv-input v-model="form.initialSchool" placeholder="请输入初始学历毕业学校" />
+          </uv-form-item>
+        </view>
+      </view>
+
+      <!-- 其他信息 -->
+      <view class="form-section">
+        <view class="section-title">其他信息</view>
+        <view class="form-item">
+          <uv-form-item label="家庭住址">
+            <uv-textarea v-model="form.homePlace" placeholder="请输入家庭住址" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="紧急联系人">
+            <uv-input v-model="form.contact" placeholder="请输入紧急联系人" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="紧急联系电话">
+            <uv-input v-model="form.telephone" placeholder="请输入紧急联系电话" />
+          </uv-form-item>
+        </view>
+        <view class="form-item">
+          <uv-form-item label="备注">
+            <uv-textarea v-model="form.remark" placeholder="请输入备注信息" />
+          </uv-form-item>
+        </view>
+      </view>
+    </uv-form>
+
+    <!-- 操作按钮 -->
+    <view class="action-section">
+      <uv-button type="default" @click="handleCancel">取消</uv-button>
+      <uv-button type="primary" @click="handleSubmit">保存</uv-button>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getUser, updateUser, addUser } from "@/api/system/user";
+import { deptTreeSelectNew } from "@/api/system/dept";
+
+export default {
+  data() {
+    return {
+      form: {
+        userId: undefined,
+        nickName: '',
+        sex: '0',
+        phonenumber: '',
+        idCard: '',
+        nativePlace: '',
+        ethnic: '',
+        politicalAffiliation: [],
+        deptId: undefined,
+        entryDate: '',
+        contractSign: '',
+        contractExpire: '',
+        titles: '',
+        titleProfession: '',
+        certificates: [],
+        postLevel: '',
+        salaryLevel: '',
+        status: '0',
+        degree: '',
+        major: '',
+        graduateSchool: '',
+        initialDegree: '',
+        initialMajor: '',
+        initialSchool: '',
+        homePlace: '',
+        contact: '',
+        telephone: '',
+        remark: ''
+      },
+      deptOptions: [],
+      politicalOptions: [
+        { label: '中共党员', value: '1' },
+        { label: '中共预备党员', value: '2' },
+        { label: '共青团员', value: '3' },
+        { label: '民革党员', value: '4' },
+        { label: '民盟盟员', value: '5' },
+        { label: '民建会员', value: '6' },
+        { label: '民进会员', value: '7' },
+        { label: '农工党党员', value: '8' },
+        { label: '致公党党员', value: '9' },
+        { label: '九三学社社员', value: '10' },
+        { label: '台盟盟员', value: '11' },
+        { label: '无党派人士', value: '12' },
+        { label: '群众', value: '13' }
+      ],
+      titleOptions: [
+        { label: '高级工程师', value: '1' },
+        { label: '工程师', value: '2' },
+        { label: '助理工程师', value: '3' },
+        { label: '技术员', value: '4' }
+      ],
+      certificateOptions: [
+        { label: '注册测绘师', value: '1' },
+        { label: '注册建筑师', value: '2' },
+        { label: '注册结构师', value: '3' },
+        { label: '注册造价师', value: '4' }
+      ],
+      degreeOptions: [
+        { label: '博士', value: '1' },
+        { label: '硕士', value: '2' },
+        { label: '本科', value: '3' },
+        { label: '专科', value: '4' },
+        { label: '高中', value: '5' }
+      ],
+      postLevelOptions: [
+        { label: '一级', value: '1' },
+        { label: '二级', value: '2' },
+        { label: '三级', value: '3' },
+        { label: '四级', value: '4' },
+        { label: '五级', value: '5' }
+      ],
+      salaryLevelOptions: [
+        { label: 'A', value: '1' },
+        { label: 'B', value: '2' },
+        { label: 'C', value: '3' },
+        { label: 'D', value: '4' },
+        { label: 'E', value: '5' }
+      ],
+      rules: {
+        nickName: [
+          { required: true, message: '请输入姓名', trigger: 'blur' }
+        ],
+        phonenumber: [
+          { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+        ],
+        idCard: [
+          { pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: '请输入正确的身份证号码', trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: '请选择归属部门', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  
+  onLoad(options) {
+    this.getDeptTree();
+    if (options.userId) {
+      this.getStaffInfo(options.userId);
+    }
+  },
+  
+  methods: {
+    // 获取部门树
+    async getDeptTree() {
+      try {
+        const res = await deptTreeSelectNew();
+        this.deptOptions = res.data || [];
+      } catch (error) {
+        console.error('获取部门树失败:', error);
+      }
+    },
+    
+    // 获取员工信息
+    async getStaffInfo(userId) {
+      try {
+        const res = await getUser(userId);
+        this.form = { ...this.form, ...res.data };
+        
+        // 处理政治面貌数组
+        if (this.form.politicalAffiliation) {
+          this.form.politicalAffiliation = this.form.politicalAffiliation.split(',');
+        }
+        
+        // 处理职业资格数组
+        if (this.form.certificates) {
+          this.form.certificates = this.form.certificates.split(',');
+        }
+      } catch (error) {
+        console.error('获取员工信息失败:', error);
+        uni.showToast({
+          title: '获取员工信息失败',
+          icon: 'none'
+        });
+      }
+    },
+    
+    // 提交表单
+    handleSubmit() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          try {
+            // 处理数组字段
+            const submitData = { ...this.form };
+            submitData.politicalAffiliation = this.form.politicalAffiliation.join(',');
+            submitData.certificates = this.form.certificates.join(',');
+            
+            if (this.form.userId) {
+              // 更新
+              await updateUser(submitData);
+              uni.showToast({
+                title: '更新成功',
+                icon: 'success'
+              });
+            } else {
+              // 新增
+              await addUser(submitData);
+              uni.showToast({
+                title: '添加成功',
+                icon: 'success'
+              });
+            }
+            
+            // 返回上一页
+            setTimeout(() => {
+              uni.navigateBack();
+            }, 1500);
+          } catch (error) {
+            console.error('保存失败:', error);
+            uni.showToast({
+              title: '保存失败',
+              icon: 'none'
+            });
+          }
+        }
+      });
+    },
+    
+    // 取消
+    handleCancel() {
+      uni.navigateBack();
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  background-color: #f5f5f5;
+  min-height: 100vh;
+  padding-bottom: 120rpx;
+}
+
+.form-section {
+  background-color: #fff;
+  margin-bottom: 20rpx;
+  padding: 30rpx;
+  
+  .section-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 30rpx;
+    border-left: 6rpx solid #007aff;
+    padding-left: 20rpx;
+  }
+  
+  .form-item {
+    margin-bottom: 30rpx;
+  }
+  
+  .level-group {
+    display: flex;
+    gap: 20rpx;
+    
+    .uv-select {
+      flex: 1;
+    }
+  }
+}
+
+.action-section {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: #fff;
+  padding: 20rpx 30rpx;
+  border-top: 1rpx solid #eee;
+  display: flex;
+  gap: 20rpx;
+  
+  .uv-button {
+    flex: 1;
+  }
+}
+</style>

oa-ui-app/pages/oa/staff/staffList.vue

@@ -0,0 +1,734 @@
+<template>
+  <view class="container">
+    <!-- 搜索栏 -->
+    <view class="search-bar">
+      <view class="search-input">
+        <input class="search-input-field" v-model="queryParams.nickName" placeholder="请输入姓名搜索" @input="handleQuery"
+          @confirm="handleQuery" />
+      </view>
+      <view class="filter-btn" @click="showFilter = true">
+        <text class="filter-icon">筛选</text>
+      </view>
+    </view>
+
+    <!-- 部门选择 -->
+    <view class="dept-section" v-if="deptOptions.length > 0">
+      <view class="dept-header">
+        <text class="dept-title">部门</text>
+        <text class="dept-name">{{ currentDeptName || '全部部门' }}</text>
+      </view>
+      <scroll-view class="dept-scroll" scroll-x>
+        <view class="dept-list">
+          <view class="dept-item" :class="{ active: !queryParams.deptId }" @click="selectDept(null, '全部部门')">
+            全部
+          </view>
+          <view v-for="dept in deptOptions" :key="dept.id" class="dept-item"
+            :class="{ active: queryParams.deptId === dept.id }" @click="selectDept(dept.id, dept.label)">
+            {{ dept.label }}
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <!-- 状态选择 -->
+    <view class="status-section">
+      <view class="status-header">
+        <text class="status-title">状态</text>
+        <text class="status-name">{{ getStatusLabel(queryParams.status) || '在职' }}</text>
+      </view>
+      <scroll-view class="status-scroll" scroll-x>
+        <view class="status-list">
+          <view class="status-item" :class="{ active: queryParams.status === '0' }" @click="selectStatus('0')">
+            在职
+          </view>
+          <view class="status-item" :class="{ active: queryParams.status === '1' }" @click="selectStatus('1')">
+            离职
+          </view>
+          <view class="status-item" :class="{ active: queryParams.status === '2' }" @click="selectStatus('2')">
+            退休
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <!-- 筛选弹窗 -->
+    <view v-if="showFilter" class="filter-overlay" @click="showFilter = false">
+      <view class="filter-popup" @click.stop>
+        <view class="filter-header">
+          <text class="filter-title">筛选条件</text>
+          <view class="filter-close" @click="showFilter = false">
+            <text>✕</text>
+          </view>
+        </view>
+        <view class="filter-content">
+          <view class="filter-item">
+            <text class="filter-label">职称</text>
+            <picker v-model="queryParams.titles" :range="titleOptions" range-key="label" @change="onTitleChange">
+              <view class="picker-view">
+                {{ getTitleLabel(queryParams.titles) || '请选择职称' }}
+              </view>
+            </picker>
+          </view>
+          <view class="filter-item">
+            <text class="filter-label">状态</text>
+            <picker v-model="queryParams.status" :range="statusOptions" range-key="label" @change="onStatusChange">
+              <view class="picker-view">
+                {{ getStatusLabel(queryParams.status) || '请选择状态' }}
+              </view>
+            </picker>
+          </view>
+        </view>
+        <view class="filter-actions">
+          <button class="btn-default" @click="resetQuery">重置</button>
+          <button class="btn-primary" @click="applyFilter">确定</button>
+        </view>
+      </view>
+    </view>
+
+    <!-- 员工列表 -->
+    <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+      :up="upOption" :fixed="false" :top="10" style="padding: 30rpx;">
+      <view class="staff-list">
+        <view v-for="(item, index) in staffList" :key="index" class="staff-card" @click="handleView(item)">
+          <view class="staff-header">
+            <view class="staff-avatar">
+              <image class="avatar-image" :src="item.avatar || '/static/images/user.png'" mode="aspectFill" />
+            </view>
+            <view class="staff-info">
+              <view class="staff-name">{{ item.nickName }}</view>
+              <view class="staff-dept">{{ (item.dept && item.dept.deptName) || '未分配部门' }}</view>
+              <view class="staff-status">
+                <text class="status-tag" :class="'status-' + item.status">
+                  {{ getStatusText(item.status) }}
+                </text>
+              </view>
+            </view>
+            <view class="staff-actions">
+              <text class="arrow-icon">></text>
+            </view>
+          </view>
+
+          <view class="staff-details">
+            <view class="detail-item">
+              <text class="detail-label">年龄：</text>
+              <text class="detail-value">{{ String(getAgeByIdCard(item.idCard)).slice(0, 2) }}岁</text>
+            </view>
+            <view class="detail-item">
+              <text class="detail-label">性别：</text>
+              <text class="detail-value">{{ item.sex == 0 ? '男' : '女' }}</text>
+            </view>
+            <view class="detail-item">
+              <text class="detail-label">手机：</text>
+              <text class="detail-value">{{ item.phonenumber || '未填写' }}</text>
+            </view>
+            <view class="detail-item">
+              <text class="detail-label">职称：</text>
+              <text class="detail-value">{{ getTitleText(item.titles) || '未填写' }}</text>
+            </view>
+            <view class="detail-item">
+              <text class="detail-label">职务：</text>
+              <text class="detail-value">{{ item.postNames || '未填写' }}</text>
+            </view>
+            <view class="detail-item">
+              <text class="detail-label">入职时间：</text>
+              <text class="detail-value">{{ formatDate(item.entryDate) || '未填写' }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </mescroll-uni>
+  </view>
+</template>
+
+<script>
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
+import { deptTreeSelectNew } from "@/api/system/dept";
+import MescrollMixin from '@/uni_modules/mescroll/components/mescroll-uni/mescroll-mixins.js';
+
+export default {
+  mixins: [MescrollMixin],
+  data() {
+    return {
+      mescroll: null, // mescroll实例
+      downOption: {
+        auto: true,
+        textOutOffset: '下拉刷新',
+        textLoading: '加载中...'
+      },
+      upOption: {
+        auto: false,
+        page: { num: 1, size: 10 },
+        noMoreSize: 5,
+        empty: { tip: '暂无更多员工数据' },
+        textNoMore: '~ 没有更多数据了 ~'
+      },
+      staffList: [],
+      deptOptions: [],
+      currentDeptName: '',
+      showFilter: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        nickName: '',
+        titles: '',
+        certificates: '',
+        degree: '',
+        status: '0',
+        deptId: undefined
+      },
+      // 筛选选项
+      titleOptions: [
+        { label: '高级工程师', value: '1' },
+        { label: '工程师', value: '2' },
+        { label: '助理工程师', value: '3' },
+        { label: '技术员', value: '4' }
+      ],
+      certificateOptions: [
+        { label: '注册测绘师', value: '1' },
+        { label: '注册建筑师', value: '2' },
+        { label: '注册结构师', value: '3' },
+        { label: '注册造价师', value: '4' }
+      ],
+      degreeOptions: [
+        { label: '博士', value: '1' },
+        { label: '硕士', value: '2' },
+        { label: '本科', value: '3' },
+        { label: '专科', value: '4' },
+        { label: '高中', value: '5' }
+      ],
+      statusOptions: [
+        { label: '在职', value: '0' },
+        { label: '离职', value: '1' },
+        { label: '退休', value: '2' },
+        { label: '试用', value: '3' },
+        { label: '返聘', value: '4' }
+      ]
+    }
+  },
+  onLoad: function (options) {
+    this.getDeptTree();
+    uni.startPullDownRefresh();
+  },
+
+  methods: {
+    mescrollInit(mescroll) {
+      this.mescroll = mescroll;
+    },
+
+    // 获取部门树
+    async getDeptTree() {
+      try {
+        const res = await deptTreeSelectNew();
+        this.deptOptions = res.data[0].children || [];
+      } catch (error) {
+        console.error('获取部门树失败:', error);
+      }
+    },
+
+    // 选择部门
+    selectDept(deptId, deptName) {
+      this.queryParams.deptId = deptId;
+      this.currentDeptName = deptName;
+      this.handleQuery();
+    },
+
+    // 选择状态
+    selectStatus(status) {
+      this.queryParams.status = status;
+      this.handleQuery();
+    },
+
+    // 搜索
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.staffList = [];
+      this.mescroll.resetUpScroll();
+    },
+
+    // 重置查询
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        nickName: '',
+        titles: '',
+        certificates: '',
+        degree: '',
+        status: '0', // 默认选中在职
+        deptId: undefined
+      };
+      this.currentDeptName = '';
+      this.showFilter = false;
+      this.handleQuery();
+    },
+
+    // 应用筛选
+    applyFilter() {
+      this.showFilter = false;
+      this.handleQuery();
+    },
+
+    // 处理职称选择变化
+    onTitleChange(e) {
+      const option = this.titleOptions[e.detail.value];
+      this.queryParams.titles = option ? option.value : '';
+    },
+
+    // 处理状态选择变化
+    onStatusChange(e) {
+      const option = this.statusOptions[e.detail.value];
+      this.queryParams.status = option ? option.value : '';
+    },
+
+    // 获取职称标签
+    getTitleLabel(value) {
+      const item = this.titleOptions.find(item => item.value === value);
+      return item ? item.label : '';
+    },
+
+    // 获取状态标签
+    getStatusLabel(value) {
+      const item = this.statusOptions.find(item => item.value === value);
+      return item ? item.label : '';
+    },
+
+    // 加载数据
+    async loadData() {
+      try {
+        const res = await listUser(this.queryParams);
+        return { data: res.rows, total: res.total };
+      } catch (e) {
+        console.error('加载员工数据失败:', e);
+        return { data: [], error: true };
+      }
+    },
+
+    // mescroll下拉刷新回调
+    async downCallback() {
+      this.staffList = []; // 清空列表
+      this.queryParams.pageNum = 1;
+      const res = await this.loadData();
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.staffList = res.data;
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+      uni.stopPullDownRefresh();
+    },
+
+    // mescroll上拉加载回调
+    async upCallback(page) {
+      this.queryParams.pageNum = page.num;
+      const res = await this.loadData();
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.staffList = this.staffList.concat(res.data);
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+    },
+
+    // 查看员工详情
+    handleView(item) {
+      uni.navigateTo({
+        url: `/pages/oa/staff/staffDetail?userId=${item.userId}&nickName=${item.nickName}`
+      });
+    },
+
+    // 获取状态文本
+    getStatusText(status) {
+      const statusMap = {
+        '0': '在职',
+        '1': '离职',
+        '2': '退休',
+        '3': '试用',
+        '4': '返聘'
+      };
+      return statusMap[status] || '未知';
+    },
+
+    // 获取状态类型
+    getStatusType(status) {
+      const typeMap = {
+        '0': 'success',
+        '1': 'error',
+        '2': 'warning',
+        '3': 'primary',
+        '4': 'info'
+      };
+      return typeMap[status] || 'default';
+    },
+
+    // 获取职称文本
+    getTitleText(titles) {
+      const titleMap = {
+        '1': '高级工程师',
+        '2': '工程师',
+        '3': '助理工程师',
+        '4': '技术员'
+      };
+      return titleMap[titles] || '';
+    },
+
+    // 根据身份证计算年龄
+    getAgeByIdCard(idCard) {
+      if (!idCard) return 0;
+      const birthStr = idCard.substring(6, 14);
+      const birthYear = parseInt(birthStr.substring(0, 4), 10);
+      const birthMonth = parseInt(birthStr.substring(4, 6), 10) - 1;
+      const birthDay = parseInt(birthStr.substring(6, 8), 10);
+      const birthDate = new Date(birthYear, birthMonth, birthDay);
+      const now = new Date();
+      let age = now.getFullYear() - birthDate.getFullYear();
+      const monthDiff = now.getMonth() - birthDate.getMonth();
+      if (monthDiff < 0 || (monthDiff === 0 && now.getDate() < birthDate.getDate())) {
+        age--;
+      }
+      return age;
+    },
+
+    // 格式化日期
+    formatDate(dateStr) {
+      if (!dateStr) return '';
+      const date = new Date(dateStr);
+      return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: 10rpx;
+  background-color: #f5f5f5;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.search-bar {
+  display: flex;
+  align-items: center;
+  padding: 20rpx 30rpx;
+  background-color: #fff;
+  border-bottom: 1rpx solid #eee;
+
+  .search-input {
+    flex: 1;
+    margin-right: 20rpx;
+
+    .search-input-field {
+      width: 100%;
+      height: 60rpx;
+      padding: 0 20rpx;
+      border: 1rpx solid #ddd;
+      border-radius: 30rpx;
+      font-size: 28rpx;
+    }
+  }
+
+  .filter-btn {
+    padding: 10rpx 20rpx;
+    background-color: #f5f5f5;
+    border-radius: 20rpx;
+
+    .filter-icon {
+      font-size: 26rpx;
+      color: #666;
+    }
+  }
+}
+
+.dept-section {
+  background-color: #fff;
+  padding: 20rpx 30rpx;
+  border-bottom: 1rpx solid #eee;
+
+  .dept-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20rpx;
+
+    .dept-title {
+      font-size: 28rpx;
+      color: #333;
+      font-weight: bold;
+    }
+
+    .dept-name {
+      font-size: 24rpx;
+      color: #666;
+    }
+  }
+
+  .dept-scroll {
+    white-space: nowrap;
+
+    .dept-list {
+      display: flex;
+
+      .dept-item {
+        display: inline-block;
+        padding: 10rpx 20rpx;
+        margin-right: 20rpx;
+        background-color: #f5f5f5;
+        border-radius: 20rpx;
+        font-size: 24rpx;
+        color: #666;
+        white-space: nowrap;
+
+        &.active {
+          background-color: #007aff;
+          color: #fff;
+        }
+      }
+    }
+  }
+}
+
+.status-section {
+  background-color: #fff;
+  padding: 20rpx 30rpx;
+  border-bottom: 1rpx solid #eee;
+
+  .status-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20rpx;
+
+    .status-title {
+      font-size: 28rpx;
+      color: #333;
+      font-weight: bold;
+    }
+
+    .status-name {
+      font-size: 24rpx;
+      color: #666;
+    }
+  }
+
+  .status-scroll {
+    white-space: nowrap;
+
+    .status-list {
+      display: flex;
+
+      .status-item {
+        display: inline-block;
+        padding: 10rpx 20rpx;
+        margin-right: 20rpx;
+        background-color: #f5f5f5;
+        border-radius: 20rpx;
+        font-size: 24rpx;
+        color: #666;
+        white-space: nowrap;
+
+        &.active {
+          background-color: #007aff;
+          color: #fff;
+        }
+      }
+    }
+  }
+}
+
+.filter-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 1000;
+  display: flex;
+  align-items: flex-end;
+}
+
+.filter-popup {
+  background-color: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  padding: 40rpx;
+  width: 100%;
+  max-height: 80vh;
+
+  .filter-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 40rpx;
+
+    .filter-title {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #333;
+    }
+
+    .filter-close {
+      padding: 10rpx;
+
+      text {
+        font-size: 24rpx;
+        color: #999;
+      }
+    }
+  }
+
+  .filter-content {
+    .filter-item {
+      margin-bottom: 30rpx;
+
+      .filter-label {
+        display: block;
+        font-size: 28rpx;
+        color: #333;
+        margin-bottom: 10rpx;
+      }
+
+      picker {
+        .picker-view {
+          padding: 20rpx;
+          background-color: #f5f5f5;
+          border-radius: 10rpx;
+          font-size: 28rpx;
+          color: #333;
+        }
+      }
+    }
+  }
+
+  .filter-actions {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 40rpx;
+    gap: 20rpx;
+
+    button {
+      flex: 1;
+      height: 80rpx;
+      border-radius: 10rpx;
+      font-size: 28rpx;
+      border: none;
+
+      &.btn-default {
+        background-color: #f5f5f5;
+        color: #666;
+      }
+
+      &.btn-primary {
+        background-color: #007aff;
+        color: #fff;
+      }
+    }
+  }
+}
+
+.staff-list {
+  .staff-card {
+    background-color: #fff;
+    border-radius: 20rpx;
+    margin-bottom: 20rpx;
+    padding: 30rpx;
+    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
+
+    .staff-header {
+      display: flex;
+      align-items: center;
+      margin-bottom: 20rpx;
+
+      .staff-avatar {
+        margin-right: 20rpx;
+
+        .avatar-image {
+          width: 60rpx;
+          height: 60rpx;
+          border-radius: 50%;
+        }
+      }
+
+      .staff-info {
+        flex: 1;
+
+        .staff-name {
+          font-size: 32rpx;
+          font-weight: bold;
+          color: #333;
+          margin-bottom: 10rpx;
+        }
+
+        .staff-dept {
+          font-size: 24rpx;
+          color: #666;
+          margin-bottom: 10rpx;
+        }
+
+        .staff-status {
+          display: inline-block;
+
+          .status-tag {
+            padding: 4rpx 12rpx;
+            border-radius: 10rpx;
+            font-size: 20rpx;
+
+            &.status-0 {
+              background-color: #e6f7ff;
+              color: #1890ff;
+            }
+
+            &.status-1 {
+              background-color: #fff2e8;
+              color: #fa8c16;
+            }
+
+            &.status-2 {
+              background-color: #f6ffed;
+              color: #52c41a;
+            }
+
+            &.status-3 {
+              background-color: #f9f0ff;
+              color: #722ed1;
+            }
+
+            &.status-4 {
+              background-color: #f0f0f0;
+              color: #8c8c8c;
+            }
+          }
+        }
+      }
+
+      .staff-actions {
+        padding: 10rpx;
+
+        .arrow-icon {
+          font-size: 24rpx;
+          color: #999;
+        }
+      }
+    }
+
+    .staff-details {
+      .detail-item {
+        display: flex;
+        margin-bottom: 15rpx;
+
+        .detail-label {
+          width: 140rpx;
+          font-size: 26rpx;
+          color: #999;
+        }
+
+        .detail-value {
+          flex: 1;
+          font-size: 26rpx;
+          color: #333;
+        }
+      }
+    }
+  }
+}
+</style>

oa-ui-app/pages/work/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-01-16 11:17:08
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-04 11:12:27
+ * @LastEditTime: 2025-08-07 13:47:32
 -->
 <template>
   <view class="work-container">
@@ -96,6 +96,12 @@ export default {
           icon: '/static/images/work/declare.png',
           url: 'declare',
           hasPermi: checkPermi(['oa:declare:list'])
+        },
+        {
+          name: '人事管理',
+          icon: '/static/images/work/staff.png',
+          url: 'staff',
+          hasPermi: checkPermi(['system:user:list'])
         }
       ],
       flowList: ['借款审批', '用车审批', '设备审批', '工作填报'],
@@ -152,6 +158,10 @@ export default {
         uni.navigateTo({
           url: '/pages/oa/declare/declareList'
         })
+      } else if (type == 'staff') {
+        uni.navigateTo({
+          url: '/pages/oa/staff/staffList'
+        })
       }
       else {
         this.$modal.showToast('模块建设中~')