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

เครื่องราช

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-09-06 14:03:54 +07:00
parent db8280d1bb
commit 04a345e6f5
5 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
View file

@ -409,7 +409,7 @@ const getData = async () => {
responseData.value.reason = data.reason ?? ""; responseData.value.reason = data.reason ?? "";
responseData.value.salary = data.salary !== null ? data.salary : 0; responseData.value.salary = data.salary !== null ? data.salary : 0;
responseData.value.status = data.status ?? ""; responseData.value.status = data.status ?? "";
responseData.value.avataPath = data.avataPath ?? ""; responseData.value.avataPath = data.avatar ?? "";
responseData.value.fullname = `${data.firstName ?? "-"} ${ responseData.value.fullname = `${data.firstName ?? "-"} ${
data.lastName ?? "-" data.lastName ?? "-"
}`; }`;

2
src/modules/06_retirement/components/DismissOrder/outRegistry.vue
View file

@ -415,7 +415,7 @@ const getData = async () => {
responseData.value.reason = data.reason ?? ""; responseData.value.reason = data.reason ?? "";
responseData.value.salary = data.salary !== null ? data.salary : 0; responseData.value.salary = data.salary !== null ? data.salary : 0;
responseData.value.status = data.status ?? ""; responseData.value.status = data.status ?? "";
responseData.value.avataPath = data.avataPath ?? ""; responseData.value.avataPath = data.avatar ?? "";
responseData.value.fullname = `${data.firstName ?? "-"} ${ responseData.value.fullname = `${data.firstName ?? "-"} ${
data.lastName ?? "-" data.lastName ?? "-"
}`; }`;

5
src/modules/06_retirement/components/ExitInterview/exitRegistry.vue
View file

@ -42,14 +42,14 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="col-xs-6 col-sm-3 row items-center"> <div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12"> <div class="col-12">
<div class="col-12 text-top">สังกัด</div> <div class="col-12 text-top">สังกัด</div>
<div class="col-12 text-detail"> <div class="col-12 text-detail">
{{ Org }} {{ Org }}
</div> </div>
</div> </div>
</div> --> </div>
</div> </div>
</div> </div>
</q-card> </q-card>
@ -526,6 +526,7 @@ const getData = async () => {
Position.value = data.position ?? ""; Position.value = data.position ?? "";
PositionLevel.value = data.positionLevel ?? ""; PositionLevel.value = data.positionLevel ?? "";
Org.value = data.org ?? ""; Org.value = data.org ?? "";
fullname.value = data.fullname ?? ""; fullname.value = data.fullname ?? "";
prefix.value = data.prefix ?? ""; prefix.value = data.prefix ?? "";
reasonWork.value = data.reasonWork ?? []; reasonWork.value = data.reasonWork ?? [];

2
src/modules/07_insignia/components/1_Proposals/listProposals.vue
View file

@ -359,7 +359,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
flat flat
round round
color="primary" color="primary"
@click="clickListInsignia(props.row.id)" @click="clickListInsignia(props.row.period_id)"
icon="mdi-account-check" icon="mdi-account-check"
> >
<q-tooltip>ผู้ได้รับเครื่องราชฯ</q-tooltip> <q-tooltip>ผู้ได้รับเครื่องราชฯ</q-tooltip>

8
src/modules/07_insignia/components/2_Manage/listManage.vue
View file

@ -169,13 +169,12 @@ const fecthInsigniaByOc = async (
if (res.data.result.items !== null) { if (res.data.result.items !== null) {
if (res.data.result.items.length !== 0) { if (res.data.result.items.length !== 0) {
hideBottom.value = true; hideBottom.value = true;
} } else hideBottom.value = false;
} }
// if (res.data.result.items.length !== 0) { // if (res.data.result.items.length !== 0) {
// hideBottom.value = true; // hideBottom.value = true;
// } // }
// DataStore.isLock = await res.data.result.isLock; // DataStore.isLock = await res.data.result.isLock;
// DataStore.requestId = await res.data.result.requestId; // DataStore.requestId = await res.data.result.requestId;
}) })
@ -281,6 +280,9 @@ const directorApproved = async () => {
}; };
const requestSendNote = async () => { const requestSendNote = async () => {
var organization = await (DataStore.agency != null
? DataStore.agency
: DataStore.typeOc);
dialogConfirm($q, async () => { dialogConfirm($q, async () => {
showLoader(); showLoader();
await http await http
@ -291,7 +293,7 @@ const requestSendNote = async () => {
success($q, "บันทึกสำเร็จ"); success($q, "บันทึกสำเร็จ");
await fecthInsigniaByOc( await fecthInsigniaByOc(
round.value, round.value,
DataStore.agency, organization,
"officer", "officer",
tab.value tab.value
); );