update fix-bug

src/components/add-update-customer-rank/index.vue

@@ -56,7 +56,7 @@
                 @update:model-value="$emit('update:level', $event)"
                 :label="$t('customerRank.dialogLabel.fieldLabels.level')"
                 :rules="levelRules"
-                type="number"
+                mask="#"
                 class="q-my-sm"
                 outlined
               ></q-input>

src/components/artist-information/bank-account/add-new-bank-account-dialog/AddAccountBankDialog.ts

@@ -50,11 +50,19 @@ export default defineComponent({
         i18n.global.t(
           'artist.dialogLabel.validateMessages.requireAccountNumber'
         ),
+      (val?: string) =>
+        (val && val.trim().length >= 8) ||
+        i18n.global.t(
+          'artist.dialogLabel.validateMessages.requireAccountNumber1'
+        ),
     ];
     const cardNumberRules = [
       (val?: string) =>
         (val && val.trim().length) ||
         i18n.global.t('artist.dialogLabel.validateMessages.requireCardNumber'),
+      (val?: string) =>
+        (val && val.trim().length === 16) ||
+        i18n.global.t('artist.dialogLabel.validateMessages.requireCardNumber1'),
     ];
     const bankNameRules = [
       (val: number | null) =>

src/components/artist-information/bank-account/add-new-bank-account-dialog/index.vue

@@ -35,7 +35,7 @@
                 :label="$t('artist.dialogLabel.fieldLabels.accountNumber')"
                 :rules="accountNumberRules"
                 hide-bottom-space
-                type="number"
+                mask="###############"
                 class="q-my-sm"
                 outlined
               ></q-input>
@@ -45,7 +45,7 @@
                 :label="$t('artist.dialogLabel.fieldLabels.cardNumber')"
                 :rules="cardNumberRules"
                 hide-bottom-space
-                type="text"
+                mask="################"
                 class="q-my-sm"
                 outlined
               ></q-input>

src/components/artist-information/personal-information/index.vue

@@ -313,7 +313,7 @@
             @update:model-value="$emit('update:phoneNumber', $event)"
             :error="phoneNumberRules"
             :error-message="errorMessPhoneNumber"
-            type="number"
+            mask="##########"
             outlined
             dense
             hide-bottom-space

src/components/customer/add-new-customer-dialog/AddNewCustomerDialog.ts

@@ -44,61 +44,6 @@ export default defineComponent({
     const level: Ref<CustomerLevelType | null> = ref(null);
 
     const confirmAddCustomer = () => {
-      // let hasError = false;
-
-      // if (
-      //   props.listCustomers.filter((customer) => customer.code === code.value)
-      //     .length
-      // ) {
-      //   hasError = true;
-      //   Notify.create({
-      //     type: 'negative',
-      //     message: i18n.global.t('customer.validateMessages.codeExists'),
-      //   });
-      // }
-      // if (
-      //   props.listCustomers.filter(
-      //     (customer) => customer.userName === userName.value
-      //   ).length
-      // ) {
-      //   hasError = true;
-      //   Notify.create({
-      //     type: 'negative',
-      //     message: i18n.global.t('customer.validateMessages.userNameExists'),
-      //   });
-      // }
-      // if (
-      //   props.listCustomers.filter(
-      //     (customer) => customer.taxCode === taxCode.value
-      //   ).length
-      // ) {
-      //   hasError = true;
-      //   Notify.create({
-      //     type: 'negative',
-      //     message: i18n.global.t('customer.validateMessages.taxCodeExists'),
-      //   });
-      // }
-      // if (
-      //   props.listCustomers.filter((customer) => customer.email === email.value)
-      //     .length
-      // ) {
-      //   hasError = true;
-      //   Notify.create({
-      //     type: 'negative',
-      //     message: i18n.global.t('customer.validateMessages.emailExists'),
-      //   });
-      // }
-      // if (
-      //   props.listCustomers.filter((customer) => customer.phone === phone.value)
-      //     .length
-      // ) {
-      //   hasError = true;
-      //   Notify.create({
-      //     type: 'negative',
-      //     message: i18n.global.t('customer.validateMessages.phoneExists'),
-      //   });
-      // }
-      // if (!hasError) {
       context.emit('addNewCustomer', {
         code: code.value,
         userName: userName.value,

src/components/customer/add-new-customer-dialog/index.vue

@@ -143,7 +143,7 @@
                 v-model="phone"
                 :label="$t('customer.dialogLabel.fieldLabels.phone')"
                 :rules="phoneRules"
-                type="number"
+                mask="##########"
                 class="q-my-sm"
                 outlined
                 hide-bottom-space

src/components/customer/update-new-customer-dialog/index.vue

@@ -146,7 +146,7 @@
                 v-model="phone"
                 :label="$t('customer.dialogLabel.fieldLabels.phone')"
                 class="q-my-sm"
-                type="number"
+                mask="##########"
                 :rules="phoneRules"
                 outlined
                 hide-bottom-space

src/i18n/vi/index.ts

@@ -425,8 +425,10 @@ export default {
       validateMessages: {
         requireAccountOwner: 'Vui lòng nhập Chủ tài khoản',
         requireAccountNumber: 'Vui lòng nhập Số tài khoản',
+        requireAccountNumber1: 'Số tài khoản không hợp lệ',
         accountNumberExits: 'Số tài khoản đã tồn tại',
         requireCardNumber: 'Vui lòng nhập Số ghi trên thẻ',
+        requireCardNumber1: 'Số ghi trên thẻ không hợp lệ',
         requireBankName: 'Vui lòng chọn Ngân hàng',
         requireCardType: 'Vui lòng chọn Loại thẻ',
         errorIsDefault: 'Nghệ sỹ đã có tài khoản ngân hàng mặc định',

src/pages/cap-nhat-thong-tin-nghe-sy/updateInformationArtist.ts

@@ -81,6 +81,7 @@ export default defineComponent({
     const typeBankOptions: Ref<TypeCardType[]> = ref([]);
     const workOptions: Ref<WorkType[]> = ref([]);
     const sexOptions = ref([
+      { id: 0, name: 'Khác' },
       { id: 1, name: 'Nam' },
       { id: 2, name: 'Nữ' },
     ]);

src/pages/khach-hang/customer.ts

@@ -115,7 +115,7 @@ export default defineComponent({
     const showDialogUpdate = ref(false);
     const pageIndex = ref(1);
     const pageSize = ref(20);
-    const totalPage = ref(10);
+    const totalPage = ref(0);
     const companyNameSelected: Ref<string | null> = ref(null);
     const taxCodeSelected: Ref<string | null> = ref(null);
     const levelSelected: Ref<CustomerLevelType | null> = ref(null);

src/pages/khach-hang/index.vue

@@ -63,15 +63,17 @@
         :no-data-label="$t('emptyData')"
         row-key="name"
         separator="cell"
-        :pagination="{ rowsPerPage: pageSize }"
+        :rows-per-page-label="$t('recordPerPage')"
+        :pagination="{
+          rowsPerPage: 0,
+        }"
+        wrap-cells
         hide-pagination
         class="sticky-header-table"
       >
         <template v-slot:body-cell-stt="item">
-          <q-td style="padding: 0; height: 100%">
-            <div align="center">
-              {{ item.rowIndex + 1 }}
-            </div>
+          <q-td :item="item">
+            {{ 1 + item.rowIndex + pageSize * (pageIndex - 1) }}
           </q-td>
         </template>
         <template v-slot:body-cell-action="rowData">

src/pages/nghe-sy/artist.ts

@@ -118,6 +118,7 @@ export default defineComponent({
     const totalPage = ref(0);
     const fullNameKeyword = ref('');
     const sexOptions = ref([
+      { id: 0, name: 'Khác' },
       { id: 1, name: 'Nam' },
       { id: 2, name: 'Nữ' },
     ]);

src/pages/nghe-sy/index.vue

@@ -290,6 +290,7 @@ export default defineComponent({
     const totalPage = ref(0);
     const fullNameKeyword = ref('');
     const sexOptions = ref([
+      { id: 0, name: 'Khác' },
       { id: 1, name: 'Nam' },
       { id: 2, name: 'Nữ' },
     ]);

src/pages/nguoi-dung/User.ts

@@ -103,6 +103,7 @@ export default defineComponent({
     const mobileNumber = ref('');
     const sex: Ref<number | undefined> = ref();
     const sexOptions = ref([
+      { id: 0, text: 'Khác' },
       { id: 1, text: 'Nam' },
       { id: 2, text: 'Nữ' },
     ]);

src/pages/them-nghe-sy/AddArtist.ts

@@ -81,6 +81,7 @@ export default defineComponent({
     const typeBankOptions: Ref<TypeCardType[]> = ref([]);
     const workOptions: Ref<WorkType[]> = ref([]);
     const sexOptions = ref([
+      { id: 0, name: 'Khác' },
       { id: 1, name: 'Nam' },
       { id: 2, name: 'Nữ' },
     ]);

src/pages/xep-hang-khach-hang/index.vue

@@ -62,9 +62,19 @@
         row-key="customerRankCode"
         separator="cell"
         :no-data-label="$t('emptyData')"
+        :rows-per-page-label="$t('recordPerPage')"
+        :pagination="{
+          rowsPerPage: 0,
+        }"
+        wrap-cells
         hide-pagination
         class="sticky-header-table"
       >
+        <template v-slot:body-cell-stt="item">
+          <q-td :item="item">
+            {{ 1 + item.rowIndex + pageSize * (pageIndex - 1) }}
+          </q-td>
+        </template>
         <template v-slot:body-cell-action="item">
           <q-td style="padding: 0" class="flex flex-center">
             <q-btn
@@ -159,14 +169,14 @@ export default defineComponent({
   },
   setup() {
     const customerRankTableColumns = [
-      // {
-      //   name: 'index',
-      //   field: 'index',
-      //   required: true,
-      //   label: 'STT',
-      //   align: 'center',
-      //   sortable: false,
-      // },
+      {
+        name: 'stt',
+        field: 'stt',
+        required: true,
+        label: 'STT',
+        align: 'center',
+        sortable: false,
+      },
       {
         name: 'code',
         field: 'code',
@@ -219,13 +229,19 @@ export default defineComponent({
     const updateCustomerRankDialogIsOpened = ref(false);
     const code = ref('');
     const name = ref('');
+    const pageIndex = ref(1);
+    const pageSize = ref(20);
+    const totalPage = ref(0);
     const level: Ref<number | undefined> = ref(undefined);
     const status: Ref<number> = ref(CustomerRankStatus.active);
     const customerRankId: Ref<number | undefined> = ref(undefined);
     const nameCustomerRank = ref('');
     const levelCustomerRank: Ref<number | undefined> = ref(undefined);
     const codeCustomerRank = ref('');
-
+    const changePageSize = () => {
+      pageIndex.value = 1;
+      void getListCustomerRank();
+    };
     //gọi api ds
     const getListCustomerRank = async () => {
       const response = (await api({
@@ -372,6 +388,10 @@ export default defineComponent({
       void getListCustomerRank();
     });
     return {
+      pageSize,
+      totalPage,
+      changePageSize,
+      pageIndex,
       addCustomerRankDialogIsOpened,
       updateCustomerRankDialogIsOpened,
       customerRankTableColumns,