update

Web-Manage/src/app/DPU/company-management/emp-borrow-manage/emp-borrow-manage.component.html

-<app-page-header [title]="'การเบิกอุปกรณ์'" [activeTitle]="'ผู้ดูแลระบบ'" [title1]="'การเบิกอุปกรณ์'"></app-page-header>
+<app-page-header [title]="'การเบิกอุปกรณ์'" [activeTitle]="'ผู้ใช้งาน'" [title1]="'การเบิกอุปกรณ์'"></app-page-header>
 
 <div class="grid grid-cols-12 gap-x-6">
   <div class="xl:col-span-12 col-span-12">

Web-Manage/src/app/DPU/company-management/emp-borrow-return-status/emp-borrow-return-status.component.html

@@ -89,7 +89,7 @@
               </tr>
             </thead>
             <tbody>
-              @for(product of filteredList; track product.peId){
+              @for(product of filteredList;track filterList){
              <tr class="product-list">
                 <td>{{ product.project_equipment?.project?.project_name }}
                 </td>
@@ -125,7 +125,7 @@
                     {{ getStatusText(product.status) }}
                   </span>
                 </td>
-                <td>{{ product.approved_by_member?.getFullname() || "-" }}</td>
+                <td>{{ product.approved_by_member?.getFullname()}}</td>
 
                 <td>
                   <div class="flex gap-1">
@@ -209,7 +209,7 @@
               id="deal-name"
               placeholder="ชื่ออุปกรณ์"
               [ngModel]="
-                selectedBorrowItem.project_equipment?.equipment?.equipmentName
+                selectedBorrowItem.project_equipment.equipment.equipmentName
               "
             />
           </div>
@@ -276,7 +276,7 @@
               readonly
               type="text"
               class="form-control"
-              [value]="selectedBorrowItem.member?.getFullname() || '-'"
+              [value]="selectedBorrowItem.member.getFullname() || '-'"
             />
           </div>
 
@@ -286,7 +286,7 @@
               readonly
               type="text"
               class="form-control"
-              [value]="selectedBorrowItem.member?.phoneNumber || '-'"
+              [value]="selectedBorrowItem.member.phoneNumber || '-'"
             />
           </div>
 
@@ -298,8 +298,7 @@
               type="text"
               class="form-control"
               [value]="
-                selectedBorrowItem.project_equipment?.equipment
-                  ?.equipmentName || '-'
+                selectedBorrowItem.project_equipment.equipment.equipmentName
               "
             />
           </div>

Web-Manage/src/app/DPU/company-management/emp-borrow-status/emp-borrow-status.component.html

@@ -66,7 +66,6 @@
           </div>
         </div>
       </div>
-
       <div class="box-body">
         <div class="table-responsive">
           <table class="table whitespace-nowrap table-bordered min-w-full">

Web-Manage/src/app/DPU/models/borrow-transactions.ts

@@ -35,4 +35,14 @@ export class BorrowTransactionsModel extends BaseModel {
     this.approved_by_member = data?.approved_by_member ? new UserProfileModel(data.approved_by_member) : new UserProfileModel();
     this.project_equipment = data?.project_equipment ? new ProjectEquipmentModel(data.project_equipment) : new ProjectEquipmentModel();
   }
+
+  getStatusText(): string {
+    switch(this.status) {
+      case 'requested': return 'รออนุมัติ';
+      case 'approved': return 'อนุมัติแล้ว';
+      case 'rejected': return 'ไม่อนุมัติ';
+      case 'returned': return 'คืนแล้ว';
+      default: return this.status;
+    }
+  }
 }