From f7fee5bde65b069a1ae24bbe973acb825adc5b80 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 09 九月 2022 09:30:34 +0800
Subject: [PATCH] 1.工单表格高度调整

---
 src/layout/components/Navbar.vue |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index afd5cae..298570f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -51,7 +51,7 @@
         <!--        <el-form-item label="鐢ㄦ埛鍚嶇О锛�">-->
         <!--          <div> {{ username }}</div>-->
         <!--        </el-form-item>-->
-        <el-form-item label="瀵嗙爜锛�" prop="password">
+        <el-form-item label="鍘熷瘑鐮侊細" prop="password">
           <el-input v-model="form.password" style="width: 220px;" />
         </el-form-item>
         <el-form-item label="鏂板瘑鐮侊細" prop="newpassword">
@@ -89,12 +89,23 @@
   },
   created() {
     this.usercode = getCookie('navTabId')
-    this.username = getCookie('admin')
+    this.username = getCookie('username')
   },
   data() {
-    const validatePassword = (rule, value, callback) => {
+    const validatePassword1 = (rule, value, callback) => {
       if (!value) {
-        return callback(new Error('璇疯緭鍏ュ瘑鐮侊紒'))
+        return callback(new Error('璇疯緭鍏ュ師瀵嗙爜锛�'))
+      } else {
+        if (SER_HZ.test(value)) {
+          return callback(new Error('瀵嗙爜涓嶈兘涓轰腑鏂囷紒'))
+        } else {
+          callback()
+        }
+      }
+    }
+    const validatePassword2 = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('璇疯緭鍏ユ柊瀵嗙爜锛�'))
       } else {
         if (SER_HZ.test(value)) {
           return callback(new Error('瀵嗙爜涓嶈兘涓轰腑鏂囷紒'))
@@ -113,10 +124,10 @@
       dialogVisible: false,
       formRules: {
         password: [
-          { required: true, validator: validatePassword, trigger: ['blur', 'change'] }
+          { required: true, validator: validatePassword1, trigger: ['blur', 'change'] }
         ],
         newpassword: [
-          { required: true, validator: validatePassword, trigger: ['blur', 'change'] }
+          { required: true, validator: validatePassword2, trigger: ['blur', 'change'] }
         ]
       }
     }
@@ -172,6 +183,8 @@
   background: #fff;
   box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 
+  //background-color: #f8f8fa;
+
   .hamburger-container {
     line-height: 46px;
     height: 100%;

--
Gitblit v1.9.3