From 7973c2434cd4a6d398aaf6bab54c3b0e0a57b9a1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 28 Jun 2024 18:06:29 +0700 Subject: [PATCH] fix bug --- src/components/Dialogs/DialogOrgSelect.vue | 4 ++-- src/components/Dialogs/DialogOrgSelectEmployee.vue | 3 +-- .../05_placement/components/PersonalList/CardPosition.vue | 2 +- .../05_placement/components/PersonalList/DialogSelectOrg.vue | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue index 099e139ef..3adf01616 100644 --- a/src/components/Dialogs/DialogOrgSelect.vue +++ b/src/components/Dialogs/DialogOrgSelect.vue @@ -52,7 +52,7 @@ const filter = ref(""); const isAll = ref(false); const isBlank = ref(false); const posMasterMain = ref([]); -const positionNo = ref(); +const positionNo = ref([]); const itemTaps = ref(); const filters = ref(""); const positionId = ref(""); @@ -60,7 +60,7 @@ const selectedPos = ref([]); const seletcId = ref(""); const datePos = ref(new Date()); const rowsPosition = ref([]); -const positionData = ref(); +const positionData = ref([]); /** active form */ const formActive = reactive({ activeId: "", diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue index f76702dee..23d797ac2 100644 --- a/src/components/Dialogs/DialogOrgSelectEmployee.vue +++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue @@ -4,7 +4,6 @@ import { useCounterMixin } from "@/stores/mixin"; import { useQuasar } from "quasar"; import { ref, watch, reactive } from "vue"; import type { QTableProps } from "quasar"; -import CardPosition from "@/modules/05_placement/components/PersonalList/CardPosition.vue"; import http from "@/plugins/http"; import config from "@/app.config"; @@ -48,7 +47,7 @@ const orgRevisionId = ref(""); const filter = ref(""); const isAll = ref(false); const isBlank = ref(false); -const posMasterMain = ref([]); +const posMasterMain = ref([]); const positionNo = ref(); const itemTaps = ref(); const filters = ref(""); diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue index ae04dac0c..47faf00f0 100644 --- a/src/modules/05_placement/components/PersonalList/CardPosition.vue +++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue @@ -17,7 +17,7 @@ const selected = defineModel("selectedPos", { required: true }); const positionId = defineModel("positionId", { required: true }); const seletcId = defineModel("seletcId", { required: true }); const date = defineModel("datePos", { required: true }); -const positionData = defineModel("position", { required: true }); +const positionData = defineModel("position", { required: true }); const isAll = defineModel("isAll", { required: true }); const isBlank = defineModel("isBlank", { required: true }); diff --git a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue index b45741cde..306d97e0b 100644 --- a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue +++ b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue @@ -66,7 +66,7 @@ const positionId = ref(""); const seletcId = ref(""); const selectedPos = ref([]); const datePos = ref(new Date()); -const posMasterMain = ref([]); +const posMasterMain = ref([]); const orgRevisionId = ref(""); /** function เรียกข้อมูลโครงสร้าง แบบปัจุบันและ แบบร่าง*/ @@ -448,7 +448,7 @@ watch( :name="item" >