diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 351ab4658..b32a2ccd1 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -27,7 +27,7 @@ - @@ -1630,90 +1630,90 @@ export default { }, tabsClickBtn(tab, event){ - if (this.commentActiveName === 'dynamicComment'){ - this.indexType = 'dynamic' - //查询评分表 - const allData = { - lawId: this.$route.params.id, - userId: this.qualityFirstHistoryPeopleId, - evaluationType: this.indexType, - } - this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { - _this: this - }, res => { - this.qualityHistoryCommentTable = res.data - this.historyInfoLoading = false - - }, e => { - this.historyInfoLoading = false - }) - } - else if (this.commentActiveName === 'historyComment'){ - this.historyInfoLoading = true - this.indexType = 'quality' - //查询评分表 - const allData = { - lawId: this.$route.params.id, - userId: this.dynamicFirstHistoryPeopleId, - evaluationType: this.indexType - } - this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { - _this: this - }, res => { - this.dynamicHistoryCommentTable = res.data - this.historyCommentForm.revise = res.data[0].targetScore - this.historyCommentForm.reviseReason = res.data[0].commentReason - - let averageScore = 0 - res.data.forEach(item => { - if (item.valueType === 'number'){ - averageScore += parseInt(item.targetScore) - } - }) - averageScore = averageScore / 4 - this.historyCommentForm.averageScore = averageScore - this.historyInfoLoading = false - }, e => { - this.historyInfoLoading = false - }) - } - - //查询动态评价总平均分和质量评价总平均分 - let standId = this.$route.params.id - this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { - _this: this - }, res => { - this.qualityCommentScore = res.data.quality.toFixed(3)/2 - this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2 - - }, e => { - }) - - // 刷新质量评价评分人表格和动态评价评分人表格 - const qualityRequest = { - lawId: standId, - evaluationType: 'quality' - } - this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, { - _this: this - }, res => { - this.qualityHistoryPeopleTable = res.data.records - this.qualityFirstHistoryPeopleId = res.data.records[0].userId - - }, e => { - }) - const dynamicRequest = { - lawId: standId, - evaluationType: 'dynamic' - } - this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, { - _this: this - }, res => { - this.dynamicHistoryPeopleTable = res.data.records - this.dynamicFirstHistoryPeopleId = res.data.records[0].userId - - }, e => { - }) + // if (this.commentActiveName === 'dynamicComment'){ + // this.indexType = 'dynamic' + // //查询评分表 + // const allData = { + // lawId: this.$route.params.id, + // userId: this.qualityFirstHistoryPeopleId, + // evaluationType: this.indexType, + // } + // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + // _this: this + // }, res => { + // this.qualityHistoryCommentTable = res.data + // this.historyInfoLoading = false + // + // }, e => { + // this.historyInfoLoading = false + // }) + // } + // else if (this.commentActiveName === 'historyComment'){ + // this.historyInfoLoading = true + // this.indexType = 'quality' + // //查询评分表 + // const allData = { + // lawId: this.$route.params.id, + // userId: this.dynamicFirstHistoryPeopleId, + // evaluationType: this.indexType + // } + // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + // _this: this + // }, res => { + // this.dynamicHistoryCommentTable = res.data + // this.historyCommentForm.revise = res.data[0].targetScore + // this.historyCommentForm.reviseReason = res.data[0].commentReason + // + // let averageScore = 0 + // res.data.forEach(item => { + // if (item.valueType === 'number'){ + // averageScore += parseInt(item.targetScore) + // } + // }) + // averageScore = averageScore / 4 + // this.historyCommentForm.averageScore = averageScore + // this.historyInfoLoading = false + // }, e => { + // this.historyInfoLoading = false + // }) + // } + // + // //查询动态评价总平均分和质量评价总平均分 + // let standId = this.$route.params.id + // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { + // _this: this + // }, res => { + // this.qualityCommentScore = res.data.quality.toFixed(3)/2 + // this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2 + // + // }, e => { + // }) + // + // // 刷新质量评价评分人表格和动态评价评分人表格 + // const qualityRequest = { + // lawId: standId, + // evaluationType: 'quality' + // } + // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, { + // _this: this + // }, res => { + // this.qualityHistoryPeopleTable = res.data.records + // this.qualityFirstHistoryPeopleId = res.data.records[0].userId + // + // }, e => { + // }) + // const dynamicRequest = { + // lawId: standId, + // evaluationType: 'dynamic' + // } + // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, { + // _this: this + // }, res => { + // this.dynamicHistoryPeopleTable = res.data.records + // this.dynamicFirstHistoryPeopleId = res.data.records[0].userId + // + // }, e => { + // }) }, tabsClick(tab, event){ @@ -3029,14 +3029,18 @@ export default { this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { _this: this }, res => { - let averageScore = 0 - res.data.forEach(item=>{ - item.targetScore = Number(item.targetScore)/2 - averageScore += item.targetScore - }) - this.businessCommentForm.averageScore = averageScore/4 - this.businessCommentTable = res.data - this.historyInfoLoading = false + if(res.data && res.data.length > 0){ + let averageScore = 0 + res.data.forEach(item=>{ + item.targetScore = Number(item.targetScore)/2 + averageScore += item.targetScore + }) + this.businessCommentForm.averageScore = averageScore/4 + console.log(res.data) + this.businessCommentTable = res.data + this.historyInfoLoading = false + this.$forceUpdate() + } }, e => { this.historyInfoLoading = false @@ -3139,6 +3143,8 @@ export default { _this: this }, res => { this.businessCommentTable = res.data + console.log(this.businessCommentTable) + this.$forceUpdate() }, e => { }) this.sarStandardsInfoEO.id = this.$route.params.id