From 4af75fe18d97960fabea0fadb28a69c01a038bc4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 25 1월 2022 17:01:37 +0900
Subject: [PATCH] - 파트너명 특수문자 입력 가능하도록 수정 - 이슈 import/export 시 파트너 정보 추가 - 이슈상세 - 메일 기록 추가
---
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index be4e4a0..33421f6 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -125,7 +125,7 @@
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.region")
- .setHWidth("bold")
+ .setHWidth("width-80-p bold")
.setDName("regionName")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
@@ -166,8 +166,8 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
result.data.data.forEach(function (data) {
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽�, 諛곗뿴 �삎�깭 �젣嫄�, 肄ㅻ쭏 湲곗� 以꾨컮轅�
if (data.tel != null && data.tel !== "") {
var tels = data.tel;
if (data.tel.indexOf("[") !== -1){
@@ -177,21 +177,26 @@
for (var i = 0; i < telArr.length; i++) {
let hyphen = telArr[i].trim();
- telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ if (hyphen.length < 9) {
+ telArr[i] = hyphen.replace(/^(\d{3,4})(\d{4})$/, "$1-$2");
+ } else {
+ telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ }
if (telArr[i] === "") {
telArr.splice(i,1);
}
}
data.tel = telArr.join();
+ data.tel = data.tel.replace(/\,/g,"</br>");
}
- });
-
- // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄�
- result.data.data.forEach(function (data) {
- if (data.email != null && data.email !== "") {
+ // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄� 諛� 肄ㅻ쭏 湲곗��쑝濡� 以꾨컮轅�
+ if ($rootScope.isDefined(data.email)) {
if (data.email.indexOf("[") !== -1){
data.email = data.email.substr(1, data.email.indexOf("]")-1);
}
+ if (data.email.indexOf(",") !== -1) {
+ data.email = data.email.replace(/\,/g,"</br>");
+ }
}
});
--
Gitblit v1.8.0