新增项目前端排序

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectProgressController.java

@@ -82,7 +82,7 @@ public class CmcProjectProgressController extends BaseController
         //如100%进度，则表示已完成；当项目流转流程结束，项目状态才结束
         //忽略从100调整到100以下，已完成状态未及时变为未完成的情况；如果考虑此情况，将导致每次执行都会产生修改项目表操作记录，意义不大，且占数据库资源
         if (cmcProjectProgress.getPercentage().equals("100")) {
-            CmcProject cmcProject = new CmcProject();
+            CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(cmcProjectProgress.getProjectId());
             cmcProject.setIsComplete("1");
             cmcProjectService.updateCmcProject(cmcProject);
         }

oa-ui/src/components/Pagination/index.vue

@@ -1,17 +1,8 @@
 <template>
-  <div :class="{'hidden':hidden}" class="pagination-container">
-    <el-pagination
-      :background="background"
-      :current-page.sync="currentPage"
-      :page-size.sync="pageSize"
-      :layout="layout"
-      :page-sizes="pageSizes"
-      :pager-count="pagerCount"
-      :total="total"
-      v-bind="$attrs"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
+  <div :class="{ 'hidden': hidden }" class="pagination-container">
+    <el-pagination :background="background" :current-page.sync="currentPage" :page-size.sync="pageSize" :layout="layout"
+      :page-sizes="pageSizes" :pager-count="pagerCount" :total="total" v-bind="$attrs" @size-change="handleSizeChange"
+      @current-change="handleCurrentChange" />
   </div>
 </template>
 
@@ -36,7 +27,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [10, 20, 30, 50, 150, 200]
       }
     },
     // 移动端页码按钮的数量端默认值5
@@ -108,6 +99,7 @@ export default {
   background: #fff;
   padding: 32px 16px;
 }
+
 .pagination-container.hidden {
   display: none;
 }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-02 14:24:27
+ * @LastEditTime: 2025-01-07 15:34:38
 -->
 <template>
   <div class="project-wrapper">
@@ -59,25 +59,25 @@
       <el-table v-loading="loading" :data="projectList" style="margin-top: 30px;">
         <el-table-column type="index" width="50">
         </el-table-column>
-        <el-table-column prop="isFinshed" align="center" label="状态" width="90px">
+        <el-table-column prop="isFinshed" align="center" label="状态" width="90px" sortable :sort-method="sortIsFinshed">
           <template slot-scope="scope">
             <el-tag :type="scope.row.isFinished === '0' ? 'success' : 'warning'" disable-transitions>
               {{ scope.row.isFinished == '0' ? '进行中' : '已结束' }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="percentage" align="center" label="生产进度" width="120px">
+        <el-table-column prop="percentage" align="center" label="生产进度" width="120px" sortable>
           <template slot-scope="scope">
             <el-progress :text-inside="true" :stroke-width="26" :status="formatStatus(scope.row.percentage)"
               :percentage="scope.row.percentage" text-color="#fff"></el-progress>
           </template>
         </el-table-column>
-        <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px" />
-        <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
-        <el-table-column label="承担部门" align="center" key="undertakingDeptName" prop="undertakingDeptName" />
-        <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName"
+        <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px" sortable  />
+        <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" sortable />
+        <el-table-column label="承担部门" align="center" key="undertakingDeptName" prop="undertakingDeptName" sortable />
+        <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" sortable
           width="120px" />
-        <el-table-column label="项目级别" align="center" key="projectLevel" prop="projectLevel" width="120px">
+        <el-table-column label="项目级别" align="center" key="projectLevel" prop="projectLevel" width="120px" sortable>
           <template slot-scope="scope">
             <el-tag :type="scope.row.projectLevel ? (scope.row.projectLevel === '0' ? 'info' : 'danger') : 'info'"
               disable-transitions>
@@ -85,7 +85,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" width="120px" />
+        <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" width="120px" sortable />
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template slot-scope="scope" v-if="scope.row.userId !== 1">
             <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
@@ -546,6 +546,10 @@ export default {
       }
       return path
     },
+    sortIsFinshed(a,b){
+      console.log(a,b);
+      return Number(a.isFinished) - Number(b.isFinished)
+    }
   },
 }
 </script>