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 2024-11-04 16:24:35 +07:00
parent 357c4a21d1
commit 56d2b63d58
19 changed files with 58 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue
View file

@ -274,7 +274,7 @@ onMounted(() => {
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -290,7 +290,7 @@ onMounted(() => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -306,7 +306,7 @@ onMounted(() => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -322,7 +322,7 @@ onMounted(() => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
v-model="salary" v-model="salary"
@ -339,7 +339,7 @@ onMounted(() => {
:class="getClass(edit)" :class="getClass(edit)"
/> />
</div> </div>
</div> </div> -->
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-6 row items-center"> <div class="col-xs-6 col-sm-6 row items-center">
<div class="col-12"> <div class="col-12">

10
src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
View file

@ -258,7 +258,7 @@ onMounted(() => {
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -274,7 +274,7 @@ onMounted(() => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -290,7 +290,7 @@ onMounted(() => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -306,7 +306,7 @@ onMounted(() => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
v-model="salary" v-model="salary"
@ -323,7 +323,7 @@ onMounted(() => {
:class="getClass(edit)" :class="getClass(edit)"
/> />
</div> </div>
</div> </div> -->
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-6 row items-center"> <div class="col-xs-6 col-sm-6 row items-center">
<div class="col-12"> <div class="col-12">

10
src/modules/05_placement/components/Other/OtherDetail.vue
View file

@ -261,7 +261,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -277,7 +277,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -293,7 +293,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -309,7 +309,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
v-model="salary" v-model="salary"
@ -326,7 +326,7 @@ onMounted(async () => {
reverse-fill-mask reverse-fill-mask
/> />
</div> </div>
</div> </div> -->
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-4 row items-center"> <div class="col-xs-6 col-sm-4 row items-center">
<div class="col-12"> <div class="col-12">

10
src/modules/05_placement/components/Receive/receiveDetail.vue
View file

@ -930,7 +930,7 @@ onMounted(async () => {
type="textarea" type="textarea"
/> />
</div> </div>
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-4">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
:outlined="edit" :outlined="edit"
@ -944,7 +944,7 @@ onMounted(async () => {
:label="`${'ประเภทตำแหน่ง'}`" :label="`${'ประเภทตำแหน่ง'}`"
/> />
</div> </div>
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-4">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
:outlined="edit" :outlined="edit"
@ -958,7 +958,7 @@ onMounted(async () => {
:label="`${'ระดับตำแหน่ง'}`" :label="`${'ระดับตำแหน่ง'}`"
/> />
</div> </div>
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-4">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
:outlined="edit" :outlined="edit"
@ -972,7 +972,7 @@ onMounted(async () => {
:label="`${'เลขที่'}`" :label="`${'เลขที่'}`"
/> />
</div> </div>
<div class="col-xs-6 col-sm-3"> <!-- <div class="col-xs-6 col-sm-3">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
v-model="salary" v-model="salary"
@ -987,7 +987,7 @@ onMounted(async () => {
mask="###,###,###,###" mask="###,###,###,###"
reverse-fill-mask reverse-fill-mask
/> />
</div> </div> -->
<div class="col-xs-12"> <div class="col-xs-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"

10
src/modules/05_placement/components/Repatriate/RepatriateDetail.vue
View file

@ -234,7 +234,7 @@ onMounted(() => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -250,7 +250,7 @@ onMounted(() => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -266,7 +266,7 @@ onMounted(() => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -282,7 +282,7 @@ onMounted(() => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
v-model="salary" v-model="salary"
@ -299,7 +299,7 @@ onMounted(() => {
reverse-fill-mask reverse-fill-mask
/> />
</div> </div>
</div> </div> -->
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-4 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">

10
src/modules/05_placement/components/Transfer/TransferDetail.vue
View file

@ -547,7 +547,7 @@ onMounted(async () => {
</div> </div>
<div class="col-12"> <div class="col-12">
<div class="row q-col-gutter-x-xs"> <div class="row q-col-gutter-x-xs">
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-4">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
:outlined="edit" :outlined="edit"
@ -561,7 +561,7 @@ onMounted(async () => {
:label="`${'ประเภทตำแหน่ง'}`" :label="`${'ประเภทตำแหน่ง'}`"
/> />
</div> </div>
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-4">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
:outlined="edit" :outlined="edit"
@ -575,7 +575,7 @@ onMounted(async () => {
:label="`${'ระดับตำแหน่ง'}`" :label="`${'ระดับตำแหน่ง'}`"
/> />
</div> </div>
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-4">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
:outlined="edit" :outlined="edit"
@ -589,7 +589,7 @@ onMounted(async () => {
:label="`${'เลขที่'}`" :label="`${'เลขที่'}`"
/> />
</div> </div>
<div class="col-xs-6 col-sm-3"> <!-- <div class="col-xs-6 col-sm-3">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
:outlined="edit" :outlined="edit"
@ -604,7 +604,7 @@ onMounted(async () => {
mask="###,###,###,###" mask="###,###,###,###"
reverse-fill-mask reverse-fill-mask
/> />
</div> </div> -->
</div> </div>
</div> </div>

1
src/modules/05_placement/views/02_transferMain.vue
View file

@ -150,7 +150,6 @@ function openModalOrder() {
r.positionTypeOld && r.positionTypeOld &&
r.positionLevelOld && r.positionLevelOld &&
r.positionNumberOld && r.positionNumberOld &&
r.salary !== null &&
r.organization && r.organization &&
r.date r.date
); );

3
src/modules/05_placement/views/03_receiveMain.vue
View file

@ -288,8 +288,7 @@ function openModalOrder() {
r.organizationPositionOld && r.organizationPositionOld &&
r.positionTypeOld && r.positionTypeOld &&
r.positionLevelOld && r.positionLevelOld &&
r.positionNumberOld && r.positionNumberOld
r.amountOld !== null
); );
rows2.value = row; rows2.value = row;

1
src/modules/05_placement/views/05_repatriateMain.vue
View file

@ -204,7 +204,6 @@ function openModalOrder() {
item.positionTypeOld && item.positionTypeOld &&
item.positionLevelOld && item.positionLevelOld &&
item.positionNumberOld && item.positionNumberOld &&
item.salary !== null &&
item.organization && item.organization &&
item.date && item.date &&
item.dateRepatriation item.dateRepatriation

1
src/modules/05_placement/views/06_appointPromoteMain.vue
View file

@ -178,7 +178,6 @@ async function fecthlistappointment() {
e.positionTypeOld && e.positionTypeOld &&
e.positionLevelOld && e.positionLevelOld &&
e.positionNumberOld && e.positionNumberOld &&
e.salary !== null &&
e.positionDate e.positionDate
); );
}) })

1
src/modules/05_placement/views/07_appointEmployeeMain.vue
View file

@ -176,7 +176,6 @@ async function fecthlistappointment() {
e.positionTypeOld && e.positionTypeOld &&
e.positionLevelOld && e.positionLevelOld &&
e.positionNumberOld && e.positionNumberOld &&
e.salary !== null &&
e.positionDate e.positionDate
); );
}) })

1
src/modules/05_placement/views/08_otherMain.vue
View file

@ -148,7 +148,6 @@ async function fecthlistOthet() {
e.positionTypeOld && e.positionTypeOld &&
e.positionLevelOld && e.positionLevelOld &&
e.positionNumberOld && e.positionNumberOld &&
e.amountOld !== null &&
e.positionDate && e.positionDate &&
e.leaveDate !== null e.leaveDate !== null
); );

1
src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
View file

@ -140,7 +140,6 @@ function openModalOrder() {
r.positionTypeOld && r.positionTypeOld &&
r.positionLevelOld && r.positionLevelOld &&
r.positionNumberOld && r.positionNumberOld &&
r.salary &&
r.organization && r.organization &&
r.date r.date
); );

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

@ -118,15 +118,15 @@ async function onSubmit() {
showLoader(); showLoader();
await http await http
.put(config.API.outByid(dataId), body) .put(config.API.outByid(dataId), body)
.then(() => { .then(async () => {
await getData();
success($q, "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้ายสำเร็จ"); success($q, "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้ายสำเร็จ");
edit.value = false; edit.value = false;
}) })
.catch((e) => { .catch((e) => {
messageError($q, e); messageError($q, e);
}) })
.finally(async () => { .finally(() => {
await getData();
hideLoader(); hideLoader();
}); });
}, },
@ -247,7 +247,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -263,7 +263,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -279,7 +279,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -295,7 +295,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
v-model="salary" v-model="salary"
@ -312,7 +312,7 @@ onMounted(async () => {
:class="getClass(edit)" :class="getClass(edit)"
/> />
</div> </div>
</div> </div> -->
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-6 row"> <div class="col-xs-6 col-sm-6 row">
<div class="col-12"> <div class="col-12">

10
src/modules/06_retirement/components/resign/ResignByid.vue
View file

@ -1162,7 +1162,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -1178,7 +1178,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -1194,7 +1194,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -1210,7 +1210,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
v-model="salary" v-model="salary"
@ -1227,7 +1227,7 @@ onMounted(async () => {
reverse-fill-mask reverse-fill-mask
/> />
</div> </div>
</div> </div> -->
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<div class="col-xs-4 row"> <div class="col-xs-4 row">
<div class="col-12"> <div class="col-12">

10
src/modules/06_retirement/components/resign/ResignReject.vue
View file

@ -583,7 +583,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -599,7 +599,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -615,7 +615,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -631,7 +631,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
v-model="salary" v-model="salary"
@ -648,7 +648,7 @@ onMounted(async () => {
reverse-fill-mask reverse-fill-mask
/> />
</div> </div>
</div> </div> -->
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<div class="col-xs-4 row"> <div class="col-xs-4 row">
<div class="col-12"> <div class="col-12">

1
src/modules/06_retirement/components/resign/Table.vue
View file

@ -165,7 +165,6 @@ async function openModalOrder() {
r.positionTypeOld && r.positionTypeOld &&
r.positionLevelOld && r.positionLevelOld &&
r.positionNumberOld && r.positionNumberOld &&
r.salary &&
r.location && r.location &&
r.sendDate r.sendDate
); );

14
src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
View file

@ -11,7 +11,7 @@ import { useDisciplineSuspendStore } from "@/modules/11_discipline/store/Suspend
/**Import type */ /**Import type */
import type { QForm } from "quasar"; import type { QForm } from "quasar";
import type { dataDetail } from "@/modules/11_discipline/interface/response/suspend"; import type { DataDetail } from "@/modules/11_discipline/interface/response/suspend";
import type { DataProfile } from "@/modules/05_placement/interface/index/Main"; import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
@ -46,7 +46,7 @@ const roleAdmin = ref<boolean>(false);
const edit = ref<boolean>(false); const edit = ref<boolean>(false);
const dataProfile = ref<DataProfile>(); const dataProfile = ref<DataProfile>();
const data = reactive<dataDetail>({ const data = reactive<DataDetail>({
id: "", id: "",
personId: "", personId: "",
citizenId: "", citizenId: "",
@ -311,7 +311,7 @@ onMounted(async () => {
<div class="row col-12 q-pa-md"> <div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md"> <div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -327,7 +327,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -343,7 +343,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <div class="col-xs-6 col-sm-4 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
:class="getClass(edit)" :class="getClass(edit)"
@ -359,7 +359,7 @@ onMounted(async () => {
/> />
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-3 row"> <!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12"> <div class="col-12">
<q-input <q-input
v-model="data.salary" v-model="data.salary"
@ -376,7 +376,7 @@ onMounted(async () => {
class="inputgreen" class="inputgreen"
/> />
</div> </div>
</div> </div> -->
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-6 row"> <div class="col-xs-6 col-sm-6 row">
<div class="col-12"> <div class="col-12">

4
src/modules/11_discipline/interface/response/suspend.ts
View file

@ -46,7 +46,7 @@ interface dataType {
disciplinaryCaseFault: string; disciplinaryCaseFault: string;
} }
interface dataDetail { interface DataDetail {
id: string; id: string;
personId: string; personId: string;
citizenId: string; citizenId: string;
@ -91,4 +91,4 @@ interface DataOption {
id: string; id: string;
name: string; name: string;
} }
export type { listData, dataType, dataDetail, DataOption }; export type { listData, dataType, DataDetail, DataOption };