diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index c5282f73c..eaf946066 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -23,65 +23,66 @@
企标评价 - - + + + - - - - - - - - - - - - - - - - - - - {{ businessCommentForm.averageScore * 2 }} - - - - - + + + + + + + + + + + + + + + + + + + {{ businessCommentForm.averageScore * 2 }} + + + + +
取消
+ + + + + + + 质量评价总平均分 + {{ + qualityCommentScore * 2 + }} + + + + + 动态评价总平均分 + {{ + dynamicCommentScore * 2 + }} + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + {{ historyCommentForm.averageScore }} + + + + + +
+ + + + + @@ -1066,6 +1291,21 @@ export default { }, data () { return { + commentAverageScoreTag: '1', + firstHistoryPeopleId: '',//最新评价的人的id + historyInfoLoading: false,//历史评价信息的loading + historyCommentForm: { + averageScore: 0, // 平均分值 + revise: '', + reviseReason: '', // 修订理由 + }, // 历史评价表单 + dynamicHistoryCommentTable: [], // 动态评价历史评价表格 + qualityHistoryCommentTable: [], // 质量评价历史评价表格 + dynamicHistoryPeopleTable: [], // 动态评价历史评价人表格 + qualityHistoryPeopleTable: [], // 质量评价历史评价人表格 + dynamicCommentScore: 0,// 动态评价总平均分 + qualityCommentScore: 0,// 质量评价总平均分 + commentActiveName: 'dynamicComment', indexType: 'dynamic', commentReason: '', // 评价理由 commentReason1: '', // 评价理由 @@ -1293,6 +1533,108 @@ export default { watch: { }, methods: { + historyPeopleChange(row){ + this.historyInfoLoading = true + const allData = { + lawId: this.sarStandardsInfoEO.id, + userId: row.userId, + evaluationType: this.indexType + } + if (this.indexType === 'quality'){ + 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.indexType === 'dynamic'){ + 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 + }) + } + + }, + tabsClick(tab, event){ + this.historyInfoLoading = true + if (this.commentAverageScoreTag === '1'){ + this.indexType = 'quality' + //查询评分表 + const allData = { + lawId: this.sarStandardsInfoEO.id, + userId: this.firstHistoryPeopleId, + 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.commentAverageScoreTag === '2'){ + this.indexType = 'dynamic' + //查询评分表 + const allData = { + lawId: this.sarStandardsInfoEO.id, + userId: this.firstHistoryPeopleId, + 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.sarStandardsInfoEO.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 => { + }) + + }, targetScoreChange(row){ if (this.targetScore1 === '') { this.targetScore1 = 0 @@ -1368,26 +1710,120 @@ export default { this.$message.warning('请填写修订理由') } if (submitFlag === true) { - this.$message.success('通过') - + this.commentSubmitLoading = true const allData = { tableData: this.businessCommentTable, formData: JSON.stringify(this.businessCommentForm), standId: this.sarStandardsInfoEO.id, - userId: this.$store.getters.userInfo.userId + userId: this.$store.getters.userInfo.userId, + evaluationType: this.indexType } - console.log(allData) this.$http.postData('sarEnterpriseStandardEvaluation/quality-evaluation/submitEvaluationForm', allData, { _this: this }, res => { - console.log(res) + if (res.ok){ + this.$message.success('提交成功') + this.commentSubmitLoading = false + //重新评分之后刷新历史评分人 + let standId = this.sarStandardsInfoEO.id + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', {lawId:standId}, { + _this: this + }, res => { + this.dynamicHistoryPeopleTable = [] + this.dynamicHistoryPeopleTable = res.data.records + this.firstHistoryPeopleId = res.data.records[0].userId + // for (let i = 0; i < res.data.records.length; i++) { + // this.dynamicHistoryPeopleTable.push(res.data.records[i].userName) + // } + + }, e => { + }) + } }, e => { }) } }, + getSummaries(param) { + const { columns, data } = param; + const sums = []; + columns.forEach((column, index) => { + if (index === 3) { + sums[index] = '合计：'; + return; + }else if(index === 6){ + sums[index] = ''; + return; + } + const values = data.map(item => Number(item[column.property])); + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] += ' '; + } else { + sums[index] = ''; + } + if(sums[index] !== '' && sums[index].indexOf(".") !== -1){ + sums[index] = parseFloat(sums[index]).toFixed(1); + } + }); + return sums; + }, + objectSpanMethod({ row, column, rowIndex, columnIndex },value) { + if (columnIndex === 0) { + if (rowIndex === 0) { + return { + rowspan: value.length, + colspan: 1 + }; + } else { + return { + rowspan: 0, + colspan: 0 + }; + } + }else if(columnIndex === 1 ) { + const _row = (this.filterData2(this.qualityHistoryCommentTable).one)[rowIndex] + const _col = _row > 0 ? 1 : 0 + return { + rowspan: _row, + colspan: _col + } + } + }, + setScoreMin(row){ + return row.scoreMin = ((row.targetScore === undefined || row.targetScore === '') ? '' : row.valueType === 'add' ? row.targetScore : (row.targetScore / 10).toFixed(1)) + + }, + filterData2(){ + let spanOneArr = [] + let concatOne = 0 + this.qualityHistoryCommentTable.forEach((item,index)=>{//循环后端查询出来的数据(orderdata) + if(index === 0){ + spanOneArr.push(1) + }else{ + //name 修改 + if(item.twoIndexTitle === this.qualityHistoryCommentTable[index - 1].twoIndexTitle){ //第一列需合并相同内容的字段 + spanOneArr[concatOne] += 1 + spanOneArr.push(0) + }else{ + spanOneArr.push(1) + concatOne = index + } + } + }) + return { + one: spanOneArr, + } + }, child1Func(child1){ const list = [] if(child1 && child1.length > 1){ @@ -2383,12 +2819,34 @@ export default { // } }, async mounted () { + const qualityRequest = { + lawId: this.sarStandardsInfoEO.id, + evaluationType: 'quality' + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, { + _this: this + }, res => { + this.qualityHistoryPeopleTable = res.data.records + this.firstHistoryPeopleId = res.data.records[0].userId + + }, e => { + }) + const dynamicRequest = { + lawId: this.sarStandardsInfoEO.id, + evaluationType: 'dynamic' + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, { + _this: this + }, res => { + this.dynamicHistoryPeopleTable = res.data.records + this.firstHistoryPeopleId = res.data.records[0].userId + + }, e => { + }) this.$http.get('sarEnterpriseStandardEvaluation/evaluation-index/getEvaluationIndex', {indexType:this.indexType}, { _this: this }, res => { - console.log('2371',res) this.businessCommentTable = res.data - console.log(this.businessCommentTable) }, e => { }) this.sarStandardsInfoEO.id = this.$route.params.id diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index dd9c0b8d1..1da2de6f6 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -722,17 +722,11 @@ prop="xccssrq" label="新车型实施日期(文本)" width="180"> - -
+
+ 导出Excel +
+ + + + diff --git a/src/pages/processCenter/pages/phone/zczqyj/step5.vue b/src/pages/processCenter/pages/phone/zczqyj/step5.vue new file mode 100644 index 000000000..2416bc2b8 --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step5.vue @@ -0,0 +1,629 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/zczqyj/step6.vue b/src/pages/processCenter/pages/phone/zczqyj/step6.vue new file mode 100644 index 000000000..0aa4816b4 --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step6.vue @@ -0,0 +1,494 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/zczqyj/step7.vue b/src/pages/processCenter/pages/phone/zczqyj/step7.vue new file mode 100644 index 000000000..9824ca4a2 --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step7.vue @@ -0,0 +1,495 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/zczqyj/step8.vue b/src/pages/processCenter/pages/phone/zczqyj/step8.vue new file mode 100644 index 000000000..92afa1e9d --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step8.vue @@ -0,0 +1,494 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/zczqyj/step9.vue b/src/pages/processCenter/pages/phone/zczqyj/step9.vue new file mode 100644 index 000000000..99a585c29 --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step9.vue @@ -0,0 +1,494 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index e27239ae9..3e09fa816 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -980,7 +980,7 @@ export default { }) } else if (row.taskInfo === '责任人审核') { this.$router.push({ - name: 'bzjdStep4', + name: 'phoneBzjdStep4', query: { taskIds: row.taskIds, prcId: row.prcId, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index 5d8122512..bad3cc6e5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -1262,7 +1262,8 @@ export default { }); }).catch(() => { // 取消删除，清空选择 - this.selectedList = []; + // console.log(this.selectedList) + // this.selectedList = []; }) } }, diff --git a/src/router/index.js b/src/router/index.js index 86627116f..0da39dace 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2094,6 +2094,66 @@ const routes = [ title: '未符合项整改流程' } }, + { + path: '/phoneZczqyjStep4', + name: 'phoneZczqyjStep4', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step4.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, + { + path: '/phoneZczqyjStep5', + name: 'phoneZczqyjStep5', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step5.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, + { + path: '/phoneZczqyjStep6', + name: 'phoneZczqyjStep6', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step6.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, + { + path: '/phoneZczqyjStep7', + name: 'phoneZczqyjStep7', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step7.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, + { + path: '/phoneZczqyjStep8', + name: 'phoneZczqyjStep8', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step8.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, + { + path: '/phoneZczqyjStep9', + name: 'phoneZczqyjStep9', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step9.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, ] },