From 956773ff5efc351d67c4319b06ec9689bea71e64 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Wed, 21 Aug 2024 19:23:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AD=A3=E5=BA=A6=E5=AE=A1=E6=A0=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E9=83=A8=E9=97=A8=E4=B8=BB=E4=BB=BB=E8=AF=84?=
 =?UTF-8?q?=E7=BA=A7=E5=8F=96=E6=B6=88=E9=A9=B3=E5=9B=9E=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=202.=E5=AD=A3=E5=BA=A6=E5=AE=A1=E6=A0=B8=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
index 49bd891..a7822c1 100644
--- a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
@@ -36,7 +36,7 @@
       <div style="text-align: right" >
         <el-button type="primary" @click="cancel()">返回</el-button>
         <el-button type="primary" @click="addExpApply(0)" v-if="verifyStatus==1">审核</el-button>
-        <el-button type="warning" @click="addExpApply(1)" v-if="verifyStatus==1">驳回</el-button>
+        <el-button type="warning" @click="addExpApply(1)" v-if="verifyStatus==1 && taskName!='部门主任评级'">驳回</el-button>
       </div>
       <data-table
         :totalColumnsData="tableColumnsData"
@@ -87,6 +87,7 @@ export default {
   },
   data () {
     return {
+      taskName:'',
       tableLoading: true,
       recordsData: [],
       tableColumnsRecordData: [],
@@ -305,7 +306,9 @@ export default {
             }
             this.tableRowsData.push(project)
             this.tableTotalPage = result.data.total
-
+            if(project.ext.taskName=="部门主任评级"){
+              this.taskName=project.ext.taskName
+            }
             for (let i = 0; i < project.ext.quarterRecord.ls.length; i++) {
               let record = project.ext.quarterRecord.ls[i].taskItems;
               for (let j = 0; j < record.length; j++) {
diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
index 6fd3735..f5e8432 100644
--- a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
@@ -105,7 +105,7 @@
                 class="form-input"
                 placeholder="战略规划部部门主任才能打分"
                 v-model.number="formModel.strategyScoring"
-                :disabled="isStrategy ||verifyStatus===2 ||isAdmin"
+                :disabled="isStrategy ||verifyStatus===2 "
                 type="number"
               >
               </el-input>
@@ -115,7 +115,7 @@
                 class="form-input"
                 placeholder="平台建设部部门主任才能打分"
                 v-model="formModel.platformScoring"
-                :disabled="isPlatform ||verifyStatus==2 ||isAdmin"
+                :disabled="isPlatform ||verifyStatus==2 "
                 type="number"
               >
               </el-input>
@@ -125,7 +125,7 @@
                 class="form-input"
                 placeholder="市场发展部部门主任才能打分"
                 v-model="formModel.marketScoring"
-                :disabled="isMarket ||verifyStatus==2 ||isAdmin"
+                :disabled="isMarket ||verifyStatus==2 "
                 type="number"
               >
               </el-input>
@@ -135,7 +135,7 @@
                 class="form-input"
                 placeholder="服务产品部部门主任才能打分"
                 v-model="formModel.serviceScoring"
-                :disabled="isService ||verifyStatus==2 ||isAdmin"
+                :disabled="isService ||verifyStatus==2 "
                 type="number"
               >
               </el-input>