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

updated บรรจุแต่งตั้ง

Browse source
This commit is contained in:
Warunee Tamkoo 2024-05-01 10:22:00 +07:00
parent 6a4568ec36
commit 1103be0d7d
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/05_placement/components/PersonalList/Table.vue
View file

@ -873,7 +873,9 @@ onMounted(async () => {
</q-item> </q-item>
<q-item <q-item
v-if=" v-if="
(roleAdmin && props.row.statusId === 'UN-CONTAIN') || (props.row.bmaOfficer !== 'บุคคลภายนอก' &&
roleAdmin &&
props.row.statusId === 'UN-CONTAIN') ||
(props.row.draft === 'รอส่งตัว' && (props.row.draft === 'รอส่งตัว' &&
props.row.statusId !== 'DISCLAIM') props.row.statusId !== 'DISCLAIM')
" "
@ -903,7 +905,9 @@ onMounted(async () => {
<q-item <q-item
v-if=" v-if="
(roleAdmin && props.row.statusId === 'UN-CONTAIN') || (props.row.bmaOfficer !== 'บุคคลภายนอก' &&
roleAdmin &&
props.row.statusId === 'UN-CONTAIN') ||
(props.row.draft === 'รอส่งตัว' && (props.row.draft === 'รอส่งตัว' &&
props.row.statusId !== 'DISCLAIM') props.row.statusId !== 'DISCLAIM')
" "
@ -929,7 +933,9 @@ onMounted(async () => {
<q-item <q-item
v-if=" v-if="
(roleAdmin && props.row.statusId === 'UN-CONTAIN') || (props.row.bmaOfficer !== 'บุคคลภายนอก' &&
roleAdmin &&
props.row.statusId === 'UN-CONTAIN') ||
(props.row.draft === 'รอส่งตัว' && (props.row.draft === 'รอส่งตัว' &&
props.row.statusId !== 'DISCLAIM') props.row.statusId !== 'DISCLAIM')
" "

4
src/modules/05_placement/stores/storeSelect.ts
View file

@ -14,9 +14,9 @@ export const useSelectOrgStore = defineStore("selectorg", () => {
isPosition: e.isPosition, isPosition: e.isPosition,
posMasterNo: posMasterNo:
e.orgShortname + e.orgShortname +
e.posMasterNoPrefix + (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
e.posMasterNo + e.posMasterNo +
e.posMasterNoSuffix, (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
positionName: e.positionName, positionName: e.positionName,
posTypeName: e.posTypeName, posTypeName: e.posTypeName,
posLevelName: e.posLevelName, posLevelName: e.posLevelName,