单位考评月季年详情重构管理事项与重点专项得功能，并且服务联调；

src/api/api.js

@@ -893,6 +893,10 @@ export function apiGetorganizationevaluationcommoninfo(params) {
         params: params
     })
 }
+//保存
+export function apiPostsaveEvaluationCommonInfo(params) {
+    return httpRequest.post('organization-evaluation-common-info/addEvaluationCommonInfo', params)
+}
 
 
 

src/components/assessment/assessmentApplicationPage.vue

@@ -428,73 +428,73 @@ export default {
                         message: row.annual+'年度'+row.declarationMonth+'月份本次申报人数为'+res.data+'人',
                         type: 'success'
                     });
-                    setTimeout(() =>{
-                        this.activeVisible = true
-                        let params = {
-                            id: row.deptId
-                        }
-                        apiGetobtainApprovalLeader(params).then(datas =>{
-                            if (datas && datas.data) {
-                                that.leaderArr = datas.data
-                                if (datas.data.length>0) {
-                                    that.activeLeaderName = datas.data[0].no
-                                }
-                            }
-                        })
-                    },1000)
-                }
-            })
-        },
-        activeresponsibility() {
-            let that = this
-            let row = this.activeRowObj
-            let pars = {
-                id: row.id,
-                employeeNo: that.activeLeaderName
-            }
-            apiGetaddApprovalLeader(pars).then(val =>{
-                if (val && val.data) {
-                    that.activeVisible = false
-                    let par = {
-                        defKey: "jxjgkhsb",
-                        businessKey: row.id,
-                        action: "start",
-                        opinion: "绩效结果考核申报",
-                        iamCode: window.localStorage.getItem('code')
+                    this.activeVisible = true
+                    let params = {
+                        id: row.deptId
                     }
-                    apiGetdoAction(par).then(datas =>{
+                    apiGetobtainApprovalLeader(params).then(datas =>{
                         if (datas && datas.data) {
-                            if (!datas.data.isOk) {
-                                that.$message({
-                                    message: datas.data.msg,
-                                    type: 'error'
-                                });
-                            } else {
-                                let params = {
-                                    id: row.id,
-                                    stage: '流程已开始'
-                                }
-                                apideptAdState(params).then(values =>{
-                                    if (values.success) {
-                                        that.getassessmentApplicationList()
-                                    } else {
-                                        that.$message({
-                                            message: values.message,
-                                            type: 'error'
-                                        });
-                                    }
-                                })
+                            that.leaderArr = datas.data
+                            if (datas.data.length>0) {
+                                that.activeLeaderName = datas.data[0].no
                             }
                         }
                     })
-                } else {
-                    that.$message({
-                        message: '领导添加失败',
-                        type: 'error'
-                    });
                 }
             })
         },
+        activeresponsibility() {
+            setTimeout(() =>{
+                let that = this
+                let row = this.activeRowObj
+                let pars = {
+                    id: row.id,
+                    employeeNo: that.activeLeaderName
+                }
+                apiGetaddApprovalLeader(pars).then(val =>{
+                    if (val && val.data) {
+                        that.activeVisible = false
+                        let par = {
+                            defKey: "jxjgkhsb",
+                            businessKey: row.id,
+                            action: "start",
+                            opinion: "绩效结果考核申报",
+                            iamCode: window.localStorage.getItem('code')
+                        }
+                        apiGetdoAction(par).then(datas =>{
+                            if (datas && datas.data) {
+                                if (!datas.data.isOk) {
+                                    that.$message({
+                                        message: datas.data.msg,
+                                        type: 'error'
+                                    });
+                                } else {
+                                    let params = {
+                                        id: row.id,
+                                        stage: '流程已开始'
+                                    }
+                                    apideptAdState(params).then(values =>{
+                                        if (values.success) {
+                                            that.getassessmentApplicationList()
+                                        } else {
+                                            that.$message({
+                                                message: values.message,
+                                                type: 'error'
+                                            });
+                                        }
+                                    })
+                                }
+                            }
+                        })
+                    } else {
+                        that.$message({
+                            message: '领导添加失败',
+                            type: 'error'
+                        });
+                    }
+                })
+            },100)
+        },
         clickDes(row, column, cell, event) {
             if (row.stage === '流程已结束') {
                 row.chngeDes = false

src/components/assessment/monthQuarterYearFrom.vue

@@ -179,11 +179,11 @@
         </el-dialog>
         <el-dialog title="详情填报" v-model="detailVisible" :fullscreen="true" :close-on-click-modal="false">
             <div class="detailSeach">
-                <div class="tableBtn add" @click="addTableDetail">
+                <div class="tableBtn add" @click="addTableDetailInfo">
                     <img :src="addIcon" alt="">
                     <span>新增</span>
                 </div>
-                <div class="tableBtn save" @click="saveAddDetail">
+                <div class="tableBtn save" @click="saveAddDetailInfo">
                     <img :src="saveIcon" alt="">
                     <span>保存</span>
                 </div>
@@ -192,7 +192,7 @@
                 :row-class-name="tableRowClassName" :border="true" >
                 <el-table-column type="index" label="序号" align="center"></el-table-column>
                 <el-table-column label="部门名称" prop="deptName" align="center" width="200"></el-table-column>
-                <el-table-column  v-for="(it, index) in monthQuarterYearHeader" :key="index"
+                <el-table-column  v-for="(it, index) in monthQuarterYearDetailHeader" :key="index"
                     :label="it.name" align="center">
                     <el-table-column v-for="(iv, index) in it.children" :key="index" :label="iv.key" align="center">
                         <template #default="scope">
@@ -211,7 +211,7 @@
 import importDailog from '../importPage/importDailog.vue'
 import {apiGetEvaluationIndicatorList,apiGetgetEvaluationInfoDataList,apiGetbinsectionList, apiGetbinstageList,apiGetExportMsg,
 apiPostorganizationUpdateEvaluationInfo, apiPostorganizationUpdateAddEvaluationInfo, apiGetOrganizationListAll,
-apiGetorganizationevaluationcommoninfo} from '../../api/api'
+apiGetorganizationevaluationcommoninfo, apiPostsaveEvaluationCommonInfo} from '../../api/api'
 import * as XLSX from 'xlsx'
 import { saveAs } from 'file-saver'
 import  * as XLSXD from 'xlsx-js-style'
@@ -234,9 +234,10 @@ export default {
             dialogVisible: false,
             detailVisible: false,
             activeName: '',
+            monthQuarterYearHeader: [],
             monthQuarterYearData: [],
             monthQuarterYearDetailData: [],
-            monthQuarterYearHeader: [],
+            monthQuarterYearDetailHeader: [],
             indicatorList: [],
             isClickTagId: '',
             compNameSa: '',
@@ -263,7 +264,8 @@ export default {
             importIcon: importIcon,
             addstageId: '',
             cycleType: '',
-            userMes: {}
+            userMes: {},
+            detailMsg: {}
         }
     },
     created() {
@@ -473,8 +475,7 @@ export default {
                     obj[it.code] = ''
                     obj['IS_LH_'+it.code] = it.flag
                 })
-                // this.monthQuarterYearData.unshift(obj)
-                this.monthQuarterYearDetailData.unshift(obj)
+                this.monthQuarterYearData.unshift(obj)
             }
             console.log('表格数据====>>>>>>>', this.monthQuarterYearData)
         },
@@ -573,11 +574,12 @@ export default {
         },
         changeDetail(row) {
             this.detailVisible = true
+            this.detailMsg = row
             let that = this
             let params = {
                 organizationEvaluationId: that.rowMsg.id,
                 indicatorId: that.isClickTagId,
-                organizationId: row.id
+                organizationId: row.organizationId
             }
             apiGetorganizationevaluationcommoninfo(params).then(datas =>{
                 if (datas && datas.data) {
@@ -590,12 +592,52 @@ export default {
                             }
                             header.push(obj)
                         }
-                        that.monthQuarterYearHeader = header
+                        that.monthQuarterYearDetailHeader = header
                     }
-                    that.monthQuarterYearData = datas.data.value
+                    that.monthQuarterYearDetailData = datas.data.value
                 }
             })
         },
+        addTableDetailInfo() {
+            if (this.monthQuarterYearDetailHeader.length>0) {
+                let headerArr = []
+                this.monthQuarterYearDetailHeader.forEach(item =>{
+                    headerArr = headerArr.concat(item.children)
+                })
+
+                let obj = {
+                    isAdd: true,
+                    deptName: '组织人事部'
+                }
+                headerArr.forEach(it =>{
+                    if (it.flag === '1') {
+                        obj[it.code] = '1.00'
+                    } else {
+                        obj[it.code] = ''
+                    }
+                    obj['IS_LH_'+it.code] = it.flag
+                })
+                this.monthQuarterYearDetailData.unshift(obj)
+            }
+        },
+        saveAddDetailInfo() {
+            let that = this
+            let addParams = []
+            let addObj = {}
+            that.monthQuarterYearDetailData.forEach(it =>{
+                addObj.organizationEvaluationId = that.rowMsg.id
+                addObj.indicatorId = that.isClickTagId
+                addObj.organizationId = that.detailMsg.organizationId
+                addObj.optionMap = it
+                addParams.push(addObj)
+            })
+            apiPostsaveEvaluationCommonInfo(addParams).then(datas =>{
+                if (datas) {
+                    that.detailVisible = false
+                    that.responseData(datas)
+                }
+            })
+        }
     }
 }
 </script>

src/components/taskCenter/taskApplicationFrom.vue

@@ -639,7 +639,7 @@ export default {
                     that.leaderVisible = false
                     setTimeout(() =>{
                         that.submitIsdoAction('leader')
-                    }, 10000)
+                    }, 100)
                 }
             })
         },