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

update

parent 51016443
...@@ -11,7 +11,7 @@ export default defineComponent({ ...@@ -11,7 +11,7 @@ export default defineComponent({
}, },
ratingsOptions: {type: Array, required: true}, ratingsOptions: {type: Array, required: true},
businessTypeOptions: {type: Array, required: true}, businessTypeOptions: {type: Array, required: true},
tenĐN: { type: String, required: true }, userName: { type: String, required: true },
customerName: { type: String, required: true }, customerName: { type: String, required: true },
businessName: { type: String, required: true }, businessName: { type: String, required: true },
taxCode: { type: Number, required: true }, taxCode: { type: Number, required: true },
...@@ -25,10 +25,10 @@ export default defineComponent({ ...@@ -25,10 +25,10 @@ export default defineComponent({
status: { type: Boolean, required: true }, status: { type: Boolean, required: true },
}, },
setup() { setup() {
const tenĐNRules = [ const userNameRules = [
(val?: string) => (val?: string) =>
(val && val.trim().length) || (val && val.trim().length) ||
i18n.global.t('customer.validateMessages.requireTenĐN'), i18n.global.t('customer.validateMessages.requireUserName'),
]; ];
const customerNameRules = [ const customerNameRules = [
(val?: string) => (val?: string) =>
...@@ -86,7 +86,7 @@ export default defineComponent({ ...@@ -86,7 +86,7 @@ export default defineComponent({
i18n.global.t('customer.validateMessages.requiredPosition'), i18n.global.t('customer.validateMessages.requiredPosition'),
]; ];
return { return {
tenĐNRules, userNameRules,
customerNameRules, customerNameRules,
businessNameRules, businessNameRules,
taxCodeRules, taxCodeRules,
...@@ -102,7 +102,7 @@ export default defineComponent({ ...@@ -102,7 +102,7 @@ export default defineComponent({
emits: [ emits: [
'update:showDialog', 'update:showDialog',
'click:CloseBtn', 'click:CloseBtn',
'update:tenĐN', 'update:userName',
'update:customerName', 'update:customerName',
'update:businessName', 'update:businessName',
'update:taxCode', 'update:taxCode',
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-6"> <div class="col-6">
<q-input <q-input
:model-value="tenĐN" :model-value="userName"
@update:model-value="$emit('update:tenĐN', $event)" @update:model-value="$emit('update:userName', $event)"
:label="$t('customer.dialogLabel.fieldLabels.tenĐN')" :label="$t('customer.dialogLabel.fieldLabels.userName')"
:rules="tenĐNRules" :rules="userNameRules"
hide-bottom-space hide-bottom-space
type="text" type="text"
class="q-my-sm" class="q-my-sm"
......
...@@ -152,7 +152,7 @@ export default { ...@@ -152,7 +152,7 @@ export default {
tableColumnsCustomer: { tableColumnsCustomer: {
stt: 'STT', stt: 'STT',
customerCode: 'Mã khách hàng', customerCode: 'Mã khách hàng',
tenĐN: 'Tên ĐN', userName: 'Tên đăng nhập',
fullName: 'Họ tên', fullName: 'Họ tên',
businessName: 'Tên doanh nghiệp', businessName: 'Tên doanh nghiệp',
taxCode: 'Mã số thuế', taxCode: 'Mã số thuế',
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
updateCustomer: 'Cập nhật người dùng', updateCustomer: 'Cập nhật người dùng',
}, },
fieldLabels: { fieldLabels: {
tenĐN: 'Tên ĐN *', userName: 'Tên đăng nhập *',
customerName: 'Họ tên *', customerName: 'Họ tên *',
businessName: 'Tên doanh nghiệp *', businessName: 'Tên doanh nghiệp *',
taxCode: 'Mã số thuế *', taxCode: 'Mã số thuế *',
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
cancel: 'Đóng', cancel: 'Đóng',
}, },
validateMessages: { validateMessages: {
requireTenĐN: 'Vui lòng nhập Tên ĐH', requireUserName: 'Vui lòng nhập Tên đăng nhập',
requireCustomerName: 'Vui lòng nhập Họ tên', requireCustomerName: 'Vui lòng nhập Họ tên',
requireBusinessName: 'Vui lòng nhập Tên Doanh nghiệp', requireBusinessName: 'Vui lòng nhập Tên Doanh nghiệp',
requireTaxCode: 'Vui lòng nhập Mã số thuế', requireTaxCode: 'Vui lòng nhập Mã số thuế',
......
...@@ -4,7 +4,7 @@ import Pagination from 'components/pagination/index.vue'; ...@@ -4,7 +4,7 @@ import Pagination from 'components/pagination/index.vue';
import AddNewCustomerDialogComponent from '../../components/customer/add-new-customer-dialog/index.vue'; import AddNewCustomerDialogComponent from '../../components/customer/add-new-customer-dialog/index.vue';
export type ArtistInfoType = { export type ArtistInfoType = {
id: number; id: number;
tenĐN: string | null; userName: string | null;
customerName: string | null; customerName: string | null;
businessName: string | null; businessName: string | null;
taxCode: number; taxCode: number;
...@@ -43,10 +43,10 @@ export default defineComponent({ ...@@ -43,10 +43,10 @@ export default defineComponent({
sortable: false, sortable: false,
}, },
{ {
name: 'tenĐN', name: 'userName',
field: 'tenĐN', field: 'userName',
required: true, required: true,
label: i18n.global.t('customer.tableColumnsCustomer.tenĐN'), label: i18n.global.t('customer.tableColumnsCustomer.userName'),
headerStyle: 'text-align: center !important;', headerStyle: 'text-align: center !important;',
align: 'left', align: 'left',
sortable: false, sortable: false,
...@@ -122,7 +122,7 @@ export default defineComponent({ ...@@ -122,7 +122,7 @@ export default defineComponent({
const id: Ref<number> = ref(0); const id: Ref<number> = ref(0);
const businessName: Ref<string | undefined> = ref(); const businessName: Ref<string | undefined> = ref();
const taxCode: Ref<number | undefined> = ref(); const taxCode: Ref<number | undefined> = ref();
const tenĐN: Ref<string | undefined> = ref(); const userName: Ref<string | undefined> = ref();
const email: Ref<string | undefined> = ref(); const email: Ref<string | undefined> = ref();
const address: Ref<string | undefined> = ref(); const address: Ref<string | undefined> = ref();
const customerName: Ref<string | undefined> = ref(); const customerName: Ref<string | undefined> = ref();
...@@ -156,7 +156,7 @@ export default defineComponent({ ...@@ -156,7 +156,7 @@ export default defineComponent({
id: 1, id: 1,
stt: 1, stt: 1,
customerCode: '0001', customerCode: '0001',
tenĐN: 'DuongNA01', userName: 'DuongNA01',
fullName: 'Nguyễn Tùng Dương', fullName: 'Nguyễn Tùng Dương',
businessName: 'TNHH Hà Đông', businessName: 'TNHH Hà Đông',
taxCode: '1234567890', taxCode: '1234567890',
...@@ -168,7 +168,7 @@ export default defineComponent({ ...@@ -168,7 +168,7 @@ export default defineComponent({
id: 2, id: 2,
stt: 2, stt: 2,
customerCode: '0001', customerCode: '0001',
tenĐN: 'DuongNA01', userName: 'DuongNA01',
fullName: 'Nguyễn Tùng Dương', fullName: 'Nguyễn Tùng Dương',
businessName: 'TNHH Hà Đông', businessName: 'TNHH Hà Đông',
taxCode: '1234567890', taxCode: '1234567890',
...@@ -197,7 +197,7 @@ export default defineComponent({ ...@@ -197,7 +197,7 @@ export default defineComponent({
const openAddCustomerDialog = () => { const openAddCustomerDialog = () => {
showDialog.value = true; showDialog.value = true;
tenĐN.value = ''; userName.value = '';
customerName.value = ''; customerName.value = '';
businessName.value = ''; businessName.value = '';
taxCode.value = undefined; taxCode.value = undefined;
...@@ -226,7 +226,7 @@ export default defineComponent({ ...@@ -226,7 +226,7 @@ export default defineComponent({
addNewCustomer, addNewCustomer,
showDialog, showDialog,
id, id,
tenĐN, userName,
customerName, customerName,
businessName, businessName,
taxCode, taxCode,
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<AddNewCustomerDialogComponent <AddNewCustomerDialogComponent
v-model:show-dialog="showDialog" v-model:show-dialog="showDialog"
v-model:tendn="tenĐN" v-model:user-name="userName"
v-model:customer-name="customerName" v-model:customer-name="customerName"
v-model:business-name="businessName" v-model:business-name="businessName"
v-model:tax-code="taxCode" v-model:tax-code="taxCode"
......
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