Merge branch 'develop' into devTee

src/modules/02_organizationalNew/components/DialogMovePos.vue

@@ -139,13 +139,13 @@ watch(
 );
 </script>
 <template>
-  <q-dialog v-model="modal" full-width full-height persistent>
+  <q-dialog v-model="modal" full-width persistent>
     <q-card>
       <HeaderDialog :tittle="title" :close="() => (modal = false)" />
       <q-separator />
 
-      <q-card-section class="q-pt-none bg-grey-2 q-pa-md">
-        <div class="row q-col-gutter-md">
+      <q-card-section class="q-pt-none bg-grey-2 q-pa-sm">
+        <div class="row">
           <q-card bordered class="col-12 col-sm-8 q-pa-sm">
             <q-toolbar style="padding: 0">
               <q-toolbar-title class="text-subtitle2 text-bold"

src/modules/02_organizationalNew/components/DialogSelectPerson.vue

@@ -668,7 +668,11 @@ watch([() => page.value, () => pageSize.value], () => {
                             :props="props"
                           >
                             <div v-if="col.name == 'no'">
-                              {{ props.rowIndex + 1 }}
+                              {{
+                                (page - 1) * Number(pageSize) +
+                                props.rowIndex +
+                                1
+                              }}
                             </div>
 
                             <div v-else>

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;

src/modules/02_organizationalNew/components/DialogSuccession.vue

@@ -215,8 +215,8 @@ function clearForm() {
 </script>
 
 <template>
-  <q-dialog v-model="modal" full-width full-height persistent>
-    <q-card class="column full-height">
+  <q-dialog v-model="modal" full-width persistent>
+    <q-card>
       <Header
         :tittle="'เลือกตำแหน่งที่ต้องการสืบทอดจากโครงสร้างปัจจุบัน'"
         :close="
@@ -227,8 +227,8 @@ function clearForm() {
       />
       <q-separator />
 
-      <q-card-section class="q-pt-none q-pa-md bg-grey-2">
-        <div class="row q-col-gutter-md">
+      <q-card-section class="q-pt-none q-pa-sm bg-grey-2">
+        <div class="row">
           <q-card
             bordered
             class="col-12 col-sm-4 scroll q-pa-sm"