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

Merge branch 'develop' into warunee-dev

Browse source
This commit is contained in:
Warunee Tamkoo 2023-09-21 12:08:23 +07:00
commit dcf609780c
1 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/modules/07_insignia/components/2_Manage/Tab1.vue
View file

@ -255,9 +255,11 @@ const changtypeOc = () => {
};
// เพิ่มราชชื่อ
const clickmodalAdd = () => {
let ocId = DataStore.typeOc ? DataStore.typeOc : DataStore.agency;
showLoader();
fecthInsignia();
fecthlistperson(DataStore.typeOc);
fecthlistperson(ocId);
insigniaType.value = "";
};
// เรียกรายชื่อข้าราชการตามหน่วยงานที่จะเพิ่ม
@ -421,15 +423,12 @@ const closemodelPopupReject = () => {
};
// ยืนยัน การไม่ยืนขอ
const savaReasonReject = (reason: string) => {
dialogConfirm(
$q,
async () => {
await listreject(rowid.value, reason);
if (props.fecthStat) {
await props.fecthStat(DataStore.roundId);
}
},
);
dialogConfirm($q, async () => {
await listreject(rowid.value, reason);
if (props.fecthStat) {
await props.fecthStat(DataStore.roundId);
}
});
};
// ยืนยัน การไม่ยืนขอ API
const listreject = async (profileId: string, reason: string) => {
@ -788,10 +787,7 @@ const closeModalEdit = () => {
>
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-list dense style="min-width: 250px">
<q-item
clickable
@click.stop="clickmodalEdit(props.row)"
>
<q-item clickable @click.stop="clickmodalEdit(props.row)">
<q-item-section
style="min-width: 0px"
avatar
@ -804,10 +800,7 @@ const closeModalEdit = () => {
>แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-item-section
>
</q-item>
<q-item
clickable
@click.stop="clickReject(props.row.id)"
>
<q-item clickable @click.stop="clickReject(props.row.id)">
<q-item-section
style="min-width: 0px"
avatar
@ -822,10 +815,7 @@ const closeModalEdit = () => {
</q-item-section>
<q-item-section>ไม่ยื่นขอ</q-item-section>
</q-item>
<q-item
clickable
@click.stop="clickDelete(props.row.id)"
>
<q-item clickable @click.stop="clickDelete(props.row.id)">
<q-item-section
style="min-width: 0px"
avatar