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

src/modules/05_placement/components/PersonalList/DialogOrders.vue

@@ -187,6 +187,7 @@ function saveOrder() {
 
 function filterSelectOrder() {
   const data = props.rows ? props.rows : [];
+  selected.value = [];
   rows.value = data.filter((v: any) => {
     switch (commandType.value) {
       case "C-PM-01":
@@ -327,6 +328,7 @@ watch(
               keep-color
               color="primary"
               dense
+              :disable="commandType"
               v-model="scope.selected"
             />
           </template>
@@ -337,6 +339,7 @@ watch(
                   keep-color
                   color="primary"
                   dense
+                  :disable="commandType"
                   v-model="props.selected"
                 />
               </q-td>

src/modules/05_placement/components/PersonalList/PersonalListPage.vue

@@ -50,7 +50,7 @@ async function getStat() {
         contain: statCard.contain,
         disclaim: statCard.disclaim,
       };
-      DataStore.checkLoad(1)
+      DataStore.checkLoad(1);
     })
     .catch((e) => {
       messageError($q, e);
@@ -65,7 +65,6 @@ async function fetchPlacementData() {
     .get(config.API.MainDetail(0))
     .then(async (res) => {
       DataStore.DataMainOrig = await res.data.result;
-      DataStore.checkLoad(1)
     })
     .catch((e) => {
       messageError($q, e);

src/modules/05_placement/store.ts

@@ -188,7 +188,8 @@ export const usePlacementDataStore = defineStore("placement", () => {
   let count = 0; // ตัวแปรนับจำนวนค่าที่รับ
   function checkLoad(val: number) {
     count += val;
-    if (count >= 3) {
+    DataMainOrig.value.length == 0;
+    if (count >= 2) {
       hideLoader();
       count = 0;
     }