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

updated & fixing

Browse source
This commit is contained in:
Warunee Tamkoo 2024-06-26 14:35:19 +07:00
parent a39a34b15f
commit 62af9f6a35
24 changed files with 392 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/modules/10_registry/02_Government/01_Government.vue
View file

@ -2,7 +2,7 @@
import { useCounterMixin } from "@/stores/mixin";
import { useQuasar, type QTableProps } from "quasar";
import { ref, reactive, onMounted } from "vue";
import { useRegistryInFormationStore } from '@/modules/10_registry/store/registry'
import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
//history dialog
import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
@ -10,7 +10,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
import http from "@/plugins/http";
import config from "@/app.config";
const store = useRegistryInFormationStore()
const store = useRegistryInFormationStore();
const rowsHistory = ref<any[]>([]);
const $q = useQuasar();
const mixin = useCounterMixin();
@ -309,7 +309,10 @@ function getData() {
/** get history */
function getHistory() {
const url = store.typeProfile == 'OFFICER' ? config.API.dataUserGovernmentHistory(''):config.API.dataUserGovernmentHistory('-employee')
const url =
store.typeProfile == "OFFICER"
? config.API.dataUserGovernmentHistory("")
: config.API.dataUserGovernmentHistory("-employee");
showLoader();
http
.get(url)
@ -354,23 +357,31 @@ onMounted(() => {
<div class="col-7">
{{ formData.org ? formData.org : "-" }}
</div>
<div class="col-5 text-grey-6 text-weight-medium">ตำแหน่ง</div>
<div class="col-5 text-grey-6 text-weight-medium">
ตำแหน่งในสายงาน
</div>
<div class="col-7">
{{ formData.position ? formData.position : "-" }}
</div>
<div class="col-5 text-grey-6 text-weight-medium">
เลขที่ตำแหน่ง
ตำแหน่งเลขที่
</div>
<div class="col-7">
{{ formData.posMasterNo ? formData.posMasterNo : "-" }}
</div>
<div v-if="store.typeProfile == 'OFFICER'" class="col-5 text-grey-6 text-weight-medium">
<div
v-if="store.typeProfile == 'OFFICER'"
class="col-5 text-grey-6 text-weight-medium"
>
ตำแหน่งทางการบริหาร
</div>
<div v-if="store.typeProfile == 'OFFICER'" class="col-7">
{{ formData.posExecutive ? formData.posExecutive : "-" }}
</div>
<div v-if="store.typeProfile == 'OFFICER'" class="col-5 text-grey-6 text-weight-medium">
<div
v-if="store.typeProfile == 'OFFICER'"
class="col-5 text-grey-6 text-weight-medium"
>
ด้านทางการบริหาร
</div>
<div v-if="store.typeProfile == 'OFFICER'" class="col-7">
@ -385,17 +396,26 @@ onMounted(() => {
<div class="col-12 col-sm-12 col-md-6">
<div class="row q-col-gutter-y-sm">
<div v-if="store.typeProfile == 'OFFICER'" class="col-5 text-grey-6 text-weight-medium">สายงาน</div>
<div
v-if="store.typeProfile == 'OFFICER'"
class="col-5 text-grey-6 text-weight-medium"
>
สายงาน
</div>
<div v-if="store.typeProfile == 'OFFICER'" class="col-7">
{{ formData.positionField ? formData.positionField : "-" }}
</div>
<div class="col-5 text-grey-6 text-weight-medium">
{{store.typeProfile == 'OFFICER' ? 'ประเภทตำแหน่ง':'กลุ่มงาน'}}
{{
store.typeProfile == "OFFICER" ? "ตำแหน่งประเภท" : "กลุ่มงาน"
}}
</div>
<div class="col-7">
{{ formData.posType ? formData.posType : "-" }}
</div>
<div class="col-5 text-grey-6 text-weight-medium">{{store.typeProfile == 'OFFICER' ? 'ระดับตำแหน่ง':'ระดับชั้นงาน'}}</div>
<div class="col-5 text-grey-6 text-weight-medium">
{{ store.typeProfile == "OFFICER" ? "ระดับ" : "ระดับชั้นงาน" }}
</div>
<div class="col-7">
{{ formData.posLevel ? formData.posLevel : "-" }}
</div>