hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

Browse source 
* 'develop' of github.com:Frappet/bma-ehr-frontend:
  fix bug
This commit is contained in:
Warunee Tamkoo 2024-06-28 18:12:55 +07:00
commit 3d7c5ccc62
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/05_placement/components/PersonalList/CardPosition.vue
View file

@ -17,7 +17,7 @@ const selected = defineModel("selectedPos", { required: true });
const positionId = defineModel<string>("positionId", { required: true });
const seletcId = defineModel<string>("seletcId", { required: true });
const date = defineModel<Date>("datePos", { required: true });
const positionData = defineModel<any>("position", { required: true });
const positionData = defineModel<any[]>("position", { required: true });
const isAll = defineModel<boolean>("isAll", { required: true });
const isBlank = defineModel<boolean>("isBlank", { required: true });

4
src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
View file

@ -66,7 +66,7 @@ const positionId = ref<string>("");
const seletcId = ref<string>("");
const selectedPos = ref<any[]>([]);
const datePos = ref<Date>(new Date());
const posMasterMain = ref<any>([]);
const posMasterMain = ref<any[]>([]);
const orgRevisionId = ref<string>("");
/** function เรียกข้อมูลโครงสร้าง แบบปัจุบันและ แบบร่าง*/
@ -448,7 +448,7 @@ watch(
:name="item"
>
<CardPosition
v-model:position="positionNo"
v-model:position="positionNo as []"
v-model:selectedPos="selectedPos"
v-model:datePos="datePos"
v-model:positionId="positionId"