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:
setthawutttty 2025-03-20 16:58:30 +07:00
parent 708170a2e5
commit fcaf891197
17 changed files with 93 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/11_discipline/components/1_Complaint/EditPage.vue
View file

@ -94,6 +94,9 @@ const columns = ref<QTableProps["columns"]>([
field: "profileType",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${mainStore.convertType(row.profileType)}`;
},
},
{
name: "idcard",
@ -116,7 +119,7 @@ const columns = ref<QTableProps["columns"]>([
{
name: "posNo",
align: "left",
label: "ตำแหน่งเลขที่",
label: "เลขที่ตำแหน่ง",
sortable: true,
field: "posNo",
headerStyle: "font-size: 14px",

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

@ -352,9 +352,9 @@ onMounted(async () => {
:readonly="!edit"
:borderless="!edit"
v-model="data.positionType"
:rules="[(val:string) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]"
:rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
hide-bottom-space
:label="`${'ประเภทตำแหน่ง'}`"
:label="`${'ตำแหน่งประเภท'}`"
/>
</div>
</div>
@ -384,9 +384,9 @@ onMounted(async () => {
:readonly="!edit"
:borderless="!edit"
v-model="data.posNo"
:rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งเลขที่'}`]"
:rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่ตำแหน่ง'}`]"
hide-bottom-space
:label="`${'ตำแหน่งเลขที่'}`"
:label="`${'เลขที่ตำแหน่ง'}`"
/>
</div>
</div>

8
src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
View file

@ -102,7 +102,7 @@ const columns = ref<QTableProps["columns"]>([
{
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 () => {
</div>
<div
v-else-if="col.name === 'organization'"
class="table_ellipsis"
class="text-html"
style="width: 250px"
>
{{ props.row.organization ? props.row.organization : "-" }}
</div>

7
src/modules/11_discipline/components/PopupSendToNext.vue
View file

@ -218,13 +218,6 @@ watch(
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div v-else-if="col.name === 'profileType'">
{{
props.row.profileType
? mainStore.convertType(props.row.profileType)
: "-"
}}
</div>
<div v-else>
{{ col.value ? col.value:'-' }}
</div>

35
src/modules/11_discipline/store/Main.ts
View file

@ -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<QTableProps["columns"]>([
{
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":