浏览代码

单位考评评级详情页面增加一键生成数据功能;绩效结果考核申报页面(包含任务中心详情)修改根据人员编号查询人员信息服务;

SunZehao 1 年之前
父节点
当前提交
ed65adaf19

+ 17 - 3
src/api/api.js

@@ -830,6 +830,14 @@ export function apiGetorganizationyearratingHeader(params) {
 }
 
 
+//--------单位绩效考核评级列表---一键生成
+export function apiGetorganizationratingGenerateRating(params) {
+    return httpRequest({
+        url: `organization-rating/generateRating?organizationYearRatingId=${params.id}&year=${params.year}`,
+        method: 'post'
+    })
+}
+
 //--------单位绩效考核评级列表---次表
 export function apiGetorganizationratinglist(params) {
     return httpRequest({
@@ -1199,11 +1207,17 @@ export function apiGetorganizationstructureFromTree(params) {
     })
 }
 //----根据组织树部门查询人员
+// export function apiGetuserPageList(params) {
+//     return httpRequest({
+//         url: 'user/pageList',
+//         method: 'get',
+//         params: params
+//     })
+// }
 export function apiGetuserPageList(params) {
     return httpRequest({
-        url: 'user/pageList',
-        method: 'get',
-        params: params
+        url: `user/getLoginNameByUserInfo?info=${params.no}`,
+        method: 'get'
     })
 }
 //----根据人员查询岗位

+ 5 - 8
src/components/assessment/assessmentApplicationFrom.vue

@@ -404,15 +404,12 @@ export default {
         changeDeptLead(val, row) {
             let that = this
             let params = {
-                current: 1,
-                size: 500,
                 no: val
             }
             apiGetuserPageList(params).then(datas =>{
                 if (datas && datas.data) {
-                    // that.deptLeaderOptionDet = datas.data.records
-                    row.employeeName = datas.data.records[0].name
-                    row.employeeId = datas.data.records[0].id
+                    row.employeeName = datas.data.name
+                    row.employeeId = datas.data.id
                 }
             })
         },
@@ -442,9 +439,9 @@ export default {
                 // })
                 let obj = {
                     assessmentDeclarationId: that.rowMsg.id,
-                    employeeId: item.employeeId,
-                    employeeName: item.employeeName,
-                    employeeNo: item.employeeNo,
+                    employeeId: item.employeeId ? item.employeeId : '',
+                    employeeName: item.employeeName ? item.employeeName : '',
+                    employeeNo: item.employeeNo ? item.employeeNo : '',
                     suggestedValue: (item.suggestedValue*1).toString(),
                     serialNumber: item.serialNumber
                 }

+ 1 - 3
src/components/assessment/evaluationApplicationTab.vue

@@ -108,13 +108,11 @@ export default {
         changeDeptLead(val) {
             let that = this
             let params = {
-                current: 1,
-                size: 500,
                 orgId: val ? val : ''
             }
             apiGetuserPageList(params).then(datas =>{
                 if (datas && datas.data) {
-                    that.deptLeaderOptionDet = datas.data.records
+                    that.deptLeaderOptionDet.push(datas.data)
                 }
             })
         },

+ 16 - 1
src/components/assessment/evaluationUnitRatingDialog.vue

@@ -19,6 +19,9 @@
                         </el-select>
                     </div>
                     <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
+                    <el-button size="mini" color="#3B7AD1" icon="Operation" @click="dataGenerator" style="margin-left: 10px">
+                        <span>数据生成</span>
+                    </el-button>
                 </div>
                 <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                     <btns
@@ -174,7 +177,7 @@ import seachs from '../seachGroup.vue'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import {apiGetorganizationratinglist, apiGetorganizationratingsave,apiGetOrganizationListAll,apiGetbinsectionList,
-apiPostorganizationratingDelete} from '../../api/api'
+apiPostorganizationratingDelete,apiGetorganizationratingGenerateRating} from '../../api/api'
 export default {
     components: {
         importDailog,
@@ -269,6 +272,18 @@ export default {
                 }
             })
         },
+        dataGenerator() {
+            let that = this
+            let params = {
+                id: that.rowObj.id,
+                year: that.rowObj.year
+            }
+            apiGetorganizationratingGenerateRating(params).then(datas =>{
+                if (datas && datas.success) {
+                    that.getevaluRatingDiaList(that.rowObj)
+                }
+            })
+        },
         //查询单位数据
         getOrganizetionData() {
             let that = this

+ 5 - 1
src/components/assessment/evaluationUnitRatingPage.vue

@@ -18,7 +18,11 @@
             </div>
             <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                 <btns
-                :showImport="false" :showExport="false" :showSave="true" :showAdd="true" :showDelete="true"
+                :showImport="false"
+                :showExport="false"
+                :showSave="$utils.havePurview('evaluationUnitRate:oneLevel:save')"
+                :showAdd="$utils.havePurview('evaluationUnitRate:oneLevel:add')"
+                :showDelete="$utils.havePurview('evaluationUnitRate:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="false" :disExport="false"

+ 5 - 8
src/components/taskCenter/taskApplicationFrom.vue

@@ -484,15 +484,12 @@ export default {
         changeDeptLead(val, row) {
             let that = this
             let params = {
-                current: 1,
-                size: 500,
                 no: val
             }
             apiGetuserPageList(params).then(datas =>{
                 if (datas && datas.data) {
-                    // that.deptLeaderOptionDet = datas.data.records
-                    row.employeeName = datas.data.records[0].name
-                    row.employeeId = datas.data.records[0].id
+                    row.employeeName = datas.data.name
+                    row.employeeId = datas.data.id
                 }
             })
         },
@@ -522,9 +519,9 @@ export default {
                 // })
                 let obj = {
                     assessmentDeclarationId: that.keyId,
-                    employeeId: item.employeeId,
-                    employeeName: item.employeeName,
-                    employeeNo: item.employeeNo,
+                    employeeId: item.employeeId ? item.employeeId : '',
+                    employeeName: item.employeeName ? item.employeeName : '',
+                    employeeNo: item.employeeNo ? item.employeeNo : '',
                     suggestedValue: (item.suggestedValue*1).toString(),
                     serialNumber: item.serialNumber
                 }