Merge branch 'nice_dev' into develop

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

@@ -31,7 +31,7 @@ const props = defineProps({
   orgLevel: Number,
   treeId: String,
   actionType: String,
-  rowId: String,
+  rowId: { type: String, default: "" },
   fetchDataTable: Function,
   getSummary: Function,
 });
@@ -781,6 +781,7 @@ async function emitSearch(keyword: string, typeSelect: string) {
                         label="คำค้น"
                         hide-bottom-space
                         :rules="[(val) => !!val || `กรุณากรอกคำค้น`]"
+                        @keydown.enter.prevent="searchInput()"
                       />
                     </div>
 

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();
+      await clearForm();
-      fetchType();
+      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]);
+        }
       }
     }
   }

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

@@ -176,7 +176,6 @@ watch(
           <TreeView
             v-model:nodeTree="nodeTree"
             v-model:nodeId="nodeId"
-            v-model:isLoad="isLoad"
             v-model:selected="selected"
             :fetchDataTree="fetchDataTree"
             :fetchDataTable="fetchDataTable"
@@ -209,9 +208,7 @@ watch(
                 class="row col-12 justify-between list-summary q-gutter-xs bg-grey-1 q-pb-xs q-pr-xs"
               >
                 <div class="row col q-pa-sm item">
-                  <div class="ellipsis">
+                  <div class="ellipsis">ตำแหน่งทั้งหมด</div>
-                    ตำแหน่งทั้งหมด
-                  </div>
                   <q-space />
                   <q-badge
                     color="secondary"

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

@@ -240,7 +240,7 @@ const dialogPosition = ref<boolean>(false);
  * @param id id
  */
 function onClickPosition(type: string, id: string) {
-  rowId.value = id;
+  rowId.value = id ? id : "";
   actionType.value = type;
   dialogPosition.value = !dialogPosition.value;
 }