diff --git a/src/components/02_personnel-management/FormPerson.vue b/src/components/02_personnel-management/FormPerson.vue index b2ff925b..cfc6dff8 100644 --- a/src/components/02_personnel-management/FormPerson.vue +++ b/src/components/02_personnel-management/FormPerson.vue @@ -406,7 +406,7 @@ watch( outlined readonly :label="$t('personnel.age')" - class="col-md-2 col-12" + class="col-md-2 col-6" :model-value=" birthDate?.toString() === 'Invalid Date' || birthDate?.toString() === undefined @@ -470,7 +470,7 @@ watch( input-debounce="0" option-label="label" option-value="value" - class="col-2" + class="col-md-2 col-6" :dense="dense" v-model="gender" :readonly="readonly" @@ -504,7 +504,7 @@ watch( option-label="label" option-value="value" v-model="nationality" - class="col-2" + class="col-md-2 col-6" :dense="dense" :readonly="readonly" :options="nationalityOptions" diff --git a/src/components/03_customer-management/FormEmployeeHealthCheck.vue b/src/components/03_customer-management/FormEmployeeHealthCheck.vue index b07fd5da..b08e7a70 100644 --- a/src/components/03_customer-management/FormEmployeeHealthCheck.vue +++ b/src/components/03_customer-management/FormEmployeeHealthCheck.vue @@ -266,7 +266,7 @@ const insuranceCompanyFilter = selectFilterOptionRefMod( :for="`${prefixId}-input-hospital`" /> -
+
('employeeOther'); :readonly="readonly || employeeOther.statusSave" hide-bottom-space :label="$t('customerEmployee.formFamily.citizenId')" - class="col-4" + class="col-md-4 col-12" v-model="employeeOther.citizenId" /> @@ -90,7 +90,7 @@ const employeeOther = defineModel('employeeOther'); :readonly="readonly || employeeOther.statusSave" hide-bottom-space :label="$t('customerEmployee.formFamily.telephoneNo')" - class="col-3" + class="col-md-3 col-12" v-model="employeeOther.telephoneNo" />
diff --git a/src/components/03_customer-management/FormEmployeePassport.vue b/src/components/03_customer-management/FormEmployeePassport.vue index 80ea8775..1eb9096d 100644 --- a/src/components/03_customer-management/FormEmployeePassport.vue +++ b/src/components/03_customer-management/FormEmployeePassport.vue @@ -220,7 +220,7 @@ watch(
-
+
-
-
+
+
-
+
@@ -266,7 +266,7 @@ const workplaceFilter = selectFilterOptionRefMod( outlined :readonly="readonly || work.statusSave" hide-bottom-space - class="col-4" + class="col-md-4 col-6" :label="$t('customerEmployee.formWorkHistory.permitIssuedAt')" v-model="work.workPermitIssueAt" /> @@ -274,7 +274,7 @@ const workplaceFilter = selectFilterOptionRefMod( @@ -301,7 +301,7 @@ defineEmits<{ outlined hide-bottom-space :readonly="readonly" - class="col-6" + class="col-md-6 col-12" :label="$t('customerEmployee.form.nrcNo')" :model-value="nrcNo" @update:model-value="(v) => (typeof v === 'string' ? (nrcNo = v) : '')" diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue index ff0cecf4..4a1dea6e 100644 --- a/src/pages/03_customer-management/MainPage.vue +++ b/src/pages/03_customer-management/MainPage.vue @@ -86,6 +86,7 @@ import { nextTick } from 'vue'; import FormEmployeeVisa from 'components/03_customer-management/FormEmployeeVisa.vue'; import { group } from 'node:console'; import PaginationPageSize from 'src/components/PaginationPageSize.vue'; +import { AddButton } from 'components/button'; const { t, locale } = useI18n(); const $q = useQuasar(); @@ -2720,7 +2721,7 @@ const emptyCreateDialog = ref(false); class="col-12 col-md-10" :class="{ 'q-py-md q-pr-md ': $q.screen.gt.sm, - 'q-py-md q-px-lg': !$q.screen.gt.sm, + 'q-pa-sm': !$q.screen.gt.sm, }" id="employee-form-content" style="height: 100%; max-height: 100; overflow-y: auto" @@ -3205,7 +3206,9 @@ const emptyCreateDialog = ref(false);