diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 115850793..ddb0e0d93 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -363,8 +363,8 @@ arbitrary=\u4EFB\u610F basic_config=\u57FA\u672C\u914D\u7F6E block_config=\u914D\u7F6E\u4FE1\u606F expression_type=\u8868\u8FBE\u5F0F\u7C7B\u578B -null=\u65E0\u8868\u8FBE\u5F0F -and=\u4E0E\u8868\u8FBE\u5F0F +null_expression=\u65E0\u8868\u8FBE\u5F0F +and_expression=\u4E0E\u8868\u8FBE\u5F0F match_method=\u5339\u914D\u65B9\u5F0F substring_match=\u5B50\u4E32\u5339\u914D right_match=\u53F3\u5339\u914D diff --git a/src/main/webapp/WEB-INF/views/sys/userForm.jsp b/src/main/webapp/WEB-INF/views/sys/userForm.jsp index 34dadb129..2f0a1011e 100644 --- a/src/main/webapp/WEB-INF/views/sys/userForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/userForm.jsp @@ -12,12 +12,12 @@ $("#inputForm").validate({ rules: { loginId: {remote: "${ctx}/sys/user/checkLoginName?oldLoginId=" + encodeURIComponent('${user.loginId}')}, - 'office.name': {officeIsValid: true }, + // 'office.name': {officeIsValid: true }, 'entity.name': {required: true } }, messages: { loginId: {remote: ""}, - 'office.name': {officeIsValid: ""}, + // 'office.name': {officeIsValid: ""}, confirmNewPassword: {equalTo: ""} }, submitHandler: function(form){ @@ -121,7 +121,10 @@ * -
+ + + + <%--
-
+
--%>
@@ -169,8 +172,8 @@
* - -
+ + <%--
@@ -180,15 +183,15 @@
-
- -
+
--%> + + <%--
* -
+
--%>
diff --git a/src/main/webapp/WEB-INF/views/sys/userList.jsp b/src/main/webapp/WEB-INF/views/sys/userList.jsp index 135528e94..bf9e7371f 100644 --- a/src/main/webapp/WEB-INF/views/sys/userList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/userList.jsp @@ -95,7 +95,7 @@
-
+ <%--
@@ -118,7 +118,7 @@ notAllowSelectParent="true"/>
-
+
--%>
@@ -167,12 +167,12 @@ class="table table-striped table-bordered table-condensed"> - - + <%-- + --%> - - + <%-- --%> + <%-- --%> <%--角色 --%> @@ -183,12 +183,12 @@ - ${user.company.name} - ${fns:getOfficeDesc(user.office.id)} + <%-- ${user.company.name} + ${fns:getOfficeDesc(user.office.id)} --%> ${user.loginId} ${user.name} - ${user.identity eq 1 ?'管理人员':'普通人员'} - ${user.email} + <%-- ${user.identity eq 1 ?'管理人员':'普通人员'} --%> + <%-- ${user.email} --%>