Browse Source

业绩指标计划和业绩指标考评详情增加部门筛选功能(包含任务中心)

SunZehao 1 year atrás
parent
commit
46ab985c0f

+ 1 - 1
src/api/api.js

@@ -465,7 +465,7 @@ export function apiGetevaluationdetailDeptData(params) {
 //------部门考评启动-详情
 export function apiGetevaluationdeptplanDetail(params) {
     return httpRequest({
-        url: `evaluation-dept-plan/details/${params.id}/${params.deptId}`,
+        url: `evaluation-dept-plan/details/${params.id}/${params.deptId}/${params.com}`,
         method: 'get'
     })
 }

+ 2 - 2
src/components/assessment/evaluationApplicationTab.vue

@@ -22,10 +22,10 @@
                             <el-table-column label="序号" type="index" width="50" align="center" />
                             <el-table-column label="人员编码" prop="employeeNo" align="center" />
                             <el-table-column label="人员姓名" prop="employeeName" align="center" />
-                            <el-table-column label="推荐系数" prop="suggestedValue" align="center" />
+                            <el-table-column label="评定系数" prop="suggestedValue" align="center" />
                             <el-table-column label="申报次数" prop="declarationsNumber" align="center" />
                             <el-table-column label="申报部门" prop="reportingDepartment" align="center" />
-                            <el-table-column label="申报级别" prop="declarationLevel" align="center" />
+                            <el-table-column label="评定级别" prop="declarationLevel" align="center" />
                         </el-table>
                     </div>
                 </div>

+ 22 - 3
src/components/assessment/evaluationDeptBusinessFrom.vue

@@ -46,6 +46,9 @@
                     </el-col>
                 </el-row>
                 <div class="btnASeach">
+                    <div class="seachFor" v-if="userMes.deptId === '23031009'">
+                        <el-input v-model="compNameSa" placeholder="请输入部门名称" @keyup.enter="getDetails(rowMsg.id)"></el-input>
+                    </div>
                     <div class="detaTableBtns">
                         <div class="tableBtn save" @click="saveDetail" v-if="isShowFn(receiptMsg.stage)">
                             <img :src="saveIcon" alt="">
@@ -187,7 +190,8 @@ export default {
                 total: 0
             },
             departData: [],
-            userMes: {}
+            userMes: {},
+            compNameSa: ''
         }
     },
     created() {
@@ -264,7 +268,8 @@ export default {
             that.quantifiedList = []
             let params = {
                 id: id,
-                deptId: that.userMes.deptId
+                deptId: that.userMes.deptId,
+                com: that.compNameSa
             }
             apiGetevaluationdeptplanDetail(params).then(datas =>{
                 if (datas && datas.data) {
@@ -413,10 +418,24 @@ export default {
                         top: 32px;
                         // left: 50vw;
                         width: 100%;
+                        .seachFor{
+                            .el-input{
+                                height: 30px;
+                                .el-input__inner{
+                                    height:30px;
+                                }
+                                .el-input__suffix{
+                                    .el-select__caret{
+                                        line-height:30px;
+                                    }
+                                }
+                            }
+                        }
                         .detaTableBtns{
                             display: flex;
                             justify-content: flex-end;
-                            width: 300px;
+                            // width: 300px;
+                            width: fit-content;
                             margin-top: 5px;
                             .tableBtn {
                                 display: flex;

+ 22 - 3
src/components/assessment/evaluationDeptStartFrom.vue

@@ -46,6 +46,9 @@
                     </el-col>
                 </el-row>
                 <div class="btnASeach">
+                    <div class="seachFor" v-if="userMes.deptId === '23031009'">
+                        <el-input v-model="compNameSa" placeholder="请输入部门名称" @keyup.enter="getDetails(rowMsg.id)"></el-input>
+                    </div>
                     <div class="detaTableBtns">
                         <div class="tableBtn add" @click="addTableDetail" v-if="isShowFn(receiptMsg.stage)">
                             <img :src="addIcon" alt="">
@@ -213,7 +216,8 @@ export default {
                 total: 0
             },
             departData: [],
-            userMes: {}
+            userMes: {},
+            compNameSa: ''
         }
     },
     created() {
@@ -351,7 +355,8 @@ export default {
             })
             let paramsDe = {
                 id: id,
-                deptId: that.userMes.deptId
+                deptId: that.userMes.deptId,
+                com: that.compNameSa
             }
             //获取详情
             apiGetevaluationdeptplanDetail(paramsDe).then(datas =>{
@@ -517,10 +522,24 @@ export default {
                         top: 32px;
                         // left: 50vw;
                         width: 100%;
+                        .seachFor{
+                            .el-input{
+                                height: 30px;
+                                .el-input__inner{
+                                    height:30px;
+                                }
+                                .el-input__suffix{
+                                    .el-select__caret{
+                                        line-height:30px;
+                                    }
+                                }
+                            }
+                        }
                         .detaTableBtns{
                             display: flex;
                             justify-content: flex-end;
-                            width: 300px;
+                            // width: 300px;
+                            width: fit-content;
                             margin-top: 5px;
                             .tableBtn {
                                 display: flex;

+ 7 - 7
src/components/taskCenter/taskApplicationFrom.vue

@@ -345,7 +345,7 @@ export default {
             this.pageLeft.currentPage = 1
             let obj = {
                 showInput: true,
-                businessPlanId: this.rowMsg.id,
+                businessPlanId: this.keyId,
                 employeeId: '',
                 employeeNo: '',
                 suggestedValue: 1,
@@ -366,7 +366,7 @@ export default {
                     }
                 })
                 let obj = {
-                    assessmentDeclarationId: that.rowMsg.id,
+                    assessmentDeclarationId: that.keyId,
                     employeeId: item.employeeId,
                     employeeName: emName,
                     employeeNo: item.employeeNo ? item.employeeNo : emNo,
@@ -385,7 +385,7 @@ export default {
                             message: '保存成功',
                             type: 'success'
                         });
-                        that.getDetails(that.rowMsg.id)
+                        that.getDetails(that.keyId)
                     } else {
                         that.$message({
                             message: datas.data,
@@ -411,7 +411,7 @@ export default {
                                 type: 'success',
                                 message: '删除成功!'
                             });
-                            that.getDetails(that.rowMsg.id)
+                            that.getDetails(that.keyId)
                         }
                     })
                 }
@@ -423,11 +423,11 @@ export default {
             this.$refs.importPage.upload.url = '/evaluation-dept-ad/import'
         },
         successImport(val) {
-            that.$message({
+            this.$message({
                 type: 'success',
-                message: val.data
+                message: val.message
             });
-            this.getDetails(this.rowMsg.id)
+            this.getDetails(this.keyId)
         },
         handleExport() {
             let data = this.quantifiedList  //接口返回数据

+ 22 - 3
src/components/taskCenter/taskCenterDeptBusinessFrom.vue

@@ -46,6 +46,9 @@
                     </el-col>
                 </el-row>
                 <div class="btnDeptSeach">
+                    <div class="seachFor" v-if="userMes.deptId === '23031009'">
+                        <el-input v-model="compNameSa" placeholder="请输入部门名称" @keyup.enter="getDetails(importId)"></el-input>
+                    </div>
                     <div class="detaTableBtns">
                         <div class="tableBtn save" @click="saveDetail">
                             <img :src="saveIcon" alt="">
@@ -195,7 +198,8 @@ export default {
             departData: [],
             instanceChild: {},
             userMes: {},
-            importId: ''
+            importId: '',
+            compNameSa: ''
         }
     },
     created() {
@@ -243,7 +247,8 @@ export default {
             that.quantifiedList = []
             let params = {
                 id: id,
-                deptId: that.userMes.deptId
+                deptId: that.userMes.deptId,
+                com: that.compNameSa
             }
             apiGetevaluationdeptassessmentDetailHeader(id).then(datas =>{
                 if (datas && datas.data) {
@@ -476,10 +481,24 @@ export default {
                         top: 32px;
                         // left: 50vw;
                         width: 100%;
+                        .seachFor{
+                            .el-input{
+                                height: 30px;
+                                .el-input__inner{
+                                    height:30px;
+                                }
+                                .el-input__suffix{
+                                    .el-select__caret{
+                                        line-height:30px;
+                                    }
+                                }
+                            }
+                        }
                         .detaTableBtns{
                             display: flex;
                             justify-content: flex-end;
-                            width: 300px;
+                            // width: 300px;
+                            width: fit-content;
                             margin-top: 5px;
                             .tableBtn {
                                 display: flex;

+ 26 - 6
src/components/taskCenter/taskCenterDeptStartFrom.vue

@@ -46,6 +46,9 @@
                     </el-col>
                 </el-row>
                 <div class="btnStartSeach">
+                    <div class="seachFor" v-if="userMes.deptId === '23031009'">
+                        <el-input v-model="compNameSa" placeholder="请输入部门名称" @keyup.enter="getDetails(importId)"></el-input>
+                    </div>
                     <div class="detaTableBtns">
                         <div class="tableBtn add" @click="addTableDetail">
                             <img :src="addIcon" alt="">
@@ -222,7 +225,8 @@ export default {
             departData: [],
             instanceChild: {},
             importId: '',
-            userMes: {}
+            userMes: {},
+            compNameSa: ''
         }
     },
     created() {
@@ -255,6 +259,7 @@ export default {
         // 查询部门
         getDepartmentFromTreeData(datas) {
             let that = this
+            that.departData = []
             // let params = {
             //     superKey: 'BM0001'
             // }
@@ -343,7 +348,8 @@ export default {
             let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             let params = {
                 id: id,
-                deptId: userMes.deptId
+                deptId: userMes.deptId,
+                com: that.compNameSa
             }
             apiGetevaluationdeptplanDetailHeader(id).then(datas =>{
                 if (datas && datas.data) {
@@ -370,7 +376,7 @@ export default {
         addTableDetail() {
             let obj = {
                 showInput: true,
-                businessPlanId: this.rowMsg.id,
+                businessPlanId: this.importId,
                 serialNumber: '1',
                 deptName: '',
                 targetName: '',
@@ -410,7 +416,7 @@ export default {
                             message: '保存成功',
                             type: 'success'
                         });
-                        that.getDetails(that.rowMsg.id)
+                        that.getDetails(that.importId)
                     } else {
                         that.$message({
                             message: datas.data,
@@ -496,7 +502,7 @@ export default {
             this.$refs.importPage.upload.url = '/evaluation-dept-plan/import'
         },
         successImport(val) {
-            this.getDetails(this.rowMsg.id)
+            this.getDetails(this.importId)
         },
         handleExport() {
             let data = this.quantifiedList  //接口返回数据
@@ -593,10 +599,24 @@ export default {
                         top: 32px;
                         // left: 50vw;
                         width: 100%;
+                        .seachFor{
+                            .el-input{
+                                height: 30px;
+                                .el-input__inner{
+                                    height:30px;
+                                }
+                                .el-input__suffix{
+                                    .el-select__caret{
+                                        line-height:30px;
+                                    }
+                                }
+                            }
+                        }
                         .detaTableBtns{
                             display: flex;
                             justify-content: flex-end;
-                            width: 300px;
+                            // width: 300px;
+                            width: fit-content;
                             margin-top: 5px;
                             .tableBtn {
                                 display: flex;