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 2024-01-31 11:02:51 +07:00
commit 69771682eb
11 changed files with 414 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

105
src/modules/02_organizationalNew/components/StructureDetail.vue
View file

@ -31,15 +31,28 @@ const formData = reactive<any>({
});
async function fetchDetailTree(id: string, type: string) {
showLoader();
await http
.get(config.API.orgLevelByid(type.toLocaleLowerCase(), id))
.then((res) => {
const data = res.data.result;
formData.orgName = data[`org${type}Name`];
formData.agencyName = data[`org${type}Name`];
formData.orgType = data[`org${type}Name`];
formData.orgLevel = data[`org${type}Rank`];
formData.status = data[`org${type}Name`];
const range = data[`org${type}Rank`];
formData.orgName =
range == "DEPARTMENT"
? data[`org${type}Name`] + ` (${data[`org${type}ShortName`]})`
: "-";
formData.agencyName =
range != "DEPARTMENT"
? data[`org${type}Name`] + ` (${data[`org${type}ShortName`]})`
: "-";
formData.orgType = range != "DEPARTMENT" ? "ส่วนราชการ" : "หน่วยงาน";
formData.orgLevel = store.convertType(range);
formData.status =
store.typeOrganizational === "current"
? "ปกติ"
: store.typeOrganizational === "draft"
? "แบบร่าง"
: "ยุบเลิก";
formData.orgPhoneEx = data[`org${type}PhoneEx`];
formData.orgPhoneIn = data[`org${type}PhoneIn`];
formData.orgFax = data[`org${type}Fax`];
@ -59,10 +72,10 @@ function close() {
watch(
() => modal.value,
() => {
async () => {
if (modal.value == true) {
const type = store.checkLevel(orgLevel.value);
fetchDetailTree(treeId.value, type);
const type = await store.checkLevel(orgLevel.value);
await fetchDetailTree(treeId.value, type);
}
}
);
@ -76,88 +89,60 @@ watch(
<q-card-section>
<div class="q-px-md">
<div class="row q-col-gutter-sm q-mb-xs">
<div class="col-4 text-bold">
<div>
<p>หน่วยงาน</p>
</div>
</div>
<div class="col-4 text-bold">หน่วยงาน</div>
<div class="col-8 text-grey-8">
<p>{{ formData.orgName }} ({{ formData.orgShortName }})</p>
<p>{{ formData.orgName }}</p>
</div>
</div>
<div class="row q-col-gutter-sm q-mb-xs">
<div class="col-4 text-bold">
<div>
<p>ส่วนราชการ</p>
</div>
</div>
<div class="col-4 text-bold">ส่วนราชการ</div>
<div class="col-8 text-grey-8">
<p>{{ formData.agencyName }}</p>
</div>
</div>
<div class="row q-col-gutter-sm q-mb-xs">
<div class="col-4 text-bold">
<div>
<p>ประเภท</p>
</div>
</div>
<div class="col-4 text-bold">ประเภท</div>
<div class="col-8 text-grey-8">
<p>{{ formData.orgType }}</p>
</div>
</div>
<div class="row q-col-gutter-sm q-mb-xs">
<div class="col-4 text-bold">
<div>
<p>ระดับ</p>
</div>
</div>
<div class="col-4 text-bold">ระดับ</div>
<div class="col-8 text-grey-8">
<p>{{ formData.orgLevel }}</p>
</div>
</div>
<div class="row q-col-gutter-sm q-mb-xs">
<div class="col-4 text-bold">
<div>
<p>สถานะ</p>
</div>
</div>
<div class="col-4 text-bold">สถานะ</div>
<div class="col-8 text-grey-8">
<p>{{ formData.status }}</p>
</div>
</div>
<div class="row q-col-gutter-sm q-mb-xs">
<div class="col-4 text-bold">
<div>
<p class="q-ma-none">เบอร์โทร</p>
</div>
</div>
<div class="col-8 text-grey-8">
<p class="q-ma-none">
{{
formData.orgPhoneEx ? `ภายนอก ${formData.orgPhoneEx}` : ""
}}
</p>
</div>
</div>
<div class="row q-col-gutter-sm">
<div class="offset-4 col-8 text-grey-8">
<p>
{{
formData.orgPhoneIn ? `ภายใน ${formData.orgPhoneIn}` : ""
}}
<div class="row q-col-gutter-sm q-mb-xs">
<div class="col-4 text-bold">เบอร์โทร</div>
<div class="col-8 text-grey-8">
<p v-if="formData.orgPhoneEx != ''">
{{ `ภายนอก ${formData.orgPhoneEx}` }}
</p>
<p v-if="formData.orgPhoneIn != ''">
{{ `ภายใน ${formData.orgPhoneIn}` }}
</p>
<p
v-show="
formData.orgPhoneEx == '' && formData.orgPhoneIn == ''
"
>
-
</p>
</div>
</div>
<div class="row q-col-gutter-sm q-mb-xs">
<div class="col-4 text-bold">
<div>
<p>Fax</p>
</div>
</div>
<div class="col-4 text-bold">Fax</div>
<div class="col-8 text-grey-8">
<p>{{ formData.orgFax }}</p>
<p v-if="formData.orgFax != ''">{{ formData.orgFax }}</p>
<p v-else>-</p>
</div>
</div>
</div>