月度绩效结果申报详情页面修改员工月度考核系数新增修改服务，删除服务；重构考评得分规则页面，与后端服务联调；单据信息中新增月度工作计划内容（月度工作报告）填写信息包含（填报人填写，必填），（1）序号、工作内容、完成情况、相关处室、经办人；备注：可添加多行（2）员工月度考核系数；本月主要工作完成情况；（采用页签的形式）（3）--人员绩效考核系数查询报表。选择时间区间（默认上一月份，开始年月，截止年月），可选择部门，可选择人员

src/api/api.js

@@ -537,14 +537,26 @@ export function apiPostevaluationdeptadDetails(params) {
         method: 'get'
     })
 }
-//------绩效结果考核申报-详情-修改
+//------绩效结果考核申报-员工月度考核系数-详情-修改
 export function apiGetevaluationdeptadUpdate(params) {
-    return httpRequest.post('evaluation-dept-ad/update', params)
+    return httpRequest.post('evaluation-dept-ad/updateContent', params)
 }
-//------绩效结果考核申报-详情-删除
+//------绩效结果考核申报-员工月度考核系数-详情-删除
 export function apiGetevaluationdeptadDelete(params) {
     return httpRequest({
-        url: `evaluation-dept-ad/delete/${params}`,
+        url: `evaluation-dept-ad/deleteContent/${params}`,
+        method: 'get'
+    })
+}
+
+//------绩效结果考核申报-本月主要工作完成情况-详情-修改
+export function apiGetevaluationdeptadUpdateComplete(params) {
+    return httpRequest.post('evaluation-dept-ad/updateComplete', params)
+}
+//------绩效结果考核申报-本月主要工作完成情况-详情-删除
+export function apiGetevaluationdeptadDeleteComplete(params) {
+    return httpRequest({
+        url: `evaluation-dept-ad/deleteComplete/${params}`,
         method: 'get'
     })
 }
@@ -552,8 +564,9 @@ export function apiGetevaluationdeptadDelete(params) {
 //--------绩效结果考核申报统计汇总表
 export function apiGetstatisticalSummaryList(params) {
     return httpRequest({
-        url: `evaluation-dept-ad/statisticalSummary/${params.year}/${params.month}`,
-        method: 'get'
+        url: `evaluation-dept-ad/statisticalSummary`,
+        method: 'get',
+        params: params
     })
 }
 

src/components/assessment/assessmentApplicationFrom.vue

@@ -20,9 +20,13 @@
                             <span>{{receiptMsg.declarationLevel}}级</span>
                         </div>
                         <div class="danjuMsg_data">
+                            <span class="data_tit">申报年度:</span>
+                            <span>{{receiptMsg.year}}年</span>
+                        </div>
+                        <!-- <div class="danjuMsg_data">
                             <span class="data_tit">申报领导:</span>
                             <span>{{receiptMsg.deptLeaderName}}</span>
-                        </div>
+                        </div> -->
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
@@ -30,8 +34,8 @@
                             <span>{{receiptMsg.stage}}</span>
                         </div>
                         <div class="danjuMsg_data">
-                            <span class="data_tit">申报年度:</span>
-                            <span>{{receiptMsg.year}}年</span>
+                            <span class="data_tit">申报月份:</span>
+                            <span>{{receiptMsg.month}}月</span>
                         </div>
                     </el-col>
                     <el-col :span="6">
@@ -39,10 +43,6 @@
                             <span class="data_tit">创建日期:</span>
                             <span>{{receiptMsg.createDate}}</span>
                         </div>
-                        <div class="danjuMsg_data">
-                            <span class="data_tit">申报月份:</span>
-                            <span>{{receiptMsg.month}}月</span>
-                        </div>
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
@@ -57,33 +57,31 @@
                         </div>
                     </el-col>
                 </el-row>
-                <div class="btnASeach">
-                    <div class="detaTableBtns">
-                        <div class="tableBtn add" @click="addTableDetail" v-if="isShowFn(receiptMsg.stage)">
-                            <img :src="addIcon" alt="">
-                            <span>新增</span>
-                        </div>
-                        <div class="tableBtn save" @click="saveDetail" v-if="isShowFn(receiptMsg.stage)">
-                            <img :src="saveIcon" alt="">
-                            <span>保存</span>
+                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+                    <el-tab-pane label="员工月度考核系数" name="first">
+                        <div class="detaTableBtns">
+                            <div class="tableBtn add" @click="addTableDetail" v-if="isShowFn(receiptMsg.stage)">
+                                <img :src="addIcon" alt="">
+                                <span>新增</span>
+                            </div>
+                            <div class="tableBtn save" @click="saveDetail" v-if="isShowFn(receiptMsg.stage)">
+                                <img :src="saveIcon" alt="">
+                                <span>保存</span>
+                            </div>
+                            <div class="tableBtn delete" @click="handleDelete" v-if="isShowFn(receiptMsg.stage)">
+                                <img :src="deleteIcon" alt="">
+                                <span>删除</span>
+                            </div>
+                            
+                            <div class="tableBtn import" @click="handleImport" v-if="isShowFn(receiptMsg.stage)">
+                                <img :src="importIcon" alt="">
+                                <span>导入</span>
+                            </div>
+                            <div class="tableBtn export" @click="handleExport">
+                                <img :src="exportIcon" alt="">
+                                <span>导出</span>
+                            </div>
                         </div>
-                        <div class="tableBtn delete" @click="handleDelete" v-if="isShowFn(receiptMsg.stage)">
-                            <img :src="deleteIcon" alt="">
-                            <span>删除</span>
-                        </div>
-                        
-                        <div class="tableBtn import" @click="handleImport" v-if="isShowFn(receiptMsg.stage)">
-                            <img :src="importIcon" alt="">
-                            <span>导入</span>
-                        </div>
-                        <div class="tableBtn export" @click="handleExport">
-                            <img :src="exportIcon" alt="">
-                            <span>导出</span>
-                        </div>
-                    </div>
-                </div>
-                <el-tabs v-model="activeName" class="demo-tabs">
-                    <el-tab-pane label="考评指标项内容" name="first">
                         <el-table :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)"
                          style="width: 100%" @select="rowClick" @select-all="rowClick">
                             <el-table-column type="selection" label="操作" align="center"></el-table-column>
@@ -132,6 +130,59 @@
                             :total="pageLeft.total">
                         </el-pagination>
                     </el-tab-pane>
+                    <el-tab-pane label="本月主要工作完成情况" name="second">
+                        <div class="detaTableBtns">
+                            <div class="tableBtn add" @click="addSecondWork">
+                                <img :src="addIcon" alt="">
+                                <span>新增</span>
+                            </div>
+                            <div class="tableBtn save" @click="saveSecondWork">
+                                <img :src="saveIcon" alt="">
+                                <span>保存</span>
+                            </div>
+                            <div class="tableBtn delete" @click="handleSecondWork">
+                                <img :src="deleteIcon" alt="">
+                                <span>删除</span>
+                            </div>
+                        </div>
+                        <el-table :data="secondWorkSituation.slice((pageRight.currentPage-1)*pageRight.pagesize, pageRight.currentPage*pageRight.pagesize)"
+                         style="width: 100%" @select="rowSituationClick" @select-all="rowSituationClick">
+                            <el-table-column type="selection" label="操作" align="center"></el-table-column>
+                            <el-table-column label="序号" type="index" width="80" />
+                            <el-table-column label="工作内容">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.jobContent" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="完成情况">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.completionStatus" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="相关处室">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.relatedOffice" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="经办人">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.handlePeopleName" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="排序" >
+                                <template #default="scope">
+                                     <el-input-number v-model="scope.row.serialNumber" :min="1" />
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <el-pagination
+                            @current-change="handleCurrentChangeRight"
+                            :current-page="pageRight.currentPage"
+                            :page-size="pageRight.pagesize"
+                            layout="total, prev, pager, next, jumper"
+                            :total="pageRight.total">
+                        </el-pagination>
+                    </el-tab-pane>
                 </el-tabs>
                 
             </div>
@@ -147,8 +198,8 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
-import {apiPostevaluationdeptadDetails,apiGetevaluationdeptadUpdate, apiGetevaluationdeptadDelete,
-apiPostevaluationdeptadDetailsHead, apiGetuserPageList} from '../../api/api'
+import {apiPostevaluationdeptadDetails,apiGetevaluationdeptadUpdate, apiGetevaluationdeptadDelete,apiGetevaluationdeptadUpdateComplete,
+apiPostevaluationdeptadDetailsHead, apiGetuserPageList,apiGetevaluationdeptadDeleteComplete} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import addIcon from '../../assets/btnIcon/add.png'
@@ -166,7 +217,9 @@ export default {
             dialogVisible: false,
             activeName: 'first',
             quantifiedList: [],
+            secondWorkSituation: [],
             changeDateSelect: [],
+            changeSituationSelect: [],
             receiptMsg: {
                 code: '',
                 des: '',
@@ -229,6 +282,11 @@ export default {
                 }
             })
         },
+        handleClick(val) {
+            this.changeDateSelect = []
+            this.changeSituationSelect = []
+            this.activeName = val.props.name
+        },
         // 判断保存 导入按钮展示权限
         isShowFn(val) {
             let show = true
@@ -271,6 +329,9 @@ export default {
         handleCurrentChangeLeft(val) {
             this.pageLeft.currentPage = val
         },
+        handleCurrentChangeRight(val) {
+            this.pageRight.currentPage = val
+        },
         //获取详情头数据
         getDetailsHeader(id) {
             let that = this
@@ -295,13 +356,20 @@ export default {
         getDetails(id) {
             let that = this
             that.quantifiedList = []
+            that.secondWorkSituation = []
             apiPostevaluationdeptadDetails(id).then(datas =>{
                 if (datas && datas.data) {
-                    datas.data.forEach(it =>{
-                        it.serialNumber = it.serialNumber.toString()
-                    })
-                    that.quantifiedList = datas.data
-                    that.pageLeft.total = datas.data.length
+                    if (datas.data['ygydkhxs'][0]) {
+                        datas.data['ygydkhxs'][0].forEach(it =>{
+                            it.serialNumber = it.serialNumber.toString()
+                        })
+                        that.quantifiedList = datas.data['ygydkhxs'][0]
+                        that.pageLeft.total = datas.data['ygydkhxs'][0].length
+                    }
+                    if (datas.data['byzygzwcqk'][0]) {
+                        that.secondWorkSituation = datas.data['byzygzwcqk'][0]
+                        that.pageRight.total = datas.data['byzygzwcqk'][0].length
+                    }
                 }
             })
         },
@@ -374,6 +442,7 @@ export default {
                             message: '保存成功',
                             type: 'success'
                         });
+                        that.activeName = 'first'
                         that.getDetails(that.rowMsg.id)
                     } else {
                         that.$message({
@@ -400,6 +469,7 @@ export default {
                                 type: 'success',
                                 message: '删除成功!'
                             });
+                            that.activeName = 'first'
                             that.getDetails(that.rowMsg.id)
                         }
                     })
@@ -447,6 +517,81 @@ export default {
                 fileSave(blob, `绩效结果考核申报数据导出.xlsx`)
             })
         },
+        rowSituationClick(selection, row) {
+            this.changeSituationSelect = selection
+        },
+        addSecondWork() {
+            this.pageRight.currentPage = 1
+            let obj = {
+                showInput: true,
+                assessmentDeclarationId: this.rowMsg.id,
+                jobContent: '',
+                completionStatus: '',
+                relatedOffice: '',
+                handlePeopleName: '',
+                serialNumber: 0
+            }
+            this.secondWorkSituation.unshift(obj)
+        },
+        saveSecondWork() {
+            let that = this
+            let params = []
+            that.secondWorkSituation.forEach(item =>{
+                let obj = {
+                    assessmentDeclarationId: that.rowMsg.id,
+                    jobContent: item.jobContent,
+                    completionStatus: item.completionStatus,
+                    relatedOffice: item.relatedOffice,
+                    handlePeopleName: item.handlePeopleName,
+                    serialNumber: item.serialNumber
+                }
+                if (!item.showInput) {
+                    obj.id = item.id
+                }
+                params.push(obj)
+            })
+            apiGetevaluationdeptadUpdateComplete(params).then(datas =>{
+                if (datas) {
+                    if (datas.success) {
+                        that.$message({
+                            message: '保存成功',
+                            type: 'success'
+                        });
+                        that.activeName = 'second'
+                        that.getDetails(that.rowMsg.id)
+                    } else {
+                        that.$message({
+                            message: datas.message,
+                            type: 'error'
+                        })
+                    }
+                }
+            })
+        },
+        handleSecondWork() {
+            this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let that = this
+                let paramsArr = []
+                that.changeSituationSelect.forEach(it =>{
+                    paramsArr.push(it.id)
+                })
+                apiGetevaluationdeptadDeleteComplete(paramsArr.join(',')).then(datas =>{
+                    if (datas) {
+                        that.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        });
+                        that.activeName = 'second'
+                        that.changeSituationSelect = []
+                        that.getDetails(that.rowMsg.id)
+                    }
+                })
+            })
+        },
     }
 }
 </script>
@@ -503,18 +648,12 @@ export default {
                     .el-select, .el-input{
                         width: 100%;
                     }
-                    .btnASeach{
-                        display: flex;
-                        z-index: 11111;
-                        justify-content: flex-end;
-                        position: relative;
-                        top: 32px;
-                        // left: 48vw;
-                        width: 100%;
+                    .el-tabs{
+                        margin-top: 20px;
                         .detaTableBtns{
                             display: flex;
                             justify-content: flex-end;
-                            width: 410px;
+                            width: 100%;
                             margin-top: 5px;
                             .tableBtn {
                                 display: flex;
@@ -570,8 +709,6 @@ export default {
                                 }
                             }
                         }
-                    }
-                    .el-tabs{
                         .el-tabs__header{
                             .el-tabs__nav{
                                 .el-tabs__item{
@@ -594,7 +731,7 @@ export default {
                         .el-table{
                             margin-bottom: 10px;
                             .el-table__body-wrapper{
-                                height: 50vh;
+                                height: 45vh;
                             }
                             .el-table__row{
                                 .cell{

src/components/assessment/assessmentApplicationPage.vue

@@ -284,14 +284,14 @@ export default {
         // 查询列表页面
         getassessmentApplicationList() {
             let that = this
-            // let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
                 orderNumber: that.orderNumber,
                 deptName: that.departNameS,
-                // deptId: userMes.deptId,
-                deptId: '',
+                deptId: userMes.deptId,
+                // deptId: '',
                 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
             }
@@ -331,7 +331,7 @@ export default {
             })
         },
         applicationTableFn() {
-            this.$refs.applicationTable.init()
+            this.$refs.applicationTable.init(this.departData)
         },
         saveevaluaStart(formName) {
             let that = this

src/components/assessment/evaluationApplicationTab.vue

@@ -5,15 +5,39 @@
                 <div class="reportTBtn">
                     <div class="collectSeach">
                         <div class="exceed">
-                            <span class="exceedSpan" style="margin-left: 10px;width: 100px">选择时间：</span>
+                            <span class="exceedSpan" style="width: 80px">选择时间：</span>
                             <el-date-picker
                                 v-model="timeIds"
-                                type="month"
+                                type="monthrange"
                                 :clearable="false"
                                 value-format="YYYY-MM"
-                                placeholder="选择时间"
+                                range-separator="To"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
                             />
                         </div>
+                        <div class="exceed" style="margin-left: 10px">
+                            <span class="exceedSpan" style="width: 100px">填报部门：</span>
+                            <el-select v-model="deptNameS" filterable clearable placeholder="请选择部门名称" @change="changeDeptLead">
+                                <el-option
+                                    v-for="item in departData"
+                                    :key="item.deptId"
+                                    :label="item.deptName"
+                                    :value="item.deptId">
+                                </el-option>
+                            </el-select>
+                        </div>
+                        <div class="exceed" style="margin-left: 10px">
+                            <span class="exceedSpan" style="width: 100px">选择人员：</span>
+                            <el-select v-model="userNameS" filterable clearable placeholder="请选择人员">
+                                <el-option
+                                v-for="item in deptLeaderOptionDet"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </div>
                         <seachs @handleSeach="getreportTableData" :showRest="false"></seachs>
                         <el-button type="info" icon="Download" size="mini" @click="handleExport" style="margin-left:10px">导出</el-button>
                     </div>
@@ -36,44 +60,64 @@
 
 <script>
 import seachs from '../seachGroup.vue'
+import { saveAs } from 'file-saver'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
-import {apiGetstatisticalSummaryList} from '../../api/api'
+import {apiGetstatisticalSummaryList, apiGetuserPageList, apiGetExportMsg} from '../../api/api'
 export default {
     components: {seachs},
     data() {
         return {
             editEvaluaVisible: false,
             reportTableData: [],
-            timeIds: ''
+            departData: [],
+            deptLeaderOptionDet: [],
+            timeIds: [],
+            deptNameS: '',
+            userNameS: ''
         }
     },
     methods: {
-        init() {
+        init(departData) {
             this.editEvaluaVisible = true
-            let year = new Date().getFullYear()
-            let month = new Date().getMonth()+1
-            let months = ''
-            if (month < 10) {
-                months = '0'+month.toString()
-            } else {
-                months = month.toString()
-            }
-            this.timeIds = year+'-'+months
+            this.departData = departData
             this.reportTableData = []
+            let month = (new Date().getMonth()+1) < 10 ? '0'+(new Date().getMonth()+1) : (new Date().getMonth()+1)
+            let startTim = `${new Date().getFullYear()}-${new Date().getMonth() < 10 ? '0'+new Date().getMonth() : new Date().getMonth()}`
+            let endTim = `${new Date().getFullYear()}-${month}`
+            this.timeIds = [startTim, endTim]
             this.getreportTableData()
+            this.changeDeptLead()
         },
         sortMethods(a, b, it) {
             if (a[it] < b[it]) {
                 return -1
             }
         },
-        // 查询规则详情数据
+        // 根据部门查询人员
+        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
+                }
+            })
+        },
+        // 查询数据
         getreportTableData() {
             let that = this
             let params = {
-                year: this.timeIds.substring(0, this.timeIds.indexOf('-')),
-                month: this.timeIds.substring(this.timeIds.indexOf('-')+1, this.timeIds.length)*1
+                // year: this.timeIds.substring(0, this.timeIds.indexOf('-')),
+                // month: this.timeIds.substring(this.timeIds.indexOf('-')+1, this.timeIds.length)*1
+                startTime: that.timeIds[0],
+                endTime: that.timeIds[1],
+                deptId: that.deptNameS,
+                employeeId: that.userNameS
             }
             apiGetstatisticalSummaryList(params).then(datas =>{
                 if (datas && datas.data) {
@@ -82,9 +126,21 @@ export default {
             })
         },
         handleExport() {
-            let year = this.timeIds.substring(0, this.timeIds.indexOf('-'))
-            let month = this.timeIds.substring(this.timeIds.indexOf('-')+1, this.timeIds.length)*1
-            this.$utils.downloadPer(`evaluation-dept-ad/generateStatisticalSummaryReports/${year}/${month}`, '统计汇总信息数据.xlsx')
+            let that = this
+            let params = {
+                startTime: that.timeIds[0],
+                endTime: that.timeIds[1],
+                deptId: that.deptNameS,
+                employeeId: that.userNameS
+            }
+            let url = 'evaluation-dept-ad/generateStatisticalSummaryReports'
+            let fileName = '统计汇总信息数据.xlsx'
+            apiGetExportMsg(url,params).then(datas =>{
+                let blob = new Blob([datas])
+                saveAs(blob, fileName)
+            }).catch((r) => {
+                console.error(r)
+            })
         }
     }
 }
@@ -112,7 +168,6 @@ export default {
                                 display: flex;
 
                                 .exceedSpan {
-                                    width: 100px;
                                     height: 12px;
                                     font-size: 14px;
                                     font-family: Microsoft YaHei;
@@ -121,20 +176,6 @@ export default {
                                     line-height: 12px;
                                     margin-top: 14px;
                                 }
-
-                                .el-input {
-                                    margin-right: 10px;
-
-                                    .el-input__inner {
-                                        height: 30px;
-                                    }
-
-                                    .el-input__suffix {
-                                        .el-select__caret {
-                                            line-height: 30px;
-                                        }
-                                    }
-                                }
                                 .el-select{
                                     line-height: 40px !important;
                                     .el-input__inner, .is-disabled{
@@ -146,7 +187,7 @@ export default {
                                         }
                                     }
                                 }
-                                .el-date-editor--month{
+                                .el-date-editor--monthrange{
                                     height: 40px;
                                 }
                             }

src/components/evaluationknowledgePage/scoringRulesNewDetailPage.vue

@@ -252,7 +252,7 @@ export default {
             let endPos = elInput.selectionEnd;
             if (startPos === undefined || endPos === undefined) return;
             let txt = elInput.value;
-            let txtSplit = val;
+            let txtSplit = '['+val+']';
             let result = txt.substring(0, startPos) + txtSplit + txt.substring(endPos);
             elInput.value = result;
             elInput.focus();
@@ -263,7 +263,6 @@ export default {
             this.$refs.optionMul.clearSelection();
         },
         optionMulItem(row) {
-            debugger
             if (row.length > 1) {
                 const newRows = row.filter((it, index) => {
                     if (index == row.length - 1) {
@@ -286,6 +285,11 @@ export default {
         //新增/修改指标数据
         saveAndEditIndicatorData() {
             let that = this
+            that.indicItemoptions.forEach(item =>{
+                item.list.forEach(it =>{
+                    it.formula = it.formula !== '' ? encodeURI(it.formula) : ''
+                })
+            })
             let params = that.indicItemoptions
             apiGetIndicatordicsaveList(params).then(datas =>{
                 if (datas) {
@@ -293,6 +297,7 @@ export default {
                         message: '指标项修改成功',
                         type: 'success'
                     });
+                    that.editEvaluaVisible = false
                 }
             })
         },

src/components/gateWay/gateWayNotificationAllData.vue

@@ -69,7 +69,7 @@
 <script>
 import seachs from '../seachGroup.vue'
 import notificationDetail from './gateWayNotificationDetail.vue'
-import {apiGetevaluationdeptnoticeList} from '../../api/api'
+import {apiGetevaluationCircularDisplaylist} from '../../api/api'
 export default {
     components: {
         seachs,

src/components/taskCenter/taskApplicationFrom.vue

@@ -20,9 +20,13 @@
                             <span>{{receiptMsg.declarationLevel}}级</span>
                         </div>
                         <div class="danjuMsg_data">
+                            <span class="data_tit">申报年度:</span>
+                            <span>{{receiptMsg.year}}年</span>
+                        </div>
+                        <!-- <div class="danjuMsg_data">
                             <span class="data_tit">申报领导:</span>
                             <span>{{receiptMsg.deptLeaderName}}</span>
-                        </div>
+                        </div> -->
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsg_data">
@@ -30,8 +34,8 @@
                             <span>{{receiptMsg.stage}}</span>
                         </div>
                         <div class="danjuMsg_data">
-                            <span class="data_tit">申报年度:</span>
-                            <span>{{receiptMsg.year}}年</span>
+                            <span class="data_tit">申报月份:</span>
+                            <span>{{receiptMsg.month}}月</span>
                         </div>
                     </el-col>
                     <el-col :span="6">
@@ -39,10 +43,6 @@
                             <span class="data_tit">创建日期:</span>
                             <span>{{receiptMsg.createDate}}</span>
                         </div>
-                        <div class="danjuMsg_data">
-                            <span class="data_tit">申报月份:</span>
-                            <span>{{receiptMsg.month}}月</span>
-                        </div>
                     </el-col>
                     <el-col :span="6">
                         <div class="danjuMsgSelect">
@@ -67,28 +67,8 @@
                         </div>
                     </el-col>
                 </el-row>
-                <div class="btnASeach">
-                    <!-- <div class="detaTableBtns">
-                        <div class="tableBtn add" @click="addTableDetail">
-                            <img :src="addIcon" alt="">
-                            <span>新增</span>
-                        </div>
-                        <div class="tableBtn save" @click="saveDetail">
-                            <img :src="saveIcon" alt="">
-                            <span>保存</span>
-                        </div>
-                        <div class="tableBtn import" @click="handleImport">
-                            <img :src="importIcon" alt="">
-                            <span>导入</span>
-                        </div>
-                        <div class="tableBtn export" @click="handleExport">
-                            <img :src="exportIcon" alt="">
-                            <span>导出</span>
-                        </div>
-                    </div> -->
-                </div>
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-                    <el-tab-pane label="考评指标项内容" name="first">
+                    <el-tab-pane label="员工月度考核系数" name="first">
                         <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" />
@@ -134,6 +114,40 @@
                             :total="pageLeft.total">
                         </el-pagination>
                     </el-tab-pane>
+                    <el-tab-pane label="本月主要工作完成情况" name="second">
+                        <el-table :data="secondWorkSituation.slice((pageRight.currentPage-1)*pageRight.pagesize, pageRight.currentPage*pageRight.pagesize)"
+                         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" width="80" />
+                            <el-table-column label="工作内容">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.employeeNo" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="完成情况">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.employeeNo" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="相关处室">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.employeeNo" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="经办人">
+                                <template #default="scope">
+                                    <el-input v-model="scope.row.employeeNo" />
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <el-pagination
+                            @current-change="handleCurrentChangeRight"
+                            :current-page="pageRight.currentPage"
+                            :page-size="pageRight.pagesize"
+                            layout="total, prev, pager, next, jumper"
+                            :total="pageRight.total">
+                        </el-pagination>
+                    </el-tab-pane>
                 </el-tabs>
                 <div>
                     <p class="starttitleSty">审批意见：</p>
@@ -172,6 +186,7 @@ export default {
             dialogVisible: false,
             activeName: 'first',
             quantifiedList: [],
+            secondWorkSituation: [],
             changeDateSelect: [],
             descMsg: '',
             receiptMsg: {
@@ -291,11 +306,14 @@ export default {
             })
         },
         handleClick() {
-            this.changeDateSelect = []
+            this.activeName = val.props.name
         },
         handleCurrentChangeLeft(val) {
             this.pageLeft.currentPage = val
         },
+        handleCurrentChangeRight(val) {
+            this.pageRight.currentPage = val
+        },
         //获取详情头数据
         getDetailsHeader(id) {
             let that = this
@@ -324,13 +342,20 @@ export default {
         getDetails(id) {
             let that = this
             that.quantifiedList = []
+            that.secondWorkSituation = []
             apiPostevaluationdeptadDetails(id).then(datas =>{
                 if (datas && datas.data) {
-                    datas.data.forEach(it =>{
-                        it.serialNumber = it.serialNumber.toString()
-                    })
-                    that.quantifiedList = datas.data
-                    that.pageLeft.total = datas.data.length
+                    if (datas.data['ygydkhxs'][0]) {
+                        datas.data['ygydkhxs'][0].forEach(it =>{
+                            it.serialNumber = it.serialNumber.toString()
+                        })
+                        that.quantifiedList = datas.data['ygydkhxs'][0]
+                        that.pageLeft.total = datas.data['ygydkhxs'][0].length
+                    }
+                    if (datas.data['byzygzwcqk'][0]) {
+                        that.secondWorkSituation = datas.data['byzygzwcqk'][0]
+                        that.pageRight.total = datas.data['byzygzwcqk'][0].length
+                    }
                 }
             })
         },
@@ -578,32 +603,26 @@ export default {
                     .el-select, .el-input{
                         width: 100%;
                     }
-                    .btnASeach{
-                        display: flex;
-                        z-index: 11111;
-                        justify-content: flex-end;
-                        position: relative;
-                        top: 32px;
-                        // left: 50vw;
-                        width: 100%;
+                    .el-tabs{
+                        margin-top: 20px;
                         .detaTableBtns{
                             display: flex;
                             justify-content: flex-end;
-                            width: 300px;
+                            width: 100%;
                             margin-top: 5px;
                             .tableBtn {
                                 display: flex;
                                 height: 20px;
                                 margin: 0 10px;
-                                // width: 13%;
+                                // width: 20%;
                                 width: fit-content;
                                 img{
                                     margin-right: 5px;
                                     margin-top: 1px;
                                 }
                                 span{
-                                    display: inline-block;
                                     width: 35px;
+                                    display: inline-block;
                                     font-size: 14px;
                                     font-family: Microsoft YaHei;
                                     font-weight: 400;
@@ -627,7 +646,7 @@ export default {
                                 }
                             }
                             .delete{
-                                cursor: no-drop;
+                                cursor: pointer;
                                 span{
                                     color: #F65177;
                                 }
@@ -645,8 +664,6 @@ export default {
                                 }
                             }
                         }
-                    }
-                    .el-tabs{
                         .el-tabs__header{
                             .el-tabs__nav{
                                 .el-tabs__item{