Merge branch 'nice_dev' into develop

src/modules/02_organizationalNew/components/DialogSelectPerson.vue

@@ -377,10 +377,10 @@ function clearPosition() {
 /** callback function ทำงานเมื่อเปิด popup*/
 watch(
   () => modal.value,
-  () => {
+  async () => {
     if (modal.value == true) {
-      clearForm();
-      fetchType();
+      await clearForm();
+      await fetchType();
 
       if (props.dataDetailPos) {
         formData.positionNo = props.dataDetailPos.posMasterNo;
@@ -402,6 +402,9 @@ watch(
             : "-",
           positionArea: e.positionArea ? e.positionArea : "-",
         }));
+        if (row.value.length === 1) {
+          selected.value.push(row.value[0]);
+        }
       }
     }
   }