|  | @@ -27,7 +27,7 @@ |  | @@ -27,7 +27,7 @@ | 
| 27 | <el-tree | 27 | <el-tree | 
| 28 | :data="sndr" | 28 | :data="sndr" | 
| 29 | show-checkbox | 29 | show-checkbox | 
| 30 | -                                            node-key="username" | 30 | +                                            node-key="account" | 
| 31 | :props="userProps" | 31 | :props="userProps" | 
| 32 | ref="sndrTree" | 32 | ref="sndrTree" | 
| 33 | @check-change="treeSndrCheckChange" | 33 | @check-change="treeSndrCheckChange" | 
|  | @@ -121,7 +121,14 @@ |  | @@ -121,7 +121,14 @@ | 
| 121 | </template> | 121 | </template> | 
| 122 |  | 122 |  | 
| 123 | <script> | 123 | <script> | 
| 124 | -    import {getAlltype, api_batchAddRouter, loadRouterBySndr, selectBusQueueList} from "../../api/message_bus"; | 124 | +    import { | 
|  |  | 125 | +        getAlltype, | 
|  |  | 126 | +        api_batchAddRouter, | 
|  |  | 127 | +        loadRouterBySndr, | 
|  |  | 128 | +        selectBusQueueList, | 
|  |  | 129 | +        getDslyUser, | 
|  |  | 130 | +        getTypesPage | 
|  |  | 131 | +    } from "../../api/message_bus"; | 
| 125 |  | 132 |  | 
| 126 | export default { | 133 | export default { | 
| 127 | name: "Configure", | 134 | name: "Configure", | 
|  | @@ -162,6 +169,99 @@ |  | @@ -162,6 +169,99 @@ | 
| 162 | value: 2 | 169 | value: 2 | 
| 163 | } | 170 | } | 
| 164 | ], | 171 | ], | 
|  |  | 172 | +                fakeUserData:{ | 
|  |  | 173 | +                    "code":200, | 
|  |  | 174 | +                    "data":{ | 
|  |  | 175 | +                        "userList":{ | 
|  |  | 176 | +                            "data":[ | 
|  |  | 177 | +                                { | 
|  |  | 178 | +                                    "account":"yang0331", | 
|  |  | 179 | +                                    "avatar":"", | 
|  |  | 180 | +                                    "birthday":"", | 
|  |  | 181 | +                                    "certNo":"420000199001010105", | 
|  |  | 182 | +                                    "certType":1, | 
|  |  | 183 | +                                    "createTime":"", | 
|  |  | 184 | +                                    "createby":"", | 
|  |  | 185 | +                                    "email":"123123@163.com", | 
|  |  | 186 | +                                    "enterpriseAdmin":1, | 
|  |  | 187 | +                                    "enterpriseId":38, | 
|  |  | 188 | +                                    "id":125, | 
|  |  | 189 | +                                    "name":"杨玉成", | 
|  |  | 190 | +                                    "phone":"13012345678", | 
|  |  | 191 | +                                    "sex":"", | 
|  |  | 192 | +                                    "status":1, | 
|  |  | 193 | +                                    "updateTime":"2021-03-31 13:57:16", | 
|  |  | 194 | +                                    "updateby":"yang0331" | 
|  |  | 195 | +                                }, | 
|  |  | 196 | +                                { | 
|  |  | 197 | +                                    "account":"yang005", | 
|  |  | 198 | +                                    "avatar":"", | 
|  |  | 199 | +                                    "birthday":"", | 
|  |  | 200 | +                                    "certNo":"420583198912070713", | 
|  |  | 201 | +                                    "certType":1, | 
|  |  | 202 | +                                    "createTime":"2021-03-31 13:32:03", | 
|  |  | 203 | +                                    "createby":"yangyucheng", | 
|  |  | 204 | +                                    "email":"123@136.com", | 
|  |  | 205 | +                                    "enterpriseAdmin":0, | 
|  |  | 206 | +                                    "enterpriseId":38, | 
|  |  | 207 | +                                    "id":126, | 
|  |  | 208 | +                                    "name":"中文名称测试", | 
|  |  | 209 | +                                    "phone":"13012345678", | 
|  |  | 210 | +                                    "sex":1, | 
|  |  | 211 | +                                    "status":1, | 
|  |  | 212 | +                                    "updateTime":"2021-03-31 14:09:27", | 
|  |  | 213 | +                                    "updateby":"yang0331" | 
|  |  | 214 | +                                }, | 
|  |  | 215 | +                                { | 
|  |  | 216 | +                                    "account":"yang006", | 
|  |  | 217 | +                                    "avatar":"", | 
|  |  | 218 | +                                    "birthday":"", | 
|  |  | 219 | +                                    "certNo":"420101199001010000", | 
|  |  | 220 | +                                    "certType":1, | 
|  |  | 221 | +                                    "createTime":"2021-03-31 14:10:45", | 
|  |  | 222 | +                                    "createby":"yang0331", | 
|  |  | 223 | +                                    "email":"1232@163.com", | 
|  |  | 224 | +                                    "enterpriseAdmin":0, | 
|  |  | 225 | +                                    "enterpriseId":38, | 
|  |  | 226 | +                                    "id":128, | 
|  |  | 227 | +                                    "name":"测试", | 
|  |  | 228 | +                                    "phone":"13012345689", | 
|  |  | 229 | +                                    "sex":"", | 
|  |  | 230 | +                                    "status":1, | 
|  |  | 231 | +                                    "updateTime":"2021-03-31 14:10:45", | 
|  |  | 232 | +                                    "updateby":"" | 
|  |  | 233 | +                                } | 
|  |  | 234 | +                            ], | 
|  |  | 235 | +                            "pageNo":1, | 
|  |  | 236 | +                            "pageSize":10, | 
|  |  | 237 | +                            "totalCount":3, | 
|  |  | 238 | +                            "totalPage":1 | 
|  |  | 239 | +                        }, | 
|  |  | 240 | +                        "enterprise":{ | 
|  |  | 241 | +                            "address":"武汉市江汉区中央商务区泛海国际 SOHO 城 3,4,6 栋 6 号", | 
|  |  | 242 | +                            "certNo":"420100199001010101", | 
|  |  | 243 | +                            "certType":1, | 
|  |  | 244 | +                            "contactName":"", | 
|  |  | 245 | +                            "contactTel":"", | 
|  |  | 246 | +                            "createTime":"2021-03-31 13:31:21", | 
|  |  | 247 | +                            "createby":"", | 
|  |  | 248 | +                            "enterpriseCreditNo":"91420103MA4KYD6K5B", | 
|  |  | 249 | +                            "enterpriseNameCn":"测试企业", | 
|  |  | 250 | +                            "id":38, | 
|  |  | 251 | +                            "legalPersonName":"测试姓名 4", | 
|  |  | 252 | +                            "legalPersonTel":"", | 
|  |  | 253 | +                            "organizationCode":"MA4KYD6K51", | 
|  |  | 254 | +                            "remark":"", | 
|  |  | 255 | +                            "type":"4,1,5,3", | 
|  |  | 256 | +                            "typeStr":"", | 
|  |  | 257 | +                            "updateTime":"2021-03-31 13:57:06", | 
|  |  | 258 | +                            "updateby":"yang0331" | 
|  |  | 259 | +                        } | 
|  |  | 260 | +                    }, | 
|  |  | 261 | +                    "message":"success", | 
|  |  | 262 | +                    "success":true, | 
|  |  | 263 | +                    "time":20210408175432336 | 
|  |  | 264 | +                }, | 
| 165 | message_type: [], | 265 | message_type: [], | 
| 166 | defaultProps: { | 266 | defaultProps: { | 
| 167 | children: 'children', | 267 | children: 'children', | 
|  | @@ -173,7 +273,8 @@ |  | @@ -173,7 +273,8 @@ | 
| 173 | userProps: { | 273 | userProps: { | 
| 174 | children: 'children', | 274 | children: 'children', | 
| 175 | label: function (data, node) { | 275 | label: function (data, node) { | 
| 176 | -                        return '(' + data.username + ')' + data.des; | 276 | +                        // return '(' + data.username + ')' + data.des; | 
|  |  | 277 | +                        return '(' + data.account + ')' + data.name; | 
| 177 | } | 278 | } | 
| 178 | }, | 279 | }, | 
| 179 | queueProps:{ | 280 | queueProps:{ | 
|  | @@ -223,29 +324,49 @@ |  | @@ -223,29 +324,49 @@ | 
| 223 | /** | 324 | /** | 
| 224 | * 访问用户服务,绑定用户列表,按组搜索 | 325 | * 访问用户服务,绑定用户列表,按组搜索 | 
| 225 | */ | 326 | */ | 
|  |  | 327 | +            // getUserInfo() { | 
|  |  | 328 | +            //     let userResponse = [{ | 
|  |  | 329 | +            //         id: 1, | 
|  |  | 330 | +            //         username: "zp260", | 
|  |  | 331 | +            //         des: "测试用户1" | 
|  |  | 332 | +            //     }, { | 
|  |  | 333 | +            //         id: 2, | 
|  |  | 334 | +            //         username: "test04", | 
|  |  | 335 | +            //         des: "测试用户2" | 
|  |  | 336 | +            //     }, | 
|  |  | 337 | +            //         { | 
|  |  | 338 | +            //             id: 3, | 
|  |  | 339 | +            //             username: "zp2505", | 
|  |  | 340 | +            //             des: "测试用户3" | 
|  |  | 341 | +            //         } | 
|  |  | 342 | +            //     ]; | 
|  |  | 343 | +            //     this.sndr = userResponse; | 
|  |  | 344 | +            // }, | 
| 226 | getUserInfo() { | 345 | getUserInfo() { | 
| 227 | -                let userResponse = [{ |  |  | 
| 228 | -                    id: 1, |  |  | 
| 229 | -                    username: "zp260", |  |  | 
| 230 | -                    des: "测试用户1" |  |  | 
| 231 | -                }, { |  |  | 
| 232 | -                    id: 2, |  |  | 
| 233 | -                    username: "test04", |  |  | 
| 234 | -                    des: "测试用户2" |  |  | 
| 235 | -                }, |  |  | 
| 236 | -                    { |  |  | 
| 237 | -                        id: 3, |  |  | 
| 238 | -                        username: "zp2505", |  |  | 
| 239 | -                        des: "测试用户3" | 346 | +                let _this = this; | 
|  |  | 347 | +                let para= { | 
|  |  | 348 | +                    enterpriseCreditNo: "100000000000000001", | 
|  |  | 349 | +                    pageNo:1, | 
|  |  | 350 | +                    pageSize:1000 | 
|  |  | 351 | +                }; | 
|  |  | 352 | +                getDslyUser(para).then((response) => { | 
|  |  | 353 | +                    let res = response.data; | 
|  |  | 354 | +                    if (res.code !== '200') { | 
|  |  | 355 | +                        return _this.$message.error('获取消息收发记录,失败!'); | 
| 240 | } | 356 | } | 
| 241 | -                ]; |  |  | 
| 242 | -                this.sndr = userResponse; | 357 | +                    _this.sndr = res.data.userList.data; | 
|  |  | 358 | +                    _this.$message.success('获取消息收发记录,成功!'); | 
|  |  | 359 | +                }).catch(error => { | 
|  |  | 360 | +                    // 关闭加载 | 
|  |  | 361 | +                    _this.$message.error(error.toString()); | 
|  |  | 362 | +                    _this.sndr = _this.fakeUserData.data.userList.data; | 
|  |  | 363 | +                }); | 
| 243 | }, | 364 | }, | 
| 244 | treeSndrCheckChange(data, checked, indeterminate) { | 365 | treeSndrCheckChange(data, checked, indeterminate) { | 
| 245 | if (checked) { | 366 | if (checked) { | 
| 246 | -                    this.params.sndrs.push(data.username); | 367 | +                    this.params.sndrs.push(data.account); | 
| 247 | } else { | 368 | } else { | 
| 248 | -                    this.params.sndrs.splice(this.params.sndrs.contains(data.username), 1); | 369 | +                    this.params.sndrs.splice(this.params.data.contains(data.account), 1); | 
| 249 | } | 370 | } | 
| 250 | }, | 371 | }, | 
| 251 | treeRcvrCheckChange(data, checked, indeterminate) { | 372 | treeRcvrCheckChange(data, checked, indeterminate) { |