From 4fb1d855025ee172f638c725912004cb5afb408c Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Fri, 9 Aug 2024 16:53:42 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=EF=BC=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85/=E7=BC=96=E8=BE=91=202.=E5=AD=A3=E5=BA=A6=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=93=E4=B8=9A/=E7=AE=A1=E7=90=86=E5=91=98=E6=89=8D?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/AddProjectApply.vue     | 42 +++++++++++--------
 .../quarterlyAssessmentDetail.vue             |  4 +-
 .../quarterlyEvaluationDetail.vue             |  2 +-
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue b/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue
index 67235e8..c56ac7e 100644
--- a/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue
+++ b/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue
@@ -384,6 +384,9 @@ export default {
           type: 'custom-input',
           title: '项目名称',
           model: 'projectName',
+          rules: [
+            {required: true, message: '项目名称不能为空'}
+          ],
           externalValue: {
             disabled: false
           }
@@ -481,6 +484,9 @@ export default {
           type: 'custom-input',
           title: '项目来源',
           model: 'cC',
+          rules: [
+            {required: true, message: '项目来源不能为空'}
+          ],
           externalValue: {
             disabled: false
           }
@@ -489,10 +495,10 @@ export default {
           type: 'custom-input-number',
           title: '难度系数',
           model: 'difficultyFactor',
-          // rules: [
-          //   {required: true, message: '难度系数不能为空'},
-          //   {type: 'number', message: '难度系数必须为数字值或小数'}
-          // ],
+          rules: [
+            {required: true, message: '难度系数不能为空'},
+            {type: 'number', message: '难度系数必须为数字值或小数'}
+          ],
           externalValue: {
             disabled: false
           }
@@ -510,38 +516,38 @@ export default {
           type: 'custom-input-number',
           title: '项目总额(万元)',
           model: 'gross',
-          // rules: [
-          //   {required: true, message: '项目总金额不能为空'},
-          //   {type: 'number', message: '项目总金额必须为数字值'}
-          // ],
+          rules: [
+            {required: true, message: '项目总金额不能为空'},
+            {type: 'number', message: '项目总金额必须为数字值'}
+          ],
           externalValue: {}
         },
         {
           type: 'custom-input-number',
           title: '支出预算(万元)',
           model: 'budget',
-          // rules: [
-          //   {required: true, message: '支出预算不能为空'},
-          //   {type: 'number', message: '支出预算必须为数字值'}
-          // ],
+          rules: [
+            {required: true, message: '支出预算不能为空'},
+            {type: 'number', message: '支出预算必须为数字值'}
+          ],
           externalValue: {}
         },
         {
           type: 'custom-textarea',
           title: '支出测算方案',
           model: 'scheme',
-          // rules: [
-          //   {required: true, message: '项目说明不能为空'},
-          // ],
+          rules: [
+            {required: true, message: '项目说明不能为空'},
+          ],
           externalValue: {}
         },
         {
           type: 'custom-textarea',
           title: '项目绩效目标',
           model: 'goal',
-          // rules: [
-          //   {required: true, message: '项目说明不能为空'},
-          // ],
+          rules: [
+            {required: true, message: '项目说明不能为空'},
+          ],
           externalValue: {}
         },
         {
diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
index 5c126e6..eef54fc 100644
--- a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
@@ -35,8 +35,8 @@
 
       <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="primary" @click="addExpApply(0)" v-if="verifyStatus==1">审核</el-button>
+        <el-button type="warning" @click="addExpApply(1)" v-if="verifyStatus==1">驳回</el-button>
       </div>
       <data-table
         :totalColumnsData="tableColumnsData"
diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
index bae92dd..6b4c4d5 100644
--- a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
@@ -344,7 +344,7 @@ export default {
           if (data.ext.projectAdmin == this.userId) {
             this.isAdmin = false
           }
-          if (data.createdBy == this.userId) {
+          if (data.ext.taskName == "季度审核填报" && data.ext.executor==this.userId) {
             console.log("执行人是当前")
             this.applyId = false
           }