Merge branch 'develop' into nice_dev

src/modules/07_insignia/components/1_Proposals/listProposals.vue

@@ -75,7 +75,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "statusRoyal",
     align: "center",
-    label: "สถานะราชกิจจานุเบกษา",
+    label: "สถานะ",
     sortable: false,
     field: "statusRoyal",
     headerStyle: "font-size: 14px",
@@ -108,6 +108,7 @@ const fetchData = async () => {
         period_isActive: e.period_isActive,
         period_doc: e.period_doc,
         period_status: e.period_status.result,
+        statusRoyal: 'กำลังดำเนินการ'
       }));
     })
     .catch((e) => {
@@ -311,6 +312,13 @@ const paginationLabel = (start: string, end: string, total: string) => {
               >
                 {{ props.row.period_end }}
               </q-td>
+              <q-td
+                key="statusRoyal"
+                :props="props"
+                @click="clickEdit(props.row)"
+              >
+                {{ props.row.statusRoyal }}
+              </q-td>
               <q-td
                 key="period_isActive"
                 :props="props"
@@ -331,22 +339,6 @@ const paginationLabel = (start: string, end: string, total: string) => {
                   @click="clickEdit(props.row)"
                 />
               </q-td>
-              <q-td key="statusRoyal" :props="props">
-                <q-icon
-                  v-if="props.row.statusRoyal == 'ยังไม่ได้เสนอ'"
-                  name="mdi-timer-sand"
-                  color="orange"
-                  class="text-h5"
-                  @click="clickEdit(props.row)"
-                />
-                <q-icon
-                  v-else
-                  name="mdi-check"
-                  color="positive"
-                  class="text-h5"
-                  @click="clickEdit(props.row)"
-                />
-              </q-td>
               <q-td auto-width>
                 <q-btn
                   dense

src/modules/07_insignia/components/2_Manage/Tab1.vue

@@ -46,7 +46,7 @@ const checkboxData = ref<any>([
   { id: 1, name: "มีโทษทางวินัย", val: true },
   {
     id: 2,
-    name: "ไม่ได้เลื่อนเงินเดือน/ไม่ได้เลื่อนขั้นเงินเดือน เนื่องจากลาเกิน",
+    name: "ไม่ได้เลื่อนเงินเดือน/ไม่ได้เลื่อนขั้น เนื่องจากลาเกิน",
     val: false,
   },
   {

src/modules/10_order/components/step/step04.vue

@@ -31,7 +31,7 @@ const tab = ref<string>("main");
 const order = ref<string>("");
 const code = ref<string>("");
 const years = ref<number>(new Date().getDate());
-const date = ref<Date>(new Date());
+const date = ref<Date | null>(null);
 const fileOrder = ref<any>(null);
 const fileTailer = ref<any>(null);
 
@@ -161,8 +161,8 @@ const fetchAttachment = async (orderId: string) => {
       let response = res.data.result;
       order.value = response.orderNo;
       years.value = Number(response.orderYear);
-      if (response.date !== undefined) {
-        date.value = response.date;
+      if (response.signDate !== undefined && response.signDate != "") {
+        date.value = response.signDate;
       }
       if (response.orderFileUrl !== null) {
         OrderPDFUpload.value = response.orderFileUrl;