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

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

@@ -18,7 +18,7 @@
         </el-button>
       </template>
     </avue-form>
-    <el-table v-show="isRead && !isDetail" :data="tableData">
+    <el-table v-show="isRead && !isDetail" :data="tableData" :row-class-name="tableRowClassName">
       <el-table-column type="index" width="50" label="序号" />
       <el-table-column
         v-for="item in tableColumn"
@@ -43,31 +43,18 @@ import {
   reportBsEfficiencyTask,
   subReportBsEfficiencyTask,
 } from '@/api/performanceManagement/dataReporting';
+
 export default {
   props: {
-    title: {
+    title: { type: String, default: '' },
-      type: String,
+    showReport: { type: Boolean, default: false },
-      default: '',
+    isDetail: { type: Boolean, default: false },
-    },
+    row: { type: Object, default: null },
-    showReport: {
-      type: Boolean,
-      default: false,
-    },
-    isDetail: {
-      type: Boolean,
-      default: false,
-    },
-    row: {
-      type: Object,
-      default: null,
-    },
   },
   data() {
     return {
       openShow: false,
-      excelForm: {
+      excelForm: { excelFile: [] },
-        excelFile: [],
-      },
       excelOption: {
         submitBtn: false,
         emptyBtn: false,
@@ -81,63 +68,58 @@ export default {
             fileSize: 50000,
             propsHttp: {
               res: 'data',
-              attachId: 'attachId', // 关键：指定附件ID字段
             },
+            dataType: 'object',
             accept: '.xls,.xlsx',
             tip: '请上传 .xls,.xlsx 标准格式文件，文件最大5M',
             action: '/api/blade-resource/oss/endpoint/put-file-attach',
-            rules: [
+            rules: [{ required: true, message: '请上传文件', trigger: 'blur' }],
-              {
-                required: true,
-                message: '请上传文件',
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '',
-            prop: 'readExcel',
-            formslot: true,
-            span: 12,
           },
+          { label: '', prop: 'readExcel', formslot: true, span: 12 },
         ],
       },
       tableData: [],
       isRead: false,
-      tableColumn: [
+      tableColumn: [],
-        { label: '员工工号', prop: 'cardNo' },
-        { label: '姓名', prop: 'name' },
-      ],
       attachId: null,
       formData: null,
     };
   },
-  created() {
+  watch: {
-    this.openShow = this.showReport;
+    showReport: {
+      handler(val) {
+        this.openShow = val;
+      },
+      immediate: true,
+    },
   },
   methods: {
+    tableRowClassName({ row }) {
+      if (row.isSysUser == '0' || row.isSysUser == 0) {
+        return 'warning-row';
+      }
+      return '';
+    },
+
     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(); // 必须执行，允许上传
+      done(file);
     },
-    // 上传后（修复版）
+    uploadAfter(res, done, loading, column) {
-    uploadAfter(file, done, loading, column) {
+      // 处理action接口返回的文件信息
-      console.log('上传成功返回:', file);
+      this.attachId = res.attachId;
-      // 正确获取 attachId
-      this.attachId = file.attachId || file.data?.attachId;
       done();
     },
-    // 读取Excel（关键修复）
+
     readExcel() {
       if (!this.attachId) {
         this.$message.warning('请先上传文件');
@@ -151,52 +133,75 @@ export default {
             this.isRead = true;
             this.$message.success('文件读取成功');
           } else {
-            this.$message.error('文件读取失败');
+            this.$message.error(res.data.msg || '读取失败');
           }
         })
-        .catch(() => {
+        .catch(error => {
+          console.error('读取文件失败:', error);
           this.$message.error('文件读取接口异常');
         });
     },
-    // 提交表单
     submitForm() {
       if (!this.attachId) {
         this.$message.error('请先上传文件');
         return;
       }
-      let params = {};
+      // 1. 判断状态
-      if (!this.isDetail) {
+      const hasPending = this.row.subTasks?.some(t => t.status === 1);
-        params = {
+      const hasError = this.tableData.some(item => item.isSysUser == 0);
-          id: this.row.id,
+      // 2. 提示语（优先级：未完成 > 错误 > 正常）
-          attachId: this.attachId,
+      let msg = '确认提交绩效数据？';
-          table: {
+      if (hasPending && hasError) {
-            tableData: this.tableData,
+        msg = '本月有未完成绩效任务，数据可能存在错误，确认提交绩效数据？';
-            tableColumn: this.tableColumn,
+      } else if (hasError) {
-          },
+        msg = '数据可能存在错误，确认提交绩效数据？';
-        };
+      } else if (hasPending) {
-        reportBsEfficiencyTask(params).then(res => {
+        msg = '本月有未完成绩效任务，确认提交绩效数据？';
-          if (res.data.code === 200) {
-            this.$message.success('提交成功');
-            this.closeDialog(true);
-          } else {
-            this.$message.error('提交失败');
-          }
-        });
       } else {
-        params = {
+        msg = '确认提交绩效数据？';
-          id: this.row.id,
+      }
-          attachId: this.attachId,
+      this.$confirm(msg, '', {
-        };
+        confirmButtonText: '确定',
-        subReportBsEfficiencyTask(params).then(res => {
+        cancelButtonText: '取消',
-          if (res.data.code === 200) {
+        type: 'warning',
-            this.$message.success('提交成功');
+      })
-            this.closeDialog(true);
+        .then(() => {
-          } else {
+          const params = {
-            this.$message.error('提交失败');
+            id: this.row.id,
+            attachId: this.attachId,
+          };
+          if (!this.isDetail) {
+            params.table = {
+              tableData: this.tableData,
+              tableColumn: this.tableColumn,
+            };
           }
+          const api = this.isDetail ? subReportBsEfficiencyTask : reportBsEfficiencyTask;
+
+          api(params)
+            .then(res => {
+              if (res.data.code === 200) {
+                this.$message.success('提交成功');
+                this.closeDialog(true);
+              } else {
+                this.$message.error('提交失败');
+              }
+            })
+            .catch(error => {
+              console.error('提交失败:', error);
+              this.$message.error('提交失败，请检查网络或稍后重试');
+            });
+        })
+        .catch(() => {
+          // 取消提交
         });
-      }
     },
   },
 };
-</script>
+</script>
+<style>
+/* 高亮样式 权重提升 确保生效 */
+.warning-row {
+  background: #fff800 !important;
+}
+</style>

src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue

@@ -40,7 +40,7 @@
       </template>
       <template #menu="scope">
         <el-button
-          v-if="scope.row.status == 1 || scope.row.status == 2"
+          v-if="scope.row.status == 1 || scope.row.status == 2 || scope.row.status == 5"
           type="text"
           @click="downloadTask(scope.row)"
         >
@@ -92,24 +92,13 @@
       :showDetail="showDetail"
       @closeDetail="closeDetail"
       :row="currentRow"
+      :type="'1'"
     />
     <el-dialog append-to-body title="审批" v-model="showExamine" width="85%">
-      <div style="margin-top: 20px">
+      <avue-form :option="examineOption" v-model="examineForm" ref="examineForm" />
-        <div style="display: flex; align-items: center; margin-bottom: 10px">
-          <div style="width: 100px">审批结果：</div>
-          <el-select v-model="resultValue" style="margin-right: 10px">
-            <el-option label="通过" value="1"></el-option>
-            <el-option label="不通过" value="2"></el-option>
-          </el-select>
-        </div>
-        <div style="display: flex; align-items: center">
-          <div style="width: 100px">审批意见：</div>
-          <el-input v-model="opinion" type="textarea"></el-input>
-        </div>
-      </div>
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="showExamine = false">取 消</el-button>
+          <el-button @click="closeExamine">取 消</el-button>
           <el-button type="primary" @click="handleApproval">确 定</el-button>
         </span>
       </template>
@@ -151,6 +140,33 @@ export default {
       currentRow: null,
       showDetail: false,
       showExamine: false,
+      examineForm: {
+        result: '',
+        remark: '',
+      },
+      examineOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '审批结果',
+            prop: 'result',
+            type: 'radio',
+            dicData: [
+              { label: '通过', value: '1' },
+              { label: '不通过', value: '2' },
+            ],
+            span: 24,
+            rules: [{ required: true, message: '请选择审批结果', trigger: 'blur' }],
+          },
+          {
+            label: '审批意见',
+            prop: 'remark',
+            type: 'textarea',
+            span: 24,
+          },
+        ],
+      },
       loading: false,
       data: [],
       form: {},
@@ -171,7 +187,7 @@ export default {
         searchMenuSpan: 12,
         searchIcon: true,
         searchIndex: 3,
-        tree: false,
+        tree: true,
         treeProps: {
           children: 'subTasks',
           hasChildren: 'hasChildren',
@@ -373,16 +389,28 @@ export default {
         });
       });
     },
+    // 关闭审批弹框
+    closeExamine() {
+      this.showExamine = false;
+      // 重置表单数据
+      this.examineForm = {
+        result: '',
+        remark: '',
+      };
+    },
     // 处理审批
     handleApproval() {
       if (!this.currentRow) return;
-      if (this.resultValue === '1') {
+      // 表单验证
-        this.approvalRow(this.currentRow);
+      this.$refs.examineForm.validate(valid => {
-      } else if (this.resultValue === '2') {
+        if (valid) {
-        this.rejectRow(this.currentRow);
+          if (this.examineForm.result === '1') {
-      } else {
+            this.approvalRow(this.currentRow);
-        this.$message.error('请选择审批结果');
+          } else if (this.examineForm.result === '2') {
-      }
+            this.rejectRow(this.currentRow);
+          }
+        }
+      });
     },
     // 删除
     removeRow(row) {
@@ -408,10 +436,10 @@ export default {
         cancelButtonText: '取消',
         type: 'success',
       }).then(() => {
-        approvalBsEfficiencyTask({ id: row.id, remark: this.opinion }).then(res => {
+        approvalBsEfficiencyTask({ id: row.id, remark: this.examineForm.remark }).then(res => {
           if (res.data.code === 200) {
             this.$message.success('审批通过成功');
-            this.showExamine = false;
+            this.closeExamine();
             this.onLoad();
           } else {
             this.$message.error('审批通过失败');
@@ -426,10 +454,10 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        rejectBsEfficiencyTask({ id: row.id, remark: this.opinion }).then(res => {
+        rejectBsEfficiencyTask({ id: row.id, remark: this.examineForm.remark }).then(res => {
           if (res.data.code === 200) {
             this.$message.success('审批不通过成功');
-            this.showExamine = false;
+            this.closeExamine();
             this.onLoad();
           } else {
             this.$message.error('审批不通过失败');