Browse Source

单据信息中新增月度工作计划内容(月度工作报告)填写信息包含(填报人填写,必填),(1)序号、工作内容、完成情况、相关处室、经办人;备注:可添加多行(2)员工月度考核系数;本月主要工作完成情况;(采用页签的形式)(3)--人员绩效考核系数查询报表。选择时间区间(默认上一月份,开始年月,截止年月),可选择部门,可选择人员

SunZehao 1 year ago
parent
commit
0a929b4b4b

+ 8 - 0
src/api/api.js

@@ -1092,6 +1092,14 @@ export function apiGetuserPageList(params) {
         params: params
     })
 }
+//----根据人员查询岗位
+export function apiGetUserPostList(params) {
+    return httpRequest({
+        url: 'organization-structure/getUserPostList',
+        method: 'get',
+        params: params
+    })
+}
 export function apiGetDepartmentLeader(params) {
     return httpRequest({
         url: `evaluation-dept-ad/getDepartmentLeader/${params}`,

+ 23 - 6
src/components/assessment/assessmentApplicationFrom.vue

@@ -106,7 +106,7 @@
                                     <span>{{scope.row.employeeName}}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="建议值">
+                            <el-table-column label="建议值" v-if="showMessage">
                                 <template #default="scope">
                                     <el-input-number v-model="scope.row.suggestedValue" :precision="2" :step="0.1" :min="0" />
                                 </template>
@@ -199,7 +199,7 @@
 <script>
 import importDailog from '../importPage/importDailog.vue'
 import {apiPostevaluationdeptadDetails,apiGetevaluationdeptadUpdate, apiGetevaluationdeptadDelete,apiGetevaluationdeptadUpdateComplete,
-apiPostevaluationdeptadDetailsHead, apiGetuserPageList,apiGetevaluationdeptadDeleteComplete} from '../../api/api'
+apiPostevaluationdeptadDetailsHead, apiGetuserPageList,apiGetevaluationdeptadDeleteComplete,apiGetUserPostList} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import addIcon from '../../assets/btnIcon/add.png'
@@ -253,7 +253,8 @@ export default {
                 total: 0
             },
             deptLeaderOptionDet: [],
-            userMes: {}
+            userMes: {},
+            showMessage: false
         }
     },
     created() {
@@ -263,9 +264,8 @@ export default {
             this.dialogVisible = true
             this.activeName = 'first'
             this.getDetails(row.id)
-            this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
-            // this.getDetailsHeader(row.id)
-            // this.changeDeptLead(row.deptId)
+            // this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            this.getUserPostList()
             this.rowMsg = row
             this.$nextTick(() =>{
                 this.receiptMsg = {
@@ -373,6 +373,23 @@ export default {
                 }
             })
         },
+        getUserPostList() {
+            let that = this
+            that.showMessage = false
+            let params = {
+                userId: that.userMes.id,
+                current: 1,
+                size: 10
+            }
+            apiGetUserPostList(params).then(datas =>{
+                if (datas.data && datas.data.records.length>0) {
+                    let posName = datas.data.records[0].posName
+                    if (posName !== '主任' || posName !== '副主任') {
+                        that.showMessage = true
+                    }
+                }
+            })
+        },
         employeeNoInputBlur(val, row) {
             row.employeeId = ''
             // this.deptLeaderOptionDet.forEach(it =>{

+ 1 - 1
src/components/assessment/assessmentApplicationPage.vue

@@ -291,7 +291,7 @@ export default {
                 orderNumber: that.orderNumber,
                 deptName: that.departNameS,
                 deptId: userMes.deptId,
-                // deptId: '',
+                // deptId: '23031006',
                 annual: that.timeIds ? this.timeIds.substring(0, this.timeIds.indexOf('-'))*1 : null,
                 declarationMonth: that.timeIds ? this.timeIds.substring(this.timeIds.indexOf('-')+1, this.timeIds.length)*1 : null
             }

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

@@ -90,7 +90,7 @@
                                     <span>{{scope.row.employeeName}}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="建议值">
+                            <el-table-column label="建议值" v-if="showMessage">
                                 <template #default="scope">
                                     <el-input-number v-model="scope.row.suggestedValue" :precision="2" :step="0.1" :min="0" />
                                 </template>
@@ -168,7 +168,7 @@
 <script>
 import importDailog from '../importPage/importDailog.vue'
 import {apiPostevaluationdeptadDetails,apiGetevaluationdeptadUpdate, apiGetevaluationdeptadDelete,apiPostIsdoAction,apideptAdmodify,
-apiPostevaluationdeptadDetailsHead, apiGetuserPageList} from '../../api/api'
+apiPostevaluationdeptadDetailsHead, apiGetuserPageList, apiGetUserPostList} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import addIcon from '../../assets/btnIcon/add.png'
@@ -225,7 +225,8 @@ export default {
             ratingGradeOption: [],
             userMes: {},
             instanceChild: {},
-            keyId: ''
+            keyId: '',
+            showMessage: false
         }
     },
     created() {
@@ -254,6 +255,7 @@ export default {
             this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
             this.activeName = 'first'
             this.instanceChild = allData
+            this.getUserPostList()
             this.getDetails(id)
             this.getDetailsHeader(id)
             this.keyId = id
@@ -274,6 +276,23 @@ export default {
                 }
             })
         },
+        getUserPostList() {
+            let that = this
+            that.showMessage = false
+            let params = {
+                userId: that.userMes.id,
+                current: 1,
+                size: 10
+            }
+            apiGetUserPostList(params).then(datas =>{
+                if (datas.data && datas.data.records.length>0) {
+                    let posName = datas.data.records[0].posName
+                    if (posName !== '主任' || posName !== '副主任') {
+                        that.showMessage = true
+                    }
+                }
+            })
+        },
         changeratingGrade(val) {
             this.modeifyDetail('level', val)
         },

+ 4 - 4
src/mobeilComponent/notificationPageDetail.vue

@@ -17,20 +17,20 @@
             <div class="notificationDetailMain">
                 <div class="cssCommon">
                     <p>公告标题:</p>
-                    <el-input v-model="ruleForm.noticeTitle" />
+                    <el-input v-model="ruleForm.noticeTitle" disabled />
                 </div>
                 <div class="cssCommon">
                     <p>公告内容:</p>
-                    <el-input v-model="ruleForm.noticeContent" type="textarea" :rows="10"></el-input>
+                    <el-input v-model="ruleForm.noticeContent" disabled type="textarea" :rows="10"></el-input>
                 </div>
-                <div class="cssCommon">
+                <!-- <div class="cssCommon">
                     <p>发布对象:</p>
                     <el-input v-model="ruleForm.sendTo" />
                 </div>
                 <div class="cssCommon">
                     <p>排序:</p>
                     <el-input-number v-model="ruleForm.serialNumber" :min="1" />
-                </div>
+                </div> -->
                 <div class="cssCommon">
                     <p>附件:</p>
                     <el-table :data="filesListEdit" style="width: 100%">

+ 1 - 1
src/utils/baseUrl.js

@@ -10,7 +10,7 @@ switch (process.env.NODE_ENV) {
     case 'development': 
         baseUrl.ROOT = "/api"  //开发环境url
         // baseUrl.URL = "http://10.65.59.67:28800"
-        baseUrl.URL = "http://192.168.2.5:28800"
+        baseUrl.URL = "http://192.168.2.8:28800"
         // baseUrl.URL = "http://10.65.78.23:28800"  //测试环境
         // baseUrl.URL = "http://10.65.78.81:28800"  // 正式环境
         break

+ 11 - 10
src/views/homePage.vue

@@ -176,22 +176,23 @@
             //         index: '3',
             //         name: '本部考评业务',
             //         img: benbuImg,
-            //         children: [{
-            //                 index: '/assessment/evaluationDeptStart',
-            //                 name: '业绩指标计划',
-            //             },
+            //         children: [
             //             {
-            //                 index: '/assessment/evaluationDeptBusiness',
-            //                 name: '业绩指标考评'
+            //                 index: '/assessment/assessmentApplication',
+            //                 name: '月度绩效考核结果申报'
             //             },
             //             {
             //                 index: '/assessment/evaluationDeptRating',
-            //                 name: '部门考评评级'
+            //                 name: '月度绩效考核结果查询'
             //             },
             //             {
-            //                 index: '/assessment/assessmentApplication',
-            //                 name: '绩效结果考核申报'
-            //             }
+            //                 index: '/assessment/evaluationDeptStart',
+            //                 name: '年度业绩指标计划申报',
+            //             },
+            //             {
+            //                 index: '/assessment/evaluationDeptBusiness',
+            //                 name: '年度业绩指标完成情况'
+            //             },
             //         ]
             //     },
             //     {