update

src/pages/danh-sach-booking-cho-duyet/index.vue

@@ -29,7 +29,7 @@
         clearable
       ></q-select>
     </div>
-    <div class="col-2 sreach">
+    <!-- <div class="col-2 sreach">
       <q-select
         v-model="sreachStatus"
         :options="ListStatusBooking"
@@ -40,8 +40,8 @@
         :label="$t('listBooking.titleColumnsTable.status')"
         clearable
       ></q-select>
-    </div>
-    <div class="col-2 sreach">
+    </div> -->
+    <!-- <div class="col-2 sreach">
       <q-select
         v-model="sreachPerformStatus"
         :options="ListPerformStatus"
@@ -52,7 +52,7 @@
         :label="$t('listBooking.titleColumnsTable.performStatus')"
         clearable
       ></q-select>
-    </div>
+    </div> -->
 
     <div class="col-2 sreach">
       <q-input
@@ -157,7 +157,7 @@
               v-if="rowData.row.approvalStatus === 0"
               flat
               round
-              size="1em"
+              size="0.9em"
               color="primary"
               icon="mdi-block-helper"
               @click="confirmRefusedBrowserCustomer(rowData.row.id)"
@@ -389,24 +389,24 @@ export default defineComponent({
       //   align: 'center',
       //   sortable: false,
       // },
-      {
-        name: 'status',
-        field: 'status',
-        required: true,
-        label: i18n.global.t('listBooking.titleColumnsTable.status'),
-        headerStyle: 'text-align: center !important; width: 8%',
-        align: 'center',
-        sortable: false,
-      },
-      {
-        name: 'performStatus',
-        field: 'performStatus',
-        required: true,
-        label: i18n.global.t('listBooking.titleColumnsTable.performStatus'),
-        headerStyle: 'text-align: center !important; width: 8%',
-        align: 'center',
-        sortable: false,
-      },
+      // {
+      //   name: 'status',
+      //   field: 'status',
+      //   required: true,
+      //   label: i18n.global.t('listBooking.titleColumnsTable.status'),
+      //   headerStyle: 'text-align: center !important; width: 8%',
+      //   align: 'center',
+      //   sortable: false,
+      // },
+      // {
+      //   name: 'performStatus',
+      //   field: 'performStatus',
+      //   required: true,
+      //   label: i18n.global.t('listBooking.titleColumnsTable.performStatus'),
+      //   headerStyle: 'text-align: center !important; width: 8%',
+      //   align: 'center',
+      //   sortable: false,
+      // },
       {
         name: 'approvalStatus',
         field: 'approvalStatus',
@@ -458,6 +458,9 @@ export default defineComponent({
     const sreachPerformStatus: Ref<
       { id: number; name: string; color: string } | undefined
     > = ref(undefined);
+
+   const date = ref(['', '']);
+
     const changePageSize = () => {
       pageIndex.value = 1;
       void getListBooking();
@@ -504,10 +507,7 @@ export default defineComponent({
       } catch (error) {}
     };
 
-    const date = ref([
-      moment(new Date()).format('DD/MM/YYYY'),
-      moment(new Date()).add(7, 'days').format('DD/MM/YYYY'),
-    ]);
+    
     const changeTime = () => {
       const startTime = Number(
         moment(date.value[0], 'DD/MM/YYYY').format('YYYYMMDD')
@@ -557,8 +557,15 @@ export default defineComponent({
             custId: sreachUserName.value?.id,
             status: sreachStatus.value?.id,
             performStatus: sreachPerformStatus.value?.id,
-            fromTime: moment(date.value[0], 'DD/MM/YYYY').format('DD/MM/YYYY'),
-            toTime: moment(date.value[1], 'DD/MM/YYYY').format('DD/MM/YYYY'),
+          
+            fromTime:
+              date.value[0] === ''
+                ? ''
+                : moment(date.value[0], 'DD/MM/YYYY').format('DD/MM/YYYY'),
+            toTime:
+              date.value[1] === ''
+                ? ''
+                : moment(date.value[1], 'DD/MM/YYYY').format('DD/MM/YYYY'),
           },
         })) as AxiosResponse<BaseResponseBody<PaginationResponse<ListBooking>>>;
         if (response.data.error.code === config.API_RES_CODE.OK.code) {

src/pages/danh-sach-booking-cho-huy/index.vue

@@ -5,7 +5,7 @@
       <q-separator vertical spaced />
     </div> -->
     <q-space></q-space>
-    <!-- <div class="col-2 sreach">
+    <div class="col-2 sreach">
       <q-select
         v-model="sreachArtist"
         :options="artistOptions"
@@ -29,30 +29,6 @@
         clearable
       ></q-select>
     </div>
-    <div class="col-2 sreach">
-      <q-select
-        v-model="sreachStatus"
-        :options="ListStatusBooking"
-        option-label="name"
-        option-value="id"
-        dense
-        outlined
-        :label="$t('listBooking.titleColumnsTable.status')"
-        clearable
-      ></q-select>
-    </div>
-    <div class="col-2 sreach">
-      <q-select
-        v-model="sreachPerformStatus"
-        :options="ListPerformStatus"
-        option-label="name"
-        option-value="id"
-        dense
-        outlined
-        :label="$t('listBooking.titleColumnsTable.performStatus')"
-        clearable
-      ></q-select>
-    </div>
 
     <div class="col-2 sreach">
       <q-input
@@ -113,9 +89,9 @@
           </q-icon>
         </template>
       </q-input>
-    </div> -->
+    </div>
 
-    <!-- <div class="col-auto">
+    <div class="col-auto">
       <q-btn
         class="q-mr-sm"
         color="primary"
@@ -125,7 +101,7 @@
         style="width: 100px"
       >
       </q-btn>
-    </div> -->
+    </div>
 
     <div class="col-12 q-mt-sm">
       <q-table
@@ -473,10 +449,7 @@ export default defineComponent({
       } catch (error) {}
     };
 
-    const date = ref([
-      moment(new Date()).format('DD/MM/YYYY'),
-      moment(new Date()).add(7, 'days').format('DD/MM/YYYY'),
-    ]);
+    const date = ref(['', '']);
     const changeTime = () => {
       const startTime = Number(
         moment(date.value[0], 'DD/MM/YYYY').format('YYYYMMDD')

src/pages/danh-sach-booking/index.vue

@@ -62,7 +62,7 @@
         option-value="id"
         dense
         outlined
-        :label="$t('listBooking.titleColumnsTable.performStatus')"
+        :label="'T.T Nghệ sĩ xác nhận'"
         clearable
       ></q-select>
     </div>
@@ -362,7 +362,7 @@ export default defineComponent({
         name: 'performStatus',
         field: 'performStatus',
         required: true,
-        label: i18n.global.t('listBooking.titleColumnsTable.performStatus'),
+        label:'T.T Nghệ sĩ xác nhận',
         headerStyle: 'text-align: center !important; width: 8%',
         align: 'center',
         sortable: false,
@@ -379,18 +379,18 @@ export default defineComponent({
     ];
 
     const ListStatusBooking = ref([
-      { id: 0, name: 'Chờ nhận', color: 'secondary' },
-      { id: 1, name: 'Đã nhận', color: 'info' },
-      { id: 2, name: 'Từ chối', color: 'warning' },
+      { id: 0, name: 'Chưa hoàn thành', color: 'secondary' },
+      { id: 1, name: 'Đã hoàn thành', color: 'info' },
+      { id: 2, name: 'Đã hủy', color: 'warning' },
+      { id: 3, name: 'Hết hạn', color: 'warning' },
+      { id: 4, name: 'Chờ hủy', color: 'warning' },
     ]);
 
     const ListPerformStatus = ref([
-      { id: 0, name: 'Chờ nhận', color: 'secondary' },
-      { id: 1, name: 'Đã thực hiện', color: 'info' },
-      { id: 2, name: 'Chưa thực hiện', color: 'warning' },
-      { id: 3, name: 'Hoãn lịch', color: 'warning' },
-      { id: 4, name: 'Hủy lịch', color: 'warning' },
-      { id: 5, name: 'Thay đổi lịch', color: 'secondary' },
+      { id: 0, name: 'Chưa xác nhận', color: 'secondary' },
+      { id: 1, name: 'Đã xác nhận', color: 'info' },
+      { id: 2, name: 'Từ chối', color: 'warning' },
+
     ]);
 
     const showDialog = ref(false);