问题修改

src/api/api.js

@@ -885,6 +885,16 @@ export function apiPostorganizationUpdateAddEvaluationInfo(params) {
 }
 
 
+//单位月季年重点专项和管理事项详情-----根据属性和阶段获取--获取指标名--表格
+export function apiGetorganizationevaluationcommoninfo(params) {
+    return httpRequest({
+        url: 'organization-evaluation-common-info/list',
+        method: 'get',
+        params: params
+    })
+}
+
+
 
 //----------------------------------------考评体系配置------------------------------------------------
 //----考评指标管理

src/components/assessment/assessmentApplicationPage.vue

@@ -419,78 +419,79 @@ export default {
             })
         },
         agetdeptresponsibility(row) {
-            this.activeVisible = true
             this.activeRowObj = row
             this.leaderArr = []
             let that = this
-            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
-                    }
-                }
-            })
-        },
-        activeresponsibility() {
-            let that = this
-            let row = this.activeRowObj
             apiGetparticipantsNumber(row.id).then(res =>{
                 if (res.success) {
                     that.$message({
                         message: row.annual+'年度'+row.declarationMonth+'月份本次申报人数为'+res.data+'人',
                         type: 'success'
                     });
-                    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')
+                    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
+                                }
                             }
-                            apiGetdoAction(par).then(datas =>{
-                                if (datas && datas.data) {
-                                    if (!datas.data.isOk) {
+                        })
+                    },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')
+                    }
+                    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: datas.data.msg,
+                                            message: values.message,
                                             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'
-                            });
+                                })
+                            }
                         }
                     })
-                    
+                } else {
+                    that.$message({
+                        message: '领导添加失败',
+                        type: 'error'
+                    });
                 }
             })
         },

src/components/assessment/monthQuarterYearFrom.vue

@@ -120,7 +120,7 @@
                                 </el-table-column>
                                 <el-table-column label="操作" width="100">
                                     <template #default="scope">
-                                        <span class="indicitem" @click="changeDetail">详情</span>
+                                        <span class="indicitem" @click="changeDetail(scope.row)">详情</span>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -210,7 +210,8 @@
 <script>
 import importDailog from '../importPage/importDailog.vue'
 import {apiGetEvaluationIndicatorList,apiGetgetEvaluationInfoDataList,apiGetbinsectionList, apiGetbinstageList,apiGetExportMsg,
-apiPostorganizationUpdateEvaluationInfo, apiPostorganizationUpdateAddEvaluationInfo, apiGetOrganizationListAll} from '../../api/api'
+apiPostorganizationUpdateEvaluationInfo, apiPostorganizationUpdateAddEvaluationInfo, apiGetOrganizationListAll,
+apiGetorganizationevaluationcommoninfo} from '../../api/api'
 import * as XLSX from 'xlsx'
 import { saveAs } from 'file-saver'
 import  * as XLSXD from 'xlsx-js-style'
@@ -570,8 +571,30 @@ export default {
                 console.error(r)
             })
         },
-        changeDetail() {
+        changeDetail(row) {
             this.detailVisible = true
+            let that = this
+            let params = {
+                organizationEvaluationId: that.rowMsg.id,
+                indicatorId: that.isClickTagId,
+                organizationId: row.id
+            }
+            apiGetorganizationevaluationcommoninfo(params).then(datas =>{
+                if (datas && datas.data) {
+                    if (datas.data.title) {
+                        let header = []
+                        for(let i in datas.data.title) {
+                            let obj = {
+                                name: i,
+                                children: datas.data.title[i]
+                            }
+                            header.push(obj)
+                        }
+                        that.monthQuarterYearHeader = header
+                    }
+                    that.monthQuarterYearData = datas.data.value
+                }
+            })
         },
     }
 }

src/components/taskCenter/taskApplicationFrom.vue

@@ -637,7 +637,9 @@ export default {
             apiGetaddRepeatBatchLeader(pars).then(val =>{
                 if (val && val.data) {
                     that.leaderVisible = false
-                    that.submitIsdoAction('leader')
+                    setTimeout(() =>{
+                        that.submitIsdoAction('leader')
+                    }, 10000)
                 }
             })
         },
@@ -960,6 +962,9 @@ export default {
                         }
                     }
                 }
+                .periodFrom{
+                    margin: 15px 0;
+                }
             }
             .el-dialog__footer{
                 .dialog-footer{