Jelajahi Sumber

perf: 处理员工管理邮箱不必填问题

wangcz 7 tahun lalu
induk
melakukan
2d8954ed02

+ 1 - 1
src/main/webapp/resources/js/index/app.js

@@ -25543,7 +25543,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     { "roleName" : "企业信息", "roleId" : "role5-1-1", 'link' : '#/approvalFlow/enterprise', "children" : [] },
                     { "roleName" : "企业信息", "roleId" : "role5-1-1", 'link' : '#/approvalFlow/enterprise', "children" : [] },
                     { "roleName" : "物料信息", "roleId" : "role5-1-2", 'link' : '#/approvalFlow/product', "children" : [] },
                     { "roleName" : "物料信息", "roleId" : "role5-1-2", 'link' : '#/approvalFlow/product', "children" : [] },
                     { "roleName" : "我的产品库", "roleId" : "role5-1-3", 'link' : '#/approvalFlow/userProduct', "children" : [] },
                     { "roleName" : "我的产品库", "roleId" : "role5-1-3", 'link' : '#/approvalFlow/userProduct', "children" : [] },
-                    { "roleName" : "人员信息", "roleId" : "role5-1-4", 'link' : '#/approvalFlow/user', "children" : [] },
+                    { "roleName" : "员工管理", "roleId" : "role5-1-4", 'link' : '#/approvalFlow/user', "children" : [] },
                     { "roleName" : "角色权限", "roleId" : "role5-1-5", 'link' : '#/approvalFlow/role', "children" : [] },
                     { "roleName" : "角色权限", "roleId" : "role5-1-5", 'link' : '#/approvalFlow/role', "children" : [] },
                     { "roleName" : "审批流", "roleId" : "role5-1-6", 'link' : '#/approvalFlow/flow', "children" : [] },
                     { "roleName" : "审批流", "roleId" : "role5-1-6", 'link' : '#/approvalFlow/flow', "children" : [] },
                     { "roleName" : "操作日志", "roleId" : "role5-1-7", 'link' : '#/approvalFlow/log', "children" : [] }
                     { "roleName" : "操作日志", "roleId" : "role5-1-7", 'link' : '#/approvalFlow/log', "children" : [] }

+ 2 - 2
src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -193,7 +193,7 @@
 	</div>
 	</div>
 </div>
 </div>
 <div class="pane base-info">
 <div class="pane base-info">
-	<div class="com_head"><span>人员信息</span></div>
+	<div class="com_head"><span>员工管理</span></div>
 	<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
 	<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
 		<span class="f14">我的个人资料</span>
 		<span class="f14">我的个人资料</span>
 		<div class="pull-right">
 		<div class="pull-right">
@@ -407,7 +407,7 @@
 						<td class="text-center"
 						<td class="text-center"
 							ng-class="{'has-error': userEmailError, 'has-success': userEmailSuccess}">
 							ng-class="{'has-error': userEmailError, 'has-success': userEmailSuccess}">
 							<input ng-model="newUser.userEmail" ng-pattern="/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/"
 							<input ng-model="newUser.userEmail" ng-pattern="/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/"
-							ng-blur="emailValid(newUser.userEmail)" required
+							ng-blur="emailValid(newUser.userEmail)"
 							name="newUserEmail" class="form-control input-sm" type="text"
 							name="newUserEmail" class="form-control input-sm" type="text"
 							placeholder="邮箱">
 							placeholder="邮箱">
 						</td>
 						</td>