([
{
name: "positionLevel",
align: "left",
- label: "ประเภทตำแหน่ง",
+ label: "ตำแหน่งประเภท",
sortable: true,
field: "positionLevel",
headerStyle: "font-size: 14px",
@@ -236,7 +236,8 @@ watch(
);
function convertType(val: string) {
- switch (val) {
+ const data = val?.toLocaleUpperCase();
+ switch (data) {
case "OFFICER":
return "ข้าราชการ กทม. สามัญ";
case "EMPLOYEE":
@@ -410,7 +411,8 @@ onMounted(async () => {
{{ props.row.organization ? props.row.organization : "-" }}
diff --git a/src/modules/11_discipline/components/PopupSendToNext.vue b/src/modules/11_discipline/components/PopupSendToNext.vue
index a0d054e71..6af8be895 100644
--- a/src/modules/11_discipline/components/PopupSendToNext.vue
+++ b/src/modules/11_discipline/components/PopupSendToNext.vue
@@ -218,13 +218,6 @@ watch(
{{ props.rowIndex + 1 }}
-
- {{
- props.row.profileType
- ? mainStore.convertType(props.row.profileType)
- : "-"
- }}
-
{{ col.value ? col.value:'-' }}
diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts
index fc3ba8341..a0a97af5a 100644
--- a/src/modules/11_discipline/store/Main.ts
+++ b/src/modules/11_discipline/store/Main.ts
@@ -53,6 +53,9 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
field: "profileType",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
+ format(val, row) {
+ return `${convertType(row.profileType)}`;
+ },
},
{
name: "idcard",
@@ -75,7 +78,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
{
name: "posNo",
align: "left",
- label: "ตำแหน่งเลขที่",
+ label: "เลขที่ตำแหน่ง",
sortable: true,
field: "posNo",
headerStyle: "font-size: 14px",
@@ -108,7 +111,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
- return val ? val.toLocaleString() : '-';
+ return val ? val.toLocaleString() : "-";
},
},
{
@@ -146,7 +149,6 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
// style: "font-size: 14px",
// },
const columnsDirector = ref([
-
{
name: "no",
align: "left",
@@ -164,6 +166,9 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
field: "profileType",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
+ format(val, row) {
+ return `${convertType(row.profileType)}`;
+ },
},
{
name: "idcard",
@@ -186,7 +191,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
{
name: "posNo",
align: "left",
- label: "ตำแหน่งเลขที่",
+ label: "เลขที่ตำแหน่ง",
sortable: true,
field: "posNo",
headerStyle: "font-size: 14px",
@@ -430,7 +435,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
* @param data ข้อมูลรายการบุคคล
*/
async function fetchData(data: ArrayPersonAdd[], type?: string) {
- console.log("🚀 ~ fetchData ~ data:", data)
+ console.log("🚀 ~ fetchData ~ data:", data);
const dataList: any = data.map((item: any) => ({
profileType: item.profileType
? item.profileType
@@ -470,17 +475,20 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
posLevelId: item.posLevelId,
posLevelName: item.posLevelName,
- rootDnaId:item.rootDnaId,
- child1DnaId:item.child1DnaId,
- child2DnaId:item.child2DnaId,
- child3DnaId:item.child3DnaId,
- child4DnaId:item.child4DnaId,
+ rootDnaId: item.rootDnaId,
+ child1DnaId: item.child1DnaId,
+ child2DnaId: item.child2DnaId,
+ child3DnaId: item.child3DnaId,
+ child4DnaId: item.child4DnaId,
}));
const newItems = dataList.filter(
- (newItem: any) => !rowsAdd.value.some((existingItem: any) => existingItem.personId === newItem.personId)
+ (newItem: any) =>
+ !rowsAdd.value.some(
+ (existingItem: any) => existingItem.personId === newItem.personId
+ )
);
-
+
// เพิ่มข้อมูลใหม่เข้า rowsAdd
rowsAdd.value = [...rowsAdd.value, ...newItems];
}
@@ -530,7 +538,8 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
}
function convertType(val: string) {
- switch (val) {
+ const data = val?.toLocaleUpperCase();
+ switch (data) {
case "OFFICER":
return "ข้าราชการ กทม. สามัญ";
case "EMPLOYEE":
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 3a69008af..9f2051d52 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -1248,11 +1248,6 @@ export const useCounterMixin = defineStore("mixin", () => {
}
}
- function textTranForm(val: string) {
- return (val.match(/[^()\s]+(?:\s*\([^()]+\))?|\([^()]+\)/g) || []).join(
- "\n"
- );
- }
function pathRegistryEmp(routeName: string) {
return routeName
? routeName === "registryNewByid"
@@ -1396,6 +1391,5 @@ export const useCounterMixin = defineStore("mixin", () => {
findOrgNameHtml,
findOrgNameOldHtml,
findOrgChildNameHtml,
- textTranForm
};
});