人效管理-绩效管理-绩效填报-接口对接

src/api/performanceManagement/dataReporting.js

@@ -1,6 +1,6 @@
 // 绩效填报相关接口
 import request from '@/axios';
-// 1. 绩效模板内容列表
+// 1. 绩效内容维护内容列表
 export function listBsEfficiencyTempParam(params) {
   return request({
     url: '/blade-desk/bsEfficiencyTempParam/list',
@@ -8,7 +8,7 @@ export function listBsEfficiencyTempParam(params) {
     params
   })
 }
-// 2. 绩效模板内容删除
+// 2. 绩效内容维护内容删除
 export function removeBsEfficiencyTempParam(params) {
   return request({
     url: '/blade-desk/bsEfficiencyTempParam/remove',
@@ -16,7 +16,7 @@ export function removeBsEfficiencyTempParam(params) {
     params
   })
 }
-// 3. 绩效模板内容新增
+// 3. 绩效内容维护内容新增
 export function submitBsEfficiencyTempParam(data) {
   return request({
     url: '/blade-desk/bsEfficiencyTempParam/submit',
@@ -24,3 +24,87 @@ export function submitBsEfficiencyTempParam(data) {
     data
   })
 }
+// 绩效填报相关接口
+// 4. 绩效填报分页查询
+export function pageBsEfficiencyTask(params) {
+  return request({
+    url: '/blade-desk/bsEfficiencyTask/page',
+    method: 'get',
+    params
+  })
+}
+// 5. 绩效填报审批通过
+export function approvalBsEfficiencyTask(data) {
+  return request({
+    url: '/blade-desk/bsEfficiencyTask/approval',
+    method: 'post',
+    data
+  })
+}
+// 6. 绩效填报审批不通过
+export function rejectBsEfficiencyTask(data) {
+  return request({
+    url: '/blade-desk/bsEfficiencyTask/reject',
+    method: 'post',
+    data
+  })
+}
+// 7. 绩效填报任务明细填报
+export function subReportBsEfficiencyTask(data) {
+  return request({
+    url: '/blade-desk/bsEfficiencyTask/subReport',
+    method: 'post',
+    data
+  })
+}
+// 8. 绩效填报任务明细重置
+export function subResetBsEfficiencyTask(data) {
+  return request({
+    url: '/blade-desk/bsEfficiencyTask/subReset',
+    method: 'post',
+    data
+  })
+}
+// 9. 绩效填报任务明细删除
+export function removeBsEfficiencyTask(params) {
+  return request({
+    url: '/blade-desk/bsEfficiencyTask/remove',
+    method: 'post',
+    params
+  })
+}
+// 10. 绩效填报读取Excel
+export function readExcelBsEfficiencyTask(data) {
+  return request({
+    url: '/blade-desk/bsEfficiencyTask/read-excel',
+    method: 'post',
+    data,
+    headers: { 'Content-Type': 'multipart/form-data' }
+  })
+}
+
+// 11. 绩效填报详情
+export function detailBsEfficiencyTask(params) {
+  return request({
+    url: '/blade-desk/bsEfficiencyTask/detail',
+    method: 'get',
+    params
+  })
+}
+// 12. 绩效填报任务填报
+export function reportBsEfficiencyTask(data) {
+  return request({
+    url: '/blade-desk/bsEfficiencyTask/report',
+    method: 'post',
+    data
+  })
+}
+// 13.绩效填报下载任务填报
+export function downloadBsEfficiencyTaskTemplate(params) {
+  return request({
+    url: '/blade-desk/bsEfficiencyTask/download-excel-template',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}

src/views/personnelEfficiencyManagement/performanceManagement/components/batchAddContent.vue

@@ -89,6 +89,10 @@ export default {
               ...item,
               _select: false,
             }));
+            // 如果没有总分行，添加一个
+            if (!hasTotalRow) {
+              this.form.tableData.push({ _select: false, paramName: '总分' });
+            }
           } else {
             this.form.tableData = [{ _select: false, paramName: '总分' }];
             this.addTable();
@@ -166,17 +170,25 @@ export default {
           });
           return;
         }
-        const submitData = this.form.tableData.map(row => {
+        const submitData = this.form.tableData
+          // 过滤：只要 姓名/员工工号 不等于 总分 的行
+          .filter(row => {
+            // 适配你的字段：name=姓名，cardNo=员工工号
+            return row.paramName !== '总分';
+          })
+          // 去掉不需要的 _select 字段
+          .map(row => {
             const { _select, ...validData } = row;
             return validData;
           });
+        console.log('提交数据（已过滤总分）', submitData);
         console.log('提交数据', submitData); // 你可以看到日志
         submitBsEfficiencyTempParam(submitData).then(res => {
           if (res.data.code === 200) {
             this.$message.success('保存成功');
             this.closeDialog(true); // 成功后刷新父页面
           }
-        });
+        })
       });
     },
   },

src/views/personnelEfficiencyManagement/performanceManagement/components/prefDetail.vue

@@ -1,5 +1,12 @@
 <template>
-    <el-dialog title="详情" append-to-body :modelValue="openShow" fullscreen width="70%" @close="closeDialog()">
+  <el-dialog
+    title="详情"
+    append-to-body
+    :modelValue="openShow"
+    fullscreen
+    width="70%"
+    @close="closeDialog()"
+  >
     <!-- 绩效详情 -->
     <avue-crud
       :option="option"
@@ -15,24 +22,28 @@
       @refresh-change="refreshChange"
     >
       <template #menu-right>
-                <el-button type="primary">附件下载(明细)</el-button>
-                <el-button type="primary">附件下载(汇总)</el-button>
+        <el-button type="primary" @click="downloadDetail">附件下载(明细)</el-button>
+        <el-button type="primary" @click="downloadSummary">附件下载(汇总)</el-button>
       </template>
     </avue-crud>
   </el-dialog>
 </template>
-
 <script>
+import {
+  detailBsEfficiencyTask,
+  downloadBsEfficiencyTaskTemplate,
+} from '@/api/performanceManagement/dataReporting';
+import { downloadXls, downloadFile, downloadFileBlob } from '@/utils/util';
 export default {
   props: {
     showDetail: {
       type: Boolean,
-            default:false
+      default: false,
     },
-        detailData:{
+    row: {
       type: Object,
-            default:()=>({})
-        }
+      default: () => ({}),
+    },
   },
   data() {
     return {
@@ -40,11 +51,11 @@ export default {
       loading: false,
       form: {},
       option: {
-                height: "auto",
-                align: "center",
+        height: 'auto',
+        align: 'center',
         calcHeight: 32,
-                rowKey: "id",
-                rowParentKey: "parentId",
+        rowKey: 'id',
+        rowParentKey: 'parentId',
         tip: false,
         simplePage: true,
         searchShow: true,
@@ -59,12 +70,12 @@ export default {
         delBtn: false,
         addBtn: false,
         editBtn: false,
-                editBtnText: "修改",
-                addBtnIcon: " ",
-                viewBtnIcon: " ",
-                delBtnIcon: " ",
-                editBtnIcon: " ",
-                viewBtnText: "详情",
+        editBtnText: '修改',
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        viewBtnText: '详情',
         labelWidth: 120,
         searchLabelWidth: 120,
         menu: false,
@@ -79,14 +90,14 @@ export default {
         excelBtn: true,
         columnSort: true,
         showOverflowTooltip: true,
-                searchLabelPosition: "left",
-                searchLabelPosition: "left",
+        searchLabelPosition: 'left',
+        searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
-                menuAlign: "center",
+        menuAlign: 'center',
         gridBtn: false,
-                searchMenuPosition: "right",
-                column: []
+        searchMenuPosition: 'right',
+        column: [],
       },
       page: {
         pageSize: 10,
@@ -97,57 +108,101 @@ export default {
       columnData: [
         { label: '员工工号', prop: 'cardNo' },
         { label: '姓名', prop: 'name' },
-            ]
-        }
+      ],
+    };
   },
   created() {
-        this.openShow = this.showDetail
-        this.columnData.map(item =>{
-            this.option.column.push({
-                label:item.label,
-                prop:item.prop,
-                search:(item.label == '员工工号' || item.label == '姓名') ? true : false
-            })
-        })
-        this.onLoad()
+    this.openShow = this.showDetail;
+    this.onLoad();
   },
   methods: {
     closeDialog(val) {
-            console.log('3333333333333333333')
-            this.openShow = false
-            this.$emit('closeDetail',val)
+      this.openShow = false;
+      this.$emit('closeDetail', val);
     },
     searchChange(params, done) {
       this.query = params;
-            this.page.currentPage = 1
-            this.onLoad()
-            done()
+      this.page.currentPage = 1;
+      this.onLoad();
+      done();
     },
     searchReset() {
-            this.query = {}
-            this.onLoad()
+      this.query = {};
+      this.onLoad();
     },
     currentChange(currentPage) {
-            this.page.currentPage = currentPage
+      this.page.currentPage = currentPage;
     },
     sizeChange(pageSize) {
-            this.page.pageSize = pageSize
+      this.page.pageSize = pageSize;
     },
     refreshChange() {
-            this.onLoad()
+      this.onLoad();
     },
     onLoad() {
-            this.data = [
-                {id:"001",cardNo:"001",name:"张三"},
-                {id:"002",cardNo:"002",name:"李四"},
-                {id:"003",cardNo:"003",name:"王五"},
-            ]
-            this.page.total = this.data.length
+      this.loading = true;
+      const params = {
+        id: this.row.id,
+        ...this.query,
+      };
+      detailBsEfficiencyTask(params)
+        .then(res => {
+          if (res.data.code === 200) {
+            this.data = res.data.data.table.tableDataList || [];
+            const arr = res.data.data.table.tableColumn;
+            arr.push({ ...arr[0], prop: arr[0].prop + 'Exact', hide: true, search: true });
+            arr.push({ ...arr[1], prop: arr[1].prop + 'Exact', hide: true, search: true });
+            res.data.data.table.tableColumn = arr.map(item => ({ ...item, sortable: true }));
+            this.option.column = res.data.data.table.tableColumn;
+          } else {
+            this.data = [];
+            this.page.total = 0;
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.data = [];
+          this.page.total = 0;
+          this.loading = false;
+        });
+    },
+    downloadDetail() {
+      if (!this.row.subTasks || this.row.subTasks.length === 0) {
+        this.$message.warning('暂无可下载文件！');
+        return;
       }
+      const completedTasks = this.row.subTasks.filter(task => task.status === 2);
+      if (completedTasks.length === 0) {
+        this.$message.warning('暂无可下载文件！');
+        return;
       }
+      // 调用模板下载接口
+      downloadBsEfficiencyTaskTemplate()
+        .then(res => {
+          downloadXls(res.data, `${this.row.yearMonth}绩效填报模板.xlsx`);
+          this.row.subTasks.forEach(task => {
+            if (task.attachLink != '') {
+              downloadFileBlob(task.attachLink, task.taskName + '.xlsx');
+              return;
+            }
+          });
+        })
+        .catch(error => {
+          console.error('下载模板失败:', error);
+          this.$message.error('下载失败，请检查网络或稍后重试');
+        });
+    },
+    downloadSummary() {
+      this.row.subTasks.forEach(task => {
+        if (task.attachLink != '') {
+          downloadFileBlob(task.attachLink, task.taskName + '.xlsx');
+          return;
         }
+      });
+    },
+  },
+};
 </script>
 
 <style>
-
 </style>

src/views/personnelEfficiencyManagement/performanceManagement/components/reportingPerf.vue

@@ -1,17 +1,32 @@
 <template>
-    <el-dialog :title="title" append-to-body :modelValue="openShow" width="70%" @close="closeDialog()">
+  <el-dialog
+    :title="title"
+    append-to-body
+    :modelValue="openShow"
+    width="70%"
+    @close="closeDialog()"
+  >
     <avue-form
       :option="excelOption"
       v-model="excelForm"
       :upload-after="uploadAfter"
-        ></avue-form>
-        <el-button type="primary" v-if="!isDetail" text style="position: absolute;top: 80px;left: 460px;">读取文件</el-button>
+      :upload-before="uploadBefore"
+    >
+      <template #readExcel>
+        <el-button type="primary" @click="readExcel" v-if="!isDetail">
+          读取文件<i class="el-icon-download el-icon--right"></i>
+        </el-button>
+      </template>
+    </avue-form>
     <el-table v-show="isRead && !isDetail" :data="tableData">
+      <el-table-column type="index" width="50" label="序号" />
       <el-table-column
-                type="index"
-                width="50">
-            </el-table-column>
-            <el-table-column v-for="item in tableColumn" :key="item.prop" :label="item.label" :prop="item.prop" align="center"></el-table-column>
+        v-for="item in tableColumn"
+        :key="item.prop"
+        :label="item.label"
+        :prop="item.prop"
+        align="center"
+      />
     </el-table>
     <template #footer>
       <span class="dialog-footer">
@@ -23,24 +38,36 @@
 </template>
 
 <script>
+import {
+  readExcelBsEfficiencyTask,
+  reportBsEfficiencyTask,
+  subReportBsEfficiencyTask,
+} from '@/api/performanceManagement/dataReporting';
 export default {
   props: {
     title: {
       type: String,
-            default:''
+      default: '',
     },
     showReport: {
       type: Boolean,
-            default:false
+      default: false,
     },
     isDetail: {
       type: Boolean,
-            default:false
-        }
+      default: false,
+    },
+    row: {
+      type: Object,
+      default: null,
+    },
   },
   data() {
     return {
       openShow: false,
+      excelForm: {
+        excelFile: [],
+      },
       excelOption: {
         submitBtn: false,
         emptyBtn: false,
@@ -49,15 +76,16 @@ export default {
             label: '填报文件',
             prop: 'excelFile',
             type: 'upload',
-                        drag: true,
-                        loadText: '文件上传中，请稍等',
-                        span: 24,
+            span: 12,
+            limit: 1,
+            fileSize: 50000,
             propsHttp: {
               res: 'data',
+              attachId: 'attachId', // 关键：指定附件ID字段
             },
             accept: '.xls,.xlsx',
             tip: '请上传 .xls,.xlsx 标准格式文件，文件最大5M',
-                        action: '/blade-system/user/import-user',
+            action: '/api/blade-resource/oss/endpoint/put-file-attach',
             rules: [
               {
                 required: true,
@@ -66,28 +94,109 @@ export default {
               },
             ],
           },
+          {
+            label: '',
+            prop: 'readExcel',
+            formslot: true,
+            span: 12,
+          },
         ],
       },
       tableData: [],
-            isRead:true,
+      isRead: false,
       tableColumn: [
         { label: '员工工号', prop: 'cardNo' },
         { label: '姓名', prop: 'name' },
-            ]
-        }
+      ],
+      attachId: null,
+      formData: null,
+    };
   },
   created() {
-        this.openShow = this.showReport
+    this.openShow = this.showReport;
   },
   methods: {
     closeDialog(val) {
-            this.openShow = false
-            this.$emit('closeDialog',val)
+      this.openShow = false;
+      // 清空数据
+      this.excelForm = { excelFile: [] };
+      this.attachId = null;
+      this.tableData = [];
+      this.isRead = false;
+      this.$emit('closeDialog', val);
+    },
+    // 上传前（不用改，保留）
+    uploadBefore(file, done, loading, column) {
+      this.formData = file;
+      done(); // 必须执行，允许上传
+    },
+    // 上传后（修复版）
+    uploadAfter(file, done, loading, column) {
+      console.log('上传成功返回:', file);
+      // 正确获取 attachId
+      this.attachId = file.attachId || file.data?.attachId;
+      done();
+    },
+    // 读取Excel（关键修复）
+    readExcel() {
+      if (!this.attachId) {
+        this.$message.warning('请先上传文件');
+        return;
+      }
+      readExcelBsEfficiencyTask({ file: this.formData })
+        .then(res => {
+          if (res.data.code === 200) {
+            this.tableData = res.data.data.tableData || [];
+            this.tableColumn = res.data.data.tableColumn || [];
+            this.isRead = true;
+            this.$message.success('文件读取成功');
+          } else {
+            this.$message.error('文件读取失败');
+          }
+        })
+        .catch(() => {
+          this.$message.error('文件读取接口异常');
+        });
+    },
+    // 提交表单
+    submitForm() {
+      if (!this.attachId) {
+        this.$message.error('请先上传文件');
+        return;
+      }
+      let params = {};
+      if (!this.isDetail) {
+        params = {
+          id: this.row.id,
+          attachId: this.attachId,
+          table: {
+            tableData: this.tableData,
+            tableColumn: this.tableColumn,
+          },
+        };
+        reportBsEfficiencyTask(params).then(res => {
+          if (res.data.code === 200) {
+            this.$message.success('提交成功');
+            this.closeDialog(true);
+          } else {
+            this.$message.error('提交失败');
           }
+        });
+      } else {
+        params = {
+          id: this.row.id,
+          attachId: this.attachId,
+        };
+        subReportBsEfficiencyTask(params).then(res => {
+          if (res.data.code === 200) {
+            this.$message.success('提交成功');
+            this.closeDialog(true);
+          } else {
+            this.$message.error('提交失败');
           }
+        });
       }
+    },
+  },
+};
 </script>
-
-<style>
-
-</style>

src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue

@@ -17,39 +17,6 @@
       @cell-click="cellClick"
     >
     </avue-crud>
-    <!-- 绩效详情弹窗 -->
-    <el-dialog title="公示详情" v-model="showExcel" append-to-body width="85%">
-      <div>
-        月份：
-        <el-date-picker
-          v-model="monthValue"
-          type="month"
-          placeholder="选择月份"
-          :disabled-date="pickerOptions"
-        >
-        </el-date-picker>
-        <el-button type="primary" style="margin-left: 10px" @click="queryPerformance">
-          查询
-        </el-button>
-      </div>
-      <el-table :data="detailList" style="margin-top: 10px" border>
-        <el-table-column align="center" label="KPI得分" prop="KPI" width="75" />
-        <el-table-column align="center" label="量化得分" prop="lh" width="80" />
-        <el-table-column align="center" label="订单准时完成率" prop="orderTime" width="130" />
-        <el-table-column align="center" label="重点零件完成率" prop="keyPoint" width="130" />
-        <el-table-column align="center" label="后工序审理单分数" prop="after" width="140" />
-        <el-table-column align="center" label="出厂不合格率DPP" prop="unqualified" width="140" />
-        <el-table-column align="center" label="成本费用率" prop="costMoney" width="95" />
-        <el-table-column align="center" label="通报" prop="notice" />
-        <el-table-column align="center" label="请假扣分" prop="leave" width="80" />
-        <el-table-column align="center" label="考勤扣分" prop="check" width="80" />
-        <el-table-column align="center" label="投稿加分项" prop="add" width="100" />
-        <el-table-column align="center" label="群策群力" prop="all" width="80" />
-        <el-table-column align="center" label="优秀员工加分" prop="excellence" width="120" />
-        <el-table-column align="center" label="成本" prop="cost" width="55" />
-        <el-table-column align="center" label="总分" prop="total" width="55" />
-      </el-table>
-    </el-dialog>
   </basic-container>
 </template>
 
@@ -59,7 +26,6 @@ export default {
   name: 'PerformanceDisclosure',
   data() {
     return {
-      // 弹窗
       showExcel: false,
       monthValue: '',
       // 详情数据
@@ -75,12 +41,10 @@ export default {
         currentPage: 1,
         total: 0,
       },
-      // 配置
       pickerOptions: time => {
         const year = new Date().getFullYear();
-        return time.getFullYear() !== year;
+        return time.getFullYear() !== year; // 如果年份不等于当前年份，则禁用该日期
       },
-      // 表格列配置
       option: {
         height: 'auto',
         align: 'center',
@@ -243,34 +207,44 @@ export default {
       },
     };
   },
-  mounted() {
-    // this.onLoad();
-  },
   methods: {
-    // 点击月份分数 - 打开详情
-    cellClick(row, column) {
-      const monthMap = {
-        m01Score: '01',
-        m02Score: '02',
-        m03Score: '03',
-        m04Score: '04',
-        m05Score: '05',
-        m06Score: '06',
-        m07Score: '07',
-        m08Score: '08',
-        m09Score: '09',
-        m10Score: '10',
-        m11Score: '11',
-        m12Score: '12',
-      };
-      const month = monthMap[column.prop];
-      if (!month) return;
+    cellClick(row, column, cell, event) {
+      const monthProps = [
+        'm01Score',
+        'm02Score',
+        'm03Score',
+        'm04Score',
+        'm05Score',
+        'm06Score',
+        'm07Score',
+        'm08Score',
+        'm09Score',
+        'm10Score',
+        'm11Score',
+        'm12Score',
+      ];
+
+      // if (monthProps.includes(column.property)) {
+      //   const monthMap = {
+      //     january: '01',
+      //     february: '02',
+      //     march: '03',
+      //     april: '04',
+      //     may: '05',
+      //     june: '06',
+      //     july: '07',
+      //     august: '08',
+      //     september: '09',
+      //     october: '10',
+      //     november: '11',
+      //     december: '12',
+      //   };
+
+      //   const currentYear = new Date().getFullYear();
+      //   this.monthValue = `${currentYear}-${monthMap[column.property]}`;
 
-      // 赋值当前年月
-      this.monthValue = `${row.year}-${month}`;
       this.showExcel = true;
-      // 自动查询
-      this.queryPerformance();
+      // }
     },
     // 查询绩效明细
     async queryPerformance() {
@@ -324,9 +298,9 @@ export default {
           ...this.query,
         };
         const res = await pageBsEfficiencyTaskReport(params);
-        if (res.code === 200) {
-          this.data = res.data.records || [];
-          this.page.total = res.data.total || 0;
+        if (res.data.code === 200) {
+          this.data = res.data.data.records || [];
+          this.page.total = res.data.data.total || 0;
         }
       } catch (error) {
         this.$message.error('加载失败');