Merge branch 'develop' into devTee

src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue

@@ -115,7 +115,7 @@ async function getData() {
       data.status = dataGet.status;
       data.descriptionSuspend = dataGet.descriptionSuspend
         ? dataGet.descriptionSuspend
-        : "ออกจากราชการ";
+        : "";
       data.startDateSuspend = dataGet.startDateSuspend;
       data.endDateSuspend = dataGet.endDateSuspend;
       data.title = dataGet.title;

src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue

@@ -22,7 +22,14 @@ const dataStore = useDisciplineSuspendStore();
 const $q = useQuasar();
 const router = useRouter();
 const mixin = useCounterMixin();
-const { messageError, showLoader, hideLoader, success, date2Thai ,convertDateToAPI} = mixin;
+const {
+  messageError,
+  showLoader,
+  hideLoader,
+  success,
+  date2Thai,
+  convertDateToAPI,
+} = mixin;
 
 const date = ref<any>(null);
 const employeeClass = ref<string>("");
@@ -304,11 +311,9 @@ onMounted(async () => {
                   class="bg-white"
                   dense
                   outlined
-                  :label="`${'ช่วงวันที่'}`"
+                  :label="`${'วันที่เริ่มต้น-สิ้นสุดคำสั่ง'}`"
                   :model-value="
-                    date
-                      ? `${date2Thai(date[0])} - ${date2Thai(date[1])}`
-                      : 'ทั้งหมด'
+                    date ? `${date2Thai(date[0])} - ${date2Thai(date[1])}` : ''
                   "
                 >
                   <template v-slot:prepend>