Showing
2 changed files
with
53 additions
and
2 deletions
@@ -14,6 +14,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -14,6 +14,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
14 | var noticeWaySelect = {}; //通知方式下拉框 | 14 | var noticeWaySelect = {}; //通知方式下拉框 |
15 | var subTypeSelect = {}; //订阅类型下拉框 | 15 | var subTypeSelect = {}; //订阅类型下拉框 |
16 | var busId = ''; | 16 | var busId = ''; |
17 | + var userName = ''; | ||
17 | if (data && data.policyId) { | 18 | if (data && data.policyId) { |
18 | policyId = data.policyId; | 19 | policyId = data.policyId; |
19 | } else { | 20 | } else { |
@@ -204,7 +205,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -204,7 +205,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
204 | subType: subTypeSelect.getValue("valueStr"), | 205 | subType: subTypeSelect.getValue("valueStr"), |
205 | subWay: noticeWaySelect.getValue("valueStr"), | 206 | subWay: noticeWaySelect.getValue("valueStr"), |
206 | resIdList: resIdList, | 207 | resIdList: resIdList, |
207 | - busId: busId | 208 | + busId: busId, |
209 | + userName: userName | ||
208 | } | 210 | } |
209 | , height: 'full-200' | 211 | , height: 'full-200' |
210 | , page: { | 212 | , page: { |
@@ -1078,7 +1080,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -1078,7 +1080,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
1078 | subType: subTypeSelect.getValue('valueStr'), | 1080 | subType: subTypeSelect.getValue('valueStr'), |
1079 | subWay: noticeWaySelect.getValue("valueStr"), | 1081 | subWay: noticeWaySelect.getValue("valueStr"), |
1080 | resIdList: resIdList, | 1082 | resIdList: resIdList, |
1081 | - busId: busId | 1083 | + busId: busId, |
1084 | + userName: userName | ||
1082 | } | 1085 | } |
1083 | }); | 1086 | }); |
1084 | } | 1087 | } |
@@ -1180,7 +1183,50 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -1180,7 +1183,50 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
1180 | } | 1183 | } |
1181 | } | 1184 | } |
1182 | }); | 1185 | }); |
1186 | + //用户 | ||
1187 | + $.ajax({ | ||
1188 | + url: domainName + '/api-user/users/getAll', | ||
1189 | + data: { | ||
1190 | + access_token: accessToken | ||
1191 | + }, | ||
1192 | + success: function (response) { | ||
1193 | + if (response) { | ||
1194 | + var busTypeList = response; | ||
1195 | + var bizList = response.map(item => { | ||
1196 | + return { | ||
1197 | + name: item.nickname, | ||
1198 | + value: item.username, | ||
1199 | + parentId: item.parentId | ||
1200 | + } | ||
1201 | + }); | ||
1202 | + var bizTree=common.pidToChildren(bizList, 'value', 'parentId'); | ||
1183 | 1203 | ||
1204 | + // 影响业务下拉框 | ||
1205 | + xmSelect.render({ | ||
1206 | + el: '#alarmsubscribe_user', | ||
1207 | + name: 'bizId', | ||
1208 | + tips: '=订阅用户=', | ||
1209 | + toolbar: { | ||
1210 | + show: true, | ||
1211 | + list: ['ALL', 'CLEAR'] | ||
1212 | + }, | ||
1213 | + filterable: true, | ||
1214 | + layVerType: 'msg', | ||
1215 | + data: bizTree, | ||
1216 | + on: function (data) { | ||
1217 | + if (data.arr.length > 0) { | ||
1218 | + userName = data.arr.map(t=>t.value).join(','); | ||
1219 | + } else { | ||
1220 | + userName = ''; | ||
1221 | + } | ||
1222 | + reloadalarmsubscribeTable(); | ||
1223 | + } | ||
1224 | + }); | ||
1225 | + } else { | ||
1226 | + layer.msg('获取用户失败', {icon: 2}); | ||
1227 | + } | ||
1228 | + } | ||
1229 | + }); | ||
1184 | //获取选中的数据 | 1230 | //获取选中的数据 |
1185 | function getCheckSubscribeData() { | 1231 | function getCheckSubscribeData() { |
1186 | return table.checkStatus('alarmsubscTable').data; | 1232 | return table.checkStatus('alarmsubscTable').data; |
@@ -52,6 +52,11 @@ | @@ -52,6 +52,11 @@ | ||
52 | </div> | 52 | </div> |
53 | </div> | 53 | </div> |
54 | <div class="layui-inline"> | 54 | <div class="layui-inline"> |
55 | + <div class="layui-input-inline layui-input-inline--long"> | ||
56 | + <div id="alarmsubscribe_user"></div> | ||
57 | + </div> | ||
58 | + </div> | ||
59 | + <div class="layui-inline"> | ||
55 | <button class="layui-btn layui-btn-normal" id="alarmsubscribeQueryBtn" | 60 | <button class="layui-btn layui-btn-normal" id="alarmsubscribeQueryBtn" |
56 | type="button"><i | 61 | type="button"><i |
57 | class="layui-icon layui-icon-search"></i>查询 | 62 | class="layui-icon layui-icon-search"></i>查询 |
-
Please register or login to post a comment