From 82fa90e0a3b078dc5e0247391a165af5e448c82b Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 21 Feb 2024 09:27:34 +0700 Subject: [PATCH 1/9] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?= =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=81=E0=B8=B3?= =?UTF-8?q?=E0=B8=A5=E0=B8=B1=E0=B8=87=20=3D>=20=E0=B9=80=E0=B8=9E?= =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=20revisionId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02_organizationalNew/components/DialogSortPosition.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/02_organizationalNew/components/DialogSortPosition.vue b/src/modules/02_organizationalNew/components/DialogSortPosition.vue index f33a4cfa0..0ac3e8b5b 100644 --- a/src/modules/02_organizationalNew/components/DialogSortPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogSortPosition.vue @@ -75,6 +75,7 @@ function getData() { page: 1, pageSize: 100, keyword: "", + revisionId: store.draftId, }) .then((res) => { const dataList = res.data.result.data; From a808eddad8d23278d1d2bf3bba074d9e37d2df8a Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 21 Feb 2024 09:40:31 +0700 Subject: [PATCH 2/9] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?= =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=81=E0=B8=B3?= =?UTF-8?q?=E0=B8=A5=E0=B8=B1=E0=B8=87=20=3D>=20=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B1=E0=B8=9A=20pagination=20=E0=B9=80=E0=B8=A5=E0=B8=B7?= =?UTF-8?q?=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=99=E0=B8=84=E0=B8=A3=E0=B8=AD?= =?UTF-8?q?=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02_organizationalNew/components/DialogSelectPerson.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue index b433b9a26..44365a5bf 100644 --- a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue +++ b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue @@ -668,7 +668,11 @@ watch([() => page.value, () => pageSize.value], () => { :props="props" >
- {{ props.rowIndex + 1 }} + {{ + (page - 1) * Number(pageSize) + + props.rowIndex + + 1 + }}
From 036820ca80aa2a606fa1adf7a1095ff08b0827c4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 21 Feb 2024 09:51:15 +0700 Subject: [PATCH 3/9] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?= =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=81=E0=B8=B3?= =?UTF-8?q?=E0=B8=A5=E0=B8=B1=E0=B8=87=20=3D>=20=E0=B9=81=E0=B8=81?= =?UTF-8?q?=E0=B9=88=E0=B9=84=E0=B8=82=20popup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02_organizationalNew/components/DialogMovePos.vue | 6 +++--- .../02_organizationalNew/components/DialogSuccession.vue | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/02_organizationalNew/components/DialogMovePos.vue b/src/modules/02_organizationalNew/components/DialogMovePos.vue index d4dc3b284..88bf12082 100644 --- a/src/modules/02_organizationalNew/components/DialogMovePos.vue +++ b/src/modules/02_organizationalNew/components/DialogMovePos.vue @@ -139,13 +139,13 @@ watch( );