fixing insignia deputy

This commit is contained in:
Warunee Tamkoo 2025-05-14 21:02:56 +07:00
parent cc1927a2f4
commit ae9e989a14
5 changed files with 31 additions and 13 deletions

View file

@ -308,7 +308,11 @@ const person = ref<DataManageList>();
/** เช็คสถานนะแสดงปุ่มเพิ่ม*/
const checkStatus = computed(() => {
if (
DataStore.isStaff &&
((DataStore.isOfficer &&
DataStore.optionsTypeOc.findIndex(
(v: OptionData) => v.id === organization.value && v.isDeputy === true
) > -1) ||
DataStore.isStaff) &&
(DataStore.requestStatus == "st1" || DataStore.requestStatus == "st4")
) {
return true;
@ -846,9 +850,10 @@ function clearInsigniaFilters(name: string) {
watch(
() => DataStore.typeOc,
async () => {
filterOrganizationOP.value = await DataStore.optionsTypeOc;
organization.value = await DataStore.typeOc;
() => {
filterOrganizationOP.value = DataStore.optionsTypeOc;
organization.value = DataStore.typeOc;
DataStore.selectOrganization = DataStore.typeOc;
}
);
@ -890,6 +895,7 @@ function onClickViewInfo(type: string, id: string, empClass: string) {
onMounted(async () => {
filterOrganizationOP.value = await DataStore.optionsTypeOc;
organization.value = DataStore.typeOc;
DataStore.selectOrganization = DataStore.typeOc;
if (organization.value !== "" || organization.value !== undefined) {
if (props.fecthInsigniaByOc) {

View file

@ -269,7 +269,8 @@ function onSearch() {
/*** Hook*/
onMounted(async () => {
filterOrganizationOP.value = await DataStore.optionsTypeOc;
organization.value = await DataStore.typeOc;
organization.value = DataStore.typeOc;
DataStore.selectOrganization = DataStore.typeOc;
if (organization.value !== "" || organization.value !== undefined) {
if (props.fecthInsigniaByOc) {
isDeputy.value = await (DataStore.optionsTypeOc.findIndex(
@ -293,6 +294,7 @@ watch(
async () => {
filterOrganizationOP.value = await DataStore.optionsTypeOc;
organization.value = await DataStore.typeOc;
DataStore.selectOrganization = DataStore.typeOc;
}
);
</script>

View file

@ -271,15 +271,17 @@ function onSearch() {
watch(
() => DataStore.typeOc,
async () => {
filterOrganizationOP.value = await DataStore.optionsTypeOc;
organization.value = await DataStore.typeOc;
filterOrganizationOP.value = DataStore.optionsTypeOc;
organization.value = DataStore.typeOc;
DataStore.selectOrganization = DataStore.typeOc;
}
);
/** Hook*/
onMounted(async () => {
filterOrganizationOP.value = await DataStore.optionsTypeOc;
organization.value = await DataStore.typeOc;
filterOrganizationOP.value = DataStore.optionsTypeOc;
organization.value = DataStore.typeOc;
DataStore.selectOrganization = DataStore.typeOc;
if (organization.value !== "" || organization.value !== undefined) {
if (props.fecthInsigniaByOc) {
isDeputy.value = await (DataStore.optionsTypeOc.findIndex(