update

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

@@ -4,7 +4,7 @@
     :model-value="showDialog"
     @update:model-value="$emit('update:showDialog', $event)"
   >
-    <q-card style="min-width: 1500px" bordered>
+    <q-card style="min-width: 1200px" bordered>
       <q-form greedy @submit.prevent="$emit('addNewManagingUnits')">
         <q-card-section>
           <q-item>
@@ -55,19 +55,6 @@
                 hide-bottom-space
                 clearable
               ></q-input>
-              <q-input
-                :model-value="address"
-                @update:model-value="$emit('update:address', $event)"
-                :label="$t('managingUnit.dialogLabel.fieldLabels.address')"
-                class="q-my-sm"
-                type="textarea"
-                outlined
-                :rules="addressRules"
-                hide-bottom-space
-                clearable
-              ></q-input>
-            </div>
-            <div class="col-6">
               <q-input
                 :model-value="email"
                 @update:model-value="$emit('update:email', $event)"
@@ -79,6 +66,17 @@
                 hide-bottom-space
                 clearable
               ></q-input>
+              <div style="padding-left: 8px">
+                <span class="text-body1">{{
+                  $t('managingUnit.dialogLabel.fieldLabels.status')
+                }}</span
+                ><q-toggle
+                  :model-value="status"
+                  @update:model-value="$emit('update:status', $event)"
+                />
+              </div>
+            </div>
+            <div class="col-6">
               <q-input
                 :model-value="phoneNumber"
                 emit-value
@@ -106,34 +104,53 @@
                 hide-bottom-space
                 clearable
               ></q-select>
-
-              <div style="padding-top: 13px; padding-left: 8px">
-                <span class="text-body1">{{
-                  $t('managingUnit.dialogLabel.fieldLabels.status')
-                }}</span
-                ><q-toggle
-                  :model-value="status"
-                  @update:model-value="$emit('update:status', $event)"
-                />
-              </div>
+              <q-input
+                :model-value="address"
+                @update:model-value="$emit('update:address', $event)"
+                :label="$t('managingUnit.dialogLabel.fieldLabels.address')"
+                class="q-my-sm"
+                type="textarea"
+                outlined
+                :rules="addressRules"
+                hide-bottom-space
+                clearable
+              ></q-input>
             </div>
           </div>
         </q-card-section>
+        <div class="col-auto text-h6 text-weight-regular flex q-ml-md">
+          {{ $t('managingUnit.titleAdd')
+          }}<span style="color: red" class="q-ml-xs">*</span>
+        </div>
+
+        <q-card-actions>
+          <div class="col-12 q-mt-sm">
+            <q-table
+              separator="cell"
+              :no-data-label="$t('emptyData')"
+              hide-pagination
+            >
+            </q-table>
+          </div>
+        </q-card-actions>
         <q-card-actions align="right">
-          <q-btn
-            color="grey"
-            no-caps
-            style="width: 90px"
-            :label="$t('customer.crudActions.cancel')"
-            @click="$emit('click:CloseBtn')"
-          />
-          <q-btn
-            type="submit"
-            color="primary"
-            no-caps
-            style="width: 90px"
-            :label="$t('customer.crudActions.save')"
-          />
+          <div>
+            <q-btn
+              color="grey"
+              no-caps
+              style="width: 90px"
+              class="q-mr-sm"
+              :label="$t('customer.crudActions.cancel')"
+              @click="$emit('click:CloseBtn')"
+            />
+            <q-btn
+              type="submit"
+              color="primary"
+              no-caps
+              style="width: 90px"
+              :label="$t('customer.crudActions.save')"
+            />
+          </div>
         </q-card-actions>
       </q-form>
     </q-card>

src/components/user-group/index.vue

@@ -10,6 +10,7 @@
             @click="$emit('click:addNewGroupUsers', EditMode.add)"
             color="primary"
             :label="$t('crudActions.add')"
+            style="width: 100px"
             no-caps
           />
         </div>

src/i18n/vi/index.ts

@@ -136,6 +136,7 @@ export default {
 
   // Đơn vị chủ quản
   managingUnit: {
+    titleAdd: 'Danh sách nghệ sỹ',
     title: 'Đơn vị chủ quản',
     tableColumns: {
       code: 'Mã đơn vị',
@@ -270,6 +271,7 @@ export default {
   },
 
   artist: {
+    title: 'Nghệ sỹ',
     tableColumnsArtist: {
       artistCode: 'Mã nghệ sỹ',
       fullName: 'Họ tên',

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

@@ -32,6 +32,7 @@
         no-caps
         :label="$t('crudActions.search')"
         @click="filterListUnit"
+        style="width: 100px"
       ></q-btn>
     </div>
     <div class="col-auto">
@@ -39,6 +40,7 @@
         color="primary"
         no-caps
         :label="$t('crudActions.add')"
+        style="width: 100px"
         @click="openAddManagingUnitsDialog"
       >
       </q-btn>

src/pages/khach-hang/index.vue

@@ -40,6 +40,7 @@
         color="primary"
         no-caps
         :label="$t('crudActions.search')"
+        style="width: 100px"
         @click="filterListCustomer"
       >
       </q-btn>
@@ -49,6 +50,7 @@
         color="primary"
         no-caps
         :label="$t('crudActions.add')"
+        style="width: 100px"
         @click="openAddCustomerDialog"
       >
       </q-btn>

src/pages/nghe-sy/index.vue

 <template>
   <div class="row q-col-gutter-sm flex-center q-mt-sm">
+    <div class="col-auto text-h6 text-weight-regular flex flex-center q-mr-md">
+      {{ $t('artist.title') }}
+      <q-separator vertical spaced />
+    </div>
     <q-space></q-space>
     <div class="col-2">
       <q-input
@@ -7,6 +11,7 @@
         dense
         outlined
         :label="$t('artist.tableColumnsArtist.artistName')"
+        clearable
       ></q-input>
     </div>
     <div class="col-2" dense outlined>
@@ -18,6 +23,7 @@
         label="Lĩnh vực"
         dense
         outlined
+        clearable
       ></q-select>
     </div>
     <div class="col-2" dense outlined>
@@ -29,6 +35,7 @@
         dense
         outlined
         label="Độ chuyên"
+        clearable
       ></q-select>
     </div>
     <div class="col-2" dense outlined>
@@ -40,6 +47,7 @@
         dense
         outlined
         label="Xếp hạng"
+        clearable
       ></q-select>
     </div>
     <div class="col-auto">
@@ -47,6 +55,7 @@
         color="primary"
         no-caps
         :label="$t('crudActions.search')"
+        style="width: 100px"
         @click="filterListArtist"
       >
       </q-btn>
@@ -56,6 +65,7 @@
         color="primary"
         no-caps
         :label="$t('crudActions.add')"
+        style="width: 100px"
         @click="isOpenNewArtistDialog = true"
       ></q-btn>
     </div>

src/pages/nguoi-dung/index.vue

@@ -27,6 +27,7 @@
                   @click="openAddUserDialog"
                   :label="$t('crudActions.add')"
                   no-caps
+                  style="width: 100px"
                   color="primary"
                 ></q-btn>
               </div>