Merge branch 'develop' into devTee

2024-10-29 14:21:09 +07:00 · 2024-10-29 14:21:09 +07:00 · fb9ee230b6
commit fb9ee230b6
parent 0e6c21f093 3b47f7fefc
12 changed files with 75 additions and 66 deletions
--- a/src/components/Workflow/Main.vue
+++ b/src/components/Workflow/Main.vue
@ -53,8 +53,8 @@ const typeSelectPerson = ref<string>("");
 //รายการระบบที่ต้องการ disable step 3 หรือรองสุดท้าย
 const displayArray = <string[]>[
  "REGISTRY_PROFILE",
-  "RETIREMENT_RESIFNATION",
-  "LEAVE_LIST",
+  "SYS_RETIREMENT",
+  "SYS_LEAVE_LIST",
 ];

 async function fetchCheckState() {
@ -113,7 +113,7 @@ function onChangeState() {
      .then(async () => {
        await fetchCheckState();
        if (
-          props.sysName === "PLACEMENT_TRANSFER" &&
+          props.sysName === "SYS_TRANSFER_REQ" &&
          state.value === itemState.value.length - 1
        ) {
          props.onUpdateStatus?.();
--- a/src/modules/02_organization/views/main.vue
+++ b/src/modules/02_organization/views/main.vue
@ -30,7 +30,6 @@ import DialogCreateCommandORG from "@/modules/18_command/components/DialogCreate
 const $q = useQuasar();
 const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin();
 const store = useOrganizational();
-const keycloakSystem = ref<string>("ORG_COMMAND");

 /** ตัวแปร*/
 const modalNewStructure = ref<boolean>(false); // เพิ่มโครงสร้าง
@ -130,7 +129,7 @@ function onClickHistory(id: string, name: string) {
 async function workflowSystem() {
  showLoader();
  http
-    .get(config.API.workflowKeycloakSystem(keycloakSystem.value))
+    .get(config.API.workflowKeycloakSystem("SYS_ORG"))
    .then((res) => {
      const data = res.data.result;
      store.isOfficer = data.isOfficer;
--- a/src/modules/05_placement/components/Other/OtherDetail.vue
+++ b/src/modules/05_placement/components/Other/OtherDetail.vue
@ -32,12 +32,8 @@ const {
  success,
 } = mixin;

-const isOfficer = ref<boolean | null>(null);
-const isStaff = ref<boolean | null>(null);
-
 const paramsId = route.params.id;
 const myForm = ref<QForm | null>(null);
-const roleAdmin = ref<boolean>(false);
 const dataProfile = ref<DataProfile>(); //ข้อมุลส่วนตัว
 const edit = ref<boolean>(false);
 const status = ref<string>("");
@ -143,27 +139,7 @@ const getClass = (val: boolean) => {
  };
 };

-async function getWorkFlow() {
-  showLoader();
-  await http
-    .get(config.API.workflowKeycloakSystem("ORG_COMMAND"))
-    .then(async (res) => {
-      const data = await res.data.result;
-      isOfficer.value = data.isOfficer;
-      isStaff.value = data.isStaff;
-      roleAdmin.value = data.isOfficer;
-      hideLoader();
-    })
-    .catch((e) => {
-      messageError($q, e);
-      hideLoader();
-    })
-    .finally(() => {});
-}
-
 onMounted(async () => {
-  getWorkFlow();
-
  fetchData();
 });
 </script>
--- a/src/modules/05_placement/components/Transfer/TransferDetail.vue
+++ b/src/modules/05_placement/components/Transfer/TransferDetail.vue
@ -696,7 +696,7 @@ onMounted(async () => {
      ref="workflowRef"
      v-model:is-check-data="isCheckData"
      :id="transferId"
-      :sys-name="'PLACEMENT_TRANSFER'"
+      :sys-name="'SYS_TRANSFER_REQ'"
      :onUpdateStatus="onUpdateStatus"
    />
  </div>
--- a/src/modules/06_retirement/components/resign/ResignReject.vue
+++ b/src/modules/06_retirement/components/resign/ResignReject.vue
@ -836,7 +836,7 @@ onMounted(async () => {
      ref="workflowRef"
      v-model:is-check-data="isCheckData"
      :id="id"
-      sys-name="RETIREMENT_RESIFNATION"
+      sys-name="SYS_RETIREMENT"
    />
  </div>

--- a/src/modules/07_insignia/components/3_result/DialogResults.vue
+++ b/src/modules/07_insignia/components/3_result/DialogResults.vue
@ -10,7 +10,8 @@ import config from "@/app.config";
 /**
 * import Type
 */
-import type { DataOption } from "@/modules/04_registry/components/profileType";
+// import type { DataOption } from "@/modules/04_registry/components/profileType";
+import type { OptionData } from "@/modules/07_insignia/interface/index/Main";

 import DialogHeader from "@/components/DialogHeader.vue";

@ -76,10 +77,10 @@ const affiliationReceived = ref<string>(""); //สังกัด ณ วัน
 const receivedate = ref<Date | null>(); //วันที่ได้รับพระราชทานเครื่องราชอิสริยาภรณ์
 const announceDate = ref<Date | null>(); //วันที่
 const invoiceDate = ref<Date | null>(null); //วันที่จ่ายใบกำกับ
-const filterinsigniaOp2 = ref<DataOption[]>([]); //ตัวเลือกเครื่องราชอิสริยาภรณ์
+const filterinsigniaOp2 = ref<OptionData[]>([]); //ตัวเลือกเครื่องราชอิสริยาภรณ์
 const employeeClass = ref<string>(""); //ขรก.สามัญ/ลูกจ้างประจำ
 //ประเภท ขรก.สามัญ/ลูกจ้างประจำ
-const employeeClassOps = ref<DataOption[]>([
+const employeeClassOps = ref<OptionData[]>([
  { id: "officer", name: "ข้าราชการ กทม.สามัญ" },
  { id: "employee", name: "ลูกจ้างประจำ" },
 ]);
@ -267,7 +268,7 @@ function filterSelector(val: string, update: Function, name: string) {
    if (name === "insigniaOp2") {
      brand.value = val ? "" : brand.value;
      filterinsigniaOp2.value = DataStore.insigniaOp2.filter(
-        (v: DataOption) => v.name.toLowerCase().indexOf(needle) > -1
+        (v: OptionData) => v.name.toLowerCase().indexOf(needle) > -1
      );
    }
  });
@ -486,6 +487,14 @@ watch(props, () => {
                        class="cursor-pointer"
                      />
                    </template>
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        color="primary"
+                      >
+                      </q-icon>
+                    </template>
                  </q-input>
                </template>
              </datepicker>
@ -578,6 +587,14 @@ watch(props, () => {
                        class="cursor-pointer"
                      />
                    </template>
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        color="primary"
+                      >
+                      </q-icon>
+                    </template>
                  </q-input>
                </template>
              </datepicker>
@ -651,6 +668,7 @@ watch(props, () => {
                borderless
                :enableTimePicker="false"
                week-start="0"
+                :readonly="disbleStatus"
              >
                <template #year="{ year }">
                  {{ year + 543 }}
--- a/src/modules/07_insignia/interface/response/Main.ts
+++ b/src/modules/07_insignia/interface/response/Main.ts
@ -61,9 +61,9 @@ interface ResponseInsigniaType {
 interface ResponseRecordLists {
  address: string;
  citizenId: string;
-  date: string | Date;
-  datePayment: string | Date;
-  dateReceive: string | Date;
+  date: Date;
+  datePayment: Date;
+  dateReceive: Date;
  dateReceiveInsignia: string;
  dateReturnInsignia: string;
  docReceiveInsignia: string;
--- a/src/modules/07_insignia/storeResult.ts
+++ b/src/modules/07_insignia/storeResult.ts
@ -93,7 +93,7 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
      prefix: e.prefix,
      position: e.position,
      status: status(e.status) ?? "",
-      dateReceive: e.dateReceive ?? date2Thai(e.dateReceive),
+      dateReceive: date2Thai(e.dateReceive),
      name: e.fullName,
      type: `${e.requestInsignia} (${
        type.value.find((item) => item.name === e.requestInsignia)?.shortName ||
@ -103,13 +103,13 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
        e.profileType === "" ? "officer" : e.profileType
      ),
      profileType: e.profileType === "" ? "officer" : e.profileType,
-      date: e.date ?? date2Thai(e.date),
+      date: date2Thai(e.date),
      volumeNo: e.volumeNo,
      section: e.section,
      page: e.page,
      number: e.no,
      vatnumber: e.number,
-      datepay: e.datePayment ?? date2Thai(e.datePayment),
+      datepay: date2Thai(e.datePayment),
      typepay: e.typePayment,
      address: e.address,
      dateReceiveInsignia: e.dateReceiveInsignia,
--- a/src/modules/07_insignia/views/03_ResultMain.vue
+++ b/src/modules/07_insignia/views/03_ResultMain.vue
@ -69,12 +69,12 @@ const dataModal = ref<DataPerson>(); //ช้อมูลที่ต้อง
 const filterRef = ref<QInput>();
 const filter = ref<string>("");
 const columns = ref<QTableProps["columns"]>([
-  {
-    name: "action",
-    align: "left",
-    label: "",
-    field: "",
-  },
+  // {
+  //   name: "action",
+  //   align: "left",
+  //   label: "",
+  //   field: "",
+  // },
  {
    name: "no",
    align: "left",
@ -403,7 +403,7 @@ function editData(data: DataPerson) {
 * ข้อมูล ไฟล์
 */
 const modelPerview = ref<boolean>(false);
-const rowspreview = ref<any>([]);
+const rowspreview = ref<any[]>([]);
 const typepreview = ref<string>("");
 const fileInsignia = ref<any>(null);

@ -560,6 +560,7 @@ onMounted(() => {
  <div class="toptitle text-dark col-12 row items-center">
    บันทึกผลการได้รับพระราชทานเครื่องราชอิสริยาภรณ์/การจ่ายใบกำกับ
  </div>
+
  <q-card
    flat
    bordered
@ -879,13 +880,17 @@ onMounted(() => {
            :pagination-label="paginationLabel"
            v-model:pagination="pagination"
          >
-            <template v-slot:body-cell="props">
-              <q-td :props="props">
-                <div v-if="props.col.name == 'no'">
-                  {{ props.rowIndex + 1 }}
-                </div>
-
-                <div v-else-if="props.col.name == 'action'">
+            <template v-slot:header="props">
+              <q-tr :props="props">
+                <q-th auto-width></q-th>
+                <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                  <span class="text-weight-medium">{{ col.label }}</span>
+                </q-th>
+              </q-tr>
+            </template>
+            <template v-slot:body="props">
+              <q-tr :props="props">
+                <q-td auto-width>
                  <q-btn
                    v-if="
                      checkPermission($route)?.attrIsGet &&
@ -915,11 +920,18 @@ onMounted(() => {
                  >
                    <q-tooltip> รับ-คืนเครื่องราชฯ</q-tooltip>
                  </q-btn>
-                </div>
-                <div v-else>
-                  {{ props.value }}
-                </div>
-              </q-td>
+                </q-td>
+
+                <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                  <div v-if="col.name == 'no'">
+                    {{ props.rowIndex + 1 }}
+                  </div>
+
+                  <div v-else>
+                    {{ col.value ? col.value : "-" }}
+                  </div>
+                </q-td>
+              </q-tr>
            </template>
          </d-table>
        </div>
@ -929,6 +941,7 @@ onMounted(() => {
      </q-tab-panel>
    </q-tab-panels>
  </q-card>
+
  <q-card v-else>
    <div class="q-pa-md q-gutter-sm">
      <q-banner inline-actions rounded class="bg-grey-1 text-center">
@ -961,7 +974,7 @@ onMounted(() => {

  <!-- ยืนยันรายการข้อมูล -->
  <q-dialog v-model="modelPerview">
-    <q-card style="width: 850px; max-width: 80vw">
+    <q-card style="min-width: 80vw">
      <DialogHeader tittle="ยืนยันรายการข้อมูล" :close="closeDialogPerview" />
      <q-card-section class="q-pt-none">
        <d-table
@ -977,7 +990,7 @@ onMounted(() => {
                {{ props.rowIndex + 1 }}
              </div>
              <div v-else>
-                {{ props.value ? props.value: "-" }}
+                {{ props.value ? props.value : "-" }}
              </div>
            </q-td>
          </template>
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@ -808,7 +808,7 @@ onMounted(async () => {
              ref="workflowRef"
              :id="paramsId"
              v-model:is-check-data="isCheckData"
-              sys-name="LEAVE_LIST"
+              sys-name="SYS_LEAVE_LIST"
            />
          </div>
        </div>
--- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
@ -709,7 +709,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {

          <!-- Workflow -->
          <div class="col-xs-12 col-sm-12">
-            <WorkFlow ref="workflowRef" :id="paramsId" sys-name="LEAVE_LIST" />
+            <WorkFlow
+              ref="workflowRef"
+              :id="paramsId"
+              sys-name="SYS_LEAVE_LIST"
+            />
          </div>
        </div>
      </div>
--- a/src/modules/17_acting/views/main.vue
+++ b/src/modules/17_acting/views/main.vue
@ -29,7 +29,6 @@ const { showLoader, hideLoader, messageError, dialogRemove } =
  useCounterMixin();

 /** โครงสร้าง*/
-const keycloakSystem = ref<string>("ORG_COMMAND");
 const expanded = ref<Array<string>>([]);
 const filter = ref<string>("");
 const nodeTree = ref<DataTree[]>([]);
@ -261,7 +260,7 @@ function onDelete(id: string) {
 function getWorkFlow() {
  showLoader();
  http
-    .get(config.API.workflowKeycloakSystem(keycloakSystem.value))
+    .get(config.API.workflowKeycloakSystem("SYS_ACTING"))
    .then((res) => {
      const data = res.data.result;
      storeActing.isOfficer = data.isOfficer;