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

Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop

Browse source 
* 'develop' of github.com:Frappet/hrms-mgt:
  fix การทดลองปฏิบัติหน้าที่ราชการ
  แก้คำ
  แก้ ชิดซ้าย
  แก้คำ
  clone เมนูให้ "รายการให้ออก (ลูกจ้าง)"
  fix / เงินเดือน
  fix color pagination
  แก้คำ

# Conflicts:
#	src/modules/05_placement/components/probation/MainSurvey.vue
This commit is contained in:
Warunee Tamkoo 2025-01-22 17:31:09 +07:00
commit 4c8fb456a1
12 changed files with 435 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/05_placement/components/probation/FormAssign.vue
View file

@ -1145,11 +1145,12 @@ onMounted(async () => {
</q-menu>
</q-btn>
<div v-if="!isEdit && !isCheckFile">
<div v-if="!isEdit">
<q-btn
v-if="
!checkRoutePermisson &&
probationStore.dataPermissions?.tab1.isEdit
probationStore.dataPermissions?.tab1.isEdit &&
!isCheckFile
"
dense
flat

23
src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
View file

@ -795,17 +795,6 @@ onMounted(() => {
</div>
</q-form>
<FormUploadFile
:group="`รายงานผลครั้งที่${props.tab?.charAt(4)}`"
v-model:is-check-file="isCheckFile"
:check-route-permisson="checkRoutePermisson"
:data-permissions="
probationStore.dataPermissions?.tab6.isEdit
? probationStore.dataPermissions?.tab6.isEdit
: false
"
/>
<q-toolbar
class="text-primary"
v-if="
@ -817,6 +806,18 @@ onMounted(() => {
<q-space />
<q-btn label="บันทึก" color="secondary" @click="savaForm" />
</q-toolbar>
<FormUploadFile
v-else
:group="`รายงานผลครั้งที่${props.tab?.charAt(4)}`"
v-model:is-check-file="isCheckFile"
:check-route-permisson="checkRoutePermisson"
:data-permissions="
probationStore.dataPermissions?.tab6.isEdit
? probationStore.dataPermissions?.tab6.isEdit
: false
"
/>
</div>
</template>

8
src/modules/05_placement/components/probation/MainProbation.vue
View file

@ -801,19 +801,19 @@ onMounted(async () => {
{{
`${
props.row.orgChild4Name
? props.row.orgChild4Name + "/"
? props.row.orgChild4Name + " "
: ""
}${
props.row.orgChild3Name
? props.row.orgChild3Name + "/"
? props.row.orgChild3Name + " "
: ""
}${
props.row.orgChild2Name
? props.row.orgChild2Name + "/"
? props.row.orgChild2Name + " "
: ""
}${
props.row.orgChild1Name
? props.row.orgChild1Name + "/"
? props.row.orgChild1Name + " "
: ""
}${props.row.orgRootName ? props.row.orgRootName : ""}`
}}

2
src/modules/05_placement/components/probation/MainSurvey.vue
View file

@ -193,7 +193,7 @@ onMounted(async () => {
v-model="filterKeyword"
ref="filterRef"
outlined
placeholder="ค้นหาจากชื่อ-นามสกุล/ตำแหน่งผู้ทดลองฯ"
placeholder="ค้นหาจากชื่อ - นามสกุล /ตำแหน่ง"
@keydown.enter.prevent="getData()"
style="width: 350px"
>