fixing column บรรจุ แต่งตั้ง ย้าย
This commit is contained in:
parent
bb2d03e499
commit
9cde68ab4f
74 changed files with 620 additions and 626 deletions
|
|
@ -16,7 +16,7 @@ import { useCounterMixin } from "@/stores/mixin";
|
|||
|
||||
/** use*/
|
||||
const $q = useQuasar();
|
||||
const { messageError, findOrgName } = useCounterMixin();
|
||||
const { messageError, findOrgNameOld, findOrgName } = useCounterMixin();
|
||||
|
||||
/** propsDataProfile*/
|
||||
const props = defineProps({
|
||||
|
|
@ -44,16 +44,32 @@ function fetchDataProfile(data: DataProfile) {
|
|||
profile.fullName = `${data.prefix ?? ""}${data.firstName ?? ""} ${
|
||||
data.lastName ?? ""
|
||||
} `;
|
||||
profile.position =
|
||||
data.position == "" || data.position === null ? "-" : data.position;
|
||||
if (data.posTypeName && data.posLevelName) {
|
||||
profile.positionLevel = `${data.posTypeName} (${data.posLevelName})`;
|
||||
} else if (data.posTypeName) {
|
||||
profile.positionLevel = `${data.posTypeName}`;
|
||||
} else if (data.posLevelName) {
|
||||
profile.positionLevel = `(${data.posLevelName})`;
|
||||
} else profile.positionLevel = "-";
|
||||
profile.organization = findOrgName(data);
|
||||
|
||||
if (data["posTypeNameOld"] !== undefined) {
|
||||
profile.position =
|
||||
data.positionOld == "" || data.positionOld == null
|
||||
? "-"
|
||||
: data.positionOld;
|
||||
if (data.posTypeNameOld && data.posLevelNameOld) {
|
||||
profile.positionLevel = `${data.posTypeNameOld} (${data.posLevelNameOld})`;
|
||||
} else if (data.posTypeNameOld) {
|
||||
profile.positionLevel = `${data.posTypeNameOld}`;
|
||||
} else if (data.posLevelNameOld) {
|
||||
profile.positionLevel = `(${data.posLevelNameOld})`;
|
||||
} else profile.positionLevel = "-";
|
||||
profile.organization = findOrgNameOld(data);
|
||||
} else {
|
||||
profile.position =
|
||||
data.position == "" || data.position == null ? "-" : data.position;
|
||||
if (data.posTypeName && data.posLevelName) {
|
||||
profile.positionLevel = `${data.posTypeName} (${data.posLevelName})`;
|
||||
} else if (data.posTypeName) {
|
||||
profile.positionLevel = `${data.posTypeName}`;
|
||||
} else if (data.posLevelName) {
|
||||
profile.positionLevel = `(${data.posLevelName})`;
|
||||
} else profile.positionLevel = "-";
|
||||
profile.organization = findOrgName(data);
|
||||
}
|
||||
}
|
||||
|
||||
function fetchProfile(id: string) {
|
||||
|
|
@ -113,7 +129,9 @@ watch(
|
|||
</div>
|
||||
<div class="col-xs-6 col-sm-3 row items-center">
|
||||
<div class="col-12 q-pl-md">
|
||||
<div class="col-12 text-top">{{ props.type == 'employee' ? 'ตำแหน่ง':'ตำแหน่งในสายงาน'}}</div>
|
||||
<div class="col-12 text-top">
|
||||
{{ props.type == "employee" ? "ตำแหน่ง" : "ตำแหน่งในสายงาน" }}
|
||||
</div>
|
||||
<div class="col-12 text-detail">
|
||||
{{ profile.position }}
|
||||
</div>
|
||||
|
|
@ -121,7 +139,9 @@ watch(
|
|||
</div>
|
||||
<div class="col-xs-6 col-sm-3 row items-center">
|
||||
<div class="col-12">
|
||||
<div class="col-12 text-top">{{ props.type == 'employee' ? 'กลุ่มงาน':'ประเภทตำแหน่ง'}}</div>
|
||||
<div class="col-12 text-top">
|
||||
{{ props.type == "employee" ? "กลุ่มงาน" : "ประเภทตำแหน่ง" }}
|
||||
</div>
|
||||
<div class="col-12 text-detail">
|
||||
{{ profile.positionLevel }}
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue