From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 三月 2024 10:14:28 +0800
Subject: [PATCH] 1.增加牌号作为唯一物料条件 (当前牌号 批号 包号可以筛选出唯一物料) 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善

---
 src/main/webapp/views/password.html |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/views/password.html b/src/main/webapp/views/password.html
index 8d20e0c..623a5ab 100644
--- a/src/main/webapp/views/password.html
+++ b/src/main/webapp/views/password.html
@@ -77,7 +77,7 @@
                 if (val === ""){
                     // return "褰撳墠瀵嗙爜涓嶈兘涓虹┖";
                 }
-                if (parent.$('#password').val() !== val) {
+                if (parent.$('#password').val() !== hex_md5(val)) {
                     return "瀵嗙爜涓嶅尮閰�";
                 }
             },
@@ -88,14 +88,30 @@
                 if (val.length < 4) {
                     return "涓嶈兘灏戜簬4涓瓧绗�";
                 }
-                if (parent.$('#password').val() !== hex_md5(val)) {
+                if (parent.$('#password').val() === hex_md5(val)) {
                     return "涓庢棫瀵嗙爜涓嶈兘鐩稿悓";
+                }
+
+                let username = localStorage.getItem('username')
+                if (!(username === 'super' || password === 'root')){
+                    if(!checkPassword(val)){
+                        //瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛�
+                        return "瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛楅暱搴︿笉鑳藉皯浜�8浣嶏紝涓斾笉鑳藉寘鍚繛缁暟瀛楀拰鍥涗綅閲嶅鏁板瓧";
+                    }
                 }
             },
             rePwd: function (val) {
                 if ($('#password').val() !== val){
                     return "瀵嗙爜涓嶄竴鑷�";
                 }
+
+                let username = localStorage.getItem('username')
+                if (!(username === 'super' || password === 'root')){
+                    if(!checkPassword(val)){
+                        //瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛�
+                        return "瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛楅暱搴︿笉鑳藉皯浜�8浣嶏紝涓斾笉鑳藉寘鍚繛缁暟瀛楀拰鍥涗綅閲嶅鏁板瓧";
+                    }
+                }
             }
         });
 

--
Gitblit v1.9.1