Merge branch 'develop' into setthawut

# Conflicts:
#	src/modules/05_command/views/lists.vue

.github/workflows/release.yaml

@@ -75,7 +75,7 @@ jobs:
             -Success✅✅✅
             Image: ${{env.IMAGE_NAME}}
             Version: ${{ steps.gen_ver.outputs.IMAGE_VER }}
-            By: ${{secrets.DOCKER_USER}}
+            By: ${{github.actor}}
       - uses: snow-actions/line-notify@v1.1.0
         if: failure()
         with:
@@ -84,4 +84,4 @@ jobs:
             -Failure❌❌❌
             Image: ${{env.IMAGE_NAME}}
             Version: ${{ steps.gen_ver.outputs.IMAGE_VER }}
-            By: ${{secrets.DOCKER_USER}}
+            By: ${{github.actor}}

src/api/02_organizational/api.organization.ts

@@ -8,7 +8,7 @@ const orgEmployeePos = `${env.API_URI}/org/employee/pos`;
 export default {
   /** โครงสร้างอัตรากำลัง*/
   activeOrganization: `${organization}/active`,
-  orgByid: (id: string) => `${organization}/${id}`,
+  orgByid: (id: string) => `${organization}/admin/${id}`,
   createOrganization: `${organization}/draft`,
   createOrgLevel: (type: string) => `${organization}/${type}`,
   orgLevelByid: (type: string, id: string) => `${organization}/${type}/${id}`,
@@ -27,7 +27,7 @@ export default {
   orgPosLevel: `${orgPos}/level`,
   orgPosMaster: `${orgPos}/master`,
   orgPosMasterById: (id: string) => `${orgPos}/master/${id}`,
-  orgPosMasterList: `${orgPos}/master/list`,
+  orgPosMasterList: `${orgPos}/admin/master/list`,
   orgPosSort: `${orgPos}/sort`,
   orgPosMove: `${orgPos}/move`,
   organizationShortName: `${organization}/sort`,

src/modules/05_command/components/ViewPdf.vue

@@ -82,13 +82,17 @@ async function fetchDocumentTemplate(dataTemple: DataTemplateDetail) {
   };
 
   await axios
-    .post(config.API.reportTemplate + `/${typeFile.value}`, body, {
-      headers: {
-        accept: "application/pdf",
-        "content-Type": "application/json",
-      },
-      responseType: "blob",
-    })
+    .post(
+      config.API.reportTemplate + `/${typeFile.value}?folder=command`,
+      body,
+      {
+        headers: {
+          accept: "application/pdf",
+          "content-Type": "application/json",
+        },
+        responseType: "blob",
+      }
+    )
     .then(async (res) => {
       isLoadPDF.value = false;
       const blob = new Blob([res.data]);
@@ -123,7 +127,7 @@ async function uploadTemplate() {
       await axios
         .post(
           config.API.reportTemplate +
-            `/${typeFile.value}/upload?report_name=${reportName}`,
+            `/${typeFile.value}/upload?report_name=${reportName}&folder=command`,
           documentFile.value,
           {
             headers: {
@@ -163,7 +167,7 @@ async function downloadTemplate() {
     : dataTemplateDetail.value.fileAttachment);
   await axios
     .post(
-      config.API.reportTemplate + `/${typeFile.value}/download`,
+      config.API.reportTemplate + `/${typeFile.value}/download?folder=command`,
       {
         template: check,
       },

src/modules/05_command/views/lists.vue

@@ -31,7 +31,7 @@ const childTemplateDetailRef = ref<InstanceType<typeof TemplateDetail> | null>(
   null
 ); //ref components ข้อความต้นแบบ
 const childPageOrderRef = ref<InstanceType<typeof PageOrder> | null>(null); //ref components คำสั่ง
-
+  
 // Tabs
 const tabs = ref<Tabs[]>([
   {
@@ -265,11 +265,10 @@ onMounted(async () => {
           <q-space />
           <div class="col-12 col-md-6 q-py-sm">
             <div class="row items-center no-wrap justify-end">
-              <q-badge
-                outline
-                :color="`${isActive ? `primary` : `orange`}`"
-                :label="`${isActive ? `Active` : `InActive`}`"
-              />
+              <q-label
+                :class="`${isActive ? `text-primary` : `text-orange`}`"
+                >{{ `${isActive ? `ใช้งาน` : `ไม่ใช้งาน`}` }}</q-label
+              >
               <label :class="`q-ml-lg toggle-control`">
                 <input type="checkbox" v-model="isActive" />
                 <span class="control"></span>

src/modules/05_command/views/salaryLists.vue

@@ -304,11 +304,10 @@ onMounted(() => {
                 <q-space />
 
                 <div class="row items-center no-wrap">
-                  <q-badge
-                    outline
-                    :color="`${isActive ? `primary` : `orange`}`"
-                    :label="`${isActive ? `ใช้` : `ไม่ใช้`}งาน`"
-                  />
+                  <q-label
+                    :class="`${isActive ? `text-primary` : `text-orange`}`"
+                    >{{ `${isActive ? `ใช้งาน` : `ไม่ใช้งาน`}` }}</q-label
+                  >
                   <label :class="`q-ml-lg toggle-control`">
                     <input type="checkbox" v-model="isActive" />
                     <span class="control"></span>

src/plugins/genreport.ts

@@ -12,7 +12,7 @@ const { showLoader, hideLoader, messageError } = mixin;
 async function genReport(data: any, fileName: string, type: string = "docx") {
   showLoader();
   await axios
-    .post(`${config.API.reportTemplate}/docx/html`, data, {
+    .post(`${config.API.reportTemplate}/docx`, data, {
       headers:
         type == "docx"
           ? {