网页端：修改绩效审批打印及流程取消

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-29 14:29:39
+ * @LastEditTime: 2025-06-09 09:32:10
  */
 import request from '@/utils/request'
 
@@ -117,7 +117,7 @@ const apiEndpoints = [
     procDefName: '绩效审批',
     apiUrl: [
       '/oa/performance/:id',
-      '/oa/wage/batch/:id'
+      '/oa/performanceStaff/:id'
     ]
   },
   {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-09-29 17:20:07
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-06-06 16:27:32
+ * @LastEditTime: 2025-06-09 09:58:25
 -->
 <template>
   <div>
@@ -24,9 +24,9 @@
         </tr>
         <tr>
           <td :colspan="9">
-            <table border="1" style="width:100%;">
-              <tr>
-                <td style="width:50px;">序号</td>
+            <table border="1" style="width:100%;text-align: center;">
+              <tr style="font-weight: bold;">
+                <td style="width:70px;">序号</td>
                 <td>姓名</td>
                 <td>部门</td>
                 <td>生产绩效</td>
@@ -38,9 +38,9 @@
                 <td>{{ index + 1 }}</td>
                 <td>{{ item.nickName }}</td>
                 <td>{{ item.dept.deptName }}</td>
-                <td style="text-align: right;">{{ item.producePerformance }}</td>
-                <td style="text-align: right;">{{ item.managePerformance }}</td>
-                <td style="text-align: right;">{{ (item.producePerformance + item.managePerformance).toFixed(2) }}</td>
+                <td style="text-align: right;">{{ item.producePerformance.toFixed(2) }}</td>
+                <td style="text-align: right;">{{ item.managePerformance.toFixed(2) }}</td>
+                <td style="text-align: right;">{{ (Number(item.producePerformance) + Number(item.managePerformance)).toFixed(2) }}</td>
                 <td>{{ parseTime(item.performanceMonth, '{y}-{m}') }}</td>
               </tr>
               <tr v-if="!performanceTableData || performanceTableData.length === 0">
@@ -49,14 +49,15 @@
               <tr>
                 <td colspan="3">总计</td>
                 <td style="text-align: right;">
-                  {{ performanceTableData.reduce((acc, curr) => acc + Number(curr.producePerformance), 0).toFixed(2) }}
+                  {{ performanceTableData.reduce((acc, curr) => acc + Number(curr.producePerformance || 0), 0).toFixed(2) }}
                 </td>
                 <td style="text-align: right;">
-                  {{ performanceTableData.reduce((acc, curr) => acc + Number(curr.managePerformance), 0).toFixed(2) }}
+                  {{ performanceTableData.reduce((acc, curr) => acc + Number(curr.managePerformance || 0), 0).toFixed(2) }}
                 </td>
                 <td style="text-align: right;">
-                  {{ performanceTableData.reduce((acc, curr) => acc + Number(curr.producePerformance) + Number(curr.managePerformance), 0).toFixed(2) }}
+                  {{ performanceTableData.reduce((acc, curr) => acc + Number(curr.producePerformance || 0) + Number(curr.managePerformance || 0), 0).toFixed(2) }}
                 </td>
+                <td></td>
               </tr>
             </table>
           </td>

oa-ui/src/views/flowable/form/performance/performanceForm.vue

@@ -267,7 +267,25 @@
       </div>
     </el-dialog>
     <el-dialog title="打印绩效统计表" :visible.sync="printDialogVisible" width="800px" append-to-body>
-      <performance-print :form="form" :performanceTableData="performanceTableData"
+      <div class="mb20">
+        <el-radio-group v-model="selectedPrintType">
+          <el-radio label="all">打印全部部门</el-radio>
+          <el-radio label="selected">选择部门打印</el-radio>
+        </el-radio-group>
+        <div v-if="selectedPrintType === 'selected'" class="mt10">
+          <el-select v-model="selectedDepts" multiple placeholder="请选择要打印的部门" style="width: 100%">
+            <el-option
+              v-for="dept,index in availableDepts"
+              :key="index + dept.deptName"
+              :label="dept.deptName"
+              :value="dept.deptName">
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+      <performance-print 
+        :form="form" 
+        :performanceTableData="filteredPerformanceData"
         @cancel="printDialogVisible = false" />
     </el-dialog>
     <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
@@ -283,6 +301,7 @@ import { listPerformance, getPerformance, addPerformance, updatePerformance, del
 import { listPerformanceStaff, getPerformanceStaff, updatePerformanceStaff, getMonthPerformanceList } from "@/api/oa/performance/performanceStaff";
 import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept, getUserByPost } from '@/api/system/post'
 import { listProject } from "@/api/oa/project/project";
+import { downloadTemplate } from "@/api/file/project";
 import { getUserByRole } from "@/api/system/role";
 import { getToken } from "@/utils/auth";
 import PerformancePrint from '../components/print/performancePrint.vue';
@@ -353,6 +372,19 @@ export default {
       returnOpen: false,
       showAlter: true,
       groupedPerformanceData: [],
+      selectedPrintType: 'all',
+      selectedDepts: [],
+      availableDepts: [],
+    }
+  },
+  computed: {
+    filteredPerformanceData() {
+      if (this.selectedPrintType === 'all') {
+        return this.performanceTableData;
+      }
+      return this.performanceTableData.filter(item => 
+        this.selectedDepts.includes(item.dept?.deptName)
+      );
     }
   },
   created() {
@@ -537,10 +569,10 @@ export default {
     },
     /* 下载模板 */
     importTemplate() {
-      const path = '/profile/upload/template/userWage.xlsx'
+      const path = '/profile/upload/template/绩效模版.xlsx'
       downloadTemplate(path).then(res => {
         const blob = new Blob([res])
-        saveAs(blob, '社保公积金模版.xlsx');
+        saveAs(blob, '绩效模版.xlsx');
       });
     },
     handleEdit(row, type) {
@@ -637,6 +669,17 @@ export default {
       this.showAlter = val
     },
     printPerformanceTable() {
+      // Get unique departments from performance data
+      const deptMap = new Map();
+      this.performanceTableData.forEach(item => {
+        if (item.dept?.deptName) {
+          deptMap.set(item.dept.deptName, item.dept);
+        }
+      });
+      console.log(this.performanceTableData);
+      this.availableDepts = Array.from(deptMap.values());
+      this.selectedDepts = [];
+      this.selectedPrintType = 'all';
       this.printDialogVisible = true;
     },
   }