Merge branch 'develop'
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 6s
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 6s
This commit is contained in:
commit
a74c4648c6
3 changed files with 16 additions and 6 deletions
|
|
@ -265,6 +265,7 @@ const smallBanner = ref(false);
|
|||
class="app-text-muted full-width"
|
||||
align="left"
|
||||
v-if="typeof tabsList === 'object'"
|
||||
@update:model-value="(v) => $emit('update:currentTab', v)"
|
||||
>
|
||||
<q-tab
|
||||
v-for="tab in tabsList"
|
||||
|
|
|
|||
|
|
@ -4541,6 +4541,15 @@ const emptyCreateDialog = ref(false);
|
|||
<ProfileBanner
|
||||
:prefix="employeeFormState.currentEmployee.firstName"
|
||||
hideFade
|
||||
@update:current-tab="
|
||||
() => {
|
||||
employeeFormState.isImageEdit = false;
|
||||
employeeFormStore.resetFormDataEmployee();
|
||||
employeeFormState.isEmployeeEdit = false;
|
||||
employeeFormState.dialogType = 'info';
|
||||
employeeFormState.currentIndexPassport = -1;
|
||||
}
|
||||
"
|
||||
@view="
|
||||
() => {
|
||||
employeeFormState.imageDialog = true;
|
||||
|
|
@ -5356,7 +5365,10 @@ const emptyCreateDialog = ref(false);
|
|||
id="btn-add-work"
|
||||
icon-only
|
||||
class="q-ml-sm"
|
||||
:disabled="
|
||||
:disabled="employeeFormState.currentIndexPassport !== -1"
|
||||
@click.stop="employeeFormStore.addPassport()"
|
||||
/>
|
||||
<!-- :disabled="
|
||||
currentFromDataEmployee.employeePassport?.filter(
|
||||
(item) => {
|
||||
if (item.id === undefined) {
|
||||
|
|
@ -5368,9 +5380,7 @@ const emptyCreateDialog = ref(false);
|
|||
employeeFormState.currentIndexPassport === -1
|
||||
? false
|
||||
: true
|
||||
"
|
||||
@click.stop="employeeFormStore.addPassport()"
|
||||
/>
|
||||
" -->
|
||||
</div>
|
||||
|
||||
<div class="col self-center">
|
||||
|
|
@ -5477,7 +5487,6 @@ const emptyCreateDialog = ref(false);
|
|||
"
|
||||
type="submit"
|
||||
/>
|
||||
|
||||
<EditButton
|
||||
v-if="
|
||||
employeeFormState.currentIndexPassport === -1 ||
|
||||
|
|
|
|||
|
|
@ -959,7 +959,7 @@ export const useEmployeeForm = defineStore('form-employee', () => {
|
|||
state.value.currentIndexVisa = -1;
|
||||
state.value.currentIndexCheckup = -1;
|
||||
state.value.currentIndexWorkHistory = -1;
|
||||
state.value.currentTab = 'personalInfo';
|
||||
// state.value.currentTab = 'personalInfo';
|
||||
if (clean) {
|
||||
state.value.formDataEmployeeOwner = undefined;
|
||||
resetEmployeeData = structuredClone(defaultFormData);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue