单位年度考评页面新增指标考核打分页面，前端增加导出功能；指标考核打分页面功能修改与完善；首页通告栏样式修改，并增加通告所有数据展示页面，并且可以查看详情；修改考评首页样式，兼容应用商店；修改绩效考核申报页面bug并优化；业绩考核系数配置问题修改；党建考核系数配置问题修改；

src/api/api.js

@@ -80,8 +80,9 @@ export function apiGetevaluationportallist(params) {
 //----------通告服务
 export function apiGetevaluationCircularDisplaylist(params) {
     return httpRequest({
-        url: `evaluation-dept-notice/circularDisplay/${params}`,
-        method: 'get'
+        url: `evaluation-dept-notice/circularDisplay`,
+        method: 'get',
+        params: params
     })
 }
 

src/components/assessment/assessmentApplicationFrom.vue

@@ -72,7 +72,7 @@
                             <el-table-column label="序号" type="index" width="80" />
                             <el-table-column label="人员" prop="deptName">
                                 <template #default="scope">
-                                    <el-select v-model="scope.row.deptName" placeholder="请选择人员">
+                                    <el-select v-model="scope.row.employeeId" placeholder="请选择人员">
                                         <el-option
                                         v-for="item in deptLeaderOptionDet"
                                         :key="item.id"
@@ -82,14 +82,14 @@
                                     </el-select>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="排序" >
+                            <el-table-column label="建议值">
                                 <template #default="scope">
-                                     <el-input-number v-model="scope.row.serialNumber" :min="1" />
+                                    <el-input-number v-model="scope.row.suggestedValue" :precision="2" :step="0.1" :min="0" />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="建议值">
+                            <el-table-column label="排序" >
                                 <template #default="scope">
-                                    <el-input-number v-model="scope.row.suggestedValue" :precision="2" :step="0.1" :min="0" />
+                                     <el-input-number v-model="scope.row.serialNumber" :min="1" />
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -116,7 +116,7 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
-import {apiPostevaluationdeptadDetails,apiGetevaluationdeptadUpdate, apiPostevaluationdeptadDetailsHead} from '../../api/api'
+import {apiPostevaluationdeptadDetails,apiGetevaluationdeptadUpdate, apiPostevaluationdeptadDetailsHead, apiGetuserPageList} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import addIcon from '../../assets/btnIcon/add.png'
@@ -172,22 +172,39 @@ export default {
     created() {
     },
     methods: {
-        init(row, deptLeaderOption) {
+        init(row) {
             this.dialogVisible = true
             this.activeName = 'first'
             this.getDetails(row.id)
-            this.deptLeaderOptionDet = deptLeaderOption
-            this.receiptMsg = {
-                code: row.orderNumber,
-                des: row.declarationReason,
-                stage: row.stage,
-                deptLeaderName: row.deptLeaderName,
-                deptName: row.deptName,
-                createDate: row.createTime,
-                year: row.annual,
-                declarationLevel: row.declarationLevel
-            }
+            // this.getDetailsHeader(row.id)
+            this.changeDeptLead(row.deptId)
             this.rowMsg = row
+            this.$nextTick(() =>{
+                this.receiptMsg = {
+                    code: row.orderNumber,
+                    des: row.declarationReason,
+                    stage: row.stage,
+                    deptLeaderName: row.deptLeaderName,
+                    deptName: row.deptName,
+                    createDate: row.createTime,
+                    year: row.annual,
+                    declarationLevel: row.declarationLevel
+                }
+            })
+        },
+        // 根据部门查询人员
+        changeDeptLead(val) {
+            let that = this
+            let params = {
+                current: 1,
+                size: 500,
+                orgId: val
+            }
+            apiGetuserPageList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.deptLeaderOptionDet = datas.data.records
+                }
+            })
         },
         handleClick() {
             this.changeDateSelect = []
@@ -202,7 +219,7 @@ export default {
                 if (datas && datas.data) {
                     let row = datas.data
                     that.receiptMsg = {
-                        code: row.responsibilityCode,
+                        code: row.orderNumber,
                         des: row.des,
                         stage: row.stage,
                         createName: row.createName,
@@ -229,7 +246,7 @@ export default {
             let obj = {
                 showInput: true,
                 businessPlanId: this.rowMsg.id,
-                deptName: '',
+                employeeId: '',
                 baseScore: 0,
                 serialNumber: 0
             }
@@ -241,13 +258,13 @@ export default {
             that.quantifiedList.forEach(item =>{
                 let emName = ''
                 that.deptLeaderOptionDet.forEach(it =>{
-                    if (item.deptName === it.id) {
+                    if (item.employeeId === it.id) {
                         emName = it.name
                     }
                 })
                 let obj = {
                     assessmentDeclarationId: that.rowMsg.id,
-                    employeeId: item.deptName,
+                    employeeId: item.employeeId,
                     employeeName: emName,
                     suggestedValue: item.suggestedValue.toString(),
                     serialNumber: item.serialNumber.toString()

src/components/assessment/assessmentApplicationPage.vue

@@ -93,8 +93,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                         <!-- prop="deptLeaderName" -->
-                        <el-form-item label="部门领导">
+                        <el-form-item label="部门领导" prop="deptLeaderName">
                             <el-select v-model="ruleForm.deptLeaderName" placeholder="请选择部门领导">
                                 <el-option
                                 v-for="item in deptLeaderOption"
@@ -393,7 +392,7 @@ export default {
         },
         //明细
         getDetail(row) {
-            this.$refs.assessmentApplicationDetail.init(row, this.deptLeaderOption)
+            this.$refs.assessmentApplicationDetail.init(row)
         },
         seeStates(row) {
             if (!row.instId) {

src/components/evaluationSystem/achievementKDetail.vue

@@ -156,6 +156,7 @@ export default {
             //根据数据自己调整
             worksheet.columns = [
                 { header: 'ID', key: 'id', width: 26 },
+                { header: '考评单位ID', key: 'organizationId', width: 26 },
                 { header: '考评单位', key: 'organizationName', width: 26 },
                 { header: '资产管理系数', key: 'zzc', width: 18},
                 { header: '', key: 'k1', width: 18 },

src/components/evaluationSystem/partyBuildingKPage.vue

@@ -37,7 +37,7 @@
                 <el-table :data="partyBuildingData" style="width: 100%" @select="rowClick" @select-all="rowClick">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column label="序号" type="index" />
-                    <el-table-column label="单位名称" prop="createOrgName" width="300" />
+                    <el-table-column label="单位名称" prop="organizationName" width="300" />
                     <el-table-column label="业务属性" prop="sectionName" />
                     <el-table-column label="年度" prop="year" />
                     <el-table-column label="党建系数" prop="multiplier">
@@ -60,11 +60,11 @@
                 <div class="periodFrom">
                     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" :validate-on-rule-change="false">
                         <el-form-item label="单位名称" prop="organizationName">
-                            <el-select v-model="ruleForm.organizationName" placeholder="请选择单位名称">
+                            <el-select v-model="ruleForm.organizationName" filterable placeholder="请选择单位名称">
                                 <el-option
                                 v-for="item in companyDatas"
                                 :key="item.id"
-                                :label="item.name"
+                                :label="item.shortName"
                                 :value="item.id">
                                 </el-option>
                             </el-select>
@@ -242,7 +242,7 @@ export default {
             let comName = ''
             that.companyDatas.forEach(item =>{
                 if (item.id === that.ruleForm.organizationName) {
-                    comName = item.name
+                    comName = item.shortName
                 }
             })
             let params = {                

src/components/gateWay/gateWayNotificationAllData.vue

@@ -9,7 +9,7 @@
                 <seachs :showRest="false" @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
             <div class="notificationTableData">
-                <el-table :data="notificationData" style="width: 100%">
+                <el-table :data="notificationData.slice((page.currentPage-1)*page.pagesize, page.currentPage*page.pagesize)" style="width: 100%">
                     <el-table-column label="发布状态" prop="releaseState" width="100" align="center">
                         <template #default="scope">
                             <span class="statusSty"
@@ -95,17 +95,19 @@ export default {
         // 查询列表页面
         getevalunotificationList() {
             let that = this
-            let params = {
-                pageNum: that.page.currentPage,
-                pageSize: that.page.pagesize,
-                noticeTitle: that.noticeTitle
-            }
-            apiGetevaluationdeptnoticeList(params).then(datas =>{
-                if (datas && datas.data) {
-                    that.notificationData = datas.data.records
-                    that.page.total = datas.data.total
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            if (userMes.deptId) {
+                let params = {
+                    deptId: userMes.deptId,
+                    noticeTitle: that.noticeTitle
                 }
-            })
+                apiGetevaluationCircularDisplaylist(params).then(datas =>{
+                    if (datas && datas.data) {
+                        that.notificationData = datas.data
+                        that.page.total = datas.data.length
+                    }
+                })
+            }
         },
         watchDetail(row) {
             this.$refs.notificationDetail.init(row)

src/components/gatewaynNewPage.vue

@@ -188,7 +188,7 @@
                     </div>
                     <div class="footerThree">
                         <div class="mainMore" @click="yearSeeMore(it.nameEn, 'season')"></div>
-                        <div style="display: flex" v-for="(item, index) in cupDataSeasonArr.integration" :key="index">
+                        <div style="display: flex; justify-content: space-between;" v-for="(item, index) in cupDataSeasonArr.integration" :key="index">
                             <div class="footerThreeMsg" v-for="it in matterMsg" :key="it">
                                 <div class="footerImg">
                                     <span>{{it}}</span>
@@ -357,7 +357,11 @@ export default {
             let that = this
             let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             if (userMes.deptId) {
-                apiGetevaluationCircularDisplaylist(userMes.deptId).then(datas =>{
+                let params = {
+                    deptId: userMes.deptId,
+                    noticeTitle: ''
+                }
+                apiGetevaluationCircularDisplaylist(params).then(datas =>{
                     if (datas && datas.data) {
                         that.noticeData = datas.data
                     }
@@ -585,6 +589,7 @@ export default {
     .quarter{
         background: #fff;
         border-radius: 10px;
+        height: 100%;
         // padding-right: 15px;
         .searchFn{
             height: 50px;
@@ -673,7 +678,8 @@ export default {
         .tableMain{
             display: flex;
             border-bottom: 1px solid #E1E3EA;
-            height: 150px;
+            // height: 150px;
+            height: 16vh;
             .mainOne{
                 width: 35px;
                 background: #184FB4;
@@ -938,7 +944,7 @@ export default {
                     margin-left: 10px;
                     margin-bottom: 8px;
                     span{
-                        font-size: 14px;
+                        font-size: 12px;
                         font-weight: 400;
                         color: #666;
                         font-family: Microsoft YaHei;
@@ -949,7 +955,8 @@ export default {
                         background: #F6F7FA;
                         span{
                             display: inline-block;
-                            width: 100%;
+                            // width: 100%;
+                            width: 48px;
                             height: 30px;
                             padding: 5px 11px 0;
                             position: relative;
@@ -971,6 +978,7 @@ export default {
     }
     .report{
         margin-left: 20px;
+        height: 100%;
         .gateway_report{
             width: 355px;
             background: #fff;
@@ -1001,7 +1009,7 @@ export default {
                 }
             }
             .reportMain{
-                height: 79vh !important;
+                height: 80vh !important;
                 overflow-y: auto;
                 .reportMain_msg{
                     display: flex;