From 2f64cda0d48b28380f9128f6076f826be249b3c4 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Thu, 20 Mar 2025 15:43:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8?=
=?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=9D=83=E9=99=90=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/chooseByDeps/index.vue | 2 +-
src/pages/dialog/index.vue | 5 ----
src/store/groupType/index.js | 46 +++++++++++++++++---------------
3 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/pages/chooseByDeps/index.vue b/src/pages/chooseByDeps/index.vue
index 7e18f0e..b453cf2 100644
--- a/src/pages/chooseByDeps/index.vue
+++ b/src/pages/chooseByDeps/index.vue
@@ -917,7 +917,7 @@ const init = async () => {
depTreeMyList.value = []
crumbs.value = []
- await getDepsTreeMy2()
+ await getDepsTreeMy2(state.chooseMode)
if (depTreeMyList.value.length) {
if (state.chooseMode === 1) {
// 部门选择模式才创建 all 节点
diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index c0d97be..bf0e40d 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -865,18 +865,13 @@ const editorOption = {
renderItem: (data) => {
const el = document.createElement("div");
el.className = "ed-member-item";
- el.innerHTML = `
`;
el.innerHTML += `${data.nickname}`;
return el;
},
source: function (searchTerm, renderList) {
- if (!dialogueStore.members.length) {
- return renderList([]);
- }
let list = [
{ id: 0, nickname: "所有人", avatar: "https://cdn-test.szjixun.cn/artistinfo/test/4455/81e23b7a-d9a3-45c2-af9b-405d33083fed.jpg", value: "所有人" },
- ...dialogueStore.members,
];
const items = list.filter(
diff --git a/src/store/groupType/index.js b/src/store/groupType/index.js
index 2bd9b0b..71a882e 100644
--- a/src/store/groupType/index.js
+++ b/src/store/groupType/index.js
@@ -37,34 +37,36 @@ export const useGroupTypeStore = createGlobalState(() => {
depTreeMyList.value = res.data.nodes
}
}
-// userInfo?.value?.ID
- const getDepsTreeMy2 = async () => {
- const isHasRes = await userHasPermission({
- erpUserId: userInfo?.value?.ID,
- ruleUrl: [
- "auth_chat_app_create_all_dept",
- "auth_chat_app_create_limit_dept"
- ]
- })
- let pramas = { nowUserId : 0 }
- if (isHasRes.code === 200) {
- if (isHasRes.data.auth_chat_app_create_all_dept) {
- pramas = {
- nowUserId : 0
- }
- } else{
- if (isHasRes.data.auth_chat_app_create_limit_dept) {
- pramas = {
- nowUserId : userInfo?.value?.ID
+ // userInfo?.value?.ID
+ const getDepsTreeMy2 = async (chooseMode) => {
+ let params = { nowUserId: 0 }
+ if (chooseMode === 1) {
+ const isHasRes = await userHasPermission({
+ erpUserId: userInfo?.value?.ID,
+ ruleUrl: [
+ 'auth_chat_app_create_all_dept',
+ 'auth_chat_app_create_limit_dept',
+ ],
+ })
+ if (isHasRes.code === 200) {
+ if (isHasRes.data.auth_chat_app_create_all_dept) {
+ params = {
+ nowUserId: 0,
}
} else {
- pramas = {
- nowUserId : 0
+ if (isHasRes.data.auth_chat_app_create_limit_dept) {
+ params = {
+ nowUserId: userInfo?.value?.ID,
+ }
+ } else {
+ params = {
+ nowUserId: 0,
+ }
}
}
}
}
- const res = await departmentV2TreeAll2(pramas)
+ const res = await departmentV2TreeAll2(params)
if (res.status === 0) {
depTreeMyList.value = res.data.nodes
}
From ce9f977efdd88dd9e464bde5881c2576877c8ccc Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Thu, 20 Mar 2025 19:12:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=BE=93=E5=85=A5?=
=?UTF-8?q?=E6=A1=86=E7=BB=84=E4=BB=B6=E4=B8=AD@=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E5=92=8C=E7=9B=B8=E5=AF=B9=E5=BA=94=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/dialog/index.vue | 1153 ++++++++++++++++--------------------
1 file changed, 521 insertions(+), 632 deletions(-)
diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index bf0e40d..398a2b1 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -53,7 +53,7 @@
v-for="item in virtualList"
:id="`zp-id-${item.msg_id}`"
:key="item.zp_index"
- style="transform: scaleY(-1)"
+ style="transform: scaleY(-1);"
>
@@ -136,7 +136,7 @@
{{ item.nickname }}
- {{ parseTime(item.created_at, "{m}/{d} {h}:{i}") }}
+ {{ parseTime(item.created_at, '{m}/{d} {h}:{i}') }}
@@ -185,7 +185,7 @@
-