diff --git a/src/app/mock-api/apps/bank/web-calculate/data.ts b/src/app/mock-api/apps/bank/web-calculate/data.ts index 8e2642d..99a605e 100644 --- a/src/app/mock-api/apps/bank/web-calculate/data.ts +++ b/src/app/mock-api/apps/bank/web-calculate/data.ts @@ -2,57 +2,43 @@ export const webCalculates = [ { - rank: '회원', - level: 4, - id: 'aa100', - nickname: 'aa100', - paymentDue: 50000, - calculateType: '롤링', - accountHolder: '광주은행2sss', - note: '@', - registrationDate: '2022-06-18 13:14', - processDate: '000-0-0 0:0', - deposit: 41200000, - withdraw: 19000000, - total: 22200000, - gameMoney: 67131, - highRank: '[매장]kgon5', - state: '신청', + id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c', + webDepositIdx: 1, + webDepositId: 'onon6', + webDepositNickname: '가가가', + webDepositRank: '회원', + nameOfDepositer: '가가가', + webDepositAmountOfPayment: 100000, + webDepositRegistrationDate: '2022-06-13 12:57', + webDepositComfirmDate: '2022-06-13 12:58', + + webWithdrawIdx: 1, + webWithdrawId: 'aa100', + webWithdrawNickname: 'aa100', + webWithdrawRank: '회원', + accountHolder: '광주은행 예금주22 565656565656', + webWithdrawAmountOfPayment: 5000000, + webWithdrawRegistrationDate: '2022-06-08 18:31', + webWithdrawConfirmDate: '2022-06-12 20:13', }, { - rank: '회원', - level: 1, - id: 'onon6', - nickname: '가가가', - paymentDue: 100000, - calculateType: '롤링', - accountHolder: '가가가', - note: '', - registrationDate: '2022-06-13 12:57', - processDate: '2022-06-13 12:58', - deposit: 200000, - withdraw: 0, - total: 200000, - gameMoney: 0, - highRank: '[매장]on04', - state: '완료', - }, - { - rank: '회원', - level: 1, - id: 'onon6', - nickname: '가가가', - paymentDue: 100000, - calculateType: '롤링', - accountHolder: '가가가', - note: '', - registrationDate: '2022-06-13 12:56', - processDate: '2022-06-13 12:57', - deposit: 200000, - withdraw: 0, - total: 200000, - gameMoney: 0, - highRank: '[매장]on04', - state: '완료', + id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c', + webDepositIdx: 2, + webDepositId: 'onon6', + webDepositNickname: '가가가', + webDepositRank: '회원', + nameOfDepositer: '가가가', + webDepositAmountOfPayment: 100000, + webDepositRegistrationDate: '2022-06-13 12:56', + webDepositComfirmDate: '2022-06-13 12:57', + + webWithdrawIdx: 2, + webWithdrawId: 'aa100', + webWithdrawNickname: 'aa100', + webWithdrawRank: '회원', + accountHolder: '광주은행 예금주22 565656565656', + webWithdrawAmountOfPayment: 14000000, + webWithdrawRegistrationDate: '2022-06-10 18:31', + webWithdrawConfirmDate: '2022-06-10 20:13', }, ]; diff --git a/src/app/modules/admin/bank/deposit/components/list.component.html b/src/app/modules/admin/bank/deposit/components/list.component.html index 327e835..895812a 100644 --- a/src/app/modules/admin/bank/deposit/components/list.component.html +++ b/src/app/modules/admin/bank/deposit/components/list.component.html @@ -22,7 +22,7 @@ - +
-
웹 입/출금정산
+
웹 입출금 정산
- - - - - + + +
+ + +
+ +
- - - 카지노콤프 - 슬롯콤프 - 배팅콤프 - 첫충콤프 - - - - + + 아이디 닉네임 - 이름 - 사이트 - 파트너수동지급 - +
+
웹입금
-
-
- - - - - - - - - - - - - - - - - -
@@ -123,200 +101,103 @@
- - diff --git a/src/app/modules/admin/bank/web-calculate/components/list.component.ts b/src/app/modules/admin/bank/web-calculate/components/list.component.ts index b8e5fd7..b8b1bf6 100644 --- a/src/app/modules/admin/bank/web-calculate/components/list.component.ts +++ b/src/app/modules/admin/bank/web-calculate/components/list.component.ts @@ -35,24 +35,28 @@ import { WebCalculatePagination } from '../models/web-calculate-pagination'; import { WebCalculateService } from '../services/web-calculate.service'; @Component({ - selector: 'bank-list', + selector: 'web-calculate-list', templateUrl: './list.component.html', styles: [ /* language=SCSS */ ` .inventory-grid { - grid-template-columns: 60px auto 40px; + /* 번호 아이디 등급 입금자 결제 */ + grid-template-columns: 40px 140px 100px auto 140px; @screen sm { - grid-template-columns: 60px auto 60px 72px; + /* 번호 아이디 등급 입금자 결제 신청 */ + grid-template-columns: 40px 140px 100px auto 140px 140px; } @screen md { - grid-template-columns: 60px 60px auto 112px 72px; + /* 번호 아이디 등급 입금자 결제 신청 */ + grid-template-columns: 40px 140px 100px auto 140px 140px; } @screen lg { - grid-template-columns: 60px 60px auto 112px 96px 96px 72px; + /* 번호 아이디 등급 입금자 결제 신청 */ + grid-template-columns: 40px 100px auto 40px 140px 140px; } } `, @@ -68,6 +72,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { webCalculates$!: Observable; users$!: Observable; + __isSearchOpened = false; isLoading = false; searchInputControl = new FormControl(); selectedWebCalculate?: WebCalculate; @@ -180,6 +185,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { */ __toggleDetails(productId: string): void {} + /** + * toggle the search + * Used in 'bar' + */ + __onClickSearch(): void { + this.__isSearchOpened = !this.__isSearchOpened; + } + /** * Track by function for ngFor loops * diff --git a/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts b/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts index 4ad295a..91a6335 100644 --- a/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts +++ b/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts @@ -1,18 +1,20 @@ export interface WebCalculate { - id?: string; - rank?: string; - level?: string; - nickname?: string; - paymentDue?: number; - calculateType?: string; + id: string; + webDepositIdx?: number; // 웹입금 idx + webDepositId?: string; // 웹입금 아이디 + webDepositNickname?: string; // 웹입금 닉네임 + webDepositRank?: string; // 웹입금 등급 + nameOfDepositer?: string; // 입금자명 + webDepositAmountOfPayment?: number; // 웹입금 결제금액 + webDepositRegistrationDate?: Date; // 웹입금 신청일 + webDepositComfirmDate?: Date; // 웹입금 확인일 + + webWithdrawIdx?: number; // 웹출금 idx + webWithdrawId?: string; // 웹출금 아이디 + webWithdrawNickname?: string; // 웹출금 닉네임 + webWithdrawRank?: string; // 웹출금 등급 accountHolder?: string; - note?: string; - registrationDate?: string; - processDate?: string; - deposit?: number; - withdraw?: number; - total?: number; - gameMoney?: number; - highRank?: string; - state?: string; + webWithdrawAmountOfPayment?: number; // 웹출금 결제금액 + webWithdrawRegistrationDate?: Date; // 웹출금 신청일 + webWithdrawConfirmDate?: Date; // 웹출금 확인일 }