diff --git a/src/components/custom-btn/custom-btn.vue b/src/components/custom-btn/custom-btn.vue index 8c274dc..ebda9a7 100644 --- a/src/components/custom-btn/custom-btn.vue +++ b/src/components/custom-btn/custom-btn.vue @@ -14,6 +14,7 @@ @click="clickBtn" :disabled="props?.disabled" :class="[props?.disabled ? 'custom-btn-class-disabled' : '']" + :plain="props?.plain" > {{ props.btnText }} @@ -29,6 +30,7 @@ const props = defineProps({ btnText: '', //按钮文字 subBtnText: '', //次要按钮文字 disabled: false, //是否禁用 + plain: false, //是否镂空 }) //点击 diff --git a/src/pages.json b/src/pages.json index 5571801..6126852 100644 --- a/src/pages.json +++ b/src/pages.json @@ -188,7 +188,7 @@ } }, { - "path": "pages/addressBook/index", + "path": "pages/chooseByDeps/index", "type": "page", "style": { "navigationStyle": "custom", diff --git a/src/pages/addressBook/index.vue b/src/pages/addressBook/index.vue deleted file mode 100644 index f42b1ef..0000000 --- a/src/pages/addressBook/index.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/pages/chatSettings/components/groupMembersList.vue b/src/pages/chatSettings/components/groupMembersList.vue index 82a3c97..dc2e48c 100644 --- a/src/pages/chatSettings/components/groupMembersList.vue +++ b/src/pages/chatSettings/components/groupMembersList.vue @@ -90,9 +90,7 @@ const toUserDetailPage = (userItem) => { uni.navigateTo({ url: '/pages/dialog/dialogDetail/userDetail?erpUserId=' + - (userItem.erp_user_id || userItem.ID) + - '&user_id=' + - (userItem.user_id || userItem.id), + (userItem.erp_user_id || userItem.ID), }) } diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue index b9b501a..c328fb5 100644 --- a/src/pages/chatSettings/index.vue +++ b/src/pages/chatSettings/index.vue @@ -552,7 +552,7 @@ const showConfirmPrompt = (flag) => { cancelText: t('cancel'), onConfirm: async () => { if (flag === 1) { - useDialogueStore().apiClearRecord() + dialogueStore.apiClearRecord() } else if (flag === 2) { let params = { group_id: dialogueParams.receiver_id, //群id @@ -560,7 +560,7 @@ const showConfirmPrompt = (flag) => { console.log(params) const res = await ServeDismissGroup(params) if (res.code === 200) { - useDialogueStore().updateGroupMembers() + dialogueStore.updateGroupMembers() groupStore.ServeGroupDetail() uni.navigateBack({ delta: 2, @@ -590,7 +590,7 @@ const inviteMembersInGroup = async (memberList) => { console.log(params) const res = await ServeInviteGroup(params) if (res.code === 200) { - useDialogueStore().updateGroupMembers() + dialogueStore.updateGroupMembers() groupStore.ServeGroupDetail() useGroupTypeStore()?.resetGroupInfo() } diff --git a/src/pages/chooseByDeps/index.vue b/src/pages/chooseByDeps/index.vue new file mode 100644 index 0000000..b5156c1 --- /dev/null +++ b/src/pages/chooseByDeps/index.vue @@ -0,0 +1,906 @@ + + + + + + + + + + + + + {{ item.name }} + + + + + + + allCheck(allCheckStatus)" + > + + + + + {{ $t('radio.btn.selectAll') }} + + + + + + + checkItemChange(item, val)" + > + + + {{ item.name }} + + ({{ getDepTotalMembers(item) }}) + + + + + + toNextLevel(item)" + class="flex items-center" + > + + + + + {{ $t('choose.deps.nextLevel') }} + + + + + + + v.ID === item.ID).length > + 0 + ? 'noChecked' + : 'checked', + ) + : toUserDetail(item) + " + class="pl-[32rpx] pr-[32rpx] bg-[#FFFFFF] mt-[20rpx] h-[110rpx] flex items-center" + > + + + + checkMember(item, val)" + > + + + + {{ item.nickName.slice(-2) }} + + + + {{ item.nickName }} + + + {{ item.jobNum }} + + + + + + {{ post.name }} + + + + + + {{ post.name }} + + + + + + + + + + + + + + + + + + {{ $t('statistics.selected.deps') }}: + + + {{ $t('select.member.num') }}: + + + + + {{ allCheckedList.length }} + + + {{ totalMembers + $t('statistic.unit.person') }} + + + + + + + + + {{ allCheckedList.map((v) => v.name).toString() }} + + + {{ item.name }}({{ item.staffNum }}) + + + {{ item.nickName }} + {{ index !== membersCheckedKeys.length - 1 ? ',' : '' }} + + + + + + + + + + + + + + + {{ $t('statistics.selected.deps') }}: + + + {{ $t('select.member.num') }}: + + + + + {{ allCheckedList.length }} + + + {{ totalMembers + $t('statistic.unit.person') }} + + + + (showWin = false)" + > + {{ $t('ok') }} + + + + + + + + + {{ item.name }} + + ({{ getDepTotalMembers(item) }}) + + + + + + + + + + + + + {{ item.nickName }}({{ item.jobNum }}) + + + {{ post.name }} + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/dialog/dialogDetail/userDetail.vue b/src/pages/dialog/dialogDetail/userDetail.vue index 6e22aeb..91dc1c6 100644 --- a/src/pages/dialog/dialogDetail/userDetail.vue +++ b/src/pages/dialog/dialogDetail/userDetail.vue @@ -83,7 +83,6 @@ const { t } = useI18n() const state = reactive({ erpUserId: '', //erp用户id - userId: '', //系统用户Id userInfo: null, //用户详情 userBasicInfos: [], //用户基本信息 }) @@ -94,9 +93,6 @@ onLoad((options) => { state.erpUserId = Number(options.erpUserId) getUserInfo() } - if(options.user_id){ - state.userId = Number(options.user_id) - } }) //获取用户信息 @@ -177,7 +173,7 @@ const getUserInfo = () => { //点击对用户发起单聊 const toTalkUser = () => { - talkStore.toTalk(1, state.userId, state.erpUserId) + talkStore.toTalk(1, state.userInfo.sys_id, state.erpUserId) }