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

Merge branch 'develop'

Browse source
This commit is contained in:
Warunee Tamkoo 2025-03-21 11:46:23 +07:00
commit d2c6c1f5c2
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/06_evaluate/components/viewstep/viewStep1.vue
View file

@ -318,7 +318,7 @@ onMounted(async () => {
borderless borderless
readonly readonly
:model-value="`${formDetail.posNo ? formDetail.posNo : '-'}`" :model-value="`${formDetail.posNo ? formDetail.posNo : '-'}`"
label="ตำแหน่งเลขที่" label="เลขที่ตำแหน่ง"
/> />
</div> </div>
<div class="col-xs-6 col-sm-4 col-md-3"> <div class="col-xs-6 col-sm-4 col-md-3">

4
src/modules/06_evaluate/stores/evaluteDetail.ts
View file

@ -102,7 +102,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
{ {
name: "posNo", name: "posNo",
align: "left", align: "left",
label: "ตำแหน่งเลขที่", label: "เลขที่ตำแหน่ง",
sortable: true, sortable: true,
field: "posNo", field: "posNo",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
@ -112,7 +112,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
{ {
name: "positionType", name: "positionType",
align: "left", align: "left",
label: "ประเภทตำแหน่ง", label: "ตำแหน่งประเภท",
sortable: true, sortable: true,
field: "positionType", field: "positionType",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",

14
src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
View file

@ -86,8 +86,10 @@ const roundOp = ref<DataOptions[]>([
]); ]);
function fetchListPlan() { function fetchListPlan() {
formFilter.nodeId = store.dataProfile.nodeDnaId; formFilter.nodeId = formFilter.isAll
formFilter.node = store.dataProfile.node; ? store.dataProfile.rootDnaId
: store.dataProfile.nodeDnaId;
formFilter.node = formFilter.isAll ? 0 : store.dataProfile.node;
formFilter.year = formFilter?.year ? formFilter.year.toString() : ""; formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
showLoader(); showLoader();
@ -146,8 +148,10 @@ function fetchListPlanByid(id: string) {
} }
function fetchListRole() { function fetchListRole() {
formFilter.nodeId = store.dataProfile.nodeDnaId; formFilter.nodeId = formFilter.isAll
formFilter.node = store.dataProfile.node; ? store.dataProfile.rootDnaId
: store.dataProfile.nodeDnaId;
formFilter.node = formFilter.isAll ? 0 : store.dataProfile.node;
formFilter.year = formFilter?.year ? formFilter.year.toString() : ""; formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
formFilter.position = store.dataProfile.position; formFilter.position = store.dataProfile.position;
@ -199,8 +203,6 @@ function fetchRoleByid(id: string) {
} }
function fetchListSpecial() { function fetchListSpecial() {
// formFilter.nodeId = store.dataProfile.nodeDnaId;
// formFilter.node = store.dataProfile.node;
formFilter.year = formFilter?.year ? formFilter.year.toString() : ""; formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
const body = { const body = {

2
src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
View file

@ -67,7 +67,7 @@ const columns = ref<QTableProps["columns"]>([
{ {
name: "posMasterNoOld", name: "posMasterNoOld",
align: "left", align: "left",
label: "ตำแหน่งเลขที่", label: "เลขที่ตำแหน่ง",
sortable: true, sortable: true,
field: "posMasterNoOld", field: "posMasterNoOld",
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",