diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 62a5b7bed..ea197d73d 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -136,13 +136,15 @@
prop="historyPeopleName"
align="center"
label="质量评价人"
- width="130px"
- show-overflow-tooltip>
+ width="200px">
+
- {{ scope.row.userName }}
+ style="width: 180px;" size="mini"
+ @click="historyPeopleChange(scope.row)">
+ {{ scope.row.userName + '-' + scope.row.processNode.substring(0,9) }}
+
@@ -232,7 +234,7 @@
-
+
@@ -254,7 +256,7 @@
-
+
@@ -293,7 +295,7 @@
-
+
@@ -1294,19 +1296,20 @@ export default {
data () {
return {
commentAverageScoreTag: '1',
- firstHistoryPeopleId: '',//最新评价的人的id
+ qualityFirstHistoryPeopleId: '',//质量评价最新评价的人的id
+ dynamicFirstHistoryPeopleId: '',//动态评价最新评价的人的id
historyInfoLoading: false,//历史评价信息的loading
historyCommentForm: {
averageScore: 0, // 平均分值
revise: '',
reviseReason: '', // 修订理由
}, // 历史评价表单
- dynamicHistoryCommentTable: [], // 动态评价历史评价表格
qualityHistoryCommentTable: [], // 质量评价历史评价表格
- dynamicHistoryPeopleTable: [], // 动态评价历史评价人表格
+ dynamicHistoryCommentTable: [], // 动态评价历史评价表格
qualityHistoryPeopleTable: [], // 质量评价历史评价人表格
- dynamicCommentScore: 0,// 动态评价总平均分
+ dynamicHistoryPeopleTable: [], // 动态评价历史评价人表格
qualityCommentScore: 0,// 质量评价总平均分
+ dynamicCommentScore: 0,// 动态评价总平均分
commentActiveName: 'dynamicComment',
indexType: 'dynamic',
commentReason: '', // 评价理由
@@ -1537,13 +1540,19 @@ export default {
methods: {
historyPeopleChange(row){
this.historyInfoLoading = true
- const allData = {
+ const qualityAllData = {
+ lawId: this.$route.params.id,
+ userId: row.userId,
+ evaluationType: this.indexType,
+ processNode: row.processNode
+ }
+ const dynamicAllData = {
lawId: this.$route.params.id,
userId: row.userId,
evaluationType: this.indexType
}
if (this.indexType === 'quality'){
- this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+ this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', qualityAllData , {
_this: this
}, res => {
this.qualityHistoryCommentTable = res.data
@@ -1553,7 +1562,7 @@ export default {
this.historyInfoLoading = false
})
}else if (this.indexType === 'dynamic'){
- this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+ this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', dynamicAllData , {
_this: this
}, res => {
this.dynamicHistoryCommentTable = res.data
@@ -1583,8 +1592,9 @@ export default {
//查询评分表
const allData = {
lawId: this.$route.params.id,
- userId: this.firstHistoryPeopleId,
- evaluationType: this.indexType
+ userId: this.qualityFirstHistoryPeopleId,
+ evaluationType: this.indexType,
+ processNode: this.qualityHistoryPeopleTable[0].processNode
}
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
_this: this
@@ -1601,7 +1611,7 @@ export default {
//查询评分表
const allData = {
lawId: this.$route.params.id,
- userId: this.firstHistoryPeopleId,
+ userId: this.dynamicFirstHistoryPeopleId,
evaluationType: this.indexType
}
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
@@ -1636,6 +1646,32 @@ export default {
}, 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 => {
+ })
+
},
targetScoreChange(row){
if (this.targetScore1 === '') {
@@ -1729,12 +1765,16 @@ export default {
this.commentSubmitLoading = false
//重新评分之后刷新历史评分人
let standId = this.$route.params.id
- this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', {lawId:standId}, {
+ const dynamicRequest = {
+ lawId: standId,
+ evaluationType: 'dynamic'
+ }
+ this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
_this: this
}, res => {
this.dynamicHistoryPeopleTable = []
this.dynamicHistoryPeopleTable = res.data.records
- this.firstHistoryPeopleId = res.data.records[0].userId
+ this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
}, e => {
})
@@ -2827,7 +2867,7 @@ export default {
_this: this
}, res => {
this.qualityHistoryPeopleTable = res.data.records
- this.firstHistoryPeopleId = res.data.records[0].userId
+ this.qualityFirstHistoryPeopleId = res.data.records[0].userId
}, e => {
})
@@ -2839,7 +2879,7 @@ export default {
_this: this
}, res => {
this.dynamicHistoryPeopleTable = res.data.records
- this.firstHistoryPeopleId = res.data.records[0].userId
+ this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
}, e => {
})