From 6bb671d3a5a3fc3ebcd1c10ea1e45bf9f3634b91 Mon Sep 17 00:00:00 2001
From: Park Byung Eun <geekdev@naver.com>
Date: Wed, 17 Aug 2022 01:57:05 +0000
Subject: [PATCH] bug fixed

---
 .../withdraw/components/list.component.html   | 137 +++++++++---------
 .../withdraw/components/list.component.ts     |   2 +-
 2 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.html b/src/app/modules/admin/bank/withdraw/components/list.component.html
index 49e6827..8e96912 100644
--- a/src/app/modules/admin/bank/withdraw/components/list.component.html
+++ b/src/app/modules/admin/bank/withdraw/components/list.component.html
@@ -35,6 +35,24 @@
   </div>
 
   <!-- Search -->
+  <div class="flex items-center mt-2 mb-2 ml-6">
+    <div>
+      <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
+        환전처리
+      </button>
+    </div>
+    <div>
+      <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
+        대기처리
+      </button>
+    </div>
+    <div>
+      <button mat-flat-button class="bet-mat-small-8" [color]="'warn'">
+        환전취소
+      </button>
+    </div>
+  </div>
+  <hr style="margin: 7px 0px" />
   <div
     *ngIf="__isSearchOpened"
     class="relative flex flex-col sm:flex-row flex-0 sm:items-center sm:justify-between py-4 px-6 md:px-8 border-b"
@@ -91,21 +109,6 @@
   </div>
   <!-- Main -->
   <div class="flex flex-auto overflow-hidden">
-    <div>
-      <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
-        환전처리
-      </button>
-    </div>
-    <div>
-      <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
-        대기처리
-      </button>
-    </div>
-    <div>
-      <button mat-flat-button class="bet-mat-small-8" [color]="'warn'">
-        환전취소
-      </button>
-    </div>
     <!-- Products list -->
     <div
       class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
@@ -120,31 +123,44 @@
               <div>
                 <mat-checkbox></mat-checkbox>
               </div>
-              <div>상부</div>
+
               <div>
+                구분
+                <hr style="margin: 7px 0px" />
                 아이디
                 <hr style="margin: 7px 0px" />
                 닉네임
               </div>
-              <div>
-                등급
-                <hr style="margin: 7px 0px" />
-                레벨
-                <hr style="margin: 7px 0px" />
-                상태
-              </div>
-              <div class="hidden sm:block">예금주</div>
-              <div>정산종류</div>
-              <div>비고</div>
               <div>환전신청금액</div>
+              <div>정산종류</div>
+              <div>
+                은행명
+                <hr style="margin: 7px 0px" />
+                계좌번호
+                <hr style="margin: 7px 0px" />
+                예금주
+              </div>
+              <div>비고</div>
               <div class="hidden md:block">
                 등록날짜
                 <hr style="margin: 7px 0px" />
                 처리날짜
               </div>
-              <div class="hidden md:block">입금출금</div>
-              <div class="hidden lg:block">회원정보</div>
-              <div class="hidden lg:block">배팅정보</div>
+              <div class="hidden md:block">
+                입금
+                <hr style="margin: 7px 0px" />
+                출금
+                <hr style="margin: 7px 0px" />
+                보유금
+              </div>
+              <div class="hidden lg:block">
+                상위
+                <hr style="margin: 7px 0px" />
+                회원정보
+                <hr style="margin: 7px 0px" />
+                배팅정보
+              </div>
+              <div class="hidden lg:block">상태</div>
               <div class="hidden lg:block">삭제</div>
             </div>
             <!-- Rows -->
@@ -158,8 +174,10 @@
                   <div>
                     <mat-checkbox></mat-checkbox>
                   </div>
-                  <div>{{ withdraw.highRank }}</div>
+
                   <div>
+                    {{ withdraw.highRank }}
+                    <hr style="margin: 7px 0px" />
                     <div
                       (click)="viewUserDetail(withdraw.id!)"
                       style="cursor: pointer"
@@ -169,32 +187,43 @@
                     <hr style="margin: 7px 0px" />
                     {{ withdraw.nickname }}
                   </div>
+                  <!--환전신청금액-->
+                  <div>{{ withdraw.exchangeApplicationAmount }}</div>
+                  <!--정산종류-->
+                  <div>{{ withdraw.calculateType }}</div>
+
                   <div>
+                    <!-- 은행명, 계좌번호, 예금주-->
                     {{ withdraw.rank }}
                     <hr style="margin: 7px 0px" />
                     LV{{ withdraw.level }}
                     <hr style="margin: 7px 0px" />
-                    {{ withdraw.state }}
-                  </div>
-                  <div class="hidden sm:block">
                     {{ withdraw.accountHolder }}
                   </div>
-                  <div>{{ withdraw.calculateType }}</div>
+                  <!-- 비고 -->
                   <div>{{ withdraw.note }}</div>
-                  <div>{{ withdraw.exchangeApplicationAmount }}</div>
+
                   <div class="hidden md:block">
                     {{ withdraw.registrationDate }}
                     <hr style="margin: 7px 0px" />
                     {{ withdraw.processDate }}
                   </div>
                   <div class="hidden md:block">
-                    입금{{ withdraw.deposit }}
+                    {{ withdraw.deposit }}
                     <hr style="margin: 7px 0px" />
-                    출금{{ withdraw.withdraw }}
+                    {{ withdraw.withdraw }}
                     <hr style="margin: 7px 0px" />
-                    계{{ withdraw.totalMoney }}
+                    {{ withdraw.totalMoney }}
                   </div>
                   <div class="hidden lg:block">
+                    <button
+                      mat-flat-button
+                      class="bet-mat-small-8"
+                      [color]="'primary'"
+                    >
+                      {{ withdraw.highRank }}
+                    </button>
+                    <hr style="margin: 7px 0px" />
                     <button
                       mat-flat-button
                       class="bet-mat-small-8"
@@ -202,25 +231,18 @@
                     >
                       회원정보
                     </button>
-                  </div>
-                  <div class="hidden lg:block">
+                    <hr style="margin: 7px 0px" />
                     <button
                       mat-flat-button
                       class="bet-mat-small-8"
                       [color]="'primary'"
                     >
-                      배팅정보
-                    </button>
-                  </div>
-                  <div class="hidden lg:block">
-                    <button
-                      mat-flat-button
-                      class="bet-mat-small-8"
-                      [color]="'primary'"
-                    >
-                      취소
+                      배팅리스트
                     </button>
                   </div>
+
+                  <div class="hidden lg:block">완료</div>
+                  <div class="hidden lg:block">삭제</div>
                 </div>
               </ng-container>
             </ng-container>
@@ -246,20 +268,5 @@
         </div>
       </ng-template>
     </div>
-    <div>
-      <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
-        환전처리
-      </button>
-    </div>
-    <div>
-      <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
-        대기처리
-      </button>
-    </div>
-    <div>
-      <button mat-flat-button class="bet-mat-small-8" [color]="'warn'">
-        환전취소
-      </button>
-    </div>
   </div>
 </div>
diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.ts b/src/app/modules/admin/bank/withdraw/components/list.component.ts
index 1c4dc47..bb52195 100644
--- a/src/app/modules/admin/bank/withdraw/components/list.component.ts
+++ b/src/app/modules/admin/bank/withdraw/components/list.component.ts
@@ -52,7 +52,7 @@ import { Router } from '@angular/router';
         }
 
         @screen lg {
-          grid-template-columns: 60px 60px auto 112px 96px 96px 72px;
+          grid-template-columns: 40px 140px auto 80px 140px 40px 120px 120px 120px 40px 40px;
         }
       }
     `,