Merge pull request 'master' (#567) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/567

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">

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"],