diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue index 41353fdb1..9ebfaf36b 100644 --- a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue +++ b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue @@ -318,7 +318,7 @@ function checkEndDate() { :disable="isReadonly" size="md" v-model="formData.isSpecial" - label="ฉ" + label="เฉพาะสายงานที่กำหนด" /> diff --git a/src/modules/13_salary/components/SalaryLists/ProcessStep.vue b/src/modules/13_salary/components/SalaryLists/ProcessStep.vue index 6bda13d2c..b50a6c732 100644 --- a/src/modules/13_salary/components/SalaryLists/ProcessStep.vue +++ b/src/modules/13_salary/components/SalaryLists/ProcessStep.vue @@ -18,7 +18,8 @@ const fileUpload = ref(null); const document = ref(""); const props = defineProps({ rootId:String, - periodId:String + periodId:String, + getData:Function }) /** * function อัปโหลดไฟล์เจ้าหน้าที่ @@ -63,6 +64,7 @@ function saveReccommend(reason:string) { }) .then((res)=>{ console.log(res) + props.getData?.() }).catch((e)=>{ messageError($q,e) }).finally(()=>{ @@ -85,6 +87,7 @@ function sendToDirector(msg: string,type:string) { .get(config.API.salaryPeriodStatus(type, props.periodId ? props.periodId:'', props.rootId ? props.rootId:'')) .then((res)=>{ console.log(res) + props.getData?.() }).catch((e)=>{ messageError($q,e) }).finally(()=>{ @@ -103,6 +106,7 @@ function sendAndRecommend(title: string,typeOrder:string) { modalRecommend.value = true; titleRecommend.value = title; type.value = typeOrder + props.getData?.() } diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue index 86d7e35f4..f48f0aa44 100644 --- a/src/modules/13_salary/views/salaryLists.vue +++ b/src/modules/13_salary/views/salaryLists.vue @@ -421,7 +421,7 @@ onMounted(async () => { bordered class="row col-12 q-mt-xs" > - +