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-01-10 11:52:28 +07:00
commit 4d81344c16
12 changed files with 64 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -721,6 +721,11 @@ onMounted(async () => {
? col.value + " " + "(ทับที่)"
: col.value
}}
<q-icon
name="mdi-star"
color="primary"
v-if="props.row.isDirector"
/>
</div>
<div v-else-if="col.name === 'isPosition'">
<div v-if="col.value">

5
src/components/Dialogs/DialogOrgSelectEmployee.vue
View file

@ -696,6 +696,11 @@ onMounted(() => {
? col.value + " " + "(ทับที่)"
: col.value
}}
<q-icon
name="mdi-star"
color="primary"
v-if="props.row.isDirector"
/>
</div>
<div v-else-if="col.name === 'isPosition'">
<div v-if="col.value">

3
src/modules/02_organization/components/DialogFormPosition.vue
View file

@ -491,8 +491,9 @@ watch(
() => formData.isDirector,
(newData, oldData) => {
if (newData === true) {
formData.positionSign = !formData.positionSign
? "ผู้อำนวยการ" + props.dataTree?.orgRootName
? ''
: formData.positionSign;
} else {
formData.positionSign = "";

8
src/modules/02_organization/components/TableMain.vue
View file

@ -801,6 +801,14 @@ watch(
? col.value + " " + "(นั่งทับตำแหน่ง)"
: col.value
}}
<q-icon
name="mdi-star"
color="primary"
v-if="props.row.isDirector"
>
<q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
</q-icon>
</div>
<div v-else-if="col.name === 'posLevelName'">
{{

2
src/modules/02_organization/interface/response/organizational.ts
View file

@ -118,6 +118,7 @@ interface PosMaster {
profilePoslevel: string;
conditionReason: string;
isCondition: boolean;
isDirector: boolean;
}
interface Position2 {
id: string; // id ตำแหน่ง
@ -157,6 +158,7 @@ interface PosMaster2 {
profilePosition: string;
profilePoslevel: string;
profilePostype: string;
isDirector?: boolean;
}
interface HistoryPos {

7
src/modules/05_placement/components/PersonalList/CardPosition.vue
View file

@ -432,6 +432,13 @@ onMounted(async () => {
? col.value + " " + "(นั่งทับตำแหน่ง)"
: col.value
}}
<q-icon
name="mdi-star"
color="primary"
v-if="props.row.isDirector"
>
<q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
</q-icon>
</div>
<div v-else-if="col.name === 'isPosition'">
<div v-if="col.value">

8
src/modules/05_placement/components/PersonalList/Table.vue
View file

@ -336,6 +336,8 @@ async function getTable() {
bmaOfficerCheck: data.bmaOfficer,
statusId: data.statusId,
draft: convertDraft(data.draft),
isDraft: data.draft,
typeCommand: data.typeCommand,
posTypeCandidateId: data.posTypeCandidateId,
posTypeCandidateName: data.posTypeCandidateName,
@ -374,7 +376,7 @@ async function getTable() {
const rowData = await (roleAdmin.value
? rowsAll.value
: rowsAll.value.filter((x: any) => x.statusId !== "DONE"));
: rowsAll.value.filter((x: any) => x.isDraft === true));
// รายชื่อทั้งหมด
await filterpositionCandidate(rowData);
@ -779,7 +781,7 @@ async function onUpdateNewRows(type: string, pos: string) {
const isStatusMatch = containStatus.value
? item.statusId === "DONE"
: item.statusId !== "";
: item.statusId !== "DONE";
return isTypeMatch && isPositionMatch && isStatusMatch;
});
@ -1394,7 +1396,7 @@ onMounted(async () => {
<!-- dialog เพิ่มรายชื่อ -->
<q-dialog v-model="modaladdlist" persistent>
<q-card style="min-width:70%">
<q-card style="min-width: 70%">
<DialogHeader
tittle="ส่งรายชื่อไปยังหน่วยงาน"
:close="clickCloseSendModal"

2
src/modules/05_placement/interface/index/SelectOrg.ts
View file

@ -9,6 +9,7 @@ interface DataPositionNo {
isSit: boolean;
positions: Positions[];
isCondition: boolean;
isDirector?: boolean;
}
interface Positions {
@ -24,6 +25,7 @@ interface Positions {
positionField: string;
positionIsSelected: boolean;
positionName: string;
isDirector?: boolean;
}
export type { DataPositionNo };

7
src/modules/08_registryEmployee/components/DialogSelectPos.vue
View file

@ -692,6 +692,13 @@ onBeforeMount(async () => {
? col.value + " " + "(นั่งทับตำแหน่ง)"
: col.value
}}
<q-icon
name="mdi-star"
color="primary"
v-if="props.row.isDirector"
>
<q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
</q-icon>
</div>
<div v-else-if="col.name === 'isPosition'">
<div v-if="col.value">

1
src/modules/19_condition/interface/response/Main.ts
View file

@ -29,6 +29,7 @@ interface DataPositionCondition {
profilePoslevel: string;
profilePostype: string;
positions: Positions[];
isDirector?: boolean;
}
interface Positions {

13
src/modules/19_condition/view/Main.vue
View file

@ -365,7 +365,7 @@ onMounted(async () => {
<!-- Table -->
<q-card-section
class="col-lg-9 col-md-8 col-xs-12 q-gutter-sm scroll"
style="height: 80vh;"
style="height: 80vh"
v-if="orgTreeId"
>
<div class="row col-12 q-gutter-sm">
@ -458,6 +458,17 @@ onMounted(async () => {
/>
<span v-else>-</span>
</div>
<div v-else-if="col.name === 'posMasterNo'">
{{ col.value }}
<q-icon
name="mdi-star"
color="primary"
v-if="props.row.isDirector"
>
<q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
</q-icon>
</div>
<div v-else>
{{ col.value ? col.value : "-" }}
</div>

16
src/stores/mixin.ts
View file

@ -966,28 +966,28 @@ export const useCounterMixin = defineStore("mixin", () => {
if (obj) {
let name =
obj.child4 != null && obj.child3 != null
? obj.child4 + "/"
? obj.child4 + " "
: obj.child4 != null
? obj.child4
: "";
name +=
obj.child3 != null && obj.child2 != null
? obj.child3 + "/"
? obj.child3 + " "
: obj.child3 !== null
? obj.child3
: "";
name +=
obj.child2 != null && obj.child1 != null
? obj.child2 + "/"
? obj.child2 + " "
: obj.child2 != null
? obj.child2
: "";
name +=
obj.child1 != null && obj.root != null
? obj.child1 + "/"
? obj.child1 + " "
: obj.child1 != null
? obj.child1
: "";
@ -1002,28 +1002,28 @@ export const useCounterMixin = defineStore("mixin", () => {
if (obj) {
let name =
obj.child4Old != null && obj.child3Old != null
? obj.child4Old + "/"
? obj.child4Old + " "
: obj.child4Old != null
? obj.child4Old
: "";
name +=
obj.child3Old != null && obj.child2Old != null
? obj.child3Old + "/"
? obj.child3Old + " "
: obj.child3Old !== null
? obj.child3Old
: "";
name +=
obj.child2Old != null && obj.child1Old != null
? obj.child2Old + "/"
? obj.child2Old + " "
: obj.child2Old != null
? obj.child2Old
: "";
name +=
obj.child1Old != null && obj.rootOld != null
? obj.child1Old + "/"
? obj.child1Old + " "
: obj.child1Old != null
? obj.child1Old
: "";