Browse Source

1.季度考评、月度考评模块:
点击列排序功能【 已完成 】;
分值不在正常范围的指标行颜色标注功能【 已完成 】;
2.评级报告:
得分及指标可点击按照列排序功能【已完成】;
3.系统首页:
界面样式对齐方式,分辨率1920*1080和1440*900的展示调试【已完成】;
4.绩效考核结果申报模块:
业务人员提交单据时,提示本次部门申报***人的功能【已完成】;
系统导入行数据,提示导入成功新增**条,更新**条,失败**条数据。【已完成】;
5.按照甲方及后端需求随时修改问题;

SunZehao 1 year ago
parent
commit
79708e9746

+ 1 - 1
src/assets/css/main.css

@@ -79,7 +79,7 @@ a {
 }
 
 .el-table tr:hover {
-    background: #f6faff;
+    /* background: #f6faff; */
 }
 
 .mgb20 {

+ 16 - 13
src/components/assessment/monthQuarterYearFrom.vue

@@ -84,7 +84,8 @@
                                     </div>
                                 </div>
                             </div>
-                            <el-table :data="monthQuarterYearData" style="width: 100%" ref="monthQuarterYearTT" :border="true" >
+                            <el-table :data="monthQuarterYearData" style="width: 100%" ref="monthQuarterYearTT"
+                             :row-class-name="tableRowClassName" :border="true" >
                                 <el-table-column type="index" label="排名" align="center"></el-table-column>
                                 <el-table-column label="考评单位" prop="organizationShortName" width="300">
                                     <template #default="scope">
@@ -228,6 +229,11 @@ export default {
             this.getModelData(type)
             this.rowMsg = row
         },
+        tableRowClassName(row, rowIndex) {
+            if (!row.row.valueFlag) {
+                return 'error-row'
+            }
+        },
         sortMethods(a, b, it) {
             if (a[it] < b[it]) {
                 return -1
@@ -637,7 +643,7 @@ export default {
                                         }
                                         span{
                                             display: inline-block;
-                                            width: 100%;
+                                            width: 50%;
                                             font-size: 14px;
                                             font-family: Microsoft YaHei;
                                             font-weight: 400;
@@ -695,11 +701,17 @@ export default {
                                             }
                                         }
                                         .el-table__body{
-                                            tr{
+                                            .error-row {
+                                                --el-table-tr-bg-color: #fdecec;
+                                                &:hover > td{
+                                                    background: #fdecec !important;
+                                                }
+                                            }
+                                            .tr{
                                                 td{
                                                     padding: 0;
                                                     .cell{
-                                                        background: #F6F7FA;
+                                                        // background: #F6F7FA;
                                                         line-height: 47px;
                                                         height: 47px;
                                                     }
@@ -709,15 +721,6 @@ export default {
                                                     height: 45px;
                                                 }
                                             }
-                                            // .el-select{
-                                            //     .el-input{
-                                            //         .el-input__wrapper{
-                                            //             .el-input__inner{
-                                            //                 color: red;
-                                            //             }
-                                            //         }
-                                            //     }
-                                            // }
                                         }
                                     }
                                 }

+ 4 - 1
src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -257,6 +257,9 @@ export default {
             apiGetDepartmentallocationLeader(val).then(datas =>{
                 if (datas && datas.data) {
                     that.deptLeaderOption = datas.data
+                    if (that.isSave) {
+                        that.ruleForm.departmentLeader = that.evalradio.chargePersonId
+                    }
                 }
             })
             // 测试数据
@@ -292,7 +295,7 @@ export default {
                 departmentInStr.push('绩效考核申报')
             }
             this.ruleForm = {
-                departmentLeader: this.evalradio.chargePersonId,
+                // departmentLeader: this.evalradio.chargePersonId,
                 serialNumber: this.evalradio.serialNumber,
                 departmentIn: departmentInStr
             }

+ 14 - 2
src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -84,7 +84,8 @@
                                     </div>
                                 </div>
                             </div>
-                            <el-table :data="monthQuarterYearData" style="width: 100%" ref="monthQuarterYearTT" :border="true" >
+                            <el-table :data="monthQuarterYearData" style="width: 100%" ref="monthQuarterYearTT"
+                             :row-class-name="tableRowClassName" :border="true" >
                                 <el-table-column type="index" label="排名" align="center"></el-table-column>
                                 <el-table-column label="考评单位" prop="organizationShortName" width="300">
                                     <template #default="scope">
@@ -345,6 +346,11 @@ export default {
                 }
             })
         },
+        tableRowClassName(row, rowIndex) {
+            if (!row.row.valueFlag) {
+                return 'error-row'
+            }
+        },
         handleClick(val) {
             let stageId = ''
             this.stageData.forEach(it =>{
@@ -768,11 +774,17 @@ export default {
                                             }
                                         }
                                         .el-table__body{
+                                            .error-row {
+                                                --el-table-tr-bg-color: #fdecec;
+                                                &:hover > td{
+                                                    background: #fdecec !important;
+                                                }
+                                            }
                                             tr{
                                                 td{
                                                     padding: 0;
                                                     .cell{
-                                                        background: #F6F7FA;
+                                                        // background: #F6F7FA;
                                                         line-height: 47px;
                                                         height: 47px;
                                                     }