Merge branch 'develop' into devTee

.onedev-buildspec.yml

@@ -1,102 +1,103 @@
 version: 37
 jobs:
-  - name: CI for UAT
+- name: CI for UAT
-    steps:
+  steps:
-      - !CheckoutStep
+  - !CheckoutStep
-        name: checkout code
+    name: checkout code
-        cloneCredential: !DefaultCredential {}
+    cloneCredential: !DefaultCredential {}
-        withLfs: false
+    withLfs: false
-        withSubmodules: false
+    withSubmodules: false
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !GenerateChecksumStep
+  - !GenerateChecksumStep
-        name: generate package checksum
+    name: generate package checksum
-        files: package-lock.json yarn.lock
+    files: package-lock.json yarn.lock
-        targetFile: checksum
+    targetFile: checksum
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    condition: NEVER
-      - !SetupCacheStep
+  - !SetupCacheStep
-        name: set up npm cache
+    name: set up npm cache
-        key: node_modules_@file:checksum@
+    key: node_modules_@file:checksum@
-        loadKeys:
+    loadKeys:
-          - node_modules
+    - node_modules
-        paths:
+    paths:
-          - node_modules
+    - node_modules
-        uploadStrategy: UPLOAD_IF_NOT_HIT
+    uploadStrategy: UPLOAD_IF_NOT_HIT
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    condition: NEVER
-      - !SetBuildVersionStep
+  - !SetBuildVersionStep
-        name: set build version
+    name: set build version
-        buildVersion: "@tag@"
+    buildVersion: '@tag@'
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !CommandStep
+  - !CommandStep
-        name: build & test
+    name: build & test
-        runInContainer: true
+    runInContainer: true
-        image: node
+    image: node
-        interpreter: !DefaultInterpreter
+    interpreter: !DefaultInterpreter
-          commands: |
+      commands: |
-            npm install
+        npm install
-            npm run build
+        npm run build
-        useTTY: true
+    useTTY: true
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    condition: NEVER
-      - !BuildImageStep
+  - !BuildImageStep
-        name: build docker image
+    name: build docker image
-        dockerfile: ./docker/Dockerfile
+    dockerfile: ./docker/Dockerfile
-        output: !RegistryOutput
+    output: !RegistryOutput
-          tags: hrms-git.chin.in.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-mgt:latest
+      tags: hrms-git.chin.in.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-mgt:latest
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    platforms: linux/amd64
-    triggers:
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !TagCreateTrigger
+  triggers:
-        tags: uat-*
+  - !TagCreateTrigger
-        branches: main
+    tags: uat-*
-    retryCondition: never
+    branches: main
-    maxRetries: 3
+  retryCondition: never
-    retryDelay: 30
+  maxRetries: 3
-    timeout: 14400
+  retryDelay: 30
-  - name: CI for PROD
+  timeout: 14400
-    steps:
+- name: CI for PROD
-      - !CheckoutStep
+  steps:
-        name: checkout code
+  - !CheckoutStep
-        cloneCredential: !DefaultCredential {}
+    name: checkout code
-        withLfs: false
+    cloneCredential: !DefaultCredential {}
-        withSubmodules: false
+    withLfs: false
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    withSubmodules: false
-      - !GenerateChecksumStep
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-        name: generate package checksum
+  - !GenerateChecksumStep
-        files: package-lock.json yarn.lock
+    name: generate package checksum
-        targetFile: checksum
+    files: package-lock.json yarn.lock
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    targetFile: checksum
-      - !SetupCacheStep
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-        name: set up npm cache
+  - !SetupCacheStep
-        key: node_modules_@file:checksum@
+    name: set up npm cache
-        loadKeys:
+    key: node_modules_@file:checksum@
-          - node_modules
+    loadKeys:
-        paths:
+    - node_modules
-          - node_modules
+    paths:
-        uploadStrategy: UPLOAD_IF_NOT_HIT
+    - node_modules
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    uploadStrategy: UPLOAD_IF_NOT_HIT
-      - !SetBuildVersionStep
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-        name: set build version
+  - !SetBuildVersionStep
-        buildVersion: "@tag@"
+    name: set build version
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    buildVersion: '@tag@'
-      - !CommandStep
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-        name: build & test
+  - !CommandStep
-        runInContainer: true
+    name: build & test
-        image: node
+    runInContainer: true
-        interpreter: !DefaultInterpreter
+    image: node
-          commands: |
+    interpreter: !DefaultInterpreter
-            npm install
+      commands: |
-            npm run build
+        npm install
-        useTTY: true
+        npm run build
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    useTTY: true
-      - !BuildImageStep
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-        name: build docker image
+  - !BuildImageStep
-        dockerfile: ./docker/Dockerfile
+    name: build docker image
-        output: !RegistryOutput
+    dockerfile: ./docker/Dockerfile
-          tags: hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:latest
+    output: !RegistryOutput
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+      tags: hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:latest
-    triggers:
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !TagCreateTrigger
+  triggers:
-        tags: prod-*
+  - !TagCreateTrigger
-        branches: main
+    tags: prod-*
-    retryCondition: never
+    branches: main
-    maxRetries: 3
+  retryCondition: never
-    retryDelay: 30
+  maxRetries: 3
-    timeout: 14400
+  retryDelay: 30
+  timeout: 14400

src/modules/02_organization/components/MainView.vue

@@ -327,22 +327,31 @@ onMounted(async () => {
                 </div>
               </q-card>
 
-              <TreeTable
+              <q-card
-                v-if="nodeId !== ''"
+                falt
-                v-model:node-tree="nodeTree"
+                bordered
-                v-model:org-level="orgLevel"
+                class="q-mt-xs q-gutter-xs scroll"
-                v-model:tree-id="nodeId"
+                style="height: 72vh"
-                v-model:pos-master="posMaster"
+              >
-                v-model:req-master="reqMaster"
+                <div class="q-pa-sm">
-                v-model:total-page="totalPage"
+                  <TreeTable
-                v-model:org-root-id="orgRootId"
+                    v-if="nodeId !== ''"
-                v-model:total-data="totalData"
+                    v-model:node-tree="nodeTree"
-                :short-name="shortName"
+                    v-model:org-level="orgLevel"
-                :main-tree="mainTree"
+                    v-model:tree-id="nodeId"
-                :fetch-data-table="fetchDataTable"
+                    v-model:pos-master="posMaster"
-                :filter-keyword="filterKeyword"
+                    v-model:req-master="reqMaster"
-                :fetch-data-tree="fetchDataTree"
+                    v-model:total-page="totalPage"
-              />
+                    v-model:org-root-id="orgRootId"
+                    v-model:total-data="totalData"
+                    :short-name="shortName"
+                    :main-tree="mainTree"
+                    :fetch-data-table="fetchDataTable"
+                    :filter-keyword="filterKeyword"
+                    :fetch-data-tree="fetchDataTree"
+                  />
+                </div>
+              </q-card>
             </div>
             <div class="row col-12 items-center" v-else>
               <q-banner class="q-pa-lg col-12 text-center">

src/modules/05_placement/views/06_appointPromoteMain.vue

@@ -42,8 +42,6 @@ const position = ref<string>(""); //ตำแหน่ง
 const typeModal = ref<string | null>(null); //ประเภท popup แต่งตั้ง , เลื่อน , ย้าย
 const dataRows = ref<PersonData>();
 const personalId = ref<string>("");
-
-const filterRef = ref<any>(null);
 const listRecevice = ref<resData[]>([]); //ข้อมูลรายการแต่งตั้ง-เลื่อน-ย้าย
 const optionsType = ref<OpType[]>([]);
 const type = ref<string>("");
@@ -167,7 +165,7 @@ async function fecthlistappointment() {
       rowsData.value = response;
       // รายชื่อ ส่งไปออกคำสั่ง
       const listData = rows.value.filter(
-        (e: any) =>
+        (e: PersonData) =>
           e.root !== null &&
           e.status !== "REPORT" &&
           e.status !== "DONE" &&

src/modules/05_placement/views/07_appointEmployeeMain.vue

@@ -41,8 +41,6 @@ const posType = ref<string>(""); //ประเภทตำแหน่ง
 const posLevel = ref<string>(""); //ระดับตำแหน่ง
 const position = ref<string>(""); //ตำแหน่ง
 const dataRows = ref<PersonData>();
-
-const filterRef = ref<any>(null);
 const listRecevice = ref<resData[]>([]); //ข้อมูลรายการปรับระดับชั้นงานลูกจ้าง
 const optionsType = ref<OpType[]>([]);
 const type = ref<string>("");

src/modules/16_positionEmployee/views/main.vue

@@ -288,21 +288,30 @@ onMounted(() => {
                       </div>
                     </q-card>
 
-                    <TreeTable
+                    <q-card
-                      v-if="nodeId !== ''"
+                      falt
-                      v-model:node-tree="nodeTree"
+                      bordered
-                      v-model:org-level="orgLevel"
+                      class="q-mt-xs q-gutter-xs scroll"
-                      v-model:tree-id="nodeId"
+                      style="height: 72vh"
-                      v-model:pos-master="posMaster"
+                    >
-                      v-model:req-master="reqMaster"
+                      <div class="q-pa-sm">
-                      v-model:total-page="totalPage"
+                        <TreeTable
-                      v-model:total-data="totalData"
+                          v-if="nodeId !== ''"
-                      :short-name="shortName"
+                          v-model:node-tree="nodeTree"
-                      :main-tree="mainTree"
+                          v-model:org-level="orgLevel"
-                      :fetch-data-table="fetchDataTable"
+                          v-model:tree-id="nodeId"
-                      :fetch-data-tree="fetchDataTree"
+                          v-model:pos-master="posMaster"
-                      :filter-keyword="filterKeyword"
+                          v-model:req-master="reqMaster"
-                    />
+                          v-model:total-page="totalPage"
+                          v-model:total-data="totalData"
+                          :short-name="shortName"
+                          :main-tree="mainTree"
+                          :fetch-data-table="fetchDataTable"
+                          :fetch-data-tree="fetchDataTree"
+                          :filter-keyword="filterKeyword"
+                        />
+                      </div>
+                    </q-card>
                   </div>
                   <div class="row col-12 items-center" v-else>
                     <q-banner class="q-pa-lg col-12 text-center">