Skip to content

Q
quasar-web-base
Commit 31591ff3 authored by Tình Trương's avatar Tình Trương
Browse files
Options

update

parent 48ee2463
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 67 deletions
src/components/managingunits/add-new-managingunits-dialog/NewManagingUnits.ts
View file @ 31591ff3
......@@ -5,23 +5,6 @@ import { isMobilePhone } from '../../../boot/functions';
import AddNewArtistDialog from 'components/managingunits/add-new-managingunits-dialog/add-new-artist-dialog/index.vue'
import UpdateNewArtistDialog from 'components/managingunits/update-new-managingunits-dialog/update-new-artist-dialog/index.vue'
export type ArtistAddInfoType = {
id: number;
nameAdd: string | null;
myedityAdd: string | null;
timeAdd: string | null;
fieldsAdd: number;
statusAdd: number;
};
export type ArtistUpdateInfoType = {
id: number;
nameUpdate: string | null;
myedityUpdate: string | null;
timeUpdate: string | null;
fieldsUpdate: number;
statusUpdate: number;
};
export default defineComponent({
components: {
AddNewArtistDialog,
......@@ -98,7 +81,7 @@ export default defineComponent({
i18n.global.t('managingUnit.validateMessages.requireAddress'),
];
const nameAdd: Ref<string | undefined> = ref()
const nameAdd: Ref<number | undefined> = ref()
const myedityAdd: Ref<string | undefined> = ref()
const fieldsAdd: Ref<number | undefined> = ref();
const statusAdd: Ref<boolean | number> = ref(true);
......@@ -106,9 +89,14 @@ export default defineComponent({
const fieldsAddOptions = ref([
{ id: 1, text: 'Giải trí' },
{ id: 2, text: 'Âm nhạc' },
{ id: 1, text: 'Thể thao' },
{ id: 3, text: 'Thể thao' },
]);
const nameAddOptions = ref([
{ id: 1, text: 'Ưng Hoàng Phúc' },
{ id: 2, text: 'Nguyễn Tùng Dương' },
{ id: 3, text: 'Nguyễn Sơn Tùng' },
]);
const nameUpdate: Ref<string | undefined> = ref()
const nameUpdate: Ref<number | undefined> = ref()
const myedityUpdate: Ref<string | undefined> = ref()
const fieldsUpdate: Ref<number | undefined> = ref();
const statusUpdate: Ref<boolean | number> = ref(true);
......@@ -116,7 +104,12 @@ export default defineComponent({
const fieldsUpdateOptions = ref([
{ id: 1, text: 'Giải trí' },
{ id: 2, text: 'Âm nhạc' },
{ id: 1, text: 'Thể thao' },
{ id: 3, text: 'Thể thao' },
]);
const nameUpdateOptions = ref([
{ id: 1, text: 'Ưng Hoàng Phúc' },
{ id: 2, text: 'Nguyễn Tùng Dương' },
{ id: 3, text: 'Nguyễn Sơn Tùng' },
]);
return {
nameUpdate,
......@@ -124,6 +117,7 @@ export default defineComponent({
statusUpdate,
fieldsUpdate,
timeUpdate,
nameUpdateOptions,
fieldsUpdateOptions,
openAddArtistDialog,
addNewManagingUnitsArtist,
......@@ -142,6 +136,7 @@ export default defineComponent({
timeAdd,
statusAdd,
fieldsAddOptions,
nameAddOptions,
};
},
emits: [
......
src/components/managingunits/add-new-managingunits-dialog/add-new-artist-dialog/NewAddArtist.ts
View file @ 31591ff3
......@@ -7,6 +7,7 @@ export default defineComponent({
type: Boolean,
required: true,
},
nameAddOptions: {type: Array, required: true},
fieldsAddOptions: {type: Array, required: true},
fieldsAdd: { type: Number, required: true},
nameAdd: { type: String, required: true },
......@@ -16,8 +17,8 @@ export default defineComponent({
},
setup() {
const nameAddRules = [
(val?: string) =>
(val && val.trim().length) ||
(val?: number) =>
val !== undefined ||
i18n.global.t('managingUnitAdd.validateMessages.requireNameAdd'),
];
const myedityAddRules = [
......@@ -25,7 +26,7 @@ export default defineComponent({
(val && val.trim().length) ||
i18n.global.t('managingUnitAdd.validateMessages.requireMyedityAdd'),
];
const fieldsAddRules = [
const fieldsAddRules = [
(val?: number) =>
val !== undefined ||
i18n.global.t('managingUnitAdd.validateMessages.requireFieldsAdd'),
......
src/components/managingunits/add-new-managingunits-dialog/add-new-artist-dialog/index.vue
View file @ 31591ff3
......@@ -20,27 +20,29 @@
<q-card-section>
<div class="row q-col-gutter-sm">
<div class="col-6">
<q-input
<q-select
:model-value="nameAdd"
@update:model-value="$emit('update:nameAdd', $event)"
:label="$t('managingUnitAdd.dialogLabel.fieldLabels.nameAdd')"
:options="nameAddOptions"
:rules="nameAddRules"
hide-bottom-space
type="text"
emit-value
map-options
option-value="id"
option-label="text"
class="q-my-sm"
outlined
clearable
></q-input>
></q-select>
<q-input
:model-value="myedityAdd"
@update:model-value="$emit('update:myedityAdd', $event)"
:label="
$t('managingUnitAdd.dialogLabel.fieldLabels.myedityAdd')
"
type="text"
:model-value="timeAdd"
@update:model-value="$emit('update:timeAdd', $event)"
:label="$t('managingUnitAdd.dialogLabel.fieldLabels.timeAdd')"
class="q-my-sm"
type="text"
outlined
:rules="myedityAddRules"
:rules="timeAddRules"
hide-bottom-space
clearable
></q-input>
......
src/components/managingunits/add-new-managingunits-dialog/index.vue
View file @ 31591ff3
......@@ -144,6 +144,7 @@
v-model:time-add="timeAdd"
v-model:status-add="statusAdd"
:fields-add-options="fieldsAddOptions"
:name-add-options="nameAddOptions"
@click:CloseBtn="openAddArtistDialog = false"
@addNewManagingUnitsArtist="addNewManagingUnitsArtist"
/>
......@@ -156,6 +157,7 @@
v-model:time-update="timeUpdate"
v-model:status-update="statusUpdate"
:fields-update-options="fieldsUpdateOptions"
:name-update-options="nameUpdateOptions"
@click:CloseBtn="openUpdateArtistDialog = false"
@updateNewManagingUnitsArtist="updateNewManagingUnitsArtist"
/>
......
src/components/managingunits/add-new-managingunits-dialog/update-new-artist-dialog/NewUpdateArtist.ts
View file @ 31591ff3
......@@ -7,6 +7,7 @@ export default defineComponent({
type: Boolean,
required: true,
},
nameUpdateOptions: {type: Array, required: true},
fieldsUpdateOptions: {type: Array, required: true},
fieldsUpdate: { type: Number, required: true},
nameUpdate: { type: String, required: true },
......@@ -16,8 +17,8 @@ export default defineComponent({
},
setup() {
const nameUpdateRules = [
(val?: string) =>
(val && val.trim().length) ||
(val?: number) =>
val !== undefined ||
i18n.global.t('managingUnitAdd.validateMessages.requireNameUpdate'),
];
const myedityUpdateRules = [
......
src/components/managingunits/add-new-managingunits-dialog/update-new-artist-dialog/index.vue
View file @ 31591ff3
......@@ -20,7 +20,7 @@
<q-card-section>
<div class="row q-col-gutter-sm">
<div class="col-6">
<q-input
<q-select
:model-value="nameUpdate"
@update:model-value="$emit('update:nameUpdate', $event)"
:label="
......@@ -28,11 +28,15 @@
"
:rules="nameUpdateRules"
hide-bottom-space
type="text"
:options="nameUpdateOptions"
emit-value
map-options
option-value="id"
option-label="text"
class="q-my-sm"
outlined
clearable
></q-input>
></q-select>
<q-input
:model-value="timeUpdate"
@update:model-value="$emit('update:timeUpdate', $event)"
......@@ -66,15 +70,15 @@
clearable
></q-select>
<q-input
:model-value="myedityUpdate"
@update:model-value="$emit('update:myedityUpdate', $event)"
:model-value="timeUpdate"
@update:model-value="$emit('update:timeUpdate', $event)"
:label="
$t('managingUnitAdd.dialogLabel.fieldLabels.myedityUpdate')
$t('managingUnitAdd.dialogLabel.fieldLabels.timeUpdate')
"
type="text"
class="q-my-sm"
type="text"
outlined
:rules="myedityUpdateRules"
:rules="timeUpdateRules"
hide-bottom-space
clearable
></q-input>
......
src/components/managingunits/update-new-managingunits-dialog/UpdateNewManagingUnits.ts
View file @ 31591ff3
......@@ -5,24 +5,6 @@ import { isMobilePhone } from '../../../boot/functions';
import NewArtistDialog from 'components/managingunits/update-new-managingunits-dialog/add-new-artist-dialog/index.vue'
import UpdateNewArtistDialog from 'components/managingunits/update-new-managingunits-dialog/update-new-artist-dialog/index.vue'
export type ArtistUpdateInfoType = {
id: number;
nameAdd: string | null;
myedityAdd: string | null;
timeAdd: string | null;
fieldsAdd: number;
statusAdd: number;
};
export type ArtistUpdateUpdateInfoType = {
id: number;
nameUpdate: string | null;
myedityUpdate: string | null;
timeUpdate: string | null;
fieldsUpdate: number;
statusUpdate: number;
};
export default defineComponent({
components: {
NewArtistDialog,
......
src/i18n/vi/index.ts
View file @ 31591ff3
......@@ -207,7 +207,7 @@ export default {
AddmanagingUnit: 'Thêm nghệ sỹ',
tableColumns: {
sttAdd: 'STT',
nameAdd: 'Tên đơn vị',
nameAdd: 'Tên Nghệ sỹ',
myedityAdd: 'Nghệ danh',
fieldsAdd: 'Lĩnh vực',
timeAdd: 'Thời gian hợp đồng',
......@@ -229,11 +229,11 @@ export default {
update: 'Cập nhật nghệ sỹ',
},
fieldLabels: {
nameAdd: 'Tên đơn vị *',
nameAdd: 'Tên nghệ sỹ *',
myedityAdd: 'Nghệ danh *',
fieldsAdd: 'Lĩnh vực *',
timeAdd: 'Thời gian hợp đồng *',
nameUpdate: 'Tên đơn vị *',
nameUpdate: 'Tên nghệ sỹ *',
myedityUpdate: 'Nghệ danh *',
fieldsUpdate: 'Lĩnh vực *',
timeUpdate: 'Thời gian hợp đồng *',
......@@ -249,11 +249,11 @@ export default {
cancel: 'Đóng',
},
validateMessages: {
requireNameAdd: 'Vui lòng nhập Tên đơn vị',
requireNameAdd: 'Vui lòng chọn Tên nghệ sỹ',
requireMyedityAdd: 'Vui lòng nhập Nghệ danh',
requireFieldsAdd: 'Vui lòng chọn Lĩnh vực',
requireTimeAdd: 'Vui lòng nhập Thời gian',
requireNameUpdate: 'Vui lòng nhập Tên đơn vị',
requireNameUpdate: 'Vui lòng chọn Tên nghệ sỹ',
requireMyedityUpdate: 'Vui lòng nhập Nghệ danh',
requireFieldsUpdate: 'Vui lòng chọn Lĩnh vực',
requireTimeUpdate: 'Vui lòng nhập Thời gian',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment