-
@@ -553,7 +553,7 @@ const clearSelectedDateTime = () => {
添加好友
-
+ -->
- // Array.isArray(dep.positions) ? dep.positions.map((pos) => pos.name) : []
- // )
- // : []
- return row.user_position.map((item) => item.position_name).join(' , ')
+ let positionNames = Array.isArray(row.depPositions)
+ ? row.depPositions.flatMap((dep) =>
+ Array.isArray(dep.positions) ? dep.positions.map((pos) => pos.name) : []
+ )
+ : []
+ return positionNames.join(' , ')
+ // return row.user_position.map((item) => item.position_name).join(' , ')
}
},
{
@@ -455,7 +457,7 @@ const state = reactive({
myFriendListData: [], // 我的好友表格数据
addFriendList: [], // 搜索出来的可添加好友
addressBookTableHeight: 524, // 通讯录表格高度
- addressBookTableWidth: 1142, // 通讯录表格宽度
+ addressBookTableWidth: 800, // 通讯录表格宽度
addressBookPage: 1, // 通讯录表格页码
addressBookPageSize: 10, // 通讯录表格每页条数
addressBookTotal: 0, // 通讯录表格总条数
@@ -520,7 +522,9 @@ const items = computed((): ISession[] => {
return [...topItems, ...normalItems]
})
-setTimeout(()=>{console.log('items',items)},2000)
+setTimeout(() => {
+ console.log('items', items)
+}, 2000)
watch(
() => state.addressBookSearchNickName,
(newValue, oldValue) => {
@@ -529,7 +533,7 @@ watch(
state.addressBookTableWidth = 1142
state.addressBookPage = 1
} else {
- // state.addressBookTableWidth = 800
+ state.addressBookTableWidth = 800
state.clickKey = 3
state.treeRefreshCount++
state.addressBookPage = 1
@@ -594,8 +598,8 @@ const indexName = computed(() => dialogueStore.index_name)
// 切换会话
const onTabTalk = (item: ISession, follow = false) => {
-console.log('onTabTalk')
-console.log('item.index_name === indexName.value',item.index_name === indexName.value)
+ console.log('onTabTalk')
+ console.log('item.index_name === indexName.value', item.index_name === indexName.value)
if (item.index_name === indexName.value) return
searchKeyword.value = ''
@@ -640,7 +644,7 @@ const onReload = () => {
// 初始化加载
const onInitialize = () => {
let index_name = getCacheIndexName()
- console.log('index_name',index_name)
+ console.log('index_name', index_name)
index_name && onTabTalk(talkStore.findItem(index_name), true)
}
@@ -648,9 +652,9 @@ const onInitialize = () => {
onBeforeRouteUpdate(onInitialize)
onBeforeMount(() => {
- // getTreeData()
+ getTreeData()
getDepPoisUser()
- getMyFriends()
+ // getMyFriends()
getUserGroupChatList()
})
@@ -749,36 +753,36 @@ const getMyFriends = () => {
}
// 获取部门下的人员
const getDepPoisUser = () => {
- // let url = '/user/v2/list'
+ let url = '/user/v2/list'
// let url = '/api/v1/contact/friend/list'
- // let params = {
- // departmentId: state.addressBookSearchNickName ? undefined : state.clickKey,
- // page: state.addressBookPage,
- // pageSize: state.addressBookPageSize,
- // status: 'notactive',
- // nickName: state.addressBookSearchNickName
- // }
- // $request.HTTP.components.postDataByParams(url, params).then((res) => {
- // // console.log(res)
- // if (res.status === 0 && Array.isArray(res.data.data)) {
- // state.addressBookData = res.data.data || []
- // state.addressBookTotal = res.data.count
- // }
- // })
let params = {
- type: 'addressBook', //查我的通讯录的时候写死addressBook
+ departmentId: state.addressBookSearchNickName ? undefined : state.clickKey,
page: state.addressBookPage,
- page_size: state.addressBookPageSize,
- name: state.addressBookSearchNickName
+ pageSize: state.addressBookPageSize,
+ status: 'notactive',
+ nickName: state.addressBookSearchNickName
}
- GetContactFriendList(params).then((res) => {
+ $request.HTTP.components.postDataByParams(url, params).then((res) => {
// console.log(res)
- if (res.code === 200 && Array.isArray(res.data.user_list)) {
- state.addressBookData = res.data.user_list || []
- state.company_name = res.data.company_name || ''
+ if (res.status === 0 && Array.isArray(res.data.data)) {
+ state.addressBookData = res.data.data || []
state.addressBookTotal = res.data.count
}
})
+ // let params = {
+ // type: 'addressBook', //查我的通讯录的时候写死addressBook
+ // page: state.addressBookPage,
+ // page_size: state.addressBookPageSize,
+ // name: state.addressBookSearchNickName
+ // }
+ // GetContactFriendList(params).then((res) => {
+ // // console.log(res)
+ // if (res.code === 200 && Array.isArray(res.data.user_list)) {
+ // state.addressBookData = res.data.user_list || []
+ // state.company_name = res.data.company_name || ''
+ // state.addressBookTotal = res.data.count
+ // }
+ // })
}
// 搜索可添加好友
@@ -802,7 +806,7 @@ const handleEnterChat = async (row) => {
state.addressBookCurrentTab === 'myFriend'
) {
//员工通讯录，聊天类型一定为单聊
- await getUserInfoByERPUserId({ erp_user_id: row.erp_user_id }).then((res) => {
+ await getUserInfoByERPUserId({ erp_user_id: row.ID }).then((res) => {
// console.log(res)
if (res.code === 200) {
let sysUserInfo = res.data
@@ -822,7 +826,7 @@ const resetAddressBookModal = () => {
state.addressBookCurrentTab = 'employeeAddressBook'
state.addressBookSearchNickName = ''
state.groupChatListSearchGroupName = ''
- state.addressBookTableWidth = 1142
+ state.addressBookTableWidth = 800
state.clickKey = 3
state.treeRefreshCount++
state.addressBookPage = 1
@@ -830,7 +834,7 @@ const resetAddressBookModal = () => {
state.groupChatListPage = 1
state.groupChatListPageSize = 10
getDepPoisUser()
- getMyFriends()
+ // getMyFriends()
getUserGroupChatList()
state.addFriendList = []
})
@@ -1095,15 +1099,15 @@ const handleEnterSearchResultChat = () => {
-->
-
-
+ />
+
@@ -1147,20 +1151,20 @@ const handleEnterSearchResultChat = () => {
-
-
-
-
-
+
+
+
+
+
@@ -1192,8 +1196,9 @@ const handleEnterSearchResultChat = () => {
>
- 组织架构
- 我的好友
+
+ 员工通讯录
+
群聊列表
{
class="addressBook-content"
v-if="state.addressBookCurrentTab == 'employeeAddressBook'"
>
-
-
+
+
{
&.border {
border-radius: 10px;
border: 1px solid var(--im-primary-color);
- background-color: red;
}
}
diff --git a/src/views/message/inner/panel/PanelHeader.vue b/src/views/message/inner/panel/PanelHeader.vue
index 2cf915d..12ac0a7 100644
--- a/src/views/message/inner/panel/PanelHeader.vue
+++ b/src/views/message/inner/panel/PanelHeader.vue
@@ -1,4 +1,5 @@
+