Merge branch 'master-v32-xwx' into 'master'

杭州-首页-修改用户信息



See merge request !258

@@ -61,7 +61,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             var data = form.val('add-user-form');
             var data = form.val('add-user-form');
             data.userProperty = addUserProperty();
             data.userProperty = addUserProperty();
             // data.orgId = orgSelect.getValue('valueStr')
             // data.orgId = orgSelect.getValue('valueStr')
-            data.roleId = roleSelect.getValue('valueStr')
+            // data.roleId = roleSelect.getValue('valueStr')
+            var email=/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+            if(data.email!=''&&!email.test(data.email)){
+                layer.msg('邮箱格式不正确',{icon: 5});
+                layer.close(load);
+                return false;
+            }
             delete data['select']
             delete data['select']
             $.ajax({
             $.ajax({
                 url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken,
                 url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken,

@@ -55,19 +55,20 @@
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
-    <div class="layui-form-item hide">
-        <div class="layui-inline" style="padding: 0 10px">
-            <label class="layui-form-label">角色<span style="color: red">*</span></label>
-            <div class="layui-input-block roles">
-            </div>
-        </div>
-        <div class="layui-inline">
-            <label class="layui-form-label">所在部门<span style="color: red">*</span></label>
-            <div class="layui-input-inline">
-                <div id="userorgId"></div>
-            </div>
-        </div>
-    </div>
+<!--    2021-12-21 xwx注-->
+<!--    <div class="layui-form-item hide">-->
+<!--        <div class="layui-inline" style="padding: 0 10px">-->
+<!--            <label class="layui-form-label">角色<span style="color: red">*</span></label>-->
+<!--            <div class="layui-input-block roles">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="layui-inline">-->
+<!--            <label class="layui-form-label">所在部门<span style="color: red">*</span></label>-->
+<!--            <div class="layui-input-inline">-->
+<!--                <div id="userorgId"></div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </div>-->
 
 
     <button type="submit" lay-submit class="layui-btn hide" lay-filter="user_form_save_id" id="user_form_save_id">保存
     <button type="submit" lay-submit class="layui-btn hide" lay-filter="user_form_save_id" id="user_form_save_id">保存
     </button>
     </button>

@@ -88,7 +88,7 @@ export default {
                         obj.value[itemId] = res.data;
                         obj.value[itemId] = res.data;
                     }
                     }
                 }
                 }
-            },null,false)
+            },undefined,true,false)
         }
         }
         // End Wang 2021/12/14 14:47 展示资产详情
         // End Wang 2021/12/14 14:47 展示资产详情