diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index 1201cfe34..cb4660243 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -1195,11 +1195,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) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3) return parseFloat(aveCount).toFixed(1) } return 0 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 44a53afbc..06b7b9cdf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -1218,9 +1218,9 @@ if(this.evaluationMap){ const hqSum = this.evaluationMap["征求意见"] const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"] - const fsSum = this.evaluationMap["标准化复审"] + const fsSum = this.evaluationMap["标准化复审"] ? this.evaluationMap["标准化复审"] : 0 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) + (shSum ? shSum: 0)) / 2 * 0.3 + const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 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 2e5f88a58..51b4083df 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -1222,7 +1222,7 @@ 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) + (shSum ? shSum: 0)) / 2 * 0.3 + const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3) return parseFloat(aveCount).toFixed(1) } return 0