Commit a206fe29 authored by Tình Trương's avatar Tình Trương

update

parent 86b38f81
......@@ -82,7 +82,7 @@ export default defineComponent({
];
const nameAdd: Ref<number | undefined> = ref()
const myedityAdd: Ref<string | undefined> = ref()
const timeAddTo: Ref<string | undefined> = ref()
const fieldsAdd: Ref<number | undefined> = ref();
const statusAdd: Ref<boolean | number> = ref(true);
const timeAdd: Ref<string | undefined> = ref();
......@@ -97,7 +97,7 @@ export default defineComponent({
{ id: 3, text: 'Nguyễn Sơn Tùng' },
]);
const nameUpdate: Ref<number | undefined> = ref()
const myedityUpdate: Ref<string | undefined> = ref()
const timeUpdateTo: Ref<string | undefined> = ref()
const fieldsUpdate: Ref<number | undefined> = ref();
const statusUpdate: Ref<boolean | number> = ref(true);
const timeUpdate: Ref<string | undefined> = ref();
......@@ -113,7 +113,7 @@ export default defineComponent({
]);
return {
nameUpdate,
myedityUpdate,
timeUpdateTo,
statusUpdate,
fieldsUpdate,
timeUpdate,
......@@ -131,7 +131,7 @@ export default defineComponent({
emailRules,
fieldsRules,
nameAdd,
myedityAdd,
timeAddTo,
fieldsAdd,
timeAdd,
statusAdd,
......
......@@ -10,9 +10,9 @@ export default defineComponent({
nameAddOptions: {type: Array, required: true},
fieldsAddOptions: {type: Array, required: true},
fieldsAdd: { type: Number, required: true},
nameAdd: { type: String, required: true },
myedityAdd: { type: String, required: true },
nameAdd: { type: Number, required: true },
timeAdd: { type: String, required: true },
timeAddTo: { type: String, required: true },
statusAdd: { type: Boolean, required: true },
},
setup() {
......@@ -21,11 +21,6 @@ export default defineComponent({
val !== undefined ||
i18n.global.t('managingUnitAdd.validateMessages.requireNameAdd'),
];
const myedityAddRules = [
(val?: string) =>
(val && val.trim().length) ||
i18n.global.t('managingUnitAdd.validateMessages.requireMyedityAdd'),
];
const fieldsAddRules = [
(val?: number) =>
val !== undefined ||
......@@ -36,9 +31,14 @@ export default defineComponent({
(val && val.trim().length) ||
i18n.global.t('managingUnitAdd.validateMessages.requireTimeAdd'),
];
const timeAddToRules = [
(val?: string) =>
(val && val.trim().length) ||
i18n.global.t('managingUnitAdd.validateMessages.requireTimeAddTo'),
];
return {
nameAddRules,
myedityAddRules,
timeAddToRules,
fieldsAddRules,
timeAddRules,
};
......@@ -47,7 +47,7 @@ export default defineComponent({
'update:openAddArtistDialog',
'click:CloseBtn',
'update:nameAdd',
'update:myedityAdd',
'update:timeAddTo',
'update:fieldsAdd',
'update:timeAdd',
'update:statusAdd',
......
......@@ -40,7 +40,7 @@
@update:model-value="$emit('update:timeAdd', $event)"
:label="$t('managingUnitAdd.dialogLabel.fieldLabels.timeAdd')"
class="q-my-sm"
type="text"
type="date"
outlined
:rules="timeAddRules"
hide-bottom-space
......@@ -64,13 +64,13 @@
clearable
></q-select>
<q-input
:model-value="timeAdd"
@update:model-value="$emit('update:timeAdd', $event)"
:label="$t('managingUnitAdd.dialogLabel.fieldLabels.timeAdd')"
:model-value="timeAddTo"
@update:model-value="$emit('update:timeAddTo', $event)"
:label="$t('managingUnitAdd.dialogLabel.fieldLabels.timeAddTo')"
class="q-my-sm"
type="text"
type="date"
outlined
:rules="timeAddRules"
:rules="timeAddToRules"
hide-bottom-space
clearable
></q-input>
......
......@@ -139,7 +139,7 @@
<AddNewArtistDialog
v-model:open-add-artist-dialog="openAddArtistDialog"
v-model:name-add="nameAdd"
v-model:myedity-add="myedityAdd"
v-model:time-add-to="timeAddTo"
v-model:fields-add="fieldsAdd"
v-model:time-add="timeAdd"
v-model:status-add="statusAdd"
......@@ -152,7 +152,7 @@
<UpdateNewArtistDialog
v-model:open-update-artist-dialog="openUpdateArtistDialog"
v-model:name-update="nameUpdate"
v-model:myedity-update="myedityUpdate"
v-model:time-update-to="timeUpdateTo"
v-model:fields-update="fieldsUpdate"
v-model:time-update="timeUpdate"
v-model:status-update="statusUpdate"
......
......@@ -8,10 +8,10 @@ export default defineComponent({
required: true,
},
nameUpdateOptions: {type: Array, required: true},
nameUpdate: { type: Number, required: true },
fieldsUpdateOptions: {type: Array, required: true},
fieldsUpdate: { type: Number, required: true},
nameUpdate: { type: String, required: true },
myedityUpdate: { type: String, required: true },
timeUpdateTo: { type: String, required: true },
timeUpdate: { type: String, required: true },
statusUpdate: { type: Boolean, required: true },
},
......@@ -21,10 +21,10 @@ export default defineComponent({
val !== undefined ||
i18n.global.t('managingUnitAdd.validateMessages.requireNameUpdate'),
];
const myedityUpdateRules = [
const timeUpdateToRules = [
(val?: string) =>
(val && val.trim().length) ||
i18n.global.t('managingUnitAdd.validateMessages.requireMyedityUpdate'),
i18n.global.t('managingUnitAdd.validateMessages.requireTimeUpdateTo'),
];
const fieldsUpdateRules = [
(val?: number) =>
......@@ -38,7 +38,7 @@ export default defineComponent({
];
return {
nameUpdateRules,
myedityUpdateRules,
timeUpdateToRules,
fieldsUpdateRules,
timeUpdateRules,
};
......@@ -47,7 +47,7 @@ export default defineComponent({
'update:openUpdateArtistDialog',
'click:CloseBtn',
'update:nameUpdate',
'update:myedityUpdate',
'update:timeUpdateTo',
'update:fieldsUpdate',
'update:timeUpdate',
'update:statusUpdate',
......
......@@ -26,9 +26,9 @@
:label="
$t('managingUnitAdd.dialogLabel.fieldLabels.nameUpdate')
"
:options="nameUpdateOptions"
:rules="nameUpdateRules"
hide-bottom-space
:options="nameUpdateOptions"
emit-value
map-options
option-value="id"
......@@ -44,7 +44,7 @@
$t('managingUnitAdd.dialogLabel.fieldLabels.timeUpdate')
"
class="q-my-sm"
type="text"
type="date"
outlined
:rules="timeUpdateRules"
hide-bottom-space
......@@ -70,15 +70,15 @@
clearable
></q-select>
<q-input
:model-value="timeUpdate"
@update:model-value="$emit('update:timeUpdate', $event)"
:model-value="timeUpdateTo"
@update:model-value="$emit('update:timeUpdateTo', $event)"
:label="
$t('managingUnitAdd.dialogLabel.fieldLabels.timeUpdate')
$t('managingUnitAdd.dialogLabel.fieldLabels.timeUpdateTo')
"
class="q-my-sm"
type="text"
type="date"
outlined
:rules="timeUpdateRules"
:rules="timeUpdateToRules"
hide-bottom-space
clearable
></q-input>
......
......@@ -80,8 +80,8 @@ export default defineComponent({
(val && val.trim().length) ||
i18n.global.t('managingUnit.validateMessages.requireAddress'),
];
const nameAdd: Ref<string | undefined> = ref()
const myedityAdd: Ref<string | undefined> = ref()
const nameAdd: Ref<number | undefined> = ref()
const timeAddTo: Ref<string | undefined> = ref()
const fieldsAdd: Ref<number | undefined> = ref();
const statusAdd: Ref<boolean | number> = ref(true);
const timeAdd: Ref<string | undefined> = ref();
......@@ -90,9 +90,14 @@ export default defineComponent({
{ id: 2, text: 'Âm nhạc' },
{ id: 1, 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 myedityUpdate: Ref<string | undefined> = ref()
const nameUpdate: Ref<number | undefined> = ref()
const timeUpdateTo: Ref<string | undefined> = ref()
const fieldsUpdate: Ref<number | undefined> = ref();
const statusUpdate: Ref<boolean | number> = ref(true);
const timeUpdate: Ref<string | undefined> = ref();
......@@ -101,20 +106,27 @@ export default defineComponent({
{ id: 2, text: 'Âm nhạc' },
{ id: 1, 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,
myedityUpdate,
timeUpdateTo,
fieldsUpdate,
statusUpdate,
timeUpdate,
fieldsUpdateOptions,
nameUpdateOptions,
openUpdateArtistDialog,
updateUpdateNewManagingUnitsArtist,
nameAdd,
myedityAdd,
timeAddTo,
fieldsAdd,
timeAdd,
statusAdd,
nameAddOptions,
fieldsAddOptions,
openAddArtistDialog,
updateNewManagingUnitsArtist,
......
......@@ -9,23 +9,24 @@ export default defineComponent({
},
fieldsAddOptions: {type: Array, required: true},
fieldsAdd: { type: Number, required: true},
nameAdd: { type: String, required: true },
myedityAdd: { type: String, required: true },
nameAddOptions: {type: Array, required: true},
nameAdd: { type: Number, required: true },
timeAddTo: { type: String, required: true },
timeAdd: { type: String, required: true },
statusAdd: { type: Boolean, required: true },
},
setup() {
const nameAddRules = [
(val?: string) =>
(val && val.trim().length) ||
(val?: number) =>
val !== undefined ||
i18n.global.t('managingUnitAdd.validateMessages.requireNameAdd'),
];
const myedityAddRules = [
const timeAddToRules = [
(val?: string) =>
(val && val.trim().length) ||
i18n.global.t('managingUnitAdd.validateMessages.requireMyedityAdd'),
i18n.global.t('managingUnitAdd.validateMessages.requireTimeAddTo'),
];
const fieldsAddRules = [
const fieldsAddRules = [
(val?: number) =>
val !== undefined ||
i18n.global.t('managingUnitAdd.validateMessages.requireFieldsAdd'),
......@@ -37,7 +38,7 @@ export default defineComponent({
];
return {
nameAddRules,
myedityAddRules,
timeAddToRules,
fieldsAddRules,
timeAddRules,
};
......@@ -46,7 +47,7 @@ export default defineComponent({
'update:openAddArtistDialog',
'click:CloseBtn',
'update:nameAdd',
'update:myedityAdd',
'update:timeAddTo',
'update:fieldsAdd',
'update:timeAdd',
'update:statusAdd',
......
......@@ -20,23 +20,27 @@
<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
hide-bottom-space
clearable
></q-input>
></q-select>
<q-input
:model-value="timeAdd"
@update:model-value="$emit('update:timeAdd', $event)"
:label="$t('managingUnitAdd.dialogLabel.fieldLabels.timeAdd')"
class="q-my-sm"
type="text"
type="date"
outlined
:rules="timeAddRules"
hide-bottom-space
......@@ -60,15 +64,13 @@
clearable
></q-select>
<q-input
:model-value="myedityAdd"
@update:model-value="$emit('update:myedityAdd', $event)"
:label="
$t('managingUnitAdd.dialogLabel.fieldLabels.myedityAdd')
"
type="text"
:model-value="timeAddTo"
@update:model-value="$emit('update:timeAddTo', $event)"
:label="$t('managingUnitAdd.dialogLabel.fieldLabels.timeAddTo')"
class="q-my-sm"
type="date"
outlined
:rules="myedityAddRules"
:rules="timeAddToRules"
hide-bottom-space
clearable
></q-input>
......
......@@ -139,11 +139,12 @@
<NewArtistDialog
v-model:open-add-artist-dialog="openAddArtistDialog"
v-model:name-add="nameAdd"
v-model:myedity-add="myedityAdd"
v-model:time-add-to="timeAddTo"
v-model:fields-add="fieldsAdd"
v-model:time-add="timeAdd"
v-model:status-add="statusAdd"
:fields-add-options="fieldsAddOptions"
:name-add-options="nameAddOptions"
@click:CloseBtn="openAddArtistDialog = false"
@updateNewManagingUnitsArtist="updateNewManagingUnitsArtist"
/>
......@@ -151,11 +152,12 @@
<UpdateNewArtistDialog
v-model:open-update-artist-dialog="openUpdateArtistDialog"
v-model:name-update="nameUpdate"
v-model:myedity-update="myedityUpdate"
v-model:time-update-to="timeUpdateTo"
v-model:fields-update="fieldsUpdate"
v-model:time-update="timeUpdate"
v-model:status-update="statusUpdate"
:fields-update-options="fieldsUpdateOptions"
:name-update-options="nameUpdateOptions"
@click:CloseBtn="openUpdateArtistDialog = false"
@updateNewManagingUnitsArtist="updateNewManagingUnitsArtist"
/>
......
......@@ -9,23 +9,24 @@ export default defineComponent({
},
fieldsUpdateOptions: {type: Array, required: true},
fieldsUpdate: { type: Number, required: true},
nameUpdate: { type: String, required: true },
myedityUpdate: { type: String, required: true },
nameUpdate: { type: Number, required: true },
nameUpdateOptions: {type: Array, required: true},
timeUpdateTo: { type: String, required: true },
timeUpdate: { type: String, required: true },
statusUpdate: { type: Boolean, required: true },
},
setup() {
const nameUpdateRules = [
(val?: string) =>
(val && val.trim().length) ||
(val?: number) =>
val !== undefined ||
i18n.global.t('managingUnitAdd.validateMessages.requireNameUpdate'),
];
const myedityUpdateRules = [
const timeUpdateToRules = [
(val?: string) =>
(val && val.trim().length) ||
i18n.global.t('managingUnitAdd.validateMessages.requireMyedityUpdate'),
i18n.global.t('managingUnitAdd.validateMessages.requireTimeUpdateTo'),
];
const fieldsUpdateRules = [
const fieldsUpdateRules = [
(val?: number) =>
val !== undefined ||
i18n.global.t('managingUnitAdd.validateMessages.requireFieldsUpdate'),
......@@ -37,7 +38,7 @@ export default defineComponent({
];
return {
nameUpdateRules,
myedityUpdateRules,
timeUpdateToRules,
fieldsUpdateRules,
timeUpdateRules,
};
......@@ -46,7 +47,7 @@ export default defineComponent({
'update:openUpdateArtistDialog',
'click:CloseBtn',
'update:nameUpdate',
'update:myedityUpdate',
'update:timeUpdateTo',
'update:fieldsUpdate',
'update:timeUpdate',
'update:statusUpdate',
......
......@@ -23,19 +23,23 @@
<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="
$t('managingUnitAdd.dialogLabel.fieldLabels.nameUpdate')
"
:options="nameUpdateOptions"
:rules="nameUpdateRules"
hide-bottom-space
type="text"
emit-value
map-options
option-value="id"
option-label="text"
class="q-my-sm"
outlined
hide-bottom-space
clearable
></q-input>
></q-select>
<q-input
:model-value="timeUpdate"
@update:model-value="$emit('update:timeUpdate', $event)"
......@@ -43,7 +47,7 @@
$t('managingUnitAdd.dialogLabel.fieldLabels.timeUpdate')
"
class="q-my-sm"
type="text"
type="date"
outlined
:rules="timeUpdateRules"
hide-bottom-space
......@@ -69,15 +73,15 @@
clearable
></q-select>
<q-input
:model-value="myedityUpdate"
@update:model-value="$emit('update:myedityUpdate', $event)"
:model-value="timeUpdateTo"
@update:model-value="$emit('update:timeUpdateTo', $event)"
:label="
$t('managingUnitAdd.dialogLabel.fieldLabels.myedityUpdate')
$t('managingUnitAdd.dialogLabel.fieldLabels.timeUpdateTo')
"
type="text"
class="q-my-sm"
type="date"
outlined
:rules="myedityUpdateRules"
:rules="timeUpdateToRules"
hide-bottom-space
clearable
></q-input>
......
......@@ -212,7 +212,7 @@ export default {
fieldsAdd: 'Lĩnh vực',
timeAdd: 'Thời gian hợp đồng',
sttUpdate: 'STT',
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',
......@@ -230,13 +230,13 @@ export default {
},
fieldLabels: {
nameAdd: 'Tên nghệ sỹ *',
myedityAdd: 'Nghệ danh *',
timeAddTo: 'Thời gian kết thúc hợp đồng *',
fieldsAdd: 'Lĩnh vực *',
timeAdd: 'Thời gian hợp đồng *',
timeAdd: 'Thời gian bắt đầu hợp đồng *',
nameUpdate: 'Tên nghệ sỹ *',
myedityUpdate: 'Nghệ danh *',
timeUpdateTo: 'Thời gian kết thúc hợp đồng *',
fieldsUpdate: 'Lĩnh vực *',
timeUpdate: 'Thời gian hợp đồng *',
timeUpdate: 'Thời gian bắt đầu hợp đồng *',
status: 'Trạng thái',
},
},
......@@ -250,13 +250,13 @@ export default {
},
validateMessages: {
requireNameAdd: 'Vui lòng chọn Tên nghệ sỹ',
requireMyedityAdd: 'Vui lòng nhập Nghệ danh',
requireTimeAddTo: 'Vui lòng chọn Thời gian kết thúc hợp đồng',
requireFieldsAdd: 'Vui lòng chọn Lĩnh vực',
requireTimeAdd: 'Vui lòng nhập Thời gian',
requireTimeAdd: 'Vui lòng chọn Thời gian bắt đầu hợp đồng',
requireNameUpdate: 'Vui lòng chọn Tên nghệ sỹ',
requireMyedityUpdate: 'Vui lòng nhập Nghệ danh',
requireTimeUpdateTo: 'Vui lòng chọn Thời gian kết thúc hợp đồng',
requireFieldsUpdate: 'Vui lòng chọn Lĩnh vực',
requireTimeUpdate: 'Vui lòng nhập Thời gian',
requireTimeUpdate: 'Vui lòng chọn Thời gian bắt đầu hợp đồng',
},
// confirmActionsTitle: {
// },
......
......@@ -13,17 +13,6 @@ import { config } from 'src/assets/configurations';
import AddNewManagingUnitsDialogComponent from '../../components/managingunits/add-new-managingunits-dialog/index.vue';
import UpdateNewManagingUnitsDialogComponent from '../../components/managingunits/update-new-managingunits-dialog/index.vue';
export type CustomerInfoType = {
id: number;
code: string | null;
name: string | null;
address: string | null;
email: string | null;
representative: string | null;
phoneNumber: string | null;
status: number;
};
export default defineComponent({
components: {
Pagination,
......@@ -31,6 +20,8 @@ export default defineComponent({
UpdateNewManagingUnitsDialogComponent
},
setup() {
//DS đơn vị chủ quản
const managingUnitTableColumns = [
// {
// name: 'index',
......@@ -114,6 +105,7 @@ export default defineComponent({
},
];
//Add nghệ sỹ
const managingUnitAddTableColumns = [
{
name: 'sttAdd',
......@@ -179,6 +171,7 @@ export default defineComponent({
},
];
//Update nghệ sỹ
const managingUnitUpdateTableColumns = [
{
name: 'sttAdd',
......@@ -256,18 +249,18 @@ export default defineComponent({
// pageSize: pageSize.value,
// },
// })) as AxiosResponse<BaseResponseBody<unknown>>;
const fakeData: unknown[] = [
{
id: 1,
sttAdd: 1,
nameAdd: 'Ưng Hoàng Phúc',
myedityAdd: 'Ưng Hoàng Phúc',
fieldsAdd: 'Âm nhạc',
timeAdd: '05/05/2021 - 05/05/2022',
status: 1,
},
];
managingUnitAddTableRows.value = fakeData;
// const fakeData: unknown[] = [
// {
// id: 1,
// sttAdd: 1,
// nameAdd: 'Ưng Hoàng Phúc',
// myedityAdd: 'Ưng Hoàng Phúc',
// fieldsAdd: 'Âm nhạc',
// timeAdd: '05/05/2021 - 05/05/2022',
// status: 1,
// },
// ];
// managingUnitAddTableRows.value = fakeData;
};
const getListUpdateUnit = () => {
......@@ -279,18 +272,18 @@ export default defineComponent({
// pageSize: pageSize.value,
// },
// })) as AxiosResponse<BaseResponseBody<unknown>>;
const fakeData: unknown[] = [
{
id: 1,
sttAdd: 1,
nameAdd: 'Ưng Hoàng Phúc',
myedityAdd: 'Ưng Hoàng Phúc',
fieldsAdd: 'Âm nhạc',
timeAdd: '05/05/2021 - 05/05/2022',
status: 1,
},
];
managingUnitUpdateTableRows.value = fakeData;
// const fakeData: unknown[] = [
// {
// id: 1,
// sttAdd: 1,
// nameAdd: 'Ưng Hoàng Phúc',
// myedityAdd: 'Ưng Hoàng Phúc',
// fieldsAdd: 'Âm nhạc',
// timeAdd: '05/05/2021 - 05/05/2022',
// status: 1,
// },
// ];
// managingUnitUpdateTableRows.value = fakeData;
};
const showDialog = ref(false);
......@@ -303,7 +296,6 @@ export default defineComponent({
const address: Ref<string | undefined> = ref();
const fields: Ref<number | undefined> = ref();
const status: Ref<boolean | number> = ref(true);
const pageIndex = ref(1);
const pageSize = ref(20);
const unitNameKeyword = ref('');
......@@ -331,7 +323,6 @@ export default defineComponent({
totalPage.value = response.data.data.totalPages;
}
} catch (error) {}
// managingUnitTableRows.value = fakeData;
};
const filterListUnit = () => {
// const response = (await api({
......@@ -348,6 +339,7 @@ export default defineComponent({
void getListUnits();
};
//gọi API xóa đơn vị
const confirmDeleteManagingUnits = (id: number) => {
Dialog.create({
title: i18n.global.t(
......@@ -384,6 +376,7 @@ export default defineComponent({
}
} catch (error) {}
};
//end
const openAddManagingUnitsDialog = () => {
showDialog.value = true;
......
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