fix(salary):report [emp-08 ,go1] rootID === ancestorDNA
This commit is contained in:
parent
3e9ff028b3
commit
ed0d84b45c
5 changed files with 23 additions and 3 deletions
|
|
@ -89,6 +89,13 @@ const commandTypeCodeArray = computed(() => {
|
|||
}
|
||||
});
|
||||
|
||||
const ancestorDNA = computed(() => {
|
||||
return (
|
||||
agencyOptionsMain.value.find((e) => e.id === agencyFilter.value)
|
||||
?.ancestorDNA || ""
|
||||
);
|
||||
});
|
||||
|
||||
/** function เรียกข้อมูลรอบการขึ้นเงินเดือน*/
|
||||
async function getRound() {
|
||||
showLoader();
|
||||
|
|
@ -209,6 +216,7 @@ async function getAgency(id: string) {
|
|||
data.map((x: DataAgency) => ({
|
||||
id: x.id,
|
||||
name: x.orgRootName,
|
||||
ancestorDNA: x.ancestorDNA,
|
||||
}))
|
||||
);
|
||||
agencyOptions.value = agencyOptionsMain.value;
|
||||
|
|
@ -562,7 +570,6 @@ onMounted(async () => {
|
|||
@update:model-value="onChangeSnap"
|
||||
:disable="!isDisable"
|
||||
/>
|
||||
|
||||
<q-select
|
||||
:readonly="checkPermission($route)?.attrOwnership === 'STAFF'"
|
||||
v-model="agencyFilter"
|
||||
|
|
@ -620,6 +627,7 @@ onMounted(async () => {
|
|||
:round-filter="roundFilter"
|
||||
:snap-shot="snapFilter"
|
||||
:revision-id="roundFilter.revisionId"
|
||||
:ancestorDNA="ancestorDNA"
|
||||
/>
|
||||
<q-card v-else class="q-pa-sm">
|
||||
<div class="q-pa-sm">
|
||||
|
|
|
|||
|
|
@ -88,6 +88,13 @@ const commandTypeCodeArray = computed(() => {
|
|||
}
|
||||
});
|
||||
|
||||
const ancestorDNA = computed(() => {
|
||||
return (
|
||||
agencyOptionsMain.value.find((e) => e.id === agencyFilter.value)
|
||||
?.ancestorDNA || ""
|
||||
);
|
||||
});
|
||||
|
||||
/**
|
||||
* function เรียกข้อมูลรอบการขึ้นค่าจ้าง
|
||||
*/
|
||||
|
|
@ -205,6 +212,7 @@ async function getAgency(id: string) {
|
|||
data.map((x: DataAgency) => ({
|
||||
id: x.id,
|
||||
name: x.orgRootName,
|
||||
ancestorDNA: x.ancestorDNA,
|
||||
}))
|
||||
);
|
||||
agencyOptions.value = agencyOptionsMain.value;
|
||||
|
|
@ -563,6 +571,7 @@ onMounted(async () => {
|
|||
:round-filter="roundFilter"
|
||||
:snap-shot="snapFilter"
|
||||
:revision-id="roundFilter.revisionId"
|
||||
:ancestorDNA="ancestorDNA"
|
||||
/>
|
||||
<q-card v-else class="q-pa-sm">
|
||||
<div class="q-pa-sm">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue