update fix-bug

src/components/units-manager/add-update-unit-dialog/index.vue

@@ -81,7 +81,7 @@
                 @update:model-value="$emit('update:phoneNumber', $event)"
                 :label="$t('managingUnit.dialogLabel.fieldLabels.phoneNumber')"
                 class="q-my-sm"
-                type="number"
+                mask="##########"
                 :rules="phoneNumberRules"
                 outlined
                 clearable
@@ -100,7 +100,14 @@
                 outlined
                 use-chips
                 clearable
-              ></q-select>
+                ><template v-slot:no-option>
+                  <q-item>
+                    <q-item-section class="text-grey">
+                      {{ $t('managingUnitAdd.noDataTable') }}
+                    </q-item-section>
+                  </q-item>
+                </template></q-select
+              >
               <q-input
                 :model-value="address"
                 @update:model-value="$emit('update:address', $event)"
@@ -544,19 +551,20 @@ export default defineComponent({
       (val?: string) =>
         (val && val.trim().length) ||
         i18n.global.t('managingUnit.validateMessages.requireName'),
-        
     ];
     const representativeRules = [
       (val?: string) =>
         (val && val.trim().length) ||
         i18n.global.t('managingUnit.validateMessages.requireRepresentative'),
-        (val?: string) =>
+      (val?: string) =>
         (val && val.trim().length < 30) ||
-        i18n.global.t('managingUnit.validateMessages.requireLengthRepresentative'),
+        i18n.global.t(
+          'managingUnit.validateMessages.requireLengthRepresentative'
+        ),
     ];
     const fieldsRules = [
-      (val?: number) =>
-        val !== undefined ||
+      (val?: Array<unknown>) =>
+        val?.length ||
         i18n.global.t('managingUnit.validateMessages.requireFields'),
     ];
     const phoneNumberRules = [

src/components/units-manager/unit-add-update-artist/index.vue

@@ -44,7 +44,14 @@
                 option-label="name"
                 class="q-my-sm"
                 outlined
-              ></q-select>
+                ><template v-slot:no-option>
+                  <q-item>
+                    <q-item-section class="text-grey">
+                      {{ $t('managingUnitAdd.noDataTable') }}
+                    </q-item-section>
+                  </q-item>
+                </template></q-select
+              >
               <q-input
                 :model-value="contractTimeFrom"
                 :label="
@@ -95,8 +102,13 @@
                   option-label="fullName"
                   class="q-my-sm"
                   outlined
-                >
-                </q-select
+                  ><template v-slot:no-option>
+                    <q-item>
+                      <q-item-section class="text-grey">
+                        {{ $t('managingUnitAdd.noDataTable') }}
+                      </q-item-section>
+                    </q-item>
+                  </template> </q-select
                 ><q-tooltip v-if="!artistField"
                   >Vui lòng chọn Lĩnh vực</q-tooltip
                 >

src/components/units-manager/unit-add-update-bank-account/index.vue

@@ -42,7 +42,15 @@
                 option-label="name"
                 class="q-my-sm"
                 outlined
-              ></q-select>
+              >
+                <template v-slot:no-option>
+                  <q-item>
+                    <q-item-section class="text-grey">
+                      {{ $t('managingUnitAdd.noDataTable') }}
+                    </q-item-section>
+                  </q-item>
+                </template>
+              </q-select>
               <q-select
                 :model-value="cardType"
                 @update:model-value="$emit('update:cardType', $event)"
@@ -54,12 +62,20 @@
                 option-label="name"
                 class="q-my-sm"
                 outlined
-              ></q-select>
+              >
+                <template v-slot:no-option>
+                  <q-item>
+                    <q-item-section class="text-grey">
+                      {{ $t('managingUnitAdd.noDataTable') }}
+                    </q-item-section>
+                  </q-item>
+                </template>
+              </q-select>
               <q-input
                 :model-value="cardCode"
                 @update:model-value="$emit('update:cardCode', $event)"
                 :label="$t('managingUnitAdd.dialogLabel.fieldLabels.cardCode')"
-                type="text"
+                mask="###############"
                 class="q-my-sm"
                 outlined
                 :rules="cardCodeRules"
@@ -83,7 +99,7 @@
                 :label="
                   $t('managingUnitAdd.dialogLabel.fieldLabels.numberCard')
                 "
-                type="number"
+                mask="################"
                 class="q-my-sm"
                 outlined
                 :rules="numberCardRules"
@@ -161,11 +177,17 @@ export default defineComponent({
       (val?: string) =>
         (val && val.trim().length) ||
         i18n.global.t('managingUnitAdd.validateMessages.requireCardCode'),
+      (val?: string) =>
+        (val && val.trim().length >= 8) ||
+        i18n.global.t('managingUnitAdd.validateMessages.requireCardCode1'),
     ];
     const numberCardRules = [
       (val?: string) =>
         (val && val.trim().length) ||
         i18n.global.t('managingUnitAdd.validateMessages.requireNumberCard'),
+      (val?: string) =>
+        (val && val.trim().length === 16) ||
+        i18n.global.t('managingUnitAdd.validateMessages.requireNumberCard1'),
     ];
     const userCardRules = [
       (val?: string) =>

src/i18n/vi/index.ts

@@ -215,6 +215,7 @@ export default {
     AddmanagingBankAccount: 'Thêm ngân hàng',
     titleAdd: 'Danh sách nghệ sỹ',
     titleUnitBankAccount: 'Danh sách tài khoản ngân hàng thụ hưởng',
+    noDataTable: 'Không có dữ liệu',
     tableColumns: {
       sttAdd: 'STT',
       nameAdd: 'Tên Nghệ sỹ',
@@ -239,7 +240,7 @@ export default {
     },
     statusLabel: {
       active: 'Còn thời gian',
-      inactive: 'Hết hợp đồng',
+      inactive: 'Hết hạn hợp đồng',
     },
     dialogLabel: {
       title: {
@@ -283,7 +284,9 @@ export default {
       requireBank: 'Vui lòng chọn Ngân hàng',
       requireCardType: 'Vui lòng chọn Loại thẻ',
       requireCardCode: 'Vui lòng nhập Số tài khoản',
+      requireCardCode1: 'Số tài khoản không hợp lệ',
       requireNumberCard: 'Vui lòng nhập Số ghi trên thẻ',
+      requireNumberCard1: 'Số ghi trên thẻ không hợp lệ',
       requireUserCard: 'Vui lòng nhập Chủ tài khoản',
     },
     confirmActionsTitle: {

src/pages/don-vi-chu-quan/index.vue

@@ -24,7 +24,14 @@
         dense
         outlined
         clearable
-      ></q-select>
+        ><template v-slot:no-option>
+          <q-item>
+            <q-item-section class="text-grey">
+              {{ $t('managingUnitAdd.noDataTable') }}
+            </q-item-section>
+          </q-item>
+        </template></q-select
+      >
     </div>
     <div class="col-auto">
       <q-btn
@@ -53,9 +60,19 @@
         row-key="unitCode"
         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
@@ -173,14 +190,14 @@ export default defineComponent({
   setup() {
     //DS đơn vị chủ quản
     const managingUnitTableColumns = [
-      // {
-      //   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',
@@ -259,9 +276,9 @@ export default defineComponent({
 
     const pageIndex = ref(1);
     const pageSize = ref(20);
+    const totalPage = ref(0);
     const unitNameKeyword = ref('');
     const fieldsOptions: Ref<FieldType[]> = ref([]);
-    const totalPage = ref(1);
     const fieldSelected: Ref<FieldType | undefined> = ref();
     const addUnitDialogIsOpened = ref(false);
     const updateUnitDialogIsOpened = ref(false);

src/pages/nghe-sy/artist.ts

@@ -23,9 +23,9 @@ export default defineComponent({
     const configImg = config;
     const userTableColumnsArtist = [
       {
+        name: 'stt',
+        field: 'stt',
         required: true,
-        name: 'STT',
-        field: 'STT',
         label: 'STT',
         align: 'center',
         sortable: false,
@@ -115,8 +115,8 @@ export default defineComponent({
     const userTableRowsArtist: Ref<unknown[]> = ref([]);
     const pageIndex = ref(1);
     const pageSize = ref(20);
-    const totalPage = ref(10);
-    const fullNameKeyword: Ref<string | null> = ref(null);
+    const totalPage = ref(0);
+    const fullNameKeyword = ref('');
     const sexOptions = ref([
       { id: 1, name: 'Nam' },
       { id: 2, name: 'Nữ' },
@@ -129,7 +129,6 @@ export default defineComponent({
     const fieldSelected: Ref<FieldType | null> = ref(null);
     const professionSelected: Ref<QualificationType | null> = ref(null);
     const artistLevelSelected: Ref<ArtistLevelType | null> = ref(null);
-
     const isOpenNewArtistDialog = ref(false);
     const id: Ref<number> = ref(0);
     const artistCode: Ref<string> = ref('');
@@ -170,8 +169,6 @@ export default defineComponent({
         if (response.data.error.code === config.API_RES_CODE.OK.code) {
           userTableRowsArtist.value = response.data.data.data;
           totalPage.value = response.data.data.totalPages;
-          // pageSize.value = response.data.data.pageSize as number;
-          // pageIndex.value = response.data.data.pageIndex as number;
         }
       } catch (error) {}
     };