From 5f9c997189df474be5d3b0bcbaa56a766715d7f5 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 4 Dec 2022 20:06:23 +0800 Subject: [PATCH 01/13] =?UTF-8?q?--=E9=A1=B9=E7=9B=AE=20=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjCheckPower.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index c2cd635c..4d93ac8e 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/src/components/drawers/ProjCheckPower.vue @@ -898,10 +898,14 @@ export default { console.log("choosepeople : ", state.choosepeople); state.selectedRowKeys = selectedRowKeys; const se = state.studentList.map(e => e.id).join(',') || '' - const addItem = item.filter(e => (e && !se.includes(e.id + ','))) + const addItem = item.filter(e => (e && !se.includes(e.id + ''))) addItem.forEach(e => { e.name = e.realName }) + const selectStr = selectedRowKeys.join(',') + console.log(selectStr) + state.studentList = state.studentList.filter(e => selectStr.includes(e.id + '')) + console.log(state.studentList) state.choosepeople = [...addItem.reverse(), ...state.studentList]; selectedsHeight(); // if (selectedRowKeys.length > 0 && item.length > 0) { From 956924f40ac8216ecffeee2c6fd44b26a1234865 Mon Sep 17 00:00:00 2001 From: lixg Date: Sun, 4 Dec 2022 21:29:00 +0800 Subject: [PATCH 02/13] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddGroupMembers.vue | 637 +++++++++++++++++++++ src/components/drawers/MemberList.vue | 26 +- 2 files changed, 658 insertions(+), 5 deletions(-) create mode 100644 src/components/drawers/AddGroupMembers.vue diff --git a/src/components/drawers/AddGroupMembers.vue b/src/components/drawers/AddGroupMembers.vue new file mode 100644 index 00000000..01065e2d --- /dev/null +++ b/src/components/drawers/AddGroupMembers.vue @@ -0,0 +1,637 @@ + + + + + diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 65fde411..3ec14370 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -62,7 +62,7 @@
列表选项总计:
{{ total }}条
-
清空
+
清空
@@ -146,20 +146,30 @@
- + +