diff --git a/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue b/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue index 2fa79c305..f74fdab4d 100644 --- a/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue +++ b/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue @@ -48,6 +48,9 @@ const dataMapToSend = computed(() => { citizenId: i.citizenId, rootId: i.rootId, remarkVertical: i.reason, + position: i.position, + posType: i.posTypeName, + posLevel: i.posLevelName, })); }); const visibleColumns2 = ref([ diff --git a/src/modules/05_placement/components/AppointMent/DialogOrders.vue b/src/modules/05_placement/components/AppointMent/DialogOrders.vue index fa4dd5882..b742c4c53 100644 --- a/src/modules/05_placement/components/AppointMent/DialogOrders.vue +++ b/src/modules/05_placement/components/AppointMent/DialogOrders.vue @@ -57,6 +57,9 @@ const dataMapToSend = computed(() => { citizenId: i.citizenId, rootId: i.rootId, remarkVertical: i.reason, + position: i.position, + posType: i.posTypeName, + posLevel: i.posLevelName, })); }); const visibleColumns2 = ref([ diff --git a/src/modules/05_placement/components/Help-Government/DialogOrders.vue b/src/modules/05_placement/components/Help-Government/DialogOrders.vue index 1be9a0aea..fdafad8b9 100644 --- a/src/modules/05_placement/components/Help-Government/DialogOrders.vue +++ b/src/modules/05_placement/components/Help-Government/DialogOrders.vue @@ -16,8 +16,13 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom /** use*/ const $q = useQuasar(); const { statusText } = useTransferDataStore(); -const { dialogConfirm, findOrgNameOld, findPosMasterNoOld, date2Thai,onSearchDataTable } = - useCounterMixin(); +const { + dialogConfirm, + findOrgNameOld, + findPosMasterNoOld, + date2Thai, + onSearchDataTable, +} = useCounterMixin(); /** props*/ const props = defineProps({ @@ -26,9 +31,11 @@ const props = defineProps({ getData: Function, }); -const rows2 = defineModel('rows2',{required:true}) -const rows2Data = defineModel('rows2Data',{required:true}) -const filterKeyword2 = defineModel('filterKeyword2',{required:true}) +const rows2 = defineModel("rows2", { required: true }); +const rows2Data = defineModel("rows2Data", { required: true }); +const filterKeyword2 = defineModel("filterKeyword2", { + required: true, +}); const emit = defineEmits(["update:filterKeyword2", "update:selected"]); @@ -180,6 +187,9 @@ const dataMapToSend = computed(() => { lastName: i.lastName, citizenId: i.citizenId, remarkVertical: i.reason, + position: i.positionOld, + posType: i.posTypeNameOld, + posLevel: i.posLevelNameOld, })); }); const modalCommand = ref(false); @@ -219,10 +229,10 @@ watch( ); function onSearch() { - rows2.value= onSearchDataTable( + rows2.value = onSearchDataTable( filterKeyword2.value, rows2Data.value, - columns2.value? columns2.value: [] + columns2.value ? columns2.value : [] ); } diff --git a/src/modules/05_placement/components/Other/DialogOrders.vue b/src/modules/05_placement/components/Other/DialogOrders.vue index 7740fc912..98841df99 100644 --- a/src/modules/05_placement/components/Other/DialogOrders.vue +++ b/src/modules/05_placement/components/Other/DialogOrders.vue @@ -53,6 +53,9 @@ const dataMapToSend = computed(() => { lastName: i.lastName, citizenId: i.citizenId, remarkVertical: i.reason, + position: i.positionOld, + posType: i.positionTypeOld, + posLevel: i.positionLevelOld, })); }); const visibleColumns2 = ref([ diff --git a/src/modules/05_placement/components/PersonalList/DialogOrders.vue b/src/modules/05_placement/components/PersonalList/DialogOrders.vue index d88238b48..25ab6555c 100644 --- a/src/modules/05_placement/components/PersonalList/DialogOrders.vue +++ b/src/modules/05_placement/components/PersonalList/DialogOrders.vue @@ -1,5 +1,5 @@