From 4f41c43d376b729225972d61f3d47d7d4085ce61 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 15 Jul 2024 22:02:43 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=20=E7=94=A8=E6=88=B7=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=AF=86=E7=A0=81=E6=A0=A1=E9=AA=8C=E5=8F=8A?=
 =?UTF-8?q?=E4=B8=93=E9=A1=B9=E8=B5=84=E9=87=91=E5=85=B3=E8=81=94=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=98=AF=E5=90=A6=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/SpecialFundDetail.vue | 4 ++--
 src/views/auth/index.vue                             | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/DetailComponent/SpecialFundDetail.vue b/src/components/DetailComponent/SpecialFundDetail.vue
index a7a7634..549549b 100644
--- a/src/components/DetailComponent/SpecialFundDetail.vue
+++ b/src/components/DetailComponent/SpecialFundDetail.vue
@@ -27,8 +27,8 @@
             </el-card>
           </el-form-item>
         </el-col>
-        <baseTitle title="关联项目"></baseTitle>
-        <el-col :span="24">
+        <baseTitle title="关联项目" v-if="!data.taskId"></baseTitle>
+        <el-col :span="24" v-if="!data.taskId">
           <el-form-item>
             <fvTable style="width: 100%;max-height:162px" height="162" v-if="showTable" :tableConfig="projectTable"
                      :data="formData.projects" :isSettingCol="false" :pagination="false">
diff --git a/src/views/auth/index.vue b/src/views/auth/index.vue
index 7432c79..b7bb56a 100644
--- a/src/views/auth/index.vue
+++ b/src/views/auth/index.vue
@@ -77,7 +77,7 @@
               <el-input placeholder="请确认新密码" v-model="userPassword.confirmPassword" type="password"/>
             </el-form-item>
             <el-form-item>
-              <el-button color="#DED0B2" @click="handleSubmit">保存</el-button>
+              <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
               <el-button @click="close">关闭</el-button>
             </el-form-item>
           </el-form>
@@ -120,8 +120,11 @@ const validatePasswordEquality = (rule, value, callback) => {
   }
 }
 const rules = reactive({
+  oldPassword: [
+    {required: true, message: "旧密码不能为空", trigger: ["change", "blur"]},
+  ],
   newPassword: [
-    {required: true, message: "密码不能为空", trigger: ["change", "blur"]},
+    {required: true, message: "新密码不能为空", trigger: ["change", "blur"]},
     {
       required: true,
       trigger: ["change", "blur"],
@@ -129,7 +132,7 @@ const rules = reactive({
     }
   ],
   confirmPassword: [
-    {required: true, message: "密码不能为空", trigger: ["change", "blur"]},
+    {required: true, message: "确认密码不能为空", trigger: ["change", "blur"]},
     {
       required: true,
       trigger: ["change", "blur"],