Преглед на файлове

月季年考评详情查询阶段服务修改参数传参;绩效结果考核申报增加修改申报理由功能并且服务联调;

SunZehao преди 1 година
родител
ревизия
369cce5857

+ 6 - 5
src/api/api.js

@@ -338,11 +338,12 @@ export function apiGetparticipantsNumber(params) {
 
 // 任务中心---绩效结果考核申报  修改评定等级
 export function apideptAdmodify(params) {
-    return httpRequest({
-        url: 'evaluation-dept-ad/modify',
-        method: 'post',
-        params: params
-    })
+    // return httpRequest({
+    //     url: 'evaluation-dept-ad/modify',
+    //     method: 'post',
+    //     params: params
+    // })
+    return httpRequest.post('evaluation-dept-ad/modify', params)
 }
 
 //----"部门考评指标考核-保存or修改"----新增后修改状态

+ 7 - 7
src/components/assessment/assessmentApplicationFrom.vue

@@ -16,8 +16,8 @@
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
-                            <span class="data_tit">申报简述:</span>
-                            <span>{{receiptMsg.des}}</span>
+                            <span class="data_tit">评定等级:</span>
+                            <span>{{receiptMsg.ratingGrade}}</span>
                         </div>
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报领导:</span>
@@ -44,10 +44,10 @@
                             <span>{{receiptMsg.declarationLevel}}级</span>
                         </div>
                     </el-col>
-                    <el-col :span="6">
+                    <el-col :span="12">
                         <div class="danjuMsg_data">
-                            <span class="data_tit">评定等级:</span>
-                            <span>{{receiptMsg.ratingGrade}}</span>
+                            <span class="data_tit">申报理由:</span>
+                            <span>{{receiptMsg.des}}</span>
                         </div>
                     </el-col>
                 </el-row>
@@ -76,12 +76,12 @@
                         <el-table :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)"
                          style="width: 100%">
                             <el-table-column label="序号" type="index" width="80" />
-                            <el-table-column label="人员编号" prop="employeeNo">
+                            <el-table-column label="人员编号">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.employeeNo" @blur="employeeNoInputBlur(scope.row.employeeNo, scope.row)" />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="人员" prop="deptName">
+                            <el-table-column label="人员">
                                 <template #default="scope">
                                     <el-select v-model="scope.row.employeeId" placeholder="请选择人员">
                                         <el-option

+ 39 - 12
src/components/assessment/assessmentApplicationPage.vue

@@ -45,14 +45,20 @@
                     <el-table-column label="申报月份" prop="declarationMonth" />
                     <el-table-column label="申报理由" width="300">
                         <template #default="scope">
-                            <el-tooltip
-                                class="box-item"
-                                effect="customized"
-                                :content="scope.row.declarationReason"
-                                placement="top"
-                            >
-                                <span class="tooltipCC">{{scope.row.declarationReason}}</span>
-                            </el-tooltip>
+                            <div v-if="!scope.row.chngeDes">
+                                <el-tooltip
+                                    class="box-item"
+                                    effect="customized"
+                                    :content="scope.row.declarationReason"
+                                    placement="top"
+                                >
+                                    <span class="tooltipCC">{{scope.row.declarationReason}}</span>
+                                </el-tooltip>
+                            </div>
+                            <div v-else>
+                                <el-input v-model="scope.row.declarationReason" :rows="1" 
+                                type="textarea" placeholder="请输入申报理由" @blur="modifyDesFn(scope.row)"></el-input>
+                            </div>
                         </template>
                     </el-table-column>
                     <el-table-column label="流程状态" prop="stage" width="200">
@@ -66,7 +72,7 @@
                                 <p class="indicitem" v-if="scope.row.stage === '流程未启动'" @click="agetdeptresponsibility(scope.row)">启动</p>
                                 <p style="font-size: 12px;margin-right: 20px;" v-else-if="scope.row.stage === '流程已结束'" >已结束</p>
                                 <p style="font-size: 12px;margin-right: 20px;" v-else >已启动</p>
-                                <p class="indicitem" @click="getGenerateReport(scope.row)">生成报表</p>
+                                <p class="indicitem" v-if="scope.row.stage === '流程已结束'" @click="getGenerateReport(scope.row)">生成报表</p>
                             </div>
                         </template>
                     </el-table-column>
@@ -162,7 +168,7 @@ import startFromList from './assessmentApplicationFrom.vue'
 import btns from '../elbuttonS.vue'
 import seachs from '../seachGroup.vue'
 import { saveAs } from 'file-saver'
-import {apiGetevaluatiodeptadList, apiPostevaluationdeptadSave,apiGetdoAction,apiGetDepartmentLeader,
+import {apiGetevaluatiodeptadList, apiPostevaluationdeptadSave,apiGetdoAction,apiGetDepartmentLeader,apideptAdmodify,
 apiGetworkflowgetOpinion,apiGetevaluationdeptadReport,apiGetEvaluationDeptListAll,
 apideptAdState, apiGetparticipantsNumber, apiPostevaluationdeptadDelete} from '../../api/api'
 export default {
@@ -389,8 +395,8 @@ export default {
         },
         clickDes(row, column, cell, event) {
             let userMes = JSON.parse(window.sessionStorage.getItem('user'))
-            if (userMes.id === row.createBy && row.stage === '流程未启动') {
-                if (column.label === '业务简述') {
+            if ((userMes.id === row.applicantId && row.stage === '流程未启动') || userMes.deptId === '23031009') {
+                if (column.label === '申报理由') {
                     row.chngeDes = true
                 } else {
                     row.chngeDes = false
@@ -401,6 +407,27 @@ export default {
         getDetail(row) {
             this.$refs.assessmentApplicationDetail.init(row)
         },
+        modifyDesFn(row) {
+            let that = this
+            let params = {
+                id: row.id,
+                declarationReason: row.declarationReason
+            }
+            apideptAdmodify(params).then(datas =>{
+                if (!datas.success) {
+                    that.$message({
+                        message: datas.message,
+                        type: 'error'
+                    });
+                } else {
+                    that.$message({
+                        message: '绩效结果考核申报申报理由修改成功',
+                        type: 'success'
+                    });
+                    that.getassessmentApplicationList()
+                }
+            })
+        },
         seeStates(row) {
             if (!row.instId) {
                 this.$message({

+ 1 - 6
src/components/assessment/evaluationAmendmentPage.vue

@@ -388,7 +388,7 @@ export default {
             let that = this
             let params = {
                 id: row.id,
-                stage: row.stage
+                stage: '流程启动'
             }
             apievaluationrevisiontargetStart(params).then(datas =>{
                 if (datas && datas.data) {
@@ -397,11 +397,6 @@ export default {
                             message: datas.message,
                             type: 'error'
                         });
-                    } else {
-                        that.$message({
-                            message: '考评目标已启动',
-                            type: 'success'
-                        });
                     }
                     that.getevaluAmendmentList()
                 }

+ 4 - 1
src/components/assessment/evaluationStartNewFrom.vue

@@ -327,7 +327,10 @@ export default {
         //根据业务属性获取业务阶段
         getStageData() {
             let that = this
-            apiGetbinstageList().then(datas =>{
+            let params = {
+                type: '2'
+            }
+            apiGetbinstageList(params).then(datas =>{
                 if (datas && datas.data) {
                     that.stageData = datas.data
                     that.activeName = datas.data[0].stageCode

+ 1 - 0
src/components/assessment/evaluationStartPage.vue

@@ -356,6 +356,7 @@ export default {
         },
         //启动修订
         evaluationRevision(row) {
+            let that = this
             let params = {
                 id: row.id
             }

+ 9 - 3
src/components/assessment/monthQuarterYearFrom.vue

@@ -272,15 +272,21 @@ export default {
                     })
                     that.titleMsgArr[0].showClick = true
                     that.binSectionStr = that.titleMsgArr[0].id
-                    that.getStageData()
+                    that.getStageData(type)
                     that.getorganizationData(type)
                 }
             })
         },
         //根据业务属性获取业务阶段
-        getStageData() {
+        getStageData(type) {
             let that = this
-            apiGetbinstageList().then(datas =>{
+            let params = {}
+            if (type !== '年度') {
+                params = {
+                    type: '3'
+                }
+            }
+            apiGetbinstageList(params).then(datas =>{
                 if (datas && datas.data) {
                     that.stageData = datas.data
                     that.activeName = datas.data[0].stageCode

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

@@ -16,10 +16,16 @@
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsgSelect">
-                            <span class="data_tit">申报简述:</span>
-                            <span v-if="userMes.deptId !== '23031009'">{{receiptMsg.des}}</span>
-                            <el-input v-model="receiptMsg.des" :rows="1" type="textarea" @blur="blurDes" v-else
-                             placeholder="请输入申报简述"></el-input>
+                            <span class="data_tit">评定等级:</span>
+                            <span v-if="userMes.deptId !== '23031009'">{{receiptMsg.ratingGrade}}</span>
+                            <el-select v-model="receiptMsg.ratingGrade" placeholder="请选择评定等级" @change="changeratingGrade" v-else>
+                                <el-option
+                                v-for="item in ratingGradeOption"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                                </el-option>
+                            </el-select>
                         </div>
                         <div class="danjuMsg_data">
                             <span class="data_tit">申报领导:</span>
@@ -48,16 +54,10 @@
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsgSelect">
-                            <span class="data_tit">评定等级:</span>
-                            <span v-if="userMes.deptId !== '23031009'">{{receiptMsg.ratingGrade}}</span>
-                            <el-select v-model="receiptMsg.ratingGrade" placeholder="请选择评定等级" @change="changeratingGrade" v-else>
-                                <el-option
-                                v-for="item in ratingGradeOption"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                                </el-option>
-                            </el-select>
+                            <span class="data_tit">申报简述:</span>
+                            <span v-if="userMes.deptId !== '23031009'">{{receiptMsg.des}}</span>
+                            <el-input v-model="receiptMsg.des" :rows="1" type="textarea" @blur="blurDes" v-else
+                             placeholder="请输入申报简述"></el-input>
                         </div>
                     </el-col>
                 </el-row>
@@ -226,7 +226,7 @@ export default {
         ]
     },
     methods: {
-        init(row, id, data) {
+        init(row, id, allData) {
             this.dialogVisible = true
             this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
             this.activeName = 'first'

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

@@ -288,7 +288,7 @@ export default {
                     })
                     that.titleMsgArr[0].showClick = true
                     that.binSectionStr = that.titleMsgArr[0].id
-                    that.getStageData()
+                    that.getStageData(type)
                     that.getorganizationData(type)
                 }
             })
@@ -310,7 +310,13 @@ export default {
         //根据业务属性获取业务阶段
         getStageData() {
             let that = this
-            apiGetbinstageList().then(datas =>{
+            let params = {}
+            if (type !== 'nddwkplc') {
+                params = {
+                    type: '3'
+                }
+            }
+            apiGetbinstageList(params).then(datas =>{
                 if (datas && datas.data) {
                     that.stageData = datas.data
                     that.activeName = datas.data[0].stageCode

+ 4 - 1
src/components/taskCenter/taskEvaluationStart.vue

@@ -356,7 +356,10 @@ export default {
         //根据业务属性获取业务阶段
         getStageData() {
             let that = this
-            apiGetbinstageList().then(datas =>{
+            let params = {
+                type: '2'
+            }
+            apiGetbinstageList(params).then(datas =>{
                 if (datas && datas.data) {
                     that.stageData = datas.data
                     that.activeName = datas.data[0].stageCode