fix ordering oraganization
This commit is contained in:
parent
17d8c32ce4
commit
3aa299ae8e
6 changed files with 25 additions and 7 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, watch, } from "vue";
|
import { ref, watch } from "vue";
|
||||||
import { useQuasar } from "quasar";
|
import { useQuasar } from "quasar";
|
||||||
|
|
||||||
import http from "@/plugins/http";
|
import http from "@/plugins/http";
|
||||||
|
|
@ -24,6 +24,10 @@ const { dialogConfirm, showLoader, success, hideLoader, messageError } =
|
||||||
const modal = defineModel<boolean>("sortPosition", { required: true });
|
const modal = defineModel<boolean>("sortPosition", { required: true });
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
fetchDataTable: Function,
|
fetchDataTable: Function,
|
||||||
|
totalData: {
|
||||||
|
type: Number,
|
||||||
|
default: 0,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
/** ข้อมูล Table*/
|
/** ข้อมูล Table*/
|
||||||
|
|
@ -83,7 +87,7 @@ function getData() {
|
||||||
type: store.level,
|
type: store.level,
|
||||||
isAll: false,
|
isAll: false,
|
||||||
page: 1,
|
page: 1,
|
||||||
pageSize: 100,
|
pageSize: props.totalData,
|
||||||
keyword: "",
|
keyword: "",
|
||||||
revisionId: store.draftId,
|
revisionId: store.draftId,
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -966,6 +966,7 @@ watch(
|
||||||
<DialogSort
|
<DialogSort
|
||||||
v-model:sort-position="modalSort"
|
v-model:sort-position="modalSort"
|
||||||
:fetchDataTable="props.fetchDataTable"
|
:fetchDataTable="props.fetchDataTable"
|
||||||
|
:total-data="totalData"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- ย้ายตำแหน่ง -->
|
<!-- ย้ายตำแหน่ง -->
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,10 @@ const { dialogConfirm, showLoader, success, hideLoader, messageError } =
|
||||||
const modal = defineModel<boolean>("sortPosition", { required: true });
|
const modal = defineModel<boolean>("sortPosition", { required: true });
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
fetchDataTable: Function,
|
fetchDataTable: Function,
|
||||||
|
totalData: {
|
||||||
|
type: Number,
|
||||||
|
default: 0,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
/** ข้อมูล Table*/
|
/** ข้อมูล Table*/
|
||||||
|
|
@ -95,7 +99,7 @@ function getData() {
|
||||||
type: store.level,
|
type: store.level,
|
||||||
isAll: false,
|
isAll: false,
|
||||||
page: 1,
|
page: 1,
|
||||||
pageSize: 100,
|
pageSize: props.totalData,
|
||||||
keyword: "",
|
keyword: "",
|
||||||
revisionId: store.activeId,
|
revisionId: store.activeId,
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -648,7 +648,10 @@ watch(
|
||||||
icon="info"
|
icon="info"
|
||||||
color="info"
|
color="info"
|
||||||
round
|
round
|
||||||
@click="(modalPerson = true), (personalId = props.row.current_holderId)"
|
@click="
|
||||||
|
(modalPerson = true),
|
||||||
|
(personalId = props.row.current_holderId)
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
|
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
|
|
@ -699,6 +702,7 @@ watch(
|
||||||
<DialogSort
|
<DialogSort
|
||||||
v-model:sort-position="modalSort"
|
v-model:sort-position="modalSort"
|
||||||
:fetchDataTable="props.fetchDataTable"
|
:fetchDataTable="props.fetchDataTable"
|
||||||
|
:total-data="totalData"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- ย้ายตำแหน่ง -->
|
<!-- ย้ายตำแหน่ง -->
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,10 @@ const { dialogConfirm, showLoader, success, hideLoader, messageError } =
|
||||||
const modal = defineModel<boolean>("sortPosition", { required: true });
|
const modal = defineModel<boolean>("sortPosition", { required: true });
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
fetchDataTable: Function,
|
fetchDataTable: Function,
|
||||||
|
totalData: {
|
||||||
|
type: Number,
|
||||||
|
default: 0,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
/** ข้อมูล Table*/
|
/** ข้อมูล Table*/
|
||||||
|
|
@ -95,7 +99,7 @@ function getData() {
|
||||||
type: store.level,
|
type: store.level,
|
||||||
isAll: false,
|
isAll: false,
|
||||||
page: 1,
|
page: 1,
|
||||||
pageSize: 100,
|
pageSize: props.totalData,
|
||||||
keyword: "",
|
keyword: "",
|
||||||
revisionId: store.activeId,
|
revisionId: store.activeId,
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -397,7 +397,7 @@ watch(
|
||||||
<q-tooltip>เพิ่มตำแหน่ง</q-tooltip>
|
<q-tooltip>เพิ่มตำแหน่ง</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
|
|
||||||
<!-- <q-btn
|
<q-btn
|
||||||
v-if="checkPermission($route)?.attrIsUpdate"
|
v-if="checkPermission($route)?.attrIsUpdate"
|
||||||
flat
|
flat
|
||||||
round
|
round
|
||||||
|
|
@ -407,7 +407,7 @@ watch(
|
||||||
@click="onClickSort()"
|
@click="onClickSort()"
|
||||||
>
|
>
|
||||||
<q-tooltip>จัดลำดับ</q-tooltip>
|
<q-tooltip>จัดลำดับ</q-tooltip>
|
||||||
</q-btn> -->
|
</q-btn>
|
||||||
|
|
||||||
<q-btn
|
<q-btn
|
||||||
v-if="checkPermission($route)?.attrIsUpdate"
|
v-if="checkPermission($route)?.attrIsUpdate"
|
||||||
|
|
@ -703,6 +703,7 @@ watch(
|
||||||
<DialogSort
|
<DialogSort
|
||||||
v-model:sort-position="modalSort"
|
v-model:sort-position="modalSort"
|
||||||
:fetchDataTable="props.fetchDataTable"
|
:fetchDataTable="props.fetchDataTable"
|
||||||
|
:total-data="totalData"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- ย้ายตำแหน่ง -->
|
<!-- ย้ายตำแหน่ง -->
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue