Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

# Conflicts:
#	src/modules/14_KPI/views/round.vue

src/api/14_KPI/api.KPI.ts

@@ -88,7 +88,7 @@ export default {
   /**
    * ประกาศผล
    */
-  evaluationUser: `${KpiUser}/evaluation/list`,
+  evaluationUser: `${KpiUser}/evaluation/list-announce`,
   evaluationUserDone: `${KpiUser}/evaluation/done/kp7`,
   achievementDev: `${KpiUser}/achievement/development/admin`,
   achievementDevByid: (id: string) =>

src/modules/04_registryPerson/components/DialogDevelopmant.vue

@@ -142,6 +142,7 @@ const emType = computed(() => {
 });
 const formData = reactive<{
   year: number | null;
+  point: number | null;
   name: string;
   group: any[];
   target: string;
@@ -155,6 +156,7 @@ const formData = reactive<{
   year: null,
   name: "",
   group: [],
+  point: 0,
   target: "",
   isDevelopment70: false,
   isDevelopment20: false,
@@ -168,6 +170,7 @@ function close() {
   id.value = "";
 
   formData.name = "";
+  formData.point = 0;
   formData.group = [];
   formData.target = "";
   formData.isDevelopment70 = false;
@@ -197,7 +200,10 @@ watch(
     if (i) {
       showLoader();
       http
-        .get(config.API.kpiAchievementDevelop + `/registry/${emType.value}/${id.value}`)
+        .get(
+          config.API.kpiAchievementDevelop +
+            `/registry/${emType.value}/${id.value}`
+        )
         .then(async (res) => {
           const data = res.data.result;
           formData.year = data.selectTypeYear;
@@ -607,6 +613,12 @@ function filterOptionFn(val: string, update: Function) {
             </q-card>
           </div>
         </div>
+        <div class="row q-pa-sm justify-center">
+          <span class="text-body2 text-weight-bold">ผลการพัฒนา </span>
+          <div class="text-primary q-pl-md">
+            {{ formData.point }}
+          </div>
+        </div>
       </q-card-section>
     </q-card>
   </q-dialog>

src/modules/04_registryPerson/store.ts

@@ -88,6 +88,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     mode,
     formFilter,
     labelOption,
-    nodeData
+    nodeData,
   };
 });

src/modules/04_registryPerson/views/list.vue

@@ -143,9 +143,9 @@ function fetchDataPerson() {
     queryParams.type = empType.value;
   }
 
-  if (nodeData.node !== null && nodeData.nodeId !== null) {
-    queryParams.node = nodeData.node;
-    queryParams.nodeId = nodeData.nodeId;
+  if (store.nodeData.node !== null && store.nodeData.nodeId !== null) {
+    queryParams.node = store.nodeData.node;
+    queryParams.nodeId = store.nodeData.nodeId;
   }
   http
     .get(
@@ -256,12 +256,14 @@ async function selectType() {
         : "เลือกหน่วยงาน";
   } else {
     // แต่ถ้าประเภทเดิมระบบจะใช้ filter เดิมที่เคยค้นหาไว้
+
     if (
       store.formFilter.keyword != "" ||
       store.labelOption.posType != "ทั้งหมด" ||
       store.labelOption.posLevel != "ทั้งหมด" ||
-      store.formFilter.isShowRetire != null ||
-      store.formFilter.isProbation != null
+      store.formFilter.isShowRetire ||
+      store.formFilter.isProbation ||
+      store.nodeData.nodeId != null
     ) {
       store.formFilter.page = 1;
       fetchDataPerson();