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

ปรับ card

Browse source
This commit is contained in:
setthawutttty 2024-03-14 12:07:00 +07:00
parent d0f721253c
commit 87c06a680e
5 changed files with 69 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
View file

@ -416,7 +416,6 @@ function getData() {
rows.value = data;
}
onMounted(() => {
getData();
});
@ -586,40 +585,40 @@ onMounted(() => {
<q-separator />
<q-card-section class="q-pa-none">
<div class="row q-pa-sm">
<div class="col text-grey-6 text-weight-medium">
<div class="col-3 text-grey-6 text-weight-medium">
ระดับการลงโทษทางวินัย
</div>
<div class="col">
<div class="col-3">
{{ props.row.level !== "" ? props.row.level : "-" }}
</div>
<div class="col text-grey-6 text-weight-medium">วัน/เดือน/ปี</div>
<div class="col">
<div class="col-3 text-grey-6 text-weight-medium">
วัน/เดือน/ปี
</div>
<div class="col-3">
{{ props.row.date ? date2Thai(props.row.date) : "-" }}
</div>
</div>
<q-separator />
<div class="row q-pa-sm bg-grey-2">
<div class="col text-grey-6 text-weight-medium">รายละเอียด</div>
<div class="col">
{{ props.row.detail !== "" ? props.row.detail : "-" }}
</div>
<div class="col text-grey-6 text-weight-medium">ล้างมลทิน</div>
<div class="col">
<div class="col-3 text-grey-6 text-weight-medium">ล้างมลทิน</div>
<div class="col-3">
{{ props.row.unStigma !== "" ? props.row.unStigma : "-" }}
</div>
</div>
<q-separator />
<div class="row q-pa-sm">
<div class="col text-grey-6 text-weight-medium">เลขที่คำสั่ง</div>
<div class="col">
<div class="col-3 text-grey-6 text-weight-medium">
เลขที่คำสั่ง
</div>
<div class="col-3">
{{
props.row.refCommandNo !== "" ? props.row.refCommandNo : "-"
}}
</div>
<div class="col text-grey-6 text-weight-medium">
</div>
<q-separator />
<div class="row q-pa-sm">
<div class="col-3 text-grey-6 text-weight-medium">
เอกสารอ้างอิง (ลงวันที่)
</div>
<div class="col">
<div class="col-3">
{{
props.row.refCommandDate
? date2Thai(props.row.refCommandDate)
@ -627,7 +626,13 @@ onMounted(() => {
}}
</div>
</div>
<q-separator />
<div class="row q-pa-sm bg-grey-2">
<div class="col-3 text-grey-6 text-weight-medium">รายละเอียด</div>
<div class="col-9">
{{ props.row.detail !== "" ? props.row.detail : "-" }}
</div>
</div>
</q-card-section>
</q-card>
</div>

40
src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
View file

@ -642,45 +642,47 @@ onMounted(() => {
<q-separator />
<q-card-section class="q-pa-none">
<div class="row q-pa-sm">
<div class="col text-grey-6 text-weight-medium">ประเภทการลา</div>
<div class="col">
<div class="col-3 text-grey-6 text-weight-medium">
ประเภทการลา
</div>
<div class="col-9">
{{ props.row.typeLeave !== "" ? props.row.typeLeave : "-" }}
</div>
<div class="col text-grey-6 text-weight-medium">
</div>
<q-separator />
<div class="row q-pa-sm bg-grey-2">
<div class="col-3 text-grey-6 text-weight-medium">
วัน/เดือน/ปี ที่ลา
</div>
<div class="col">
<div class="col-3">
{{
props.row.dateStartLeave
? date2Thai(props.row.dateStartLeave)
: "-"
}}
</div>
</div>
<q-separator />
<div class="row q-pa-sm bg-grey-2">
<div class="col text-grey-6 text-weight-medium">จำนวนวันลา</div>
<div class="col">
<div class="col-3 text-grey-6 text-weight-medium">จำนวนวันลา</div>
<div class="col-3">
{{ props.row.numLeave ? props.row.numLeave : "-" }}
</div>
<div class="col text-grey-6 text-weight-medium">ลามาเเล้ว</div>
<div class="col">
{{ props.row.sumLeave ? props.row.sumLeave : "-" }}
</div>
</div>
<q-separator />
<div class="row q-pa-sm">
<div class="col text-grey-6 text-weight-medium">รวมเป็น</div>
<div class="col">
{{ props.row.totalLeave ? props.row.totalLeave : "-" }}
<div class="col-3 text-grey-6 text-weight-medium">ลามาเเล้ว</div>
<div class="col-3">
{{ props.row.sumLeave ? props.row.sumLeave : "-" }}
</div>
<div class="col text-grey-6 text-weight-medium">สถานะ</div>
<div class="col">
{{ props.row.status ? statusLeave(props.row.status) : "-" }}
<div class="col-3 text-grey-6 text-weight-medium">รวมเป็น</div>
<div class="col-3">
{{ props.row.totalLeave ? props.row.totalLeave : "-" }}
</div>
</div>
<q-separator />
<div class="row q-pa-sm bg-grey-2">
<div class="col-3 text-grey-6 text-weight-medium">สถานะ</div>
<div class="col-3">
{{ props.row.status ? statusLeave(props.row.status) : "-" }}
</div>
<div class="col-3 text-grey-6 text-weight-medium">เหตุผล</div>
<div class="col-3">
{{ props.row.reason !== "" ? props.row.reason : "-" }}

32
src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
View file

@ -483,32 +483,38 @@ onMounted(() => {
</div>
<q-separator />
<div class="row q-pa-sm bg-grey-2">
<div class="col text-grey-6 text-weight-medium">
<div class="col-3 text-grey-6 text-weight-medium">
เอกสารอ้างอิง
</div>
<div class="col">
<div class="col-3">
{{ props.row.reference ? props.row.reference : "-" }}
</div>
<div class="col text-grey-6 text-weight-medium">รายละเอียด</div>
<div class="col">
{{ props.row.detail ? props.row.detail : "-" }}
</div>
</div>
<q-separator />
<div class="row q-pa-sm">
<div class="col text-grey-6 text-weight-medium">เลขที่คำสั่ง</div>
<div class="col">
{{ props.row.refCommandNo ? props.row.refCommandNo : "-" }}
</div>
<div class="col text-grey-6 text-weight-medium">
</div>
<q-separator />
<div class="row q-pa-sm">
<div class="col-3 text-grey-6 text-weight-medium">
เอกสารอ้างอิง (ลงวันที่)
</div>
<div class="col">
{{ props.row.refCommandDate ? date2Thai(props.row.refCommandDate) : "-" }}
<div class="col-3">
{{
props.row.refCommandDate
? date2Thai(props.row.refCommandDate)
: "-"
}}
</div>
</div>
<q-separator />
<div class="row q-pa-sm bg-grey-2">
<div class="col-3 text-grey-6 text-weight-medium">รายละเอียด</div>
<div class="col-9">
{{ props.row.detail ? props.row.detail : "-" }}
</div>
</div>
</q-card-section>
</q-card>
</div>
</template>

4
src/modules/13_salary/components/SalaryRound/DialogForm.vue
View file

@ -21,7 +21,7 @@ const effective = defineModel<Date | null | string>("effective", {
const isRead = defineModel<boolean>("isRead", { required: true });
const year = defineModel<number | null | string>("year");
const mixin = useCounterMixin();
const { dialogConfirm, date2Thai, messageError } = mixin;
const { dialogConfirm, date2Thai, messageError,success } = mixin;
const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
const effectiveDate = ref<Date | null>(null);
/** ตัวแปร validate */
@ -98,6 +98,7 @@ function editSummit() {
modal.value = false;
clearForm();
props.getData?.();
success($q,'บันทึกข้อมูลสำเร็จ')
})
.catch((e) => {
messageError($q, e);
@ -119,6 +120,7 @@ function onSubmit() {
.then((res) => {
modal.value = false;
clearForm();
success($q,'บันทึกข้อมูลสำเร็จ')
props.getData?.();
})
.catch((e) => {

2
src/modules/13_salary/views/salaryRound.vue
View file

@ -22,6 +22,7 @@ const {
date2Thai,
dateToISO,
dialogConfirm,
success
} = mixin;
const dataStore = useSalaryDataStore();
const year = ref<number>(0);
@ -151,6 +152,7 @@ function deleteData(id: string) {
.delete(config.API.salaryPeriod() + `/${id}`)
.then((res) => {
getData();
success($q,'ลบข้อมูลสำเร็จ')
})
.catch((e) => {
messageError($q, e);