From 56506a7ca4f7f91cd0c4c9de549b00de41ad3bb3 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 5 Dec 2021 13:40:59 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E6=80=BB=E8=A1=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=A0=8F=E6=B7=BB=E5=8A=A03=E4=B8=AA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=94=E9=A1=BA=E5=BA=8F=E4=B8=BA=EF=BC=9A=E2=80=9C=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=97=A5=E6=9C=9F=E2=80=9D=E2=80=9C=E5=AE=9E=E6=96=BD?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E2=80=9D=E2=80=9C=E6=96=B0=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E2=80=9D=E2=80=9C=E5=9C=A8?= =?UTF-8?q?=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E2=80=9D?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B8=8A=E4=B8=8B=E7=AE=AD=E5=A4=B4?= =?UTF-8?q?=EF=BC=8C=EF=BC=88=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E7=94=B1=E8=BF=91=E5=88=B0=E8=BF=9C=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 308c3e146..608ab87c7 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -153,22 +153,22 @@ {{ scope.row.itemsName }} - + - + - + - + From 0a475e9fe489ff4ad4a2b5476048c10ad2f46bee Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 14:15:52 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E3=80=81=E5=8F=82?= =?UTF-8?q?=E4=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue | 3 ++- src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 84efd9938..c2e5c78b5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -153,7 +153,7 @@ - + { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 9a3f4a843..1fd7e6aa1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -123,11 +123,11 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index e846129cd..bcf5d217c 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -239,7 +239,7 @@ @pageSizeChange="pageSizeChange"/> Date: Sun, 5 Dec 2021 14:27:18 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E7=9A=84=E8=AF=84=E4=BB=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 206 +++++++++++++++--- 1 file changed, 171 insertions(+), 35 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index cf109226c..c5282f73c 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -23,9 +23,9 @@
企标评价 - - + - - - + + - + + + + - + + + + + + {{ businessCommentForm.averageScore * 2 }} + +
+ 提交 + + 取消 + +
@@ -1037,19 +1066,26 @@ export default { }, data () { return { - targetScore: '', + indexType: 'dynamic', + commentReason: '', // 评价理由 + commentReason1: '', // 评价理由 + commentReason2: '', // 评价理由 + commentReason3: '', // 评价理由 + commentReason4: '', // 评价理由 + commentSubmitLoading: false, + targetScore: '', // 指标分值 + targetScore1: '', + targetScore2: '', + targetScore3: '', + targetScore4: '', businessCommentDialog: false, - businessCommentForm: {}, - revise: '', - businessCommentTable: [{ - commentTarget: '企业标准内容完整、要求合理(指标、流程等。)', - }, { - commentTarget: '企业标准便于实施应用', - }, { - commentTarget: '标准编写规范,内容清晰易理解', - }, { - commentTarget: '标准对我的实际工作很有帮助', - }], + businessCommentForm: { + averageScore: '', // 平均分值 + revise: '', + reviseReason: '', // 修订理由 + }, + businessCommentTable: [], + commentTarget: '', // 评价指标 activeNames: ['基础信息','过程稿件','实施日期'], activeState: true, visiblePlanCheck: false, @@ -1258,7 +1294,99 @@ export default { }, methods: { targetScoreChange(row){ - console.log('1234',row) + if (this.targetScore1 === '') { + this.targetScore1 = 0 + } + if (this.targetScore2 === '') { + this.targetScore2 = 0 + } + if (this.targetScore3 === '') { + this.targetScore3 = 0 + } + if (this.targetScore4 === '') { + this.targetScore4 = 0 + } + switch (row.threeIndexTitle){ + case "企业标准内容完整、要求合理(指标、流程等。)": + this.targetScore1 = 0 + this.targetScore1 = row.targetScore + break + case "企业标准便于实施应用": + this.targetScore2 = 0 + this.targetScore2 = row.targetScore + break + case "标准编写规范,内容清晰易理解": + this.targetScore3 = 0 + this.targetScore3 = row.targetScore + break + case "标准对我的实际工作很有帮助": + this.targetScore4 = 0 + this.targetScore4 = row.targetScore + break + } + this.businessCommentForm.averageScore = (this.targetScore1 + this.targetScore2 + this.targetScore3 +this.targetScore4)/4 + + + }, + commentReasonChange(row){ + if (row.threeIndexTitle === '企业标准内容完整、要求合理(指标、流程等。)'){ + this.commentReason1 = row.commentReason + } + if (row.threeIndexTitle === '企业标准便于实施应用'){ + this.commentReason2 = row.commentReason + } + if (row.threeIndexTitle === '标准编写规范,内容清晰易理解'){ + this.commentReason3 = row.commentReason + } + if (row.threeIndexTitle === '标准对我的实际工作很有帮助'){ + this.commentReason4 = row.commentReason + } + + }, + commentSubmit(){ + //验证必填 + let submitFlag = true + if (this.targetScore1 === '' || this.targetScore1 === 0 || + this.targetScore2 === '' || this.targetScore2 === 0 || + this.targetScore3 === '' || this.targetScore3 === 0 || + this.targetScore4 === '' || this.targetScore4 === 0) { + submitFlag = false + this.$message.warning('请评价指标分值') + }else if ( + (this.commentReason1 === '' && this.targetScore1 < 3) || + (this.commentReason2 === '' && this.targetScore2 < 3) || + (this.commentReason3 === '' && this.targetScore3 < 3) || + (this.commentReason4 === '' && this.targetScore4 < 3) + ) { + submitFlag = false + this.$message.warning('请简述低分理由') + } else if (this.businessCommentForm.revise === ''){ + submitFlag = false + this.$message.warning('请选择是否需要修订') + }else if (this.businessCommentForm.revise === '1' && this.businessCommentForm.reviseReason === ''){ + submitFlag = false + this.$message.warning('请填写修订理由') + } + if (submitFlag === true) { + this.$message.success('通过') + + const allData = { + tableData: this.businessCommentTable, + formData: JSON.stringify(this.businessCommentForm), + standId: this.sarStandardsInfoEO.id, + userId: this.$store.getters.userInfo.userId + } + + console.log(allData) + this.$http.postData('sarEnterpriseStandardEvaluation/quality-evaluation/submitEvaluationForm', allData, { + _this: this + }, res => { + console.log(res) + }, e => { + }) + + + } }, child1Func(child1){ const list = [] @@ -2255,6 +2383,14 @@ export default { // } }, async mounted () { + 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 this.getOrgTreeSource() this.standItemEO.standId = this.$route.params.id From 4564b016928457ea9bc621bfa6310c3e79409857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 5 Dec 2021 14:32:13 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E5=90=88=E5=B9=B6type=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index b3503075a..413010df3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -431,6 +431,9 @@ export default { }, //流程提交 handleSubmit() { + if(this.$refs["childForm"].qbfsForm.type === undefined){ + this.$refs["childForm"].qbfsForm.type = '1' + } this.repeatName() if(this.comFlag === '0'){ this.$message.warning('请更改企标名称') From 9d505caf60257d0a31166fd5a32dda268d2c3788 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 14:39:10 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 8ebea20ce..86d86d981 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -50,6 +50,7 @@