Merge branch 'develop' into dev-tee

src/modules/04_registry/components/Salary.vue

@@ -67,8 +67,8 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
-            </q-btn>
+                <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
+              </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -1566,6 +1566,9 @@ const fetchData = async () => {
       .get(config.API.profileSalaryId(profileId.value))
       .then((res) => {
         let data = res.data.result;
+        console.log(data);
+        
+
         rows.value = [];
         data.map((e: ResponseObject) => {
           rows.value.push({
@@ -1577,9 +1580,15 @@ const fetchData = async () => {
             oc: e.oc,
             ocId: e.ocId,
             position: e.position,
-            positionId: e.positionId,
+            positionId:
+              e.positionId !== "00000000-0000-0000-0000-000000000000"
+                ? e.positionId
+                : "",
             posNo: e.posNo,
-            posNoId: e.posNoId,
+            posNoId:
+              e.posNoId !== "00000000-0000-0000-0000-000000000000"
+                ? e.posNo
+                : "",
             positionLine: e.positionLine,
             positionLineId: e.positionLineId,
             positionPathSide: e.positionPathSide,

src/modules/07_insignia/components/5_Borrow/DialogForm.vue

@@ -90,7 +90,7 @@ const fecthlistInsignia = async () => {
   showLoader();
   let data = {
     insigniaTypeId: props.typeId,
-    insigniaNoteId: props.roundId,
+    insigniaNoteId: roundNo.value,
     insigniaId: "",
   };
   await http
@@ -102,6 +102,11 @@ const fecthlistInsignia = async () => {
       messageError($q, err);
     })
     .finally(() => {
+      cardid.value = "";
+      fullName.value = "";
+      brand.value = "";
+      OrganazationId.value = "";
+      reason.value = "";
       hideLoader();
     });
 };
@@ -206,7 +211,13 @@ const searchcardid = async () => {
       fullName.value = `${node.prefix} ${node.fullName}`;
       brand.value = node.requestInsignia;
       insigniaNoteProfileId.value = node.id;
-    } else notifyError($q, "ไม่พบข้อมูลการได้รับในรอบนี้");
+    } else {
+      notifyError($q, "ไม่พบข้อมูลการได้รับในรอบนี้");
+      fullName.value = "";
+      brand.value = "";
+      OrganazationId.value = "";
+      reason.value = "";
+    }
   }
 };