diff --git a/src/api/message_bus.js b/src/api/message_bus.js
index dd2fc33..7acd3a2 100644
--- a/src/api/message_bus.js
+++ b/src/api/message_bus.js
@@ -158,3 +158,8 @@ export const delRcvr = params =>{return http.del(`${baseUrl}/router/receiver`,
//编辑
export const ediRcvr = params =>{return http.put(`${baseUrl}/router/ediRouter`, params);};
+//消息路由配置
+ //选择消息发送者
+export const getDslyUser = params =>{return http.get(`/zz-system/enterprise/user/page/list`, params);};
+
+
diff --git a/src/views/bus/RouterBatch.vue b/src/views/bus/RouterBatch.vue
index 72752f2..2df90b2 100644
--- a/src/views/bus/RouterBatch.vue
+++ b/src/views/bus/RouterBatch.vue
@@ -27,7 +27,7 @@
<el-tree
:data="sndr"
show-checkbox
- node-key="username"
+ node-key="account"
:props="userProps"
ref="sndrTree"
@check-change="treeSndrCheckChange"
@@ -121,7 +121,14 @@
</template>
<script>
- import {getAlltype, api_batchAddRouter, loadRouterBySndr, selectBusQueueList} from "../../api/message_bus";
+ import {
+ getAlltype,
+ api_batchAddRouter,
+ loadRouterBySndr,
+ selectBusQueueList,
+ getDslyUser,
+ getTypesPage
+ } from "../../api/message_bus";
export default {
name: "Configure",
@@ -162,6 +169,99 @@
value: 2
}
],
+ fakeUserData:{
+ "code":200,
+ "data":{
+ "userList":{
+ "data":[
+ {
+ "account":"yang0331",
+ "avatar":"",
+ "birthday":"",
+ "certNo":"420000199001010105",
+ "certType":1,
+ "createTime":"",
+ "createby":"",
+ "email":"123123@163.com",
+ "enterpriseAdmin":1,
+ "enterpriseId":38,
+ "id":125,
+ "name":"杨玉成",
+ "phone":"13012345678",
+ "sex":"",
+ "status":1,
+ "updateTime":"2021-03-31 13:57:16",
+ "updateby":"yang0331"
+ },
+ {
+ "account":"yang005",
+ "avatar":"",
+ "birthday":"",
+ "certNo":"420583198912070713",
+ "certType":1,
+ "createTime":"2021-03-31 13:32:03",
+ "createby":"yangyucheng",
+ "email":"123@136.com",
+ "enterpriseAdmin":0,
+ "enterpriseId":38,
+ "id":126,
+ "name":"中文名称测试",
+ "phone":"13012345678",
+ "sex":1,
+ "status":1,
+ "updateTime":"2021-03-31 14:09:27",
+ "updateby":"yang0331"
+ },
+ {
+ "account":"yang006",
+ "avatar":"",
+ "birthday":"",
+ "certNo":"420101199001010000",
+ "certType":1,
+ "createTime":"2021-03-31 14:10:45",
+ "createby":"yang0331",
+ "email":"1232@163.com",
+ "enterpriseAdmin":0,
+ "enterpriseId":38,
+ "id":128,
+ "name":"测试",
+ "phone":"13012345689",
+ "sex":"",
+ "status":1,
+ "updateTime":"2021-03-31 14:10:45",
+ "updateby":""
+ }
+ ],
+ "pageNo":1,
+ "pageSize":10,
+ "totalCount":3,
+ "totalPage":1
+ },
+ "enterprise":{
+ "address":"武汉市江汉区中央商务区泛海国际 SOHO 城 3,4,6 栋 6 号",
+ "certNo":"420100199001010101",
+ "certType":1,
+ "contactName":"",
+ "contactTel":"",
+ "createTime":"2021-03-31 13:31:21",
+ "createby":"",
+ "enterpriseCreditNo":"91420103MA4KYD6K5B",
+ "enterpriseNameCn":"测试企业",
+ "id":38,
+ "legalPersonName":"测试姓名 4",
+ "legalPersonTel":"",
+ "organizationCode":"MA4KYD6K51",
+ "remark":"",
+ "type":"4,1,5,3",
+ "typeStr":"",
+ "updateTime":"2021-03-31 13:57:06",
+ "updateby":"yang0331"
+ }
+ },
+ "message":"success",
+ "success":true,
+ "time":20210408175432336
+ },
message_type: [],
defaultProps: {
children: 'children',
@@ -173,7 +273,8 @@
userProps: {
children: 'children',
label: function (data, node) {
- return '(' + data.username + ')' + data.des;
+ // return '(' + data.username + ')' + data.des;
+ return '(' + data.account + ')' + data.name;
}
},
queueProps:{
@@ -223,29 +324,49 @@
/**
* 访问用户服务,绑定用户列表，按组搜索
*/
+ // getUserInfo() {
+ // let userResponse = [{
+ // id: 1,
+ // username: "zp260",
+ // des: "测试用户1"
+ // }, {
+ // id: 2,
+ // username: "test04",
+ // des: "测试用户2"
+ // },
+ // {
+ // id: 3,
+ // username: "zp2505",
+ // des: "测试用户3"
+ // }
+ // ];
+ // this.sndr = userResponse;
+ // },
getUserInfo() {
- let userResponse = [{
- id: 1,
- username: "zp260",
- des: "测试用户1"
- }, {
- id: 2,
- username: "test04",
- des: "测试用户2"
- },
- {
- id: 3,
- username: "zp2505",
- des: "测试用户3"
+ let _this = this;
+ let para= {
+ enterpriseCreditNo: "100000000000000001",
+ pageNo:1,
+ pageSize:1000
+ };
+ getDslyUser(para).then((response) => {
+ let res = response.data;
+ if (res.code !== '200') {
+ return _this.$message.error('获取消息收发记录，失败！');
}
- ];
- this.sndr = userResponse;
+ _this.sndr = res.data.userList.data;
+ _this.$message.success('获取消息收发记录，成功！');
+ }).catch(error => {
+ // 关闭加载
+ _this.$message.error(error.toString());
+ _this.sndr = _this.fakeUserData.data.userList.data;
+ });
},
treeSndrCheckChange(data, checked, indeterminate) {
if (checked) {
- this.params.sndrs.push(data.username);
+ this.params.sndrs.push(data.account);
} else {
- this.params.sndrs.splice(this.params.sndrs.contains(data.username), 1);
+ this.params.sndrs.splice(this.params.data.contains(data.account), 1);
}
},
treeRcvrCheckChange(data, checked, indeterminate) {