修改人事管理列的显示，首页项目结算的图标

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-13 11:22:54
+ * @LastEditTime: 2025-02-27 15:38:19
 -->
 
 <template>
@@ -235,7 +235,7 @@ export default {
         },{
           id: 9,
           name: '项目结算',
-          icon: 'buy',
+          icon: 'money',
           bgColor: '#ff6f61',
           boxShadow: '0 5px 20px rgba(255,111,97,0.5)',
           path: '/product/settle/project',

oa-ui/src/views/oa/staff/index.vue

@@ -130,9 +130,12 @@
             :formatter="formatterCertificates" />
           <el-table-column label="最高学历毕业院校" align="center" key="graduateSchool" prop="graduateSchool"
             v-if="columns[10].visible" sortable="custom" />
-          <el-table-column label="专业" align="center" key="major" prop="major" v-if="columns[11].visible" />
-          <el-table-column label="学历" align="center" key="degree" prop="degree" :formatter="formatterDegree"
+          <el-table-column label="最高学历专业" align="center" key="major" prop="major" v-if="columns[11].visible" />
+          <el-table-column label="最高学历" sortable align="center" key="degree" prop="degree" :formatter="formatterDegree"
             v-if="columns[12].visible" />
+          <el-table-column label="初始学历专业" align="center" key="initialMajor" prop="initialMajor" v-if="columns[20].visible" />
+          <el-table-column label="初始学历" sortable align="center" key="initialDegree" prop="initialDegree" :formatter="formatterInitialDegree"
+            v-if="columns[19].visible" />
           <el-table-column label="籍贯" align="center" key="nativePlace" prop="nativePlace" v-if="columns[13].visible" />
           <el-table-column label="政治面貌" align="center" key="politicalAffiliation"
             :formatter="formatterPoliticalAffiliation" prop="politicalAffiliation" v-if="columns[14].visible" />
@@ -247,8 +250,8 @@
                 <el-input v-model="form.major" placeholder="请输入专业" />
               </el-col>
             </el-form-item>
-            <el-form-item label="毕业学校" prop="graduateSchool">
-              <el-input v-model="form.graduateSchool" placeholder="请输入毕业学校" />
+            <el-form-item label="最高学历毕业学校" prop="graduateSchool">
+              <el-input v-model="form.graduateSchool" placeholder="请输入最高学历毕业学校" />
             </el-form-item>
             <el-form-item label="家庭住址" prop="homePlace">
               <el-input type="textarea" v-model="form.homePlace" placeholder="请输入家庭住址" />
@@ -463,14 +466,16 @@ export default {
         { key: 8, label: `合同期满`, visible: true },
         { key: 9, label: `状态`, visible: true },
         { key: 10, label: `最高学历毕业院校`, visible: false },
-        { key: 11, label: `专业`, visible: false },
-        { key: 12, label: `学历`, visible: false },
+        { key: 11, label: `最高学历专业`, visible: false },
+        { key: 12, label: `最高学历`, visible: false },
         { key: 13, label: `籍贯`, visible: false },
         { key: 14, label: `政治面貌`, visible: false },
         { key: 15, label: `民族`, visible: false },
         { key: 16, label: `入职时间`, visible: true },
         { key: 17, label: `职务`, visible: false },
         { key: 18, label: `职业资格`, visible: false },
+        { key: 19, label: `初始学历`, visible: false },
+        { key: 20, label: `初始学历专业`, visible: false },
       ],
       // 表单校验
       rules: {
@@ -928,6 +933,10 @@ export default {
       let v = this.selectDictLabel(this.dict.type.sys_user_degree, row.degree)
       return v
     },
+    formatterInitialDegree(row){
+      let v = this.selectDictLabel(this.dict.type.sys_user_degree, row.initialDegree)
+      return v
+    },
     formatterPoliticalAffiliation(row) {
       let v = this.selectDictLabels(this.dict.type.sys_user_political, row.politicalAffiliation, ',')
       return v