移动端：更新人事管理

oa-ui-app/pages.json

@@ -1,66 +1,79 @@
 {
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/login",
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
-		}, {
+		},
+		{
 			"path": "pages/index",
 			"style": {
 				"navigationBarTitleText": "CMC智联云枢办公系统移动端",
 				"navigationStyle": "custom"
 			}
-		}, {
+		},
+		{
 			"path": "pages/work/index",
 			"style": {
 				"navigationBarTitleText": "工作台"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/index",
 			"style": {
 				"navigationBarTitleText": "我的"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/avatar/index",
 			"style": {
 				"navigationBarTitleText": "修改头像"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/info/index",
 			"style": {
 				"navigationBarTitleText": "个人信息"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/info/edit",
 			"style": {
 				"navigationBarTitleText": "编辑资料"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/pwd/index",
 			"style": {
 				"navigationBarTitleText": "修改密码"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/setting/index",
 			"style": {
 				"navigationBarTitleText": "应用设置"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/help/index",
 			"style": {
 				"navigationBarTitleText": "常见问题"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/about/index",
 			"style": {
 				"navigationBarTitleText": "关于我们"
 			}
-		}, {
+		},
+		{
 			"path": "pages/common/webview/index",
 			"style": {
 				"navigationBarTitleText": "浏览网页"
 			}
-		}, {
+		},
+		{
 			"path": "pages/common/textview/index",
 			"style": {
 				"navigationBarTitleText": "浏览文本"
@@ -95,99 +108,92 @@
 			}
 		},
 		{
-			"path" : "pages/message/apply/detail",
-			"style" : 
-			{
-				"navigationBarTitleText" : "表单信息"
+			"path": "pages/message/apply/detail",
+			"style": {
+				"navigationBarTitleText": "表单信息"
 			}
 		},
 		{
-			"path" : "pages/form/declare/declare",
-			"style" : 
-			{
-				"navigationBarTitleText" : "工作填报"
+			"path": "pages/form/declare/declare",
+			"style": {
+				"navigationBarTitleText": "工作填报"
 			}
 		},
 		{
-			"path" : "pages/form/borrow/borrow",
-			"style" : 
-			{
-				"navigationBarTitleText" : "借款审批"
+			"path": "pages/form/borrow/borrow",
+			"style": {
+				"navigationBarTitleText": "借款审批"
 			}
 		},
 		{
-			"path" : "pages/project/projectInfo",
-			"style" : 
-			{
-				"navigationBarTitleText" : "项目详情"
+			"path": "pages/project/projectInfo",
+			"style": {
+				"navigationBarTitleText": "项目详情"
 			}
 		},
 		{
-			"path" : "pages/oa/budget/budgetInfo",
-			"style" : 
-			{
-				"navigationBarTitleText" : "项目预算表"
+			"path": "pages/oa/budget/budgetInfo",
+			"style": {
+				"navigationBarTitleText": "项目预算表"
 			}
 		},
 		{
-			"path" : "pages/oa/borrow/borrowList",
-			"style" : 
-			{
-				"navigationBarTitleText" : "借款管理",
+			"path": "pages/oa/borrow/borrowList",
+			"style": {
+				"navigationBarTitleText": "借款管理",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path" : "pages/oa/car/carList",
-			"style" : 
-			{
-				"navigationBarTitleText" : "用车管理",
+			"path": "pages/oa/car/carList",
+			"style": {
+				"navigationBarTitleText": "用车管理",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path" : "pages/oa/car/useCarList",
-			"style" : 
-			{
-				"navigationBarTitleText" : "派出记录",
+			"path": "pages/oa/car/useCarList",
+			"style": {
+				"navigationBarTitleText": "派出记录",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path" : "pages/oa/device/deviceLog",
-			"style" : 
-			{
-				"navigationBarTitleText" : "设备作业记录"
+			"path": "pages/oa/device/deviceLog",
+			"style": {
+				"navigationBarTitleText": "设备作业记录"
 			}
 		},
 		{
-			"path" : "pages/oa/device/instrumentsList",
-			"style" : 
-			{
-				"navigationBarTitleText" : "仪器设备管理"
+			"path": "pages/oa/device/instrumentsList",
+			"style": {
+				"navigationBarTitleText": "仪器设备管理"
 			}
 		},
 		{
-			"path" : "pages/oa/declare/declareList",
-			"style" : 
-			{
-				"navigationBarTitleText" : "工作填报列表",
+			"path": "pages/oa/declare/declareList",
+			"style": {
+				"navigationBarTitleText": "工作填报列表",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path" : "pages/oa/staff/staffList",
-			"style" : 
-			{
-				"navigationBarTitleText" : "人事管理",
+			"path": "pages/oa/staff/staffList",
+			"style": {
+				"navigationBarTitleText": "人事管理",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path" : "pages/components/formInfo",
-			"style" : 
-			{
-				"navigationBarTitleText" : "表单信息"
+			"path": "pages/oa/staff/staffDetail",
+			"style": {
+				"navigationBarTitleText": "员工信息"
+			}
+		},
+		{
+			"path": "pages/components/formInfo",
+			"style": {
+				"navigationBarTitleText": "表单信息"
 			}
 		}
 	],
@@ -196,7 +202,8 @@
 		"selectedColor": "#000000",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
-		"list": [{
+		"list": [
+			{
 				"pagePath": "pages/message/index",
 				"iconPath": "static/images/tabbar/msg_1.png",
 				"selectedIconPath": "static/images/tabbar/msg_2.png",
@@ -207,12 +214,14 @@
 				"iconPath": "static/images/tabbar/home.png",
 				"selectedIconPath": "static/images/tabbar/home_.png",
 				"text": "项目"
-			}, {
+			},
+			{
 				"pagePath": "pages/work/index",
 				"iconPath": "static/images/tabbar/apply_1.png",
 				"selectedIconPath": "static/images/tabbar/apply_2.png",
 				"text": "工作台"
-			}, {
+			},
+			{
 				"pagePath": "pages/mine/index",
 				"iconPath": "static/images/tabbar/my_1.png",
 				"selectedIconPath": "static/images/tabbar/my_2.png",

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

@@ -3,23 +3,16 @@
     <!-- 头部信息 -->
     <view class="header-section">
       <view class="avatar-section">
-        <uv-avatar 
-          :src="staffInfo.avatar || '/static/images/user.png'"
-          size="120"
-        />
+        <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="dept">{{ staffInfo.dept ? staffInfo.dept.deptName : '未分配部门' }}</view>
         <view class="status">
-          <uv-tag 
-            :text="getStatusText(staffInfo.status)" 
-            :type="getStatusType(staffInfo.status)"
-          />
+          <u-tag :text="getStatusText(staffInfo.status)" :type="getStatusType(staffInfo.status)" />
         </view>
       </view>
     </view>
-
     <!-- 基本信息 -->
     <view class="info-section">
       <view class="section-title">基本信息</view>
@@ -30,7 +23,7 @@
         </view>
         <view class="info-item">
           <text class="label">年龄</text>
-          <text class="value">{{ String(getAgeByIdCard(staffInfo.idCard)).slice(0,2) }}岁</text>
+          <text class="value">{{ String(getAgeByIdCard(staffInfo.idCard)).slice(0, 2) }}岁</text>
         </view>
         <view class="info-item">
           <text class="label">性别</text>
@@ -38,23 +31,23 @@
         </view>
         <view class="info-item">
           <text class="label">手机号码</text>
-          <text class="value">{{ staffInfo.phonenumber || '未填写' }}</text>
+          <text class="value">{{ staffInfo.phonenumber || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">身份证</text>
-          <text class="value">{{ staffInfo.idCard || '未填写' }}</text>
+          <text class="value">{{ staffInfo.idCard || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">籍贯</text>
-          <text class="value">{{ staffInfo.nativePlace || '未填写' }}</text>
+          <text class="value">{{ staffInfo.nativePlace || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">民族</text>
-          <text class="value">{{ staffInfo.ethnic || '未填写' }}</text>
+          <text class="value">{{ staffInfo.ethnic || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">政治面貌</text>
-          <text class="value">{{ getPoliticalText(staffInfo.politicalAffiliation) || '未填写' }}</text>
+          <text class="value">{{ getPoliticalText(staffInfo.politicalAffiliation) || '' }}</text>
         </view>
       </view>
     </view>
@@ -65,35 +58,47 @@
       <view class="info-grid">
         <view class="info-item">
           <text class="label">部门</text>
-          <text class="value">{{ staffInfo.dept?.deptName || '未分配部门' }}</text>
+          <text class="value">{{ staffInfo.dept ? staffInfo.dept.deptName : '未分配部门' }}</text>
         </view>
         <view class="info-item">
           <text class="label">职务</text>
-          <text class="value">{{ staffInfo.postNames || '未填写' }}</text>
+          <text class="value">{{ postData || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">职称</text>
-          <text class="value">{{ getTitleText(staffInfo.titles) || '未填写' }}</text>
+          <text class="value">{{ titlesMap[staffInfo.titles] || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">职业资格</text>
-          <text class="value">{{ getCertificateText(staffInfo.certificates) || '未填写' }}</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>
+          <text class="value">{{ getPostLevelText(staffInfo.postLevel, staffInfo.salaryLevel) || '' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">工程师岗级</text>
+          <text class="value">{{ engineerLevelData[staffInfo.engineerLevel] || '' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">技工等级</text>
+          <text class="value">{{ operatorLevelData[staffInfo.operatorLevel] || '' }}</text>
+        </view>
+        <view class="info-item">
+          <text class="label">项目经理等级</text>
+          <text class="value">{{ pmLevelData[staffInfo.pmLevel] || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">入职时间</text>
-          <text class="value">{{ formatDate(staffInfo.entryDate) || '未填写' }}</text>
+          <text class="value">{{ parseTime(staffInfo.entryDate, "{y}-{m}-{d}") || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">合同签订</text>
-          <text class="value">{{ formatDate(staffInfo.contractSign) || '未填写' }}</text>
+          <text class="value">{{ parseTime(staffInfo.contractSign, "{y}-{m}-{d}") || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">合同期满</text>
-          <text class="value">{{ formatDate(staffInfo.contractExpire) || '未填写' }}</text>
+          <text class="value">{{ parseTime(staffInfo.contractExpire, "{y}-{m}-{d}") || '' }}</text>
         </view>
       </view>
     </view>
@@ -104,46 +109,47 @@
       <view class="info-grid">
         <view class="info-item">
           <text class="label">最高学历</text>
-          <text class="value">{{ getDegreeText(staffInfo.degree) || '未填写' }}</text>
+          <text class="value">{{ getDegreeText(staffInfo.degree) || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">最高学历专业</text>
-          <text class="value">{{ staffInfo.major || '未填写' }}</text>
+          <text class="value">{{ staffInfo.major || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">最高学历毕业院校</text>
-          <text class="value">{{ staffInfo.graduateSchool || '未填写' }}</text>
+          <text class="value">{{ staffInfo.graduateSchool || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">初始学历</text>
-          <text class="value">{{ getDegreeText(staffInfo.initialDegree) || '未填写' }}</text>
+          <text class="value">{{ getDegreeText(staffInfo.initialDegree) || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">初始学历专业</text>
-          <text class="value">{{ staffInfo.initialMajor || '未填写' }}</text>
+          <text class="value">{{ staffInfo.initialMajor || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">初始学历毕业院校</text>
-          <text class="value">{{ staffInfo.initialSchool || '未填写' }}</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>
+          <text class="value">{{ staffInfo.homePlace || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">紧急联系人</text>
-          <text class="value">{{ staffInfo.contact || '未填写' }}</text>
+          <text class="value">{{ staffInfo.contact || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">紧急联系电话</text>
-          <text class="value">{{ staffInfo.telephone || '未填写' }}</text>
+          <text class="value">{{ staffInfo.telephone || '' }}</text>
         </view>
         <view class="info-item">
           <text class="label">备注</text>
@@ -151,38 +157,54 @@
         </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";
+import { parseTime } from "@/utils/common.js"
+import { getUser } from "@/api/system/user"
+import { listType, getType } from "@/api/system/dict/type"
+import { listData } from "@/api/system/dict/data"
 
 export default {
   data() {
     return {
       staffInfo: {},
       userId: '',
-      nickName: ''
+      nickName: '',
+      postData: '',
+      engineerLevelData: {},
+      operatorLevelData: {},
+      pmLevelData: {},
+      politicalMap: {},
+      titlesMap: {},
+      certificateMap: {},
+      postLevelMap: {},
+      salaryLevelMap: {}
     }
   },
-  
   onLoad(options) {
-    this.userId = options.userId;
-    this.nickName = options.nickName;
+    this.userId = options.userId
+    this.nickName = options.nickName
+    this.getDictLabelValue();
     this.getStaffInfo();
   },
-  
   methods: {
+    parseTime,
     // 获取员工信息
     async getStaffInfo() {
       try {
         const res = await getUser(this.userId);
         this.staffInfo = res.data;
+        let postArr = [];
+        for (let post of res.posts) {
+          for (let postid of res.postIds) {
+            if (postid == post.postId) {
+              postArr.push(post.postName)
+            }
+          }
+        }
+        this.postData = postArr.join('/')
       } catch (error) {
         console.error('获取员工信息失败:', error);
         uni.showToast({
@@ -191,7 +213,48 @@ export default {
         });
       }
     },
-    
+    getDictLabelValue() {
+      listData({ pageSize: 100, dictType: 'sys_user_engineerlevel' }).then(res => {
+        res.rows.map(item => {
+          this.engineerLevelData[item.dictValue] = item.dictLabel
+        })
+      })
+      listData({ pageSize: 100, dictType: 'sys_user_operatorlevel' }).then(res => {
+        res.rows.map(item => {
+          this.operatorLevelData[item.dictValue] = item.dictLabel
+        })
+      })
+      listData({ pageSize: 100, dictType: 'sys_user_pmlevel' }).then(res => {
+        res.rows.map(item => {
+          this.pmLevelData[item.dictValue] = item.dictLabel
+        })
+      })
+      listData({ pageSize: 100, dictType: 'sys_user_political' }).then(res => {
+        res.rows.map(item => {
+          this.politicalMap[item.dictValue] = item.dictLabel
+        })
+      })
+      listData({ pageSize: 100, dictType: 'sys_user_titles' }).then(res => {
+        res.rows.map(item => {
+          this.titlesMap[item.dictValue] = item.dictLabel
+        })
+      })
+      listData({ pageSize: 100, dictType: 'sys_user_certificates' }).then(res => {
+        res.rows.map(item => {
+          this.certificateMap[item.dictValue] = item.dictLabel
+        })
+      })
+      listData({ pageSize: 100, dictType: 'sys_user_postlevel' }).then(res => {
+        res.rows.map(item => {
+          this.postLevelMap[item.dictValue] = item.dictLabel
+        })
+      })
+      listData({ pageSize: 100, dictType: 'sys_user_salarylevel' }).then(res => {
+        res.rows.map(item => {
+          this.salaryLevelMap[item.dictValue] = item.dictLabel
+        })
+      })
+    },
     // 获取状态文本
     getStatusText(status) {
       const statusMap = {
@@ -203,7 +266,6 @@ export default {
       };
       return statusMap[status] || '未知';
     },
-    
     // 获取状态类型
     getStatusType(status) {
       const typeMap = {
@@ -215,86 +277,6 @@ export default {
       };
       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;
@@ -311,21 +293,41 @@ export default {
       }
       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')}`;
+    // 获取政治面貌文本
+    getPoliticalText(politicalAffiliation) {
+      if (!politicalAffiliation) return '';
+      const politicalArray = politicalAffiliation.split(',');
+      let politicalText = politicalArray.map(political => this.politicalMap[political] || political).join('、');
+      return politicalText;
     },
-    
-    // 编辑信息
-    handleEdit() {
-      uni.navigateTo({
-        url: `/pages/oa/staff/staffEdit?userId=${this.userId}`
-      });
-    }
-  }
+
+    // 获取职业资格文本
+    getCertificateText(certificates) {
+      if (!certificates) return '';
+      const certArray = certificates.split(',');
+      return certArray.map(cert => this.certificateMap[cert] || cert).join('、');
+    },
+
+    // 获取岗级文本
+    getPostLevelText(postLevel, salaryLevel) {
+      const postText = this.postLevelMap[postLevel] || '';
+      const salaryText = this.salaryLevelMap[salaryLevel] || '';
+      return postText && salaryText ? `${postText}${salaryText}` : '';
+    },
+    // 获取学历文本
+    getDegreeText(degree) {
+      const degreeMap = {
+        '0': '博士',
+        '1': '硕士',
+        '2': '本科',
+        '3': '专科',
+        '4': '高中',
+        '5': '中专',
+        '6': '初中'
+      };
+      return degreeMap[degree] || '';
+    },
+  },
 }
 </script>
 
@@ -333,6 +335,7 @@ export default {
 .container {
   background-color: #f5f5f5;
   min-height: 100vh;
+  padding: 30rpx;
   padding-bottom: 120rpx;
 }
 
@@ -342,27 +345,27 @@ export default {
   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;
     }
@@ -373,7 +376,7 @@ export default {
   background-color: #fff;
   margin-bottom: 20rpx;
   padding: 30rpx;
-  
+
   .section-title {
     font-size: 32rpx;
     font-weight: bold;
@@ -382,18 +385,18 @@ export default {
     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;
@@ -412,9 +415,9 @@ export default {
   background-color: #fff;
   padding: 20rpx 30rpx;
   border-top: 1rpx solid #eee;
-  
+
   .uv-button {
     width: 100%;
   }
 }
-</style>
+</style>

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

@@ -1,419 +0,0 @@
-<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

@@ -6,9 +6,6 @@
         <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>
 
     <!-- 部门选择 -->
@@ -51,40 +48,6 @@
       </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;">
@@ -104,7 +67,7 @@
               </view>
             </view>
             <view class="staff-actions">
-              <text class="arrow-icon">></text>
+              <text class="arrow-icon" @click="goToDetail(item)">详情</text>
             </view>
           </view>
 
@@ -119,19 +82,23 @@
             </view>
             <view class="detail-item">
               <text class="detail-label">手机：</text>
-              <text class="detail-value">{{ item.phonenumber || '未填写' }}</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>
+              <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>
+              <text class="detail-value">{{ item.postNames || '无' }}</text>
+            </view>
+            <view class="detail-item">
+              <text class="detail-label">岗级：</text>
+              <text class="detail-value">{{ formatPostLevel(item.postLevel, item.salaryLevel) || '无' }}</text>
             </view>
             <view class="detail-item">
               <text class="detail-label">入职时间：</text>
-              <text class="detail-value">{{ formatDate(item.entryDate) || '未填写' }}</text>
+              <text class="detail-value">{{ formatDate(item.entryDate) || '无' }}</text>
             </view>
           </view>
         </view>
@@ -165,7 +132,6 @@ export default {
       staffList: [],
       deptOptions: [],
       currentDeptName: '',
-      showFilter: false,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -178,6 +144,7 @@ export default {
       },
       // 筛选选项
       titleOptions: [
+        { label: '正高级工程师', value: '0' },
         { label: '高级工程师', value: '1' },
         { label: '工程师', value: '2' },
         { label: '助理工程师', value: '3' },
@@ -242,7 +209,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.staffList = [];
-      this.mescroll.resetUpScroll();
+      this.downCallback();
     },
 
     // 重置查询
@@ -258,28 +225,9 @@ export default {
         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);
@@ -363,6 +311,7 @@ export default {
     // 获取职称文本
     getTitleText(titles) {
       const titleMap = {
+        '0': '正高级工程师',
         '1': '高级工程师',
         '2': '工程师',
         '3': '助理工程师',
@@ -393,6 +342,32 @@ export default {
       if (!dateStr) return '';
       const date = new Date(dateStr);
       return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+    },
+
+    // 格式化岗级
+    formatPostLevel(postLevel, salaryLevel) {
+      const postLevelMap = {
+        '0': '一岗',
+        '1': '二岗',
+        '2': '三岗',
+        '3': '四岗',
+        '4': '五岗',
+        '5': '六岗',
+        '6': '七岗',
+        '7': '八岗',
+      };
+      const salaryLevelMap = {
+        '0': '一级',
+        '1': '二级',
+        '2': '三级',
+        '3': '四级',
+      };
+      return postLevelMap[postLevel] + salaryLevelMap[salaryLevel] || '';
+    },
+    goToDetail(item) {
+      uni.navigateTo({
+        url: `/pages/oa/staff/staffDetail?userId=${item.userId}&nickName=${item.nickName}`
+      });
     }
   },
 }
@@ -416,7 +391,6 @@ export default {
 
   .search-input {
     flex: 1;
-    margin-right: 20rpx;
 
     .search-input-field {
       width: 100%;
@@ -427,17 +401,6 @@ export default {
       font-size: 28rpx;
     }
   }
-
-  .filter-btn {
-    padding: 10rpx 20rpx;
-    background-color: #f5f5f5;
-    border-radius: 20rpx;
-
-    .filter-icon {
-      font-size: 26rpx;
-      color: #666;
-    }
-  }
 }
 
 .dept-section {
@@ -536,96 +499,6 @@ export default {
   }
 }
 
-.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;
@@ -675,7 +548,7 @@ export default {
 
             &.status-0 {
               background-color: #e6f7ff;
-              color: #1890ff;
+              color: #52c41a;
             }
 
             &.status-1 {
@@ -685,7 +558,7 @@ export default {
 
             &.status-2 {
               background-color: #f6ffed;
-              color: #52c41a;
+              color: #1890ff;
             }
 
             &.status-3 {

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-07 13:47:32
+ * @LastEditTime: 2025-09-03 16:38:56
 -->
 <template>
   <view class="work-container">
@@ -101,7 +101,7 @@ export default {
           name: '人事管理',
           icon: '/static/images/work/staff.png',
           url: 'staff',
-          hasPermi: checkPermi(['system:user:list'])
+          hasPermi: checkRole(['staff','leader'])
         }
       ],
       flowList: ['借款审批', '用车审批', '设备审批', '工作填报'],