hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2025-05-07 10:17:24 +07:00
commit ab2d0fe86c
10 changed files with 100 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/Dialogs/DialogOrgSelect.vue
View file

@ -278,7 +278,7 @@ async function getDataTable(id: string, level: number = 0) {
isPosition: e.isPosition, isPosition: e.isPosition,
posMasterNo: posMasterNo:
e.orgShortname + e.orgShortname +
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") + (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") + ' ' +
e.posMasterNo + e.posMasterNo +
(e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""), (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
positionName: e.positionName, positionName: e.positionName,

8
src/components/Dialogs/PopupPersonalNew.vue
View file

@ -477,7 +477,11 @@ watch(modal, (newValue) => {
:model-value=" :model-value="
goverment.position ? goverment.position : '-' goverment.position ? goverment.position : '-'
" "
label="ตำแหน่ง" :label="
props.type.toLocaleLowerCase() == 'employee'
? 'ตำแหน่ง'
: 'ตำแหน่งในสายงาน'
"
/> />
</div> </div>
<div class="col-xs-6 col-md-6"> <div class="col-xs-6 col-md-6">
@ -615,7 +619,7 @@ watch(modal, (newValue) => {
? govermentTemp.positionEmployeePositionId ? govermentTemp.positionEmployeePositionId
: '-' : '-'
" "
label="ตำแหน่งทางสายงาน" label="ตำแหน่ง"
/> />
</div> </div>

8
src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
View file

@ -175,7 +175,7 @@ const columns = ref<QTableColumn[]>([
{ {
name: "positionEmployeePositionId", name: "positionEmployeePositionId",
align: "left", align: "left",
label: "ตำแหน่งทางสายงาน", label: "ตำแหน่ง",
sortable: true, sortable: true,
field: "positionEmployeePositionId", field: "positionEmployeePositionId",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
@ -391,7 +391,7 @@ onMounted(() => {
</div> </div>
<div class="row items-center"> <div class="row items-center">
<div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium"> <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
<div>ตำแหน่งทางสายงาน</div> <div>ตำแหน่ง</div>
</div> </div>
<div class="col-12 col-sm-12 col-md-7"> <div class="col-12 col-sm-12 col-md-7">
{{ dataEmployee.positionEmployeePositionId ?? "-" }} {{ dataEmployee.positionEmployeePositionId ?? "-" }}
@ -503,8 +503,8 @@ onMounted(() => {
hide-bottom-space hide-bottom-space
v-model="formData.positionEmployeePositionId" v-model="formData.positionEmployeePositionId"
class="inputgreen" class="inputgreen"
label="ตำแหน่งทางสายงาน" label="ตำแหน่ง"
:rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่งทางสายงาน'}`]" :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
/> />
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-6"> <div class="col-xs-12 col-sm-6 col-md-6">

23
src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
View file

@ -349,11 +349,26 @@ const baseVisibleColumns = ref<string[]>([
const columns = computed<QTableColumn[]>(() => { const columns = computed<QTableColumn[]>(() => {
if (empType.value !== "") { if (empType.value !== "") {
if (baseColumns.value) { if (baseColumns.value) {
return baseColumns.value.filter( const filterBaseColumn =
(column) => empType.value != "-temp"
column.name !== "positionSalaryAmount" && ? baseColumns.value.filter(
column.name !== "mouthSalaryAmount" (column) =>
column.name !== "positionSalaryAmount" &&
column.name !== "positionExecutive" && // ลูกจ้างไม่มีตำแหน่งทางการบริหาร
column.name !== "mouthSalaryAmount"
)
: baseColumns.value.filter(
(column) =>
column.name !== "positionSalaryAmount" &&
column.name !== "mouthSalaryAmount" &&
column.name !== "positionExecutive" && // ลูกจ้างชั่วคราวไม่มีตำแหน่งทางการบริหาร
column.name !== "positionLevel" && // ลูกจ้างชั่วคราวไม่มีระดับชั้นงาน
column.name !== "posNo" // ลูกจ้างชั่วคราวไม่มีตำแหน่งเลขที่
);
visibleColumnsHistory.value = filterBaseColumn.map(
(e: QTableColumn) => e.name
); );
return filterBaseColumn;
} }
} }
return baseColumns.value.filter( return baseColumns.value.filter(

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

@ -610,6 +610,14 @@ onMounted(async () => {
: "-" : "-"
}} }}
</div> </div>
<div
v-else-if="col.name == 'organizationNameOld'"
class="text-html"
>
{{ col.value ? col.value : "-" }}
</div>
<div v-else-if="col.name == 'createdAt'"> <div v-else-if="col.name == 'createdAt'">
{{ {{
props.row.createdAt ? date2Thai(props.row.createdAt) : "-" props.row.createdAt ? date2Thai(props.row.createdAt) : "-"

4
src/modules/20_positionTemp/components/DialogAddPosition.vue
View file

@ -196,7 +196,7 @@ watch(
/> />
</div> </div>
<div class="col-6"> <!-- <div class="col-6">
<q-select <q-select
ref="posLevelNameRef" ref="posLevelNameRef"
label="ระดับชั้นงาน" label="ระดับชั้นงาน"
@ -214,7 +214,7 @@ watch(
:rules="[(val:string) => !!val || `${'กรุณาเลือกระดับชั้นงาน'}`]" :rules="[(val:string) => !!val || `${'กรุณาเลือกระดับชั้นงาน'}`]"
class="inputgreen" class="inputgreen"
/> />
</div> </div> -->
</div> </div>
<q-separator /> <q-separator />

34
src/modules/20_positionTemp/components/DialogFormPosition.vue
View file

@ -59,7 +59,7 @@ const type = ref<string>("positionName");
const optionFilter = ref<DataOption[]>([ const optionFilter = ref<DataOption[]>([
{ id: "positionName", name: "ชื่อตำแหน่ง" }, { id: "positionName", name: "ชื่อตำแหน่ง" },
{ id: "positionType", name: "กลุ่มงาน" }, { id: "positionType", name: "กลุ่มงาน" },
{ id: "positionLevel", name: "ระดับชั้นงาน" }, // { id: "positionLevel", name: "ระดับชั้นงาน" },
]); ]);
const listMenu = ref<ListMenu[]>([ const listMenu = ref<ListMenu[]>([
@ -122,21 +122,21 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
}, },
{ // {
name: "posLevelName", // name: "posLevelName",
align: "left", // align: "left",
label: "ระดับชั้นงาน", // label: "ระดับชั้นงาน",
sortable: true, // sortable: true,
field: "posLevelName", // field: "posLevelName",
headerStyle: "font-size: 14px", // headerStyle: "font-size: 14px",
style: "font-size: 14px", // style: "font-size: 14px",
}, // },
]); ]);
const visibleColumns = ref<string[]>([ const visibleColumns = ref<string[]>([
"no", "no",
"posDictName", "posDictName",
"posTypeName", "posTypeName",
"posLevelName", // "posLevelName",
]); ]);
async function fetchPosition(id: string) { async function fetchPosition(id: string) {
@ -475,7 +475,7 @@ watch(
> >
{{ col.value ? col.value : "-" }} {{ col.value ? col.value : "-" }}
</div> </div>
<div v-else-if="col.name === 'posLevelName'"> <!-- <div v-else-if="col.name === 'posLevelName'">
{{ {{
props.row.posLevelName props.row.posLevelName
? props.row.isSpecial == true ? props.row.isSpecial == true
@ -483,7 +483,7 @@ watch(
: props.row.posLevelName : props.row.posLevelName
: "-" : "-"
}} }}
</div> </div> -->
<div v-else-if="col.name === 'positionArea'"> <div v-else-if="col.name === 'positionArea'">
{{ col.value ? col.value : "-" }} {{ col.value ? col.value : "-" }}
</div> </div>
@ -525,14 +525,14 @@ watch(
class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md" class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
> >
เลือกตำแหน่งที่ต้องการเพิ่ม เลือกตำแหน่งที่ต้องการเพิ่ม
<q-btn <!-- <q-btn
icon="mdi-plus" icon="mdi-plus"
flat flat
round round
color="teal" color="teal"
@click="() => (modalAdd = true)" @click="() => (modalAdd = true)"
><q-tooltip>สร้างตำแหน่ง</q-tooltip></q-btn ><q-tooltip>สร้างตำแหน่ง</q-tooltip></q-btn
> > -->
</div> </div>
<div class="col-12"><q-separator /></div> <div class="col-12"><q-separator /></div>
<div class="q-pa-sm"> <div class="q-pa-sm">
@ -671,7 +671,7 @@ watch(
> >
{{ col.value ? col.value : "-" }} {{ col.value ? col.value : "-" }}
</div> </div>
<div v-else-if="col.name === 'posLevelName'"> <!-- <div v-else-if="col.name === 'posLevelName'">
{{ {{
props.row.posLevelName props.row.posLevelName
? props.row.isSpecial == true ? props.row.isSpecial == true
@ -679,7 +679,7 @@ watch(
: props.row.posLevelName : props.row.posLevelName
: "-" : "-"
}} }}
</div> </div> -->
<div v-else-if="col.name === 'positionArea'"> <div v-else-if="col.name === 'positionArea'">
{{ col.value ? col.value : "-" }} {{ col.value ? col.value : "-" }}

4
src/modules/20_positionTemp/components/DialogPositionDetail.vue
View file

@ -48,7 +48,7 @@ function close() {
</div> </div>
</div> </div>
<div class="row q-col-gutter-sm q-mb-xs"> <!-- <div class="row q-col-gutter-sm q-mb-xs">
<div class="col-4 text-bold"> <div class="col-4 text-bold">
<div> <div>
<p>ระดับชั้นงาน</p> <p>ระดับชั้นงาน</p>
@ -57,7 +57,7 @@ function close() {
<div class="col-8 text-grey-8"> <div class="col-8 text-grey-8">
<p>{{ prosp?.dataDetailPos?.posLevelName }}</p> <p>{{ prosp?.dataDetailPos?.posLevelName }}</p>
</div> </div>
</div> </div> -->
</div> </div>
</q-card-section> </q-card-section>
</q-card> </q-card>

63
src/modules/20_positionTemp/components/DialogSelectPerson.vue
View file

@ -94,8 +94,7 @@ const visibleColumnsResult = ref<String[]>([
"citizenId", "citizenId",
"name", "name",
"posTypeName", "posTypeName",
"posLevelName", "positionName",
"positionName"
]); ]);
const columns = ref<QTableProps["columns"]>([ const columns = ref<QTableProps["columns"]>([
{ {
@ -126,15 +125,15 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
}, },
{ // {
name: "posLevelName", // name: "posLevelName",
align: "left", // align: "left",
label: "ระดับชั้นงาน", // label: "ระดับชั้นงาน",
sortable: true, // sortable: true,
field: "posLevelName", // field: "posLevelName",
headerStyle: "font-size: 14px", // headerStyle: "font-size: 14px",
style: "font-size: 14px", // style: "font-size: 14px",
}, // },
]); ]);
const columnsResult = ref<QTableProps["columns"]>([ const columnsResult = ref<QTableProps["columns"]>([
{ {
@ -182,16 +181,15 @@ const columnsResult = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
}, },
// {
{ // name: "posLevelName",
name: "posLevelName", // align: "left",
align: "left", // label: "ระดับชั้นงาน",
label: "ระดับชั้นงาน", // sortable: true,
sortable: true, // field: "posLevelName",
field: "posLevelName", // headerStyle: "font-size: 14px",
headerStyle: "font-size: 14px", // style: "font-size: 14px",
style: "font-size: 14px", // },
},
]); ]);
/** /**
@ -239,15 +237,15 @@ function inputEdit(val: boolean) {
/** /**
* function เรียกข้แมูลระดับตำแหน่ง * function เรียกข้แมูลระดับตำแหน่ง
*/ */
function updateSelectType(val: string) { // function updateSelectType(val: string) {
const listLevel: any = dataLevel.value.find((e: TypePos) => e.id === val); // const listLevel: any = dataLevel.value.find((e: TypePos) => e.id === val);
levelOpsMain.value = listLevel?.posLevels.map((e: OptionLevel) => ({ // levelOpsMain.value = listLevel?.posLevels.map((e: OptionLevel) => ({
id: e.id, // id: e.id,
name: e.posLevelName, // name: e.posLevelName,
})); // }));
levelOps.value = levelOpsMain.value; // levelOps.value = levelOpsMain.value;
formData.positionLevel = ""; // formData.positionLevel = "";
} // }
/** /**
* ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม * ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม
@ -560,7 +558,6 @@ watch(
:options="typeOps" :options="typeOps"
emit-value emit-value
dense dense
@update:model-value="updateSelectType"
map-options map-options
outlined outlined
option-label="name" option-label="name"
@ -575,7 +572,7 @@ watch(
/> </template /> </template
></q-select> ></q-select>
</div> </div>
<div class="col-2"> <!-- <div class="col-2">
<q-select <q-select
ref="positionLevelRef" ref="positionLevelRef"
:class="inputEdit(isReadonly)" :class="inputEdit(isReadonly)"
@ -599,7 +596,7 @@ watch(
class="cursor-pointer" class="cursor-pointer"
/> </template /> </template
></q-select> ></q-select>
</div> </div> -->
<div class="col-2"> <div class="col-2">
<q-btn <q-btn
label="ค้นหา" label="ค้นหา"

22
src/modules/20_positionTemp/components/TableMain.vue
View file

@ -153,15 +153,15 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
}, },
{ // {
name: "posLevelName", // name: "posLevelName",
align: "left", // align: "left",
label: "ระดับชั้นงาน", // label: "ระดับชั้นงาน",
sortable: false, // sortable: false,
field: "posLevelName", // field: "posLevelName",
headerStyle: "font-size: 14px", // headerStyle: "font-size: 14px",
style: "font-size: 14px", // style: "font-size: 14px",
}, // },
{ {
name: "positionIsSelected", name: "positionIsSelected",
align: "left", align: "left",
@ -623,7 +623,7 @@ watch(
: col.value : col.value
}} }}
</div> </div>
<div v-else-if="col.name === 'posLevelName'"> <!-- <div v-else-if="col.name === 'posLevelName'">
{{ {{
props.row.posLevelName props.row.posLevelName
? props.row.isSpecial == true ? props.row.isSpecial == true
@ -631,7 +631,7 @@ watch(
: props.row.posLevelName : props.row.posLevelName
: "-" : "-"
}} }}
</div> </div> -->
<div v-else-if="col.name == 'positionIsSelected'"> <div v-else-if="col.name == 'positionIsSelected'">
{{ {{
props.row.positionIsSelected props.row.positionIsSelected