From 90fb84c177a778b2fc57657d5be14dee977ea955 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Mon, 22 Jul 2024 14:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E6=8C=87=E6=A0=87=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E4=B9=8B=E5=90=8E=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E5=AD=A3=E5=BA=A6=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=8F=82=E6=95=B0=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quarterlyAssessment/quarterlyAssessmentDetail.vue    | 9 ++++++---
 .../quarterlyAssessment/quarterlyEvaluationDetail.vue    | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
index 33442cf..9c1764a 100644
--- a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
@@ -138,7 +138,9 @@ export default {
       let map = {
         id: this.reimburseId,
         spyj: this.formData.spyj,
-        examine: this.isExamine
+        examine: this.isExamine,
+        quarter: this.quarter,
+        isOffice: this.isOffice
       }
       Api.ProjectManagements.examine(map).then(result => {
         console.log(result)
@@ -146,7 +148,7 @@ export default {
           this.$message.success(result.data)
           this.isSubmit = false
           this.$router.push({
-            name: 'quarterlyAssessmentApply',
+            name: 'quarterlyEvaluation',
             params: {id: this.reimburseId}
           })
         } else {
@@ -193,6 +195,7 @@ export default {
               project.platformScoring = project.ext.platformScoring
               project.marketScoring = project.ext.marketScoring
               project.serviceScoring = project.ext.serviceScoring
+              project.sum = project.ext.sum
             }
             this.tableRowsData.push(project)
             this.tableTotalPage = result.data.total
@@ -311,7 +314,7 @@ export default {
           },
           {
             label: '项目平均分',
-            // prop: '',
+            prop: 'sum',
             show: true
           }
         ]
diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
index b90351c..3dc3cfe 100644
--- a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
@@ -166,6 +166,7 @@ export default {
   },
   data () {
     return {
+      quarter: '',
       isStrategy: true,
       isPlatform: true,
       isMarket: true,
@@ -315,6 +316,7 @@ export default {
           let data = result.data.ls[0]
           this.formModel = data
           this.ext = data.ext
+          this.quarter = data.quarter
           this.formModel.execution = data.ext.execution
           if (!this.isOffice) {
             this.formModel.selfEvaluation = data.ext.selfEvaluation
@@ -524,7 +526,7 @@ export default {
             if (result.status === 0) {
               this.$message.success(result.data)
               this.$router.push(
-                {name: 'quarterlyAssessmentDetail', params: {id: this.pid}})
+                {name: 'quarterlyAssessmentDetail', params: {id: this.pid, quarter: this.quarter}})
             } else {
               this.$message.error(result.data)
             }