新增人事管理按岗级排序

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

@@ -15,28 +15,29 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="19" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
           <el-form-item label="姓名" prop="nickName">
             <el-input v-model="queryParams.nickName" placeholder="请输入姓名" clearable style="width: 140px"
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="职称" prop="titles">
             <el-select v-model="queryParams.titles" clearable placeholder="请输入职称" style="width:100%;">
-                <el-option v-for="dict in dict.type.sys_user_titles" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
+              <el-option v-for="dict in dict.type.sys_user_titles" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
           </el-form-item>
           <el-form-item label="执业证书" prop="certificates">
             <el-select v-model="queryParams.certificates" clearable placeholder="请输入执业证书" style="width:100%;">
-                <el-option v-for="dict in dict.type.sys_user_certificates" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
+              <el-option v-for="dict in dict.type.sys_user_certificates" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
           </el-form-item>
           <el-form-item label="学历" prop="degree">
             <el-select v-model="queryParams.degree" clearable placeholder="请输入学历" style="width:100%;">
-                <el-option v-for="dict in dict.type.sys_user_degree" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
+              <el-option v-for="dict in dict.type.sys_user_degree" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -65,6 +66,9 @@
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
               v-hasPermi="['system:user:export']">导出</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <div style="text-align:right;font-size:14px;line-height:28px;">共{{ total }}条数据</div>
+          </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
@@ -78,7 +82,8 @@
           <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
           <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[0].visible"
             :show-overflow-tooltip="true" />
-          <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[1].visible" sortable :sort-method="sortAge">
+          <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[1].visible" sortable
+            :sort-method="sortAge">
             <template slot-scope="scope">
               {{ getAgeByIdCard(scope.row.idCard) }}
             </template>
@@ -94,10 +99,10 @@
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[4].visible"
             :show-overflow-tooltip="true" />
           <el-table-column label="岗级" align="center" key="postLevel" v-if="columns[5].visible"
-            :show-overflow-tooltip="true">
+            :show-overflow-tooltip="true" sortable :sort-method="sortPostLevel">
             <template slot-scope="scope">
               {{ selectDictLabel(dict.type.sys_user_postlevel, scope.row.postLevel) +
-                selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
+      selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
             </template>
           </el-table-column>
           <el-table-column label="职称" align="center" key="titles" prop="titles" v-if="columns[6].visible"
@@ -156,9 +161,8 @@
             </template>
           </el-table-column>
         </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" /> -->
       </el-col>
     </el-row>
     <!-- 添加或修改用户配置对话框 -->
@@ -239,7 +243,8 @@
                 value-format="yyyy-MM" />
             </el-form-item>
             <el-form-item label="政治面貌" prop="politicalAffiliation">
-              <el-select v-model="form.politicalAffiliation" multiple clearable placeholder="请选择政治面貌" style="width:100%;">
+              <el-select v-model="form.politicalAffiliation" multiple clearable placeholder="请选择政治面貌"
+                style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_political" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
@@ -407,7 +412,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 300,
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
@@ -759,6 +764,26 @@ export default {
     },
     sortAge(a, b) {
       return this.getAgeByIdCard(a.idCard) - this.getAgeByIdCard(b.idCard);
+    },
+    sortPostLevel(a, b) {
+      // 安全地解析postLevel，如果无法解析，则视为Infinity  
+      let aPostLevel = parseInt(a.postLevel, 10);
+      if (isNaN(aPostLevel)) {
+        aPostLevel = Infinity; // 无法解析时视为无穷大  
+      }
+      let bPostLevel = parseInt(b.postLevel, 10);
+      if (isNaN(bPostLevel)) {
+        bPostLevel = Infinity; // 同上  
+      }
+      // 首先比较postLevel  
+      if (aPostLevel !== bPostLevel) {
+        return aPostLevel - bPostLevel; // 注意：这里直接返回差值，但由于Infinity的特殊性，它会按预期工作  
+      }
+      // 如果postLevel相等，则比较salaryLevel（同样需要安全解析）  
+      let aSalaryLevel = parseInt(a.salaryLevel, 10) || 0; // 如果无法解析，则视为0  
+      let bSalaryLevel = parseInt(b.salaryLevel, 10) || 0; // 同上  
+      // 返回salaryLevel的差值  
+      return aSalaryLevel - bSalaryLevel;
     }
   }
 };