เพิ่มแสดงตำแหน่งติดเงื่อนไข

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

@@ -367,7 +367,6 @@ onMounted(async () => {
                   map-options
                   :options="columns"
                   option-value="name"
-                  
                   style="min-width: 140px"
                 />
               </div>
@@ -402,7 +401,10 @@ onMounted(async () => {
                   :key="col.name"
                   :props="props"
                   @click="onClickSelectPos(props.row.id)"
-                  :class="props.row.id === positionId ? 'bg-blue-2' : ''"
+                  :class="{
+                    'bg-blue-2': props.row.id === positionId,
+                    'text-red': props.row.isCondition === true,
+                  }"
                 >
                   <div v-if="col.name == 'no'">
                     {{ props.rowIndex + 1 }}

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

@@ -160,6 +160,7 @@ async function fetchDataTable(id: string, level: number = 0) {
         const newUse = positionUse.value.filter(
           (e) => e !== props.dataRow?.posmasterId
         );
+
         positionNo.value = posMain.filter((e: any) => !newUse.includes(e.id));
       } else {
         positionNo.value = posMain.filter(
@@ -266,6 +267,7 @@ function clearData() {
   posType.value = null;
   posLevel.value = "";
   isPosition.value = "exam";
+  filterTree.value = "";
 }
 
 /** callback function เมื่อมีการเปิด popup*/
@@ -403,7 +405,7 @@ onMounted(() => {
               default-expand-all
               :nodes="lazy"
               node-key="orgTreeId"
-              label-key="orgTreeName"
+              label-key="labelName"
               :filter="filterTree"
               no-results-label="ไม่พบข้อมูลที่ค้นหา"
               no-nodes-label="ไม่มีข้อมูล"