From f96c2adc8d6bab6a4ee67a50ecfc9e6c7e435efd Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 24 四月 2023 08:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs' into stasrs
---
src/main/webapp/static/js/common.js | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 31ad23d..412dbdf 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,9 +1,25 @@
-var baseUrl = "/jkwms";
+var baseUrl = "/stwms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
// 璇︽儏绐楀彛-瀹藉害
var detailWidth = '90%';
+
+function checkPassword(password) {
+ //瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛楅暱搴︿笉鑳藉皯浜�8浣�
+ let pattern = /(?=.*[0-9])(?=.*[a-zA-Z!@#$]).{8,}/
+ //涓嶈兘鍖呭惈杩炵画鏁板瓧
+ let pattern2 = /(0(?=1)|1(?=2)|2(?=3)|3(?=4)|4(?=5)|5(?=6)|6(?=7)|7(?=8)|8(?=9)){3}\d/
+ //閲嶅鏁板瓧涓嶈兘瓒呰繃鍥涗綅
+ let pattern3 = /(\d)\1{3}/
+ if (pattern.test(password) && pattern2.test(password) === false && pattern3.test(password) === false) {
+ //鍖归厤鏀捐
+ return true
+ }
+
+ //涓嶅尮閰嶈姹備慨鏀瑰瘑鐮�1
+ return false;
+}
// 闈炵┖鍒ゆ柇
function isEmpty(obj){
@@ -14,7 +30,7 @@
// layer.close(loadIndex);
// 鏃堕棿 ==>> 瀛楃涓�
-function dateToStr(date) {
+function dateToStr(date, millisecond) {
var time = new Date(date);
var y = time.getFullYear();
var M = time.getMonth() + 1;
@@ -27,7 +43,18 @@
m = m < 10 ? ("0" + m) : m;
var s = time.getSeconds();
s = s < 10 ? ("0" + s) : s;
- return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+ if (!millisecond) {
+ return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+ } else {
+ var p = time.getMilliseconds();
+ if (p < 10) {
+ p = "00" + p;
+ }
+ if (p < 100) {
+ p = "0" + p;
+ }
+ return y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s + "," + p;
+ }
}
// 瀛楃涓� ===>> 鏃堕棿
@@ -176,7 +203,7 @@
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
@@ -213,12 +240,12 @@
var detlCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
--
Gitblit v1.9.1