人事管理——审批流分页bug修复

src/views/staffmanage/confirmationmanage/index.vue

@@ -85,11 +85,11 @@
           <span>{{ parseTime(scope.row.serviceDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审批状态" align="center" width="150" prop="confirmationApprovalState">
+<!--      <el-table-column label="审批状态" align="center" width="150" prop="confirmationApprovalState">
         <template #default="scope">
           <dict-tag :options="confirmationmanage_state" :value="scope.row.confirmationApprovalState"/>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="拟转正日期" align="center" prop="proposedDate" width="140">
         <template v-slot:default="scope">
           <span>{{ parseTime(scope.row.proposedDate, '{y}-{m}-{d}') }}</span>

src/views/staffmanage/leavemanage/edit.vue

@@ -169,14 +169,14 @@
                  </el-date-picker>
                </el-form-item>
              </el-row>
-            <el-row>
+<!--            <el-row>
               <el-form-item label="审批" prop="managerOpinion" class="textForInput">
                 <el-radio-group v-model="form.managerOpinion" size="medium">
                   <el-radio v-for="(item, index) in managerOpinions" :key="index" :label="item.value"
                             :disabled="item.disabled">{{item.label}}</el-radio>
                 </el-radio-group>
               </el-form-item>
-            </el-row>
+            </el-row>-->
           <el-form-item class="bottom-button">
             <el-button @click="goBack" class="cancel-button">取 消</el-button>
             <el-button class="savecConfirm-button" @click="submitForm">确 定</el-button>

src/views/staffmanage/leavemanage/index.vue

@@ -107,11 +107,11 @@
         </template>
       </el-table-column>
       <el-table-column label="岗位" width="150" align="center" prop="position" />
-      <el-table-column label="审批状态" width="150" align="center" prop="leaveApprovalState">
+<!--      <el-table-column label="审批状态" width="150" align="center" prop="leaveApprovalState">
         <template #default="scope">
           <dict-tag :options="leavemanage_state" :value="scope.row.leaveApprovalState"/>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="聘用形式" width="150" align="center" prop="employmentForm">
           <template #default="scope">
             <dict-tag :options="employment_form" :value="scope.row.employmentForm"/>

src/views/staffmanage/onboardmanage/check.vue

@@ -305,17 +305,9 @@
               </el-select>
             </el-form-item>
           </el-row>
-          <el-row>
-            <el-form-item label="审批" prop="managerOpinion" class="textForInput">
-              <el-radio-group v-model="form.managerOpinion" size="medium">
-                <el-radio v-for="(item, index) in managerOpinions" :key="index" :label="item.value"
-                          :disabled="item.disabled">{{item.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-row>
           <el-form-item class="bottom-button">
             <el-button @click="cancel" class="cancel-button">取 消</el-button>
-            <el-button  class="savecConfirm-button" @click="saveOnDraft">保存</el-button>
+            <el-button  class="savecConfirm-button" @click="saveOnDraft">保 存</el-button>
             <el-button class="savecConfirm-button" @click="submitForm">确 定</el-button>
           </el-form-item>
         </el-form>

src/views/staffmanage/onboardmanage/edit.vue

@@ -298,17 +298,9 @@
               </el-select>
             </el-form-item>
           </el-row>
-          <el-row>
-            <el-form-item label="审批" prop="managerOpinion" class="textForInput">
-              <el-radio-group v-model="form.managerOpinion" size="medium">
-                <el-radio v-for="(item, index) in managerOpinions" :key="index" :label="item.value"
-                          :disabled="item.disabled">{{item.label}}</el-radio>
-                </el-radio-group>
-            </el-form-item>
-          </el-row>
           <el-form-item class="bottom-button">
             <el-button @click="cancel" class="cancel-button">取 消</el-button>
-            <el-button  class="savecConfirm-button" @click="saveOnDraft">保存</el-button>
+            <el-button  class="savecConfirm-button" @click="saveOnDraft">保 存</el-button>
             <el-button class="savecConfirm-button" @click="submitForm">确 定</el-button>
           </el-form-item>
         </el-form>

src/views/staffmanage/onboardmanage/index.vue

@@ -479,16 +479,24 @@ function fieldBeforeUpload(file) {
 /** 查询入职审批列表 */
 function getList() {
   loading.value = true;
-  listOnBoardManage(queryParams.value).then(response => {
-  /*  onboardmanageList.value = response.rows.filter(item=>
-        item.employmentApprovalState === 0 || 1
-    );*/
+
+  // 将筛选条件加入请求参数
+  const params = {
+    ...queryParams.value,
+    currentNode: 103,          // 将筛选条件放到请求参数中
+    employmentApprovalState: 2 // 让服务端进行筛选
+  };
+
+  listOnBoardManage(params).then(response => {
+    // 直接使用服务端返回的分页数据（不要在前端二次筛选）
     onboardmanageList.value = response.rows;
+
+    // 使用服务端返回的真实总数
     total.value = response.total;
+
     loading.value = false;
   });
 }
-
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;

src/views/staffmanage/personalmanage/components/confirmationmanageApprove.vue

@@ -231,7 +231,9 @@ const data = reactive({
     isPassPeriod: null,
     departManagerSignature: null,
     officialConversionDate: null,
-    managerConfirm: null
+    managerConfirm: null,
+    currentNode:null,
+    confirmationApprovalState:null
   },
   rules: {
   }
@@ -337,36 +339,41 @@ function handleSelectionChange1(val) {
   this.selectedRows = val;
 }
 /** 查询转正审批列表 */
-function getList() {
+async function getList() {
   loading.value = true;
   const userStore = useUserStore();
-  userStore.getInfo(); // 确保用户信息已加载
+  await userStore.getInfo(); // 确保用户信息已加载
+
   const roleKey = userStore.roles[0]; // 获取当前用户的角色 ID
-  console.log("当前角色ID:", roleKey);
-  let filterNode;
-  if (roleKey === "common") {
-    filterNode = 89;  // 普通员工
-  } else if (roleKey === "hr") {
-    filterNode = 90;  // hr
-  } else if (roleKey === "project-manager") {
-    filterNode = 91;  // 项目经理
-  } else if (roleKey === "general-manager") {
-    filterNode = 92;  // 总经理
-  } else {
-    filterNode = null;  // 如果没有匹配到角色，则不过滤
-  }
-  listConfirmationManage(queryParams.value).then(response => {
-    // 根据角色过滤数据
-    let filteredList = response.rows;
-    if (filterNode !== null) {
-      filteredList = response.rows.filter(item => item.currentNode === filterNode);
-    }
-    confirmationmanageList.value = filteredList;
-    // 设置过滤后的 total 数量
-    total.value = filteredList.length;
+  console.log("当前角色id:", roleKey);
+
+  // 构建动态查询参数
+  const params = {
+    ...queryParams.value,
+    currentNode: null // 初始化参数
+  };
+
+  const  roleNodeMap = {
+    'common': 89, // 普通员工
+    'hr': 90, // hr
+    'project-manager': 91,// 项目经理
+    'general-manager': 92  // 总经理
+  };
 
+  if (roleNodeMap[roleKey]) {
+    params.currentNode = roleNodeMap[roleKey];
+    console.log("当前角色-ID:", params.currentNode);
+  }
+  try{
+    const response = await listConfirmationManage(params);
+    confirmationmanageList.value = response.rows;
+    total.value = response.total;
     loading.value = false;
-  });
+  }catch (error){
+    console.log(error);
+  }finally {
+    loading.value = false;
+  }
 }
 /** 搜索按钮操作 */
 function handleQuery() {

src/views/staffmanage/personalmanage/components/leavemanageApprove.vue

@@ -360,37 +360,41 @@ function handleSelectionChange1(val) {
   this.selectedRows = val;
 }
 /** 查询转正审批列表 */
-function getList() {
+async function getList() {
   loading.value = true;
   const userStore = useUserStore();
-  userStore.getInfo(); // 确保用户信息已加载
+  await userStore.getInfo(); // 确保用户信息已加载
+
   const roleKey = userStore.roles[0]; // 获取当前用户的角色 ID
-  console.log("当前角色ID:", roleKey);
-  let filterNode;
-  if (roleKey === "common") {
-    filterNode = 106;  // 普通员工
-  } else if (roleKey === "project-manager") {
-    filterNode = 107;  // 项目经理
-  } else if (roleKey === "work-manage") {
-    filterNode = 108;  // 工作交接人
-  } else if (roleKey === "hr") {
-    filterNode = 109;  // hr
-  } else {
-    filterNode = null;  // 如果没有匹配到角色，则不过滤
-  }
-  listLeaveManage(queryParams.value).then(response => {
-    // 根据角色过滤数据
-    let filteredList = response.rows;
-    if (filterNode !== null) {
-      filteredList = response.rows.filter(item => item.currentNode === filterNode);
-    }
-    resignationList.value = filteredList;
-    // 设置过滤后的 total 数量
-    total.value = filteredList.length;
+  console.log("当前角色id:", roleKey);
 
-    loading.value = false;
+  // 构建动态查询参数
+  const params = {
+    ...queryParams.value,
+    currentNode: null // 初始化参数
+  };
 
-  });
+  const  roleNodeMap = {
+    'common': 106, // 普通员工
+    'project-manager': 107, // 项目经理
+    'work-manage': 108,// 项目经理
+    'hr': 109  // hr
+  };
+
+  if (roleNodeMap[roleKey]) {
+    params.currentNode = roleNodeMap[roleKey];
+    console.log("当前角色-ID:", params.currentNode);
+  }
+  try{
+    const response = await listLeaveManage(params);
+    resignationList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  }catch (error){
+    console.log(error);
+  }finally {
+    loading.value = false;
+  }
 }
 /** 搜索按钮操作 */
 function handleQuery() {

src/views/staffmanage/personalmanage/components/onboardmanageApprove.vue

@@ -303,6 +303,7 @@ const data = reactive({
     educationLevel: null,
     employmentForm: null,
     employeeState: null,
+    currentNode:null
   },
   rules: {}
 });
@@ -436,39 +437,41 @@ function fieldBeforeUpload(file) {
 }
 
 /** 查询入职审批列表 */
-function getList() {
+async function getList() {
   loading.value = true;
   const userStore = useUserStore();
-  userStore.getInfo(); // 确保用户信息已加载
+  await userStore.getInfo(); // 确保用户信息已加载
+
   const roleKey = userStore.roles[0]; // 获取当前用户的角色 ID
-  console.log("当前角色ID:", roleKey);
-  let filterNode;
-  if (roleKey === "project-manager") {
-    filterNode = 101;  // 项目经理
-  } else if (roleKey === "general-manager") {
-    filterNode = 102;  // 总经理
-  } else if (roleKey === "hr") {
-    filterNode = 103;  // HR
-  } else {
-    filterNode = null;  // 如果没有匹配到角色，则不过滤
-  }
-  listOnBoardManage(queryParams.value).then(response => {
-    // 根据角色过滤数据
-    let filteredList = response.rows;
-    if (filterNode !== null) {
-      filteredList = response.rows.filter(item => item.currentNode === filterNode);
-    }
+  console.log("当前角色id:", roleKey);
 
-    // 设置过滤后的数据
-    onboardmanageList.value = filteredList;
+  // 构建动态查询参数
+  const params = {
+    ...queryParams.value,
+    currentNode: null // 初始化参数
+  };
 
-    // 设置过滤后的 total 数量
-    total.value = filteredList.length;
+  const  roleNodeMap = {
+    'project-manager': 101, // 项目经理
+    'general-manager': 102, // 总经理
+    'hr': 103  // HR
+  };
 
+  if (roleNodeMap[roleKey]) {
+    params.currentNode = roleNodeMap[roleKey];
+    console.log("当前角色-ID:", params.currentNode);
+  }
+  try{
+    const response = await listOnBoardManage(params);
+    onboardmanageList.value = response.rows;
+    total.value = response.total;
     loading.value = false;
-  });
+   }catch (error){
+     console.log(error);
+   }finally {
+     loading.value = false;
+   }
 }
-
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
@@ -592,10 +595,6 @@ function handleExport() {
 onMounted(() => {
   const userStore = useUserStore();
   userStore.getInfo(); // 确保用户信息已加载
-  const currentUserId = userStore.id; // 获取当前用户的 id
-  const RoleId = userStore.roles[0]; // 获取当前用户的角色 ID
-  console.log("当前用户 ID:", currentUserId);
-  console.log("当前角色ID:", RoleId);
   getList();
 });
 </script>