chamomind/jws-frontend
chamomind/jws-frontend
7
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

refactor: styling

Browse source
This commit is contained in:
Methapon2001 2024-08-15 09:47:23 +07:00
parent 12482659da
commit 5c6f201a99
2 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/02_personnel-management/FormPerson.vue
View file

@ -14,11 +14,11 @@ import { useI18n } from 'vue-i18n';
const { locale } = useI18n(); const { locale } = useI18n();
const optionStore = useOptionStore(); const optionStore = useOptionStore();
const prefixName = defineModel<string>('prefixName'); const prefixName = defineModel<string>('prefixName');
const prefixNameEn = defineModel<string>('prefixNameEn'); const prefixNameEN = defineModel<string>('prefixNameEn');
const firstName = defineModel<string>('firstName'); const firstName = defineModel<string>('firstName');
const lastName = defineModel<string>('lastName'); const lastName = defineModel<string>('lastName');
const firstNameEN = defineModel<string>('firstNameEN'); const firstNameEN = defineModel<string>('firstNameEn');
const lastNameEN = defineModel<string>('lastNameEN'); const lastNameEN = defineModel<string>('lastNameEn');
const telephoneNo = defineModel<string>('telephoneNo'); const telephoneNo = defineModel<string>('telephoneNo');
const email = defineModel<string>('email'); const email = defineModel<string>('email');
const gender = defineModel<string>('gender'); const gender = defineModel<string>('gender');
@ -195,7 +195,7 @@ watch(
:disable="!readonly" :disable="!readonly"
class="col-1" class="col-1"
:label="$t('formDialogInputPrefixName')" :label="$t('formDialogInputPrefixName')"
v-model="prefixNameEn" v-model="prefixNameEN"
/> />
<q-input <q-input

32
src/pages/02_personnel-management/MainPage.vue
View file

@ -1173,15 +1173,9 @@ watch(
{{ (currentPage - 1) * pageSize + props.rowIndex + 1 }} {{ (currentPage - 1) * pageSize + props.rowIndex + 1 }}
</q-td> </q-td>
<q-td v-if="fieldSelected.includes('name')"> <q-td v-if="fieldSelected.includes('name')">
<div class="row items-center"> <div class="row items-center" style="flex-wrap: nowrap">
<div <div style="display: flex">
style=" <div class="branch-card__icon q-mr-md">
width: 50px;
display: flex;
margin-bottom: var(--size-2);
"
>
<div class="branch-card__icon">
<q-avatar size="md"> <q-avatar size="md">
<q-img <q-img
:ratio="1" :ratio="1"
@ -1208,8 +1202,8 @@ watch(
</q-avatar> </q-avatar>
</div> </div>
</div> </div>
<div class="col"> <div class="column">
<div class="col"> <div>
{{ {{
$i18n.locale === 'en-US' $i18n.locale === 'en-US'
? `${props.row.firstNameEN} ${props.row.lastNameEN}`.trim() ? `${props.row.firstNameEN} ${props.row.lastNameEN}`.trim()
@ -1228,7 +1222,7 @@ watch(
width="24px" width="24px"
/> />
</div> </div>
<div class="col app-text-muted"> <div class="app-text-muted">
{{ props.row.code || '-' }} {{ props.row.code || '-' }}
</div> </div>
</div> </div>
@ -1683,8 +1677,8 @@ watch(
id="info-personal" id="info-personal"
v-model:first-name="formData.firstName" v-model:first-name="formData.firstName"
v-model:last-name="formData.lastName" v-model:last-name="formData.lastName"
v-model:first-name-e-n="formData.firstNameEN" v-model:first-name-en="formData.firstNameEN"
v-model:last-name-e-n="formData.lastNameEN" v-model:last-name-en="formData.lastNameEN"
v-model:telephone-no="formData.telephoneNo" v-model:telephone-no="formData.telephoneNo"
v-model:email="formData.email" v-model:email="formData.email"
v-model:gender="formData.gender" v-model:gender="formData.gender"
@ -1837,11 +1831,11 @@ watch(
outlined outlined
separator separator
:title="'formDialogTitlePersonal'" :title="'formDialogTitlePersonal'"
v-model:firstName="formData.firstName" v-model:first-name="formData.firstName"
v-model:lastName="formData.lastName" v-model:last-name="formData.lastName"
v-model:firstNameEN="formData.firstNameEN" v-model:first-name-en="formData.firstNameEN"
v-model:lastNameEN="formData.lastNameEN" v-model:last-name-en="formData.lastNameEN"
v-model:telephoneNo="formData.telephoneNo" v-model:telephone-no="formData.telephoneNo"
v-model:email="formData.email" v-model:email="formData.email"
v-model:gender="formData.gender" v-model:gender="formData.gender"
v-model:birthDate="formData.birthDate" v-model:birthDate="formData.birthDate"