diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue index 5ae648fb6..7fe30ebb5 100644 --- a/src/pages/details/complianceDetails/index.vue +++ b/src/pages/details/complianceDetails/index.vue @@ -32,12 +32,12 @@ >
企标评价 - - + + + - - - - - - - - - - - - - - - - - - - {{ 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/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index a802ef400..eb446c480 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -367,17 +367,11 @@ - - - - { this.selectList.forEach(items => { - if (item.id === items) { + if (item.itemNum === items.itemNum) { item.complianceReasons = this.batchEditForm.complianceReasons; //不合规 item.noCompliance = this.batchEditForm.noCompliance; @@ -884,10 +884,10 @@ export default { }, //标准表格选择框改变 selectStandChange(data) { - this.selectList = []; - for (let i = 0; i < data.length; i++) { - this.selectList.push(data[i].id); - } + this.selectList = data; + // for (let i = 0; i < data.length; i++) { + // this.selectList.push(data[i].id); + // } }, selectThree() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 8408f31f0..db05102b1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -118,18 +118,12 @@ align="center" sortable label="标准实施日期"> - - - - - - - - - - - - +
{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -368,7 +360,7 @@ label="新车型实施日期"> {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -474,13 +466,13 @@ label="新车型实施日期"> @@ -490,13 +482,13 @@ label="在产车实施日期"> @@ -563,9 +555,9 @@ width="120" >
+ - - - - - - - - - - - {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -389,7 +372,7 @@ label="新车型实施日期"> {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -495,13 +478,13 @@ label="新车型实施日期"> @@ -511,13 +494,13 @@ label="在产车实施日期"> @@ -584,9 +567,9 @@ width="120" > { - if(item.ssrq === "-"){ - item.ssrq = '' - } - if(item.zrbm === '[]'){ - item.zrbm ='' - } - }) - this.standList.map(item => { - let addIndex - addIndex = this.dataList.findIndex(items =>{ - return items.id === item.id - }) - if(addIndex > -1){ - this.$message.warning('请勿重复添加数据') - }else{ - this.dataList.push(item) - } - }) - - this.standModel = false - } - - }, + // okStand() { + // if(this.standList.length < 1){ + // this.$message.warning('请至少选择一条数据进行添加') + // }else{ + // this.standList.forEach(item =>{ + // if(item.ssrq === "-"){ + // item.ssrq = '' + // } + // if(item.zrbm === '[]'){ + // item.zrbm ='' + // } + // }) + // this.standList.map(item => { + // let addIndex + // addIndex = this.dataList.findIndex(items =>{ + // return items.id === item.id + // }) + // if(addIndex > -1){ + // this.$message.warning('请勿重复添加数据') + // }else{ + // this.dataList.push(item) + // } + // }) + // + // this.standModel = false + // } + // + // }, //手动查找的清空按钮 clearLawBtn(){ this.lawInfoTableLoading = true @@ -1162,6 +1145,7 @@ export default { this.$message.warning('请先选择标准/政策来源') } }, + //添加标准带入事件 handleSelectConfirm(){ if(this.handleSelectTableList.length < 1){ this.$message.warning('请至少选择一条数据进行添加') @@ -1175,6 +1159,8 @@ export default { } }) this.handleSelectTableList.map(item => { + this.$set(item, 'involve', 'involve') + this.$set(item, 'remarks', '') let addIndex addIndex = this.dataList.findIndex(items =>{ return items.id === item.id @@ -1185,10 +1171,6 @@ export default { this.dataList.push(item) } }) - this.dataList.forEach(item => { - this.$set(item, 'involve', 'involve') - this.$set(item, 'remarks', '') - }) this.standModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 2a2e58460..4fa29cf5e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -107,27 +107,18 @@ width="190px" align="center" label="标准实施日期"> - - - {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -373,7 +364,7 @@ label="新车型实施日期"> {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} {{ - scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' + scope.row.ssrq }} - {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }} + {{ scope.row.ssrq }} @@ -479,13 +470,13 @@ label="新车型实施日期"> @@ -495,13 +486,13 @@ label="在产车实施日期"> @@ -568,9 +559,9 @@ width="120" > - - - + + + + + diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue new file mode 100644 index 000000000..86697848d --- /dev/null +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue @@ -0,0 +1,657 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/wbsm/step3.vue b/src/pages/processCenter/pages/phone/wbsm/step3.vue new file mode 100644 index 000000000..feb758afb --- /dev/null +++ b/src/pages/processCenter/pages/phone/wbsm/step3.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue new file mode 100644 index 000000000..f78968e5e --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue @@ -0,0 +1,715 @@ + + + + + diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 35cb33d8c..52208b187 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -243,8 +243,8 @@ {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} - {{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }} + style="color: #F56C6C">{{ scope.row.SSRQ }} + {{ scope.row.SSRQ }} @@ -270,8 +270,8 @@ {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }} - {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }} + style="color: #F56C6C">{{ scope.row.ZCCSSRQ }} + {{ scope.row.ZCCSSRQ }} import('@/pages/processCenter/pages/phone/xmqdqr/step5.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '项目清单确认流程' + } + }, + { + path: '/phoneGrbzhxhStep3', + name: 'phoneGrbzhxhStep3', + component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step3.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, + { + path: '/phoneGrbzhxhStep4', + name: 'phoneGrbzhxhStep4', + component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step4.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, { path: '/phoneWfhxStep5', name: 'phoneWfhxStep5',