diff --git a/src/main/resources/static/res/front/js/biz/sell/add.js b/src/main/resources/static/res/front/js/biz/sell/add.js
index c03266c..4e63df1 100644
--- a/src/main/resources/static/res/front/js/biz/sell/add.js
+++ b/src/main/resources/static/res/front/js/biz/sell/add.js
@@ -127,7 +127,7 @@ let appVue = new Vue({
if($this.phoneNumber== ''){
alert('핸드폰번호를 입력하세요');
return false;
- }
+ }
if($this.phoneId== ''){
alert('핸드폰을 선택하세요');
return false;
@@ -181,9 +181,9 @@ let appVue = new Vue({
businessPartner : $this.businessPartner,
mobileCarrier : $this.mobileCarrier,
name : $this.name,
- phoneNumber : $this.phoneNumber,
+ phoneNumber : $this.phoneNumber.replaceAll('-', ''),
pname : $this.pname,
- pphoneNumber : $this.pphoneNumber,
+ pphoneNumber : $this.pphoneNumber.replaceAll('-', ''),
mainRatePlan : $this.mainRatePlan,
subRatePlan : $this.subRatePlan.toString(),
serialNumber : $this.serialNumber,
@@ -214,7 +214,7 @@ let appVue = new Vue({
//개통일 date로 변환
if($this.openingDate.length == 4){
- $this.openingDate = '2023' + $this.openingDate;
+ $this.openingDate = '2026' + $this.openingDate;
}
else if($this.openingDate.length == 6){
$this.openingDate = '20' + $this.openingDate;
@@ -225,7 +225,7 @@ let appVue = new Vue({
//개통일 date로 변환
if($this.payBackDay.length == 4){
- $this.payBackDay = '2023' + $this.payBackDay;
+ $this.payBackDay = '2026' + $this.payBackDay;
}
if($this.payBackDay.length == 6){
$this.payBackDay = '20' + $this.payBackDay;
@@ -254,6 +254,26 @@ let appVue = new Vue({
}
}
},
+
+ phoneNumberBlur: function (){
+ let $this = this;
+
+ if($this.phoneNumber.length == 11){
+ let numbers = $this.phoneNumber.replace(/[^0-9]/g, "")
+ .replace(/^(\d{3})(\d{4})(\d{4})$/, `$1-$2-$3`);
+ $this.phoneNumber = numbers;
+ }
+ },
+ pPhoneNumberBlur: function (){
+ let $this = this;
+
+ if($this.pphoneNumber.length == 11){
+ let numbers = $this.pphoneNumber.replace(/[^0-9]/g, "")
+ .replace(/^(\d{3})(\d{4})(\d{4})$/, `$1-$2-$3`);
+ $this.pphoneNumber = numbers;
+ }
+ },
+
birthdayChange: function (){
let $this = this;
if($this.birthday.length != 8){ //생일 입력 안됨
diff --git a/src/main/resources/static/res/front/js/biz/sell/info.js b/src/main/resources/static/res/front/js/biz/sell/info.js
index 30f10c4..8d38019 100644
--- a/src/main/resources/static/res/front/js/biz/sell/info.js
+++ b/src/main/resources/static/res/front/js/biz/sell/info.js
@@ -79,8 +79,12 @@ let appVue = new Vue({
let $this = this;
let fees = $this.getFees(x);
var settlementAmount = (x.faceValueRebate+x.guestMoney+x.addRebate) - (x.cashRebate+x.usim+fees);
-
- return moneyText(settlementAmount,'Y');
+
+ if(x.name == '김주호'){
+ return settlementAmount.toLocaleString('ko-KR');
+ }else{
+ return moneyText(settlementAmount,'Y');
+ }
},
getTex: function(x){
//정산금액 * 0.1 = 세금
@@ -103,8 +107,14 @@ let appVue = new Vue({
let $this = this;
var settlementAmount = Number($this.getSettlementAmount(x).replaceAll(',',''));
var middleMargin = (settlementAmount - (x.payBack+x.introductionPay+x.usim));
-
- return moneyText(middleMargin,'Y');
+ if(x.name == '정연미'){
+ debugger;
+ }
+ if(x.name == '김주호'){
+ return middleMargin.toLocaleString('ko-KR');
+ }else{
+ return moneyText(middleMargin,'Y');
+ }
},
getRealMargin: function(x){
//(중간마진-세금)+세금키핑 = 실마진 //세금키핑없음
@@ -112,8 +122,11 @@ let appVue = new Vue({
var middleMargin = Number($this.getMiddleMargin(x).replaceAll(',',''));
var tex = Number($this.getTex(x).replaceAll(',',''));
var realMargin = (middleMargin-tex);
-
- return moneyText(realMargin,'Y');
+ if(x.name == '김주호'){
+ return realMargin.toLocaleString('ko-KR');
+ }else{
+ return moneyText(realMargin,'Y');
+ }
},
callMoneyText: function(value){
return moneyText(value,'Y');
@@ -132,7 +145,8 @@ let appVue = new Vue({
},
getRealBondIssuanceAmount: function(x){
//채권발생액-유심비 = 실체권발생액
- let $this = this;
+ let $this = this;
+ if(x.name == '김경빈')debugger;
var bondIssuanceAmount = Number($this.getBondIssuanceAmount(x).replaceAll(',',''));
var realBondIssuanceAmount = (bondIssuanceAmount-x.usim);
@@ -148,7 +162,7 @@ let appVue = new Vue({
let $this = this;
if($this.searchDate.length == 2){
- $this.searchDate = '2023' + $this.searchDate;
+ $this.searchDate = '2026' + $this.searchDate;
}
else if($this.searchDate.length == 4){
$this.searchDate = '20' + $this.searchDate;
diff --git a/src/main/webapp/WEB-INF/view/sell/add.jsp b/src/main/webapp/WEB-INF/view/sell/add.jsp
index 8393245..028539f 100644
--- a/src/main/webapp/WEB-INF/view/sell/add.jsp
+++ b/src/main/webapp/WEB-INF/view/sell/add.jsp
@@ -107,6 +107,11 @@
※ 현금 페이백은 페이백(P/B)에 작성
※ 가이드 = P(현금수납 or 상품권)
+
+ ※ 할부 P 계산식
+ 출고가 - 공시지원금 - 전환지원금 = 단말기 구매가
+ -> 단말기 구매가 - 할부금 + 유통망 추가 지원금
+