From 1ff81f14c15c85c2ba6e2149acdae4500d77a3dc Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 3 Mar 2022 14:33:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=E5=85=AC=E5=BC=8F=E5=85=B6=E4=B8=AD=E4=B8=80?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=94=B9=E6=88=90=20=EF=BC=88=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E2=9E=95=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E4=B8=BB=E7=AE=A1=EF=BC=89=E2=9E=972=E2=9C=96=EF=B8=8F0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbrk/step9.vue | 8 ++++----
 .../processCenter/pages/creatProcess/qbrk/stepC1.vue      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
index 687fea355..8a12da907 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -1210,11 +1210,11 @@
             },
             calScope(){
                 if(this.evaluationMap){
-                    const hqSum = this.evaluationMap["会签征求意见"]
-                    const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"]
-                    const fsSum = this.evaluationMap["复审"]
+                    const hqSum = this.evaluationMap["征求意见"]
+                    const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
+                    const fsSum = this.evaluationMap["标准化复审"]
                     const shSum = this.form.evaluationData && this.form.evaluationData.length > 0 ? this.form.evaluationData[0].sum : 0
-                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0)
+                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3
                     return parseFloat(aveCount).toFixed(1)
                 }
                 return 0
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
index 545fb0606..1d86db8d7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
@@ -1212,11 +1212,11 @@
             },
             calScope(){
                 if(this.evaluationMap){
-                    const hqSum = this.evaluationMap["会签征求意见"]
-                    const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"]
-                    const fsSum = this.evaluationMap["复审"]
+                    const hqSum = this.evaluationMap["征求意见"]
+                    const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
+                    const fsSum = this.evaluationMap["标准化复审"]
                     const shSum = this.evaluationMap["标准法规部高级经理审核"]
-                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0)
+                    const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3
                     return parseFloat(aveCount).toFixed(1)
                 }
                 return 0