修改人事管理的排序

oa-ui/src/views/flowable/form/components/print/borrowPrint.vue

@@ -157,7 +157,7 @@
                 签名：<span class="auditor">{{ getUserName(form.cwUserId) }}</span>
               </el-col>
               <el-col :span="6">
-                支付日期：<span>{{ form.cwTime }}</span>
+                支付日期：<span>{{ form.lendTime }}</span>
               </el-col>
             </el-row>
           </td>

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

@@ -72,7 +72,8 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange"
+          @sort-change="handleSortChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="序号" width="50" align="center" prop="userId">
             <template slot-scope="scope">
@@ -89,7 +90,7 @@
             </template>
           </el-table-column>
           <el-table-column label="性别" align="center" key="sex" prop="sex" v-if="columns[2].visible"
-            :show-overflow-tooltip="true">
+            :show-overflow-tooltip="true" sortable>
             <template slot-scope="scope">
               {{ scope.row.sex == 0 ? '男' : '女' }}
             </template>
@@ -97,7 +98,7 @@
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[3].visible"
             width="120" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[4].visible"
-            :show-overflow-tooltip="true" />
+            :show-overflow-tooltip="true" sortable />
           <el-table-column label="岗级" align="center" key="postLevel" v-if="columns[5].visible"
             :show-overflow-tooltip="true" sortable :sort-method="sortPostLevel">
             <template slot-scope="scope">
@@ -105,7 +106,7 @@
       selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
             </template>
           </el-table-column>
-          <el-table-column label="职务" align="center" key="postName" prop="postName" v-if="columns[17].visible"
+          <el-table-column label="职务" align="center" key="postNames" prop="postNames" v-if="columns[17].visible"
             :show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="职称" align="center" key="titles" prop="titles" v-if="columns[6].visible"
             :show-overflow-tooltip="true" sortable :sort-method="sortTitles">
@@ -114,45 +115,40 @@
             </template>
           </el-table-column>
           <el-table-column label="毕业院校" align="center" key="graduateSchool" prop="graduateSchool"
-            v-if="columns[10].visible" />
+            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"
             v-if="columns[12].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" />
-          <el-table-column label="民族" align="center" key="ethnic" prop="ethnic" v-if="columns[15].visible" />
-          <el-table-column label="入职时间" sortable align="center" key="entryDate" prop="entryDate" v-if="columns[16].visible"
-            :show-overflow-tooltip="true">
+          <el-table-column label="民族" align="center" key="ethnic" prop="ethnic" v-if="columns[15].visible" sortable />
+          <el-table-column label="入职时间" sortable align="center" key="entryDate" prop="entryDate"
+            v-if="columns[16].visible" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.entryDate, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
           <el-table-column label="合同签订" align="center" key="contractSign" prop="contractSign" v-if="columns[7].visible"
-            :show-overflow-tooltip="true">
+            :show-overflow-tooltip="true" sortable>
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.contractSign, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
           <el-table-column label="合同期满" align="center" key="contractExpire" prop="contractExpire"
-            v-if="columns[8].visible" :show-overflow-tooltip="true">
+            v-if="columns[8].visible" :show-overflow-tooltip="true" sortable>
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.contractExpire, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="间接成本(天)" align="center" key="salary" prop="salary.salary" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.salary ? scope.row.salary.salary : "" }}
-          </template>
-        </el-table-column> -->
-          <el-table-column label="状态" align="center" key="status" v-if="columns[9].visible">
+          <el-table-column label="状态" align="center" key="status" v-if="columns[9].visible" sortable
+            :sort-method="sortStatus">
             <template slot-scope="scope">
               <el-tag type="success" v-if="scope.row.status == 0">在职</el-tag>
               <el-tag type="danger" v-if="scope.row.status == 1">离职</el-tag>
               <el-tag type="warning" v-if="scope.row.status == 2">退休</el-tag>
               <el-tag type="primary" v-if="scope.row.status == 3">试用</el-tag>
-              <!-- <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
-              @change="handleStatusChange(scope.row)"></el-switch> -->
+              <el-tag type="info" v-if="scope.row.status == 4">返聘</el-tag>
             </template>
           </el-table-column>
 
@@ -351,7 +347,6 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { number } from 'echarts';
 
 export default {
   name: "Staff",
@@ -486,6 +481,7 @@ export default {
     }
   },
   created() {
+    console.log(this.dict.type.sys_post_status);
     this.getList();
     this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then(response => {
@@ -806,6 +802,25 @@ export default {
       }
       return newStr
     },
+    handleSortChange({ prop, order }) {
+      if (prop == 'graduateSchool') {
+        // 自定义排序  
+        this.userList.sort((a, b) => {
+          let valueA = a[prop];
+          let valueB = b[prop];
+          // 检查值是否为字符串，如果不是，则将其视为空字符串（或根据需要处理）  
+          if (typeof valueA !== 'string') valueA = '';
+          if (typeof valueB !== 'string') valueB = '';
+
+          if (order === 'ascending') {
+            return valueA.localeCompare(valueB, 'zh-Hans-CN', { sensitivity: 'base' });
+          } else if (order === 'descending') {
+            return valueB.localeCompare(valueA, 'zh-Hans-CN', { sensitivity: 'base' });
+          }
+          return 0; // 如果没有指定排序顺序，则不改变数组顺序  
+        });
+      }
+    },
     sortAge(a, b) {
       return this.getAgeByIdCard(a.idCard) - this.getAgeByIdCard(b.idCard);
     },
@@ -832,6 +847,13 @@ export default {
     sortTitles(a, b) {
       let res = Number(b.titles) - Number(a.titles)
       return res
+    },
+    sortStatus(a, b) {
+      let res = Number(a.status) - Number(b.status)
+      return res
+    },
+    sortGraduateSchool(a, b) {
+
     },
     formatterDegree(row) {
       let v = this.selectDictLabel(this.dict.type.sys_user_degree, row.degree)

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-25 15:21:12
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-08 10:42:03
 -->
 <template>
   <div class="bg" v-loading="loading">
@@ -22,8 +22,12 @@
           </div>
           <div class="user-name">{{ form.nickName }}</div>
           <div class="user-sex">
-            {{ getAgeByIdCard(form.idCard) + '岁' }} {{ form.sex == '0' ? ' 男' : ' 女' }}
-            <el-tag :type="form.status == '在职' ? 'success' : 'warning'">{{ form.status }}</el-tag>
+            <span class="mr10">{{ getAgeByIdCard(form.idCard) + '岁' }} {{ form.sex == '0' ? ' 男' : ' 女' }}</span>
+            <el-tag type="success" v-if="form.status == '0'">在职</el-tag>
+            <el-tag type="danger" v-if="form.status == '1'">离职</el-tag>
+            <el-tag type="warning" v-if="form.status == '2'">退休</el-tag>
+            <el-tag type="primary" v-if="form.status == '3'">试用</el-tag>
+            <el-tag type="info" v-if="form.status == '4'">返聘</el-tag>
           </div>
         </div>
         <div class="info-item">
@@ -225,14 +229,6 @@ export default {
         }
       }
       this.postData = postArr.join('/')
-
-      if (this.form.status == '0') {
-        this.form.status = '在职'
-      } else if (this.form.status == '1') {
-        this.form.status = '离职'
-      } else {
-        this.form.status = '退休'
-      }
     },
     handleClick() {