-
+
diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
index 652d0f54e..1499646c9 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -549,136 +549,135 @@ onMounted(async () => {
-
+
{
{
{
{
outlined
dense
class="inputgreen"
- lazy-rules
clearable
@clear="() => (trainData.dateOrder = null)"
@update:modelValue="trainData.dateOrder = null"
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
index 1a494efde..0252a1a08 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -1003,11 +1003,7 @@ onMounted(async () => {
/>
-
-
-
-
-
-
+
+
+
+
+
+ {{ col.label }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
index c83a10e3f..99e3e9b20 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -728,11 +728,7 @@ onMounted(async () => {
/>
+
-
-
@@ -708,68 +707,68 @@ onMounted(async () => {
-
-
-
- {{ col.label }}
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
-
- {{ year + 543 }}
- {{
- parseInt(value + 543)
- }}
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-
- {{ year + 543 }}
- {{
- parseInt(value + 543)
- }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ year + 543 }}
+ {{
+ parseInt(value + 543)
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+ {{
+ parseInt(value + 543)
+ }}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{ col.value ? col.value : "-" }}
-
-
+ {{ col.value ? col.value : "-" }}
+
+
- {{ col.value === "" ? "-" : col.value }}
-
-
+ {{ col.value === "" ? "-" : col.value }}
+
+
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
+ :icon="tab.icon"
+ :label="tab.label"
+ />
+
+
+
+
+
+
- ("ไม่พบข้อมูลที่ค้นหา");
const noData = ref("ไม่พบข้อมูลผังโครงสร้าง");
@@ -115,15 +122,18 @@ const myFilterMethod = (node: any, filter: string) => {
(node.organizationName && node.organizationName.indexOf(filt) > -1) ||
(node.positionNum && node.positionNum.indexOf(filt) > -1) ||
(node.positionName && node.positionName.indexOf(filt) > -1) ||
- (node.governmentCode && node.governmentCode.toString().indexOf(filt) > -1) ||
+ (node.governmentCode &&
+ node.governmentCode.toString().indexOf(filt) > -1) ||
(node.agency && node.agency.indexOf(filt) > -1) ||
(node.government && node.government.indexOf(filt) > -1) ||
(node.department && node.department.indexOf(filt) > -1) ||
(node.pile && node.pile.indexOf(filt) > -1) ||
- (node.organizationShortName && node.organizationShortName.indexOf(filt) > -1) ||
+ (node.organizationShortName &&
+ node.organizationShortName.indexOf(filt) > -1) ||
(node.positionSideName && node.positionSideName.indexOf(filt) > -1) ||
(node.executivePosition && node.executivePosition.indexOf(filt) > -1) ||
- (node.executivePositionSide && node.executivePositionSide.indexOf(filt) > -1) ||
+ (node.executivePositionSide &&
+ node.executivePositionSide.indexOf(filt) > -1) ||
(node.positionLevel && node.positionLevel.indexOf(filt) > -1)
);
};
@@ -242,7 +252,6 @@ const positionLevelOptions = ref([
const selectedPosition = async (data: any) => {
if (data.name == null && selected.value != data.keyId) {
-
editDataStatus.value = true;
selected.value = data.keyId;
@@ -330,7 +339,6 @@ const checkPosition = (val: string) => {
return num;
};
-
watch(props, () => {
expanded.value = [];
const dataPersonal = props.personal;
@@ -352,7 +360,6 @@ watch(props, () => {
}
}
});
-
}
});
@@ -389,24 +396,46 @@ function findByPerson(element: any): any {
-
+
+
diff --git a/src/modules/05_placement/components/AppointEmployee/Modal.vue b/src/modules/05_placement/components/AppointEmployee/Modal.vue
index b7cc4ce2c..ae6d9330f 100644
--- a/src/modules/05_placement/components/AppointEmployee/Modal.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Modal.vue
@@ -9,7 +9,14 @@ import config from "@/app.config";
const $q = useQuasar();
const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const { date2Thai, hideLoader, messageError, showLoader, success, dialogConfirm } = mixin; //ฟังก์ชันกลางที่เรียกใช้
+const {
+ date2Thai,
+ hideLoader,
+ messageError,
+ showLoader,
+ success,
+ dialogConfirm,
+} = mixin; //ฟังก์ชันกลางที่เรียกใช้
const notFound = ref{
-
-
+
{
-
-
-
-
-
+
{{ year + 543 }}
{{
parseInt(value + 543)
}}
-
+ :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
+ hide-bottom-space
+ :label="`${'ดำรงตำแหน่งในระดับปัจจุบันเมื่อ'}`"
+ >
-
+
@@ -309,8 +419,18 @@ onMounted(async () => {
-
-
+
-
+
-
+
- ![]()
+ ![]()
+ "
+ />
-
{{ prop.node.organizationName }}
-
+
-
+
ว่าง
- ("ไม่พบข้อมูลที่ค้นหา");
const noData = ref("ไม่พบข้อมูลผังโครงสร้าง");
@@ -106,8 +113,6 @@ const fetchplacementPosition = async () => {
});
};
-
-
const props = defineProps({
personalId: String,
modal: Boolean,
@@ -126,15 +131,18 @@ const myFilterMethod = (node: any, filter: string) => {
(node.organizationName && node.organizationName.indexOf(filt) > -1) ||
(node.positionNum && node.positionNum.indexOf(filt) > -1) ||
(node.positionName && node.positionName.indexOf(filt) > -1) ||
- (node.governmentCode && node.governmentCode.toString().indexOf(filt) > -1) ||
+ (node.governmentCode &&
+ node.governmentCode.toString().indexOf(filt) > -1) ||
(node.agency && node.agency.indexOf(filt) > -1) ||
(node.government && node.government.indexOf(filt) > -1) ||
(node.department && node.department.indexOf(filt) > -1) ||
(node.pile && node.pile.indexOf(filt) > -1) ||
- (node.organizationShortName && node.organizationShortName.indexOf(filt) > -1) ||
+ (node.organizationShortName &&
+ node.organizationShortName.indexOf(filt) > -1) ||
(node.positionSideName && node.positionSideName.indexOf(filt) > -1) ||
(node.executivePosition && node.executivePosition.indexOf(filt) > -1) ||
- (node.executivePositionSide && node.executivePositionSide.indexOf(filt) > -1) ||
+ (node.executivePositionSide &&
+ node.executivePositionSide.indexOf(filt) > -1) ||
(node.positionLevel && node.positionLevel.indexOf(filt) > -1)
);
};
@@ -183,7 +191,6 @@ const saveAppoint = async () => {
});
};
-
const closeModal = () => {
if (editDataStatus.value == true) {
dialogConfirm(
@@ -258,7 +265,6 @@ const positionLevelOptions = ref([
const selectedPosition = async (data: any) => {
if (data.name == null && selected.value != data.keyId) {
-
editDataStatus.value = true;
selected.value = data.keyId;
@@ -346,7 +352,6 @@ const checkPosition = (val: string) => {
return num;
};
-
watch(props, () => {
expanded.value = [];
const dataPersonal = props.personal;
@@ -368,7 +373,6 @@ watch(props, () => {
}
}
});
-
}
});
@@ -566,7 +570,6 @@ function findByPerson(element: any): any {
class="full-width inputgreen cursor-pointer"
outlined
dense
- lazy-rules
:model-value="
date2Thai(new Date(dataForm.containDate))
"
diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue
index fbfd54ba2..2fb0e0edb 100644
--- a/src/modules/05_placement/components/AppointMent/Detail.vue
+++ b/src/modules/05_placement/components/AppointMent/Detail.vue
@@ -14,7 +14,7 @@ import type { QForm } from "quasar";
import http from "@/plugins/http";
import config from "@/app.config";
import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-
+
const modalPersonal = ref(false);
const personId = ref("");
const $q = useQuasar();
@@ -395,7 +395,6 @@ onMounted(async () => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:readonly="!edit"
:model-value="date !== null ? date2Thai(date) : null"
@@ -429,7 +428,6 @@ onMounted(async () => {
:readonly="!edit"
:borderless="!edit"
v-model="reason"
-
hide-bottom-space
:label="`${'หมายเหตุ '}`"
type="textarea"
diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue
index 714390ecb..95fde264e 100644
--- a/src/modules/05_placement/components/Other/Detail.vue
+++ b/src/modules/05_placement/components/Other/Detail.vue
@@ -18,7 +18,7 @@ import keycloak from "@/plugins/keycloak";
import CurruncyInput from "@/components/CurruncyInput.vue";
import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-
+
const modalPersonal = ref(false);
const personId = ref("");
const $q = useQuasar();
@@ -434,7 +434,6 @@ onMounted(async () => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="date !== null ? date2Thai(date) : null"
@@ -528,7 +527,6 @@ onMounted(async () => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="
diff --git a/src/modules/05_placement/components/Other/OtherModal.vue b/src/modules/05_placement/components/Other/OtherModal.vue
index 782be968a..8bc20313d 100644
--- a/src/modules/05_placement/components/Other/OtherModal.vue
+++ b/src/modules/05_placement/components/Other/OtherModal.vue
@@ -172,7 +172,7 @@ const saveAppoint = async () => {
// mouthSalaryAmount: dataForm.mouthSalaryAmount,
// positionSalaryAmount: dataForm.positionSalaryAmount,
};
-
+
showLoader();
await http
.put(config.API.otherPosition(id.value), dataAppoint)
@@ -277,8 +277,6 @@ const positionLevelOptions = ref([
const selectedPosition = async (data: any) => {
if (data.name == null && selected.value != data.keyId) {
-
-
editDataStatus.value = true;
selected.value = data.keyId;
@@ -359,7 +357,6 @@ const selectedPosition = async (data: any) => {
dataForm.positionPathSideId = "";
dataForm.positionTypeId = "";
}
-
};
const checkPosition = (val: string) => {
@@ -372,25 +369,19 @@ const expanded = ref([]);
watch(props, () => {
expanded.value = [];
const dataPersonal = props.personal;
-
if (dataPersonal) {
dataPersonal.map((data: any) => {
personal.value = data;
});
-
}
-
if (personal.value) {
-
let findData: any = null;
dataRespone.value.map((x: any) => {
findData = findByPerson(x);
-
if (findData != null) {
-
selectedPosition(findData);
for (let i = 3; i <= findData.keyId.length; i += 2) {
expanded.value.push(findData.keyId.slice(0, i));
@@ -597,7 +588,6 @@ function findByPerson(element: any): any {
class="full-width inputgreen cursor-pointer"
outlined
dense
- lazy-rules
:model-value="
date2Thai(new Date(dataForm.containDate))
"
diff --git a/src/modules/05_placement/components/PersonalDetail/Education.vue b/src/modules/05_placement/components/PersonalDetail/Education.vue
index 10ed86e72..5541abe83 100644
--- a/src/modules/05_placement/components/PersonalDetail/Education.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Education.vue
@@ -870,7 +870,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="startDate + 543"
:rules="[
@@ -915,7 +914,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="date2Thai(startDate2)"
:rules="[
@@ -965,7 +963,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="endDate + 543"
:rules="[
@@ -1009,7 +1006,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="date2Thai(endDate2)"
:rules="[
@@ -1059,7 +1055,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="date2Thai(finishDate)"
:rules="[
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
index 558a8f65b..3df2ccc34 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
@@ -327,7 +327,7 @@ const clickSave = async () => {
/**
* บันทึกเพิ่มข้อมูล
*/
-const saveData = async () => {
+const saveData = async () => {
showLoader();
await http
.post(config.API.placementCertId(route.params.personalId.toString()), {
@@ -699,7 +699,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="date2Thai(issueDate)"
:rules="[
@@ -745,7 +744,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="date2Thai(expireDate)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่หมดอายุ'}`]"
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Information.vue b/src/modules/05_placement/components/PersonalDetail/Information/Information.vue
index 8b13435cc..e79bdcb70 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Information.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Information.vue
@@ -438,7 +438,6 @@ const getClass = (val: boolean) => {
hide-bottom-space
:outlined="edit"
dense
- lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="
diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index 934485e1e..37397d433 100644
--- a/src/modules/05_placement/components/PersonalList/CardPosition.vue
+++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue
@@ -345,7 +345,6 @@ onMounted(async () => {
hide-bottom-space
:model-value="date != null ? date2Thai(date) : null"
label="วันที่รายงานตัว"
- lazy-rules
>
{
@@ -74,7 +74,7 @@ async function fetchPublishFile(){
.finally(async () => {
hideLoader();
});
-};
+}
/** โหลดข้อมูลโครงสร้างจาก json */
const loadTreeData = async () => {
@@ -596,7 +596,6 @@ onMounted(async () => {
class="full-width inputgreen cursor-pointer"
outlined
dense
- lazy-rules
:model-value="
date2Thai(new Date(dataForm.containDate))
"
diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue
index 529e0a9f8..de959e95a 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail2.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue
@@ -661,7 +661,7 @@ onMounted(async () => {
hide-bottom-space
:outlined="edit"
dense
- lazy-rules
+
:readonly="!edit"
:borderless="!edit"
:model-value="
diff --git a/src/modules/05_placement/components/Receive/receiveModal.vue b/src/modules/05_placement/components/Receive/receiveModal.vue
index cc3bc1734..3cee75384 100644
--- a/src/modules/05_placement/components/Receive/receiveModal.vue
+++ b/src/modules/05_placement/components/Receive/receiveModal.vue
@@ -538,7 +538,7 @@ onMounted(async () => {
class="full-width inputgreen cursor-pointer"
outlined
dense
- lazy-rules
+
:model-value="
date2Thai(new Date(dataForm.containDate))
"
diff --git a/src/modules/05_placement/components/Relocation/RelocationModal.vue b/src/modules/05_placement/components/Relocation/RelocationModal.vue
index 418cc5ead..f2fd2233f 100644
--- a/src/modules/05_placement/components/Relocation/RelocationModal.vue
+++ b/src/modules/05_placement/components/Relocation/RelocationModal.vue
@@ -283,8 +283,6 @@ const positionLevelOptions = ref([
const selectedPosition = async (data: any) => {
if (data.name == null && selected.value != data.keyId) {
-
-
editDataStatus.value = true;
selected.value = data.keyId;
@@ -384,7 +382,6 @@ watch(props, () => {
});
}
-
if (personal.value) {
// const findData = dataRespone.value.find(findByPerson);
let findData: any = null;
@@ -598,7 +595,6 @@ function findByPerson(element: any): any {
class="full-width inputgreen cursor-pointer"
outlined
dense
- lazy-rules
:model-value="
date2Thai(new Date(dataForm.containDate))
"
diff --git a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
index 8f63424cd..44690bf00 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
@@ -13,7 +13,7 @@ import config from "@/app.config";
import type { QForm } from "quasar";
import type { ResponseData } from "@/modules/05_placement/interface/response/officer";
import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-
+
const modalPersonal = ref(false);
const personalId = ref("");
const $q = useQuasar();
@@ -386,7 +386,6 @@ onMounted(async () => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="date !== null ? date2Thai(date) : null"
@@ -431,7 +430,6 @@ onMounted(async () => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="
diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue
index 957985933..e8f5b9ae1 100644
--- a/src/modules/05_placement/components/Transfer/transferRegistry.vue
+++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue
@@ -664,7 +664,7 @@ onMounted(async () => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
+
:borderless="!edit"
:readonly="!edit"
:model-value="date !== null ? date2Thai(date) : null"
diff --git a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
index 63a13f632..f22988124 100644
--- a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
+++ b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue
@@ -8,7 +8,7 @@ import config from "@/app.config";
import type { QForm } from "quasar";
import type { resHelpDetail } from "@/modules/05_placement/interface/response/officer";
import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-
+
const modalPersonal = ref(false);
const personId = ref("");
const $q = useQuasar();
@@ -316,7 +316,6 @@ onMounted(async () => {
:outlined="edit"
dense
:readonly="!edit"
- lazy-rules
:borderless="!edit"
:rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
:model-value="
@@ -363,7 +362,6 @@ onMounted(async () => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="dateEnd !== null ? date2Thai(dateEnd) : null"
:rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
diff --git a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
index 46b1805c7..8e4bd37b1 100644
--- a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
+++ b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue
@@ -12,7 +12,7 @@ import keycloak from "@/plugins/keycloak";
import type { QForm } from "quasar";
import type { ResponseDataDetail } from "@/modules/06_retirement/interface/response/discharged";
import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-
+
const modalPersonal = ref(false);
const personId = ref("");
/** use */
@@ -187,7 +187,6 @@ function onclickViewinfo(id: string) {
function updatemodalPersonal(modal: boolean) {
modalPersonal.value = modal;
}
-
{
{
dense
borderless
outlined
- lazy-rules
hide-bottom-space
:model-value="
invoiceDate != null ? date2Thai(invoiceDate) : undefined
diff --git a/src/modules/07_insignia/components/3_result/Dialogbody.vue b/src/modules/07_insignia/components/3_result/Dialogbody.vue
index 96e08ca04..0af969e00 100644
--- a/src/modules/07_insignia/components/3_result/Dialogbody.vue
+++ b/src/modules/07_insignia/components/3_result/Dialogbody.vue
@@ -91,11 +91,11 @@ async function SaveData(type: string, id: string) {
function dataSave(type: string, id: string) {
const formData = new FormData();
if (props.dateCheckReceive === null) {
- formData.append("Date", dateToISO(Datereceive.value as Date ?? nullii));
+ formData.append("Date", dateToISO((Datereceive.value as Date) ?? nullii));
formData.append("File", files.value);
formData.append("OrgId", OrganazationId.value);
} else {
- formData.append("Date", dateToISO(Datereturn.value as Date?? nullii));
+ formData.append("Date", dateToISO((Datereturn.value as Date) ?? nullii));
formData.append("File", filesReturn.value);
formData.append("OrgId", OrganazationId2.value);
}
@@ -226,7 +226,7 @@ watch(props, () => {
:label="`${'วันที่ได้รับ'}`"
:disable="dateCheckReceive !== null"
>
-
+
{
dense
borderless
outlined
- lazy-rules
:rules="[(val) => !!val || 'กรุณาเลือกวันที่คืน']"
hide-bottom-space
:model-value="
diff --git a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
index 8f05753c6..9eff283e9 100644
--- a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
+++ b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
@@ -232,7 +232,7 @@ async function searchcardid() {
} else {
fullName.value = "";
brand.value = "";
- receivedate.value = null
+ receivedate.value = null;
// OrganazationId.value = "";
}
}
@@ -243,7 +243,6 @@ function closeDialog() {
props.close();
}
-
/** function reset วันที่คืน*/
function clearReturnDate() {
returndate.value = null;
@@ -420,13 +419,13 @@ watch(props, () => {
"
:label="`${'วันที่ยืม'}`"
>
-
-
@@ -483,7 +482,6 @@ watch(props, () => {
dense
borderless
outlined
- lazy-rules
:rules="[(val) => !!val || 'กรุณาเลือกวันที่คืน']"
hide-bottom-space
:model-value="
diff --git a/src/modules/08_registryEmployee/components/AddEmployee/Main.vue b/src/modules/08_registryEmployee/components/AddEmployee/Main.vue
index 157ad7948..3cc7d286e 100644
--- a/src/modules/08_registryEmployee/components/AddEmployee/Main.vue
+++ b/src/modules/08_registryEmployee/components/AddEmployee/Main.vue
@@ -447,7 +447,6 @@ const clickBack = () => {
hide-bottom-space
outlined
dense
- lazy-rules
:model-value="
informaData.birthDate == null
? null
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Assessment.vue b/src/modules/08_registryEmployee/components/EditEmployee/Assessment.vue
index b9ff755a8..8cd904c7e 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Assessment.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Assessment.vue
@@ -35,8 +35,15 @@ const store = useProfileDataStore();
const { profileData, changeProfileColumns } = store;
const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
- mixin;
+const {
+ date2Thai,
+ success,
+ dateToISO,
+ messageError,
+ showLoader,
+ hideLoader,
+ dialogConfirm,
+} = mixin;
const route = useRoute();
const id = ref("");
const name = ref();
@@ -395,9 +402,9 @@ const clickAdd = async () => {
/**
* กดบันทึกใน dialog
*/
-const clickSave = () =>{
- dialogConfirm($q,()=>SaveData())
-}
+const clickSave = () => {
+ dialogConfirm($q, () => SaveData());
+};
const SaveData = async () => {
await myForm.value.validate().then(async (result: boolean) => {
if (result) {
@@ -735,9 +742,7 @@ const textPoint = (val: number | undefined) => {
/>
-
+
@@ -464,8 +515,13 @@ function findByPerson(element: any): any {
{{ prop.node.name }}
{{ prop.node.positionLevel }}
-
-
+
{{ year + 543 }}
{{
parseInt(value + 543)
}}
-
+
-
+
@@ -501,36 +575,92 @@ function findByPerson(element: any): any {
-
-
-
-
-
-
@@ -423,7 +422,6 @@ function updatemodalPersonal(modal: boolean) {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="date !== null ? date2Thai(date) : null"
diff --git a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
index 4b632fa7d..aef4b58be 100644
--- a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
+++ b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
@@ -12,7 +12,7 @@ import keycloak from "@/plugins/keycloak";
import type { QForm } from "quasar";
import type { ResponseDataDetail } from "@/modules/06_retirement/interface/response/expulsion";
import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-
+
const modalPersonal = ref(false);
const personId = ref("");
/** use */
@@ -426,7 +426,6 @@ function updatemodalPersonal(modal: boolean) {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="date !== null ? date2Thai(date) : null"
diff --git a/src/modules/06_retirement/components/ExitInterview/exitMain.vue b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
index f4aa33d7a..211738f2b 100644
--- a/src/modules/06_retirement/components/ExitInterview/exitMain.vue
+++ b/src/modules/06_retirement/components/ExitInterview/exitMain.vue
@@ -499,7 +499,6 @@ const openModalCalendar = (rows: any) => {
(false);
const personId = ref("");
/** Use */
@@ -436,7 +436,6 @@ function updatemodalPersonal(modal: boolean) {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:readonly="!edit"
:model-value="date !== null ? date2Thai(date) : null"
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index 5993b15b1..cfd285482 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -837,7 +837,6 @@ function updatemodalPersonal(modal: boolean) {
dense
outlined
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
- lazy-rules
:model-value="
signDate !== null ? date2Thai(signDate) : null
"
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index deb4d5b5a..dd390f9d4 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -314,7 +314,6 @@ const clickCancelConditions = async () => {
conditions.value = false;
};
-
const saveConditions = () => {
if (myForm.value !== null) {
myForm.value.validate().then((success) => {
@@ -335,9 +334,7 @@ const saveConditions = () => {
};
//Save จาก Api
-const dataSave = async () => {
-
-};
+const dataSave = async () => {};
/**
* Functionบันทึก
@@ -361,7 +358,6 @@ const conditionSave = () => {
}
};
-
//Save จาก Api
const saveData = async () => {
const formData = new FormData();
@@ -772,7 +768,7 @@ function confirmRemove(fileId: string) {
label="แก้ไข"
style="width: 80px"
@click="conditions = !conditions"
- />
+ />
+
{
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่ได้รับ'}`]"
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Discipline.vue b/src/modules/08_registryEmployee/components/EditEmployee/Discipline.vue
index 5ecb2868b..ed4899acb 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Discipline.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Discipline.vue
@@ -34,8 +34,15 @@ const store = useProfileDataStore();
const { profileData, changeProfileColumns } = store;
const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader, dialogConfirm } =
- mixin;
+const {
+ date2Thai,
+ success,
+ dateToISO,
+ messageError,
+ showLoader,
+ hideLoader,
+ dialogConfirm,
+} = mixin;
const route = useRoute();
const id = ref("");
const level = ref();
@@ -415,8 +422,8 @@ const clickAdd = async () => {
* กดบันทึกใน dialog
*/
const clickSave = () => {
- dialogConfirm($q,()=>SaveData())
-}
+ dialogConfirm($q, () => SaveData());
+};
const SaveData = async () => {
await myForm.value.validate().then(async (result: boolean) => {
if (result) {
@@ -723,9 +730,7 @@ const resetFilter = () => {};
-
+
{};
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[(val:string) => !!val || `${'กรุณาเลือกวัน เดือน ปี'}`]"
@@ -866,7 +870,6 @@ const resetFilter = () => {};
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="
refCommandDate == null ? null : date2Thai(refCommandDate)
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Education.vue b/src/modules/08_registryEmployee/components/EditEmployee/Education.vue
index 9c1fcbe9a..72df895cf 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Education.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Education.vue
@@ -32,8 +32,15 @@ const store = useProfileDataStore();
const { profileData, changeProfileColumns } = store;
const mixin = useCounterMixin();
-const { success, dateToISO, date2Thai, messageError, showLoader, hideLoader,dialogConfirm } =
- mixin;
+const {
+ success,
+ dateToISO,
+ date2Thai,
+ messageError,
+ showLoader,
+ hideLoader,
+ dialogConfirm,
+} = mixin;
const route = useRoute();
const id = ref("");
const levelId = ref();
@@ -657,8 +664,8 @@ const clickAdd = async () => {
* กดบันทึกใน dialog
*/
const clickSave = () => {
- dialogConfirm($q,() => SaveData() )
-}
+ dialogConfirm($q, () => SaveData());
+};
const SaveData = async () => {
await myForm.value.validate().then(async (result: boolean) => {
if (result) {
@@ -1054,9 +1061,7 @@ const getClass = (val: boolean) => {
-
+
{
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="startDate + 543"
:rules="[
@@ -1187,7 +1191,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="date2Thai(startDate2)"
:rules="[
@@ -1237,7 +1240,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="endDate + 543"
:rules="[
@@ -1281,7 +1283,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="date2Thai(endDate2)"
:rules="[
@@ -1331,7 +1332,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
- lazy-rules
:borderless="!edit"
:model-value="date2Thai(finishDate)"
:rules="[
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue b/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
index 085cb07b4..6cd103233 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
@@ -311,29 +311,71 @@ const paginationHis = ref({
-
+
แก้ไขข้อมูล
-
- ลบข้อมูล
+
+ ลบข้อมูล
-
+
ประวัติข้อมูลการจ้าง
@@ -380,17 +444,33 @@ const paginationHis = ref({
เพิ่มข้อมูลการจ้าง
-
-
ข้อมูลการจ้าง
-
+
เพิ่มข้อมูลการจ้าง
-
-
+
@@ -352,16 +394,38 @@ const paginationHis = ref({