-
+
diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
index 7e4935ded..402f1f118 100644
--- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
@@ -150,7 +150,6 @@ function onSubmit() {
level.value !== 0 ? formData.orgLevelSub : undefined,
[nameId]: rootId,
};
- console.log(body);
if (actionType.value === "ADD") {
await http
@@ -375,7 +374,6 @@ function selectOrgLevele(val: string, status: boolean = true) {
for="#ocNo"
:label="level == 0 ? 'รหัสหน่วยงาน' : 'รหัสส่วนราชการ'"
hide-bottom-space
- class="inputNumber"
:rules="[
(val) =>
!!val ||
@@ -482,14 +480,4 @@ function selectOrgLevele(val: string, status: boolean = true) {
-
+
diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
index f7c3860f7..859053e83 100644
--- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
@@ -544,8 +544,6 @@ watch(
);
async function addPosition(data: RowDetailPositions) {
- console.log(data);
-
const isIdExist = await rows.value.some(
(item: any) =>
item.posExecutiveId == data.posExecutiveId &&
@@ -817,7 +815,7 @@ async function emitSearch(keyword: string, typeSelect: string) {
flat
round
color="teal"
- @click="() => (modalAdd = true)"
+ @click="() => ((modalAdd = true), (dataCopy = null))"
>สร้างตำแหน่ง
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Document.vue b/src/modules/05_placement/components/PersonalDetail/Information/Document.vue
index 7c6151a85..aa1b157f8 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Document.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Document.vue
@@ -10,9 +10,9 @@ import http from "@/plugins/http";
import config from "@/app.config";
interface ArrayFileList {
- id:string
- pathName:string
- fileName:string
+ id: string;
+ pathName: string;
+ fileName: string;
}
const props = defineProps({
@@ -40,7 +40,14 @@ const fileList = ref
([]);
const $q = useQuasar(); // show dialog
const mixin = useCounterMixin();
const route = useRoute();
-const { success, messageError, showLoader, dialogConfirm, hideLoader,dialogRemove } = mixin;
+const {
+ success,
+ messageError,
+ showLoader,
+ dialogConfirm,
+ hideLoader,
+ dialogRemove,
+} = mixin;
const profileId = ref(
route.params.personalId ? route.params.personalId.toString() : ""
);
@@ -51,30 +58,28 @@ const file = ref([]);
const name = ref("");
const dataMain = ref([]);
-
-
// const getData = async () => {
// if (props.datainformation) {
// dataMain.value = props.datainformation;
// files.value = dataMain.value.docs;
// }
- // โค้ดเก่ายังไม่ได้ใช้
- // if (profileId.value) {
- // showLoader();
- // await http
- // .get(config.API.profilePaperId(profileId.value))
- // .then((res) => {
- // const data = res.data.result;
- // files.value = data;
- // })
- // .catch((e) => {
- // messageError($q, e);
- // })
- // .finally(() => {
- // hideLoader();
- // });
- // }
+// โค้ดเก่ายังไม่ได้ใช้
+// if (profileId.value) {
+// showLoader();
+// await http
+// .get(config.API.profilePaperId(profileId.value))
+// .then((res) => {
+// const data = res.data.result;
+// files.value = data;
+// })
+// .catch((e) => {
+// messageError($q, e);
+// })
+// .finally(() => {
+// hideLoader();
+// });
+// }
// };
const deleteData = async (id: string) => {
@@ -229,7 +234,7 @@ async function uploadFileDoc(uploadUrl: string, file: any) {
* ดาวน์โหลดลิงค์ไฟล์
* @param fileName file name
*/
- function downloadFile(fileName: string) {
+function downloadFile(fileName: string) {
showLoader();
http
.get(
@@ -269,7 +274,6 @@ function deleteFile(fileName: string) {
)
)
.then((res) => {
-
setTimeout(() => {
getData();
success($q, `ลบไฟล์สำเร็จ`);
@@ -286,7 +290,7 @@ function deleteFile(fileName: string) {
}
async function getData() {
- showLoader()
+ showLoader();
await http
.get(
config.API.file("ระบบบรรจุ แต่งตั้ง", "เอกสารหลักฐาน", profileId.value)
@@ -298,17 +302,16 @@ async function getData() {
messageError($q, e);
})
.finally(() => {
- hideLoader()
+ hideLoader();
});
}
onMounted(async () => {
await getData();
});
-
-
+
{
:disable="statusEdit"
:save="uploadData"
/>
-
-
+
(false);
const isBlank = ref(false);
async function fetchDataTable(id: string, level: number = 0) {
- console.log(props.dataRow);
-
showLoader();
const body = {
node: level,
@@ -196,9 +194,6 @@ async function fetchPosFind(level: number, id: string) {
.post(config.API.orgPosFind, body)
.then((res) => {
const data = res.data.result;
-
- console.log(props?.dataRow);
-
expanded.value = data;
nodeId.value = id;
positionId.value = props?.dataRow?.posmasterId;
@@ -224,7 +219,6 @@ async function onClickSubmit() {
} else {
dialogConfirm($q, async () => {
showLoader();
-
const body = {
personalId: props?.dataRow?.personalId,
node: dataPosMaster.node,
@@ -239,6 +233,7 @@ async function onClickSubmit() {
posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
reportingDate: datePos.value,
+ posmasterId: dataPosMaster.id,
typeCommand: props.typeCommand,
};
@@ -277,8 +272,6 @@ watch(
() => modal.value,
async () => {
if (modal.value) {
- console.log(props?.dataRow);
-
await fetchOrganizationActive();
if (props?.dataRow?.node !== null && props?.dataRow?.nodeId !== null) {
await fetchPosFind(props?.dataRow?.node, props?.dataRow?.nodeId);
@@ -319,22 +312,18 @@ function filterNodeFn(data: any, id: string) {
watch(
() => isAll.value,
(value, oldVal) => {
- console.log("value", value);
- console.log("oldVal", oldVal);
- isAll.value = value;
-
- fetchDataTable(nodeId.value, nodeLevel.value);
+ if (value !== oldVal) {
+ fetchDataTable(nodeId.value, nodeLevel.value);
+ }
}
);
watch(
() => isBlank.value,
(value, oldVal) => {
- console.log("isBlank value", value);
- console.log("isBlank oldVal", oldVal);
- isBlank.value = value;
-
- fetchDataTable(nodeId.value, nodeLevel.value);
+ if (value !== oldVal) {
+ fetchDataTable(nodeId.value, nodeLevel.value);
+ }
}
);
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 5ffb35a3a..1ad8939c4 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -234,14 +234,14 @@ function convertBmaOfficer(val: string) {
* แปลงสถานะบรรจุ
* @param val type
*/
-function convertContainStatus(val: string) {
+function convertContainStatus(val: string, type: string = "") {
switch (val) {
case "UN-CONTAIN":
return "ยังไม่บรรจุ";
case "PREPARE-CONTAIN":
- return "เตรียมบรรจุ";
+ return "เตรียม" + (type != "" ? type : "บรรจุ");
case "CONTAIN":
- return "บรรจุแล้ว";
+ return (type != "" ? type : "บรรจุ") + "แล้ว";
case "DISCLAIM":
return "สละสิทธิ์";
default:
@@ -249,6 +249,21 @@ function convertContainStatus(val: string) {
}
}
+function convertTypeCommand(val: string) {
+ switch (val) {
+ case "APPOINTED":
+ return "บรรจุแต่งตั้ง";
+ case "APPOINT":
+ return "แต่งตั้ง";
+ case "SLIP":
+ return "เลื่อน";
+ case "MOVE":
+ return "ย้าย";
+ default:
+ return "";
+ }
+}
+
/**
* แปลงสถานะการส่งรายชื่อ
* @param val true/false
@@ -322,7 +337,11 @@ async function getTable() {
posLevelCandidateName: data.posLevelCandidateName,
posmasterId: data.posmasterId,
- statusName: convertContainStatus(data.statusId),
+ statusName:
+ convertContainStatus(data.statusId) +
+ (data.typeCommand != ""
+ ? convertTypeCommand(data.typeCommand)
+ : ""),
organizationName:
data.root +
" " +
@@ -854,7 +873,9 @@ onMounted(async () => {
{
{
{
isPosition: e.isPosition,
posMasterNo:
e.orgShortname +
- e.posMasterNoPrefix +
+ (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
e.posMasterNo +
- e.posMasterNoSuffix,
+ (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
positionName: e.positionName,
posTypeName: e.posTypeName,
posLevelName: e.posLevelName,
diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index 672c17c64..b39ae98da 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -55,11 +55,11 @@ const byOrderOption = ref([]);
const CommandOption = ref([]);
//Main
-const typeOrder = ref([]);
+const typeOrder = ref();
const nameOrder = ref("");
const command = ref();
-const dateYear = ref(new Date().getFullYear());
-const dateCommand = ref(new Date());
+const dateYear = ref(null);
+const dateCommand = ref(null);
const byOrder = ref("");
const nameCommand = ref([]);
const positionCommand = ref("");
@@ -68,30 +68,30 @@ const positionCommand = ref("");
const examRound = ref("");
const examRoundOption = ref([]);
const conclusionRegisterNo = ref("");
-const conclusionRegisterDate = ref(new Date());
+const conclusionRegisterDate = ref(null);
const conclusionResultNo = ref("");
-const conclusionResultDate = ref(new Date());
+const conclusionResultDate = ref(null);
// C-PM-05 - 06
const meeting = ref("");
-const dateMeeting = ref(new Date());
+const dateMeeting = ref(null);
// C-PM-08
const conclusionReturnNo = ref("");
-const conclusionReturnDate = ref(new Date());
+const conclusionReturnDate = ref(null);
// C-PM-09
const organizations = ref("");
const order = ref("");
-const orderDate = ref(new Date());
+const orderDate = ref(null);
const book = ref("");
-const bookDate = ref(new Date());
+const bookDate = ref(null);
// C-PM-10
const dialogVisible = ref(false);
const organizationsOld = ref("");
const orderOld = ref("");
-const orderOldDate = ref(new Date());
+const orderOldDate = ref(null);
const locationname = ref("");
const experimentOc = ref("");
-const experimentformDate = ref(new Date());
-const experimenttoDate = ref(new Date());
+const experimentformDate = ref(null);
+const experimenttoDate = ref(null);
const chairman = ref("");
const director = ref("");
const director2 = ref("");
@@ -99,25 +99,24 @@ const director2 = ref("");
// C-PM-11-12
const committeeOc = ref("");
const committeeOrder = ref("");
-const committeeDate = ref(new Date());
+const committeeDate = ref(null);
// C-PM-13
const receiveOc = ref("");
// C-PM-14
const transferOrganizationName = ref("");
const conclusionReceive = ref("");
-const conclusionReceiveDate = ref(new Date());
+const conclusionReceiveDate = ref(null);
// C-PM-16
const orderNumber = ref();
-const orderNumberDate = ref(new Date());
-// C-PM-18-20
+const orderNumberDate = ref(null);
const fault = ref("");
const guiltyBasis = ref("");
const conclusionFireNo = ref("");
-const conclusionFireDate = ref(new Date());
+const conclusionFireDate = ref(null);
const conclusionFireResolution = ref("");
// C-PM-24
const conclusionTranferNo = ref("");
-const conclusionTranferDate = ref(new Date());
+const conclusionTranferDate = ref(null);
// C-PM-25-32
const faultLevel = ref("");
@@ -381,53 +380,53 @@ const selectCMP = async (selectOrder: OrederResult) => {
//01-04
examRound.value = "";
conclusionRegisterNo.value = "";
- conclusionRegisterDate.value = new Date();
+ conclusionRegisterDate.value = null;
conclusionResultNo.value = "";
- conclusionResultDate.value = new Date();
+ conclusionResultDate.value = null;
// 05-06
meeting.value = "";
- dateMeeting.value = new Date();
+ dateMeeting.value = null;
//08
conclusionReceive.value = "";
- conclusionReceiveDate.value = new Date();
+ conclusionReceiveDate.value = null;
//09
organizations.value = "";
order.value = "";
- orderDate.value = new Date();
+ orderDate.value = null;
book.value = "";
- bookDate.value = new Date();
+ bookDate.value = null;
//10
organizationsOld.value, (orderOld.value = "");
- orderOldDate.value = new Date();
+ orderOldDate.value = null;
locationname.value = "";
experimentOc.value = "";
- experimentformDate.value = new Date();
- experimenttoDate.value = new Date();
+ experimentformDate.value = null;
+ experimenttoDate.value = null;
chairman.value = "";
director.value = "";
director2.value = "";
//11-12
committeeOc.value = "";
committeeOrder.value = "";
- committeeDate.value = new Date();
+ committeeDate.value = null;
//13
receiveOc.value = "";
//14
transferOrganizationName.value = "";
conclusionReceive.value = "";
- conclusionReceiveDate.value = new Date();
+ conclusionReceiveDate.value = null;
//16
orderNumber.value = "";
- orderNumberDate.value = new Date();
+ orderNumberDate.value = null;
//18-20
fault.value = "";
guiltyBasis.value = "";
conclusionFireNo.value = "";
- conclusionFireDate.value = new Date();
+ conclusionFireDate.value = null;
conclusionFireResolution.value = "";
// 24
conclusionTranferNo.value = "";
- conclusionTranferDate.value = new Date();
+ conclusionTranferDate.value = null;
// 19, 20 & 25-32
faultLevel.value = "";
caseFault.value = "";
@@ -465,7 +464,7 @@ async function getComplaint() {
}
// บันทึกข้อมูล
-const submit = async () => {
+const onSubmit = async () => {
let signBy = null;
// หาคนออกคำสั่ง
if (!nameCommand.value.length) {
@@ -616,19 +615,19 @@ const submit = async () => {
}
// เช็คค่าว่าง
- await myForm.value!.validate().then((result: boolean) => {
- if (result) {
- dialogConfirm($q, () => {
- // ถ้ามี orderId ให้ อัพเดท ไม่มีให้สร้าง
- if (!orderId) {
- createListOrder(formdata, typeOrder.value.commandCode);
- } else {
- let orderIdString = orderId.toString();
- updateOrder(formdata, orderIdString, typeOrder.value.commandCode);
- }
- });
+ // await myForm.value!.validate().then((result: boolean) => {
+ // if (result) {
+ dialogConfirm($q, () => {
+ // ถ้ามี orderId ให้ อัพเดท ไม่มีให้สร้าง
+ if (!orderId) {
+ createListOrder(formdata, typeOrder.value.commandCode);
+ } else {
+ let orderIdString = orderId.toString();
+ updateOrder(formdata, orderIdString, typeOrder.value.commandCode);
}
});
+ // }
+ // });
};
// สร้างคำสัง
@@ -813,1455 +812,1491 @@ const getClass = (val: boolean) => {
};
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+ {{ year + 543 }}
+ {{
+ parseInt(value + 543)
+ }}
+
+
+
+
+
+
+
+
- {{ year + 543 }}
- {{
- parseInt(value + 543)
- }}
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ กรุณาเลือกคำสั่งโดยก่อน
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
- กรุณาเลือกคำสั่งโดยก่อน
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ year + 543 }}
-
-
- {{ parseInt(value + 543) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
- บันทึกข้อมูล
-
-
+
+
+
+ บันทึกข้อมูล
+
+
+
diff --git a/src/modules/13_salary/components/Command/step04.vue b/src/modules/13_salary/components/Command/step04.vue
index a2f14acbc..3e913d278 100644
--- a/src/modules/13_salary/components/Command/step04.vue
+++ b/src/modules/13_salary/components/Command/step04.vue
@@ -130,8 +130,6 @@ const getCommandDetail = async () => {
})
.catch((e) => {
messageError($q, e);
- })
- .finally(() => {
hideLoader();
});
};
diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index 1f0851e7a..4c317ba77 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -96,22 +96,22 @@ function fetchData() {
formData.developmentProjectTechniqueActuals =
data.developmentProjectTechniqueActuals;
formData.projectModalPlanned = data.projectModalPlanned;
- expanded.value = [
+ const arrayExpanded = [
data.strategyChild1Planned,
data.strategyChild2Planned,
data.strategyChild3Planned,
data.strategyChild4Planned,
data.strategyChild5Planned,
];
- expanded2.value = [
+ const arrayExpanded2 = [
data.strategyChild1Actual,
data.strategyChild2Actual,
data.strategyChild3Actual,
data.strategyChild4Actual,
data.strategyChild5Actual,
];
- const filteredArray = expanded.value.filter((item) => item !== null);
- const filteredArray2 = expanded2.value.filter((item) => item !== null);
+ const filteredArray = arrayExpanded.filter((item) => item !== null);
+ const filteredArray2 = arrayExpanded2.filter((item) => item !== null);
const lastItem = filteredArray[filteredArray.length - 1];
const lastItem2 = filteredArray2[filteredArray2.length - 1];
formData.strategyChildPlannedId =
@@ -122,6 +122,9 @@ function fetchData() {
lastItem2 !== undefined ? lastItem2 : null;
formData.strategyChildActualNode =
lastItem2 !== undefined ? filteredArray2.length : null;
+
+ expanded.value = arrayExpanded.filter((e) => e !== null).slice(0, -1);
+ expanded2.value = arrayExpanded2.filter((e) => e !== null).slice(0, -1);
})
.catch((err) => {
messageError($q, err);
diff --git a/src/modules/15_development/components/Record.vue b/src/modules/15_development/components/Record.vue
index fedfe4deb..c48cc80f6 100644
--- a/src/modules/15_development/components/Record.vue
+++ b/src/modules/15_development/components/Record.vue
@@ -359,20 +359,20 @@ onMounted(() => {
>
+
{{ col.label }}
-
ส่งไปบันทึกที่ทะเบียนประวัติแล้ว