Authored by xwx

杭州-对比分析-优化

@@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
12 //对外暴露的接口 12 //对外暴露的接口
13 exports('userChange', function (data) { 13 exports('userChange', function (data) {
14 var accessToken = session.getToken()['access_token'] 14 var accessToken = session.getToken()['access_token']
15 - var roleSelect = {} 15 + var roleSelect ;
16 var orgSelect = {} 16 var orgSelect = {}
17 var listData = []; 17 var listData = [];
18 var userOrgSel; 18 var userOrgSel;
@@ -35,10 +35,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -35,10 +35,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
35 success: function (res) { 35 success: function (res) {
36 form.val('add-user-form', res) 36 form.val('add-user-form', res)
37 if (res.orgId != null && res.orgId.length > 0) { 37 if (res.orgId != null && res.orgId.length > 0) {
38 - userOrgSel.setValue([res.orgId]); 38 + userOrgSel=[res.orgId];
39 } 39 }
40 if (res.roleId != null && res.roleId.length > 0) { 40 if (res.roleId != null && res.roleId.length > 0) {
41 - roleSelect.setValue(res.roleId.split(',')) 41 + roleSelect=res.roleId;
42 } 42 }
43 if (res && res.userProperty && res.userProperty.length > 0) { 43 if (res && res.userProperty && res.userProperty.length > 0) {
44 //回显用户属性 44 //回显用户属性
@@ -61,7 +61,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -61,7 +61,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
61 var data = form.val('add-user-form'); 61 var data = form.val('add-user-form');
62 data.userProperty = addUserProperty(); 62 data.userProperty = addUserProperty();
63 // data.orgId = orgSelect.getValue('valueStr') 63 // data.orgId = orgSelect.getValue('valueStr')
64 - // data.roleId = roleSelect.getValue('valueStr') 64 + data.roleId = roleSelect;
65 var email=/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; 65 var email=/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
66 if(data.email!=''&&!email.test(data.email)){ 66 if(data.email!=''&&!email.test(data.email)){
67 layer.msg('邮箱格式不正确',{icon: 5}); 67 layer.msg('邮箱格式不正确',{icon: 5});
@@ -20,7 +20,7 @@ const timeRange = () => { @@ -20,7 +20,7 @@ const timeRange = () => {
20 callback(res.data[0].ddicCode); 20 callback(res.data[0].ddicCode);
21 } 21 }
22 } 22 }
23 - }); 23 + },undefined,true,true);
24 } 24 }
25 25
26 return { 26 return {
@@ -125,7 +125,7 @@ export default { @@ -125,7 +125,7 @@ export default {
125 series: series 125 series: series
126 } 126 }
127 } 127 }
128 - },undefined,undefined,false); 128 + },undefined,true,true);
129 } 129 }
130 130
131 131