From e557dba3b8d29c9ad789f8f5d51bdc6f02d461f3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 08 11월 2021 17:33:04 +0900
Subject: [PATCH] 업체 관리 항목 수정
---
src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js | 4
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 2
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 30 ++--
src/main/webapp/i18n/ko/global.json | 4
src/main/webapp/views/companyField/companyFieldModify.html | 135 ++++++++++++---------
src/main/webapp/views/companyField/companyFieldAdd.html | 134 ++++++++++++----------
6 files changed, 173 insertions(+), 136 deletions(-)
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 435db83..23233ec 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -800,7 +800,9 @@
"desc" : "鍮꾧퀬",
"failedToSelectCompanyFieldFullList" : "�뾽泥� 愿�由� 紐⑸줉 議고쉶 �떎�뙣",
"delete" : "�뾽泥� �궘�젣",
- "wantToDeleteSelectCompanyField" : "�꽑�깮�븳 �뾽泥대�� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �뾽泥대뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
+ "wantToDeleteSelectCompanyField" : "�꽑�깮�븳 �뾽泥대�� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �뾽泥대뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+ "failedCompanyFieldRegistration" : "�뾽泥� �벑濡� �떎�뙣",
+ "failedToDetailCompanyFieldModify" : "�뾽泥� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
},
"ispField" : {
"add" : "ISP �깮�꽦",
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index 58d1229..8019895 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
@@ -19,13 +19,14 @@
$scope.vm = {
form : {
name : "", //�뾽泥대챸
- companyType : "", //�뾽泥대텇瑜�
- profitYN : "", //�쁺由�/鍮꾩쁺由�
- industry : "", //�궛�뾽遺꾨쪟
- domain : "", //�룄硫붿씤
- email : "", //�씠硫붿씪
+ //companyType : "", //�뾽泥대텇瑜�
+ //profitYN : "", //�쁺由�/鍮꾩쁺由�
+ //industry : "", //�궛�뾽遺꾨쪟
+ //domain : "", //�룄硫붿씤
+ manager : "", //�떞�떦�옄
tel : "", //�쟾�솕踰덊샇
- desc : "" //硫붾え(鍮꾧퀬)
+ email : "", //�씠硫붿씪
+ memo : "" //鍮꾧퀬
}
};
@@ -43,13 +44,14 @@
var content = {
name : $rootScope.preventXss($scope.vm.form.name), // �뾽泥대챸
- companyType : $scope.vm.form.companyType, //�뾽泥대텇瑜�
- profitYN : $scope.vm.form.profitYN, //�쁺由�/鍮꾩쁺由�
- industry : $scope.vm.form.industry, //�궛�뾽遺꾨쪟
- domain : $scope.vm.form.domain, //�룄硫붿씤
- email : $scope.vm.form.email, //�씠硫붿씪
+ //companyType : $scope.vm.form.companyType, //�뾽泥대텇瑜�
+ //profitYN : $scope.vm.form.profitYN, //�쁺由�/鍮꾩쁺由�
+ //industry : $scope.vm.form.industry, //�궛�뾽遺꾨쪟
+ //domain : $scope.vm.form.domain, //�룄硫붿씤
+ manager : $scope.vm.form.manager, //�떞�떦�옄
tel : $scope.vm.form.tel, //�쟾�솕踰덊샇
- desc : $scope.vm.form.desc //硫붾え(鍮꾧퀬)
+ email : $scope.vm.form.email, //�씠硫붿씪
+ desc : $scope.vm.form.desc //鍮꾧퀬
};
CompanyField.add($resourceProvider.getContent(content,
@@ -58,10 +60,10 @@
if (result.data.message.status === "success") {
$scope.fn.cancel();
// 紐⑸줉 �솕硫� 媛깆떊
- $rootScope.$broadcast("getDepartmentList", {});
+ $rootScope.$broadcast("getPageList", {});
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedLevelRegistration"), result.data.message.message);
+ SweetAlert.error($filter("translate")("companyField.failedCompanyFieldRegistration"), result.data.message.message);
}
$rootScope.spinner = false;
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 0768ab3..4e80b88 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -139,7 +139,7 @@
$uibModal.open({
templateUrl : 'views/companyField/companyFieldAdd.html',
size : "md",
- controller : 'companyFieldModifyController',
+ controller : 'companyFieldAddController',
backdrop : 'static',
resolve : {
parameter : function () {
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
index 6c35b54..eca409e 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
@@ -55,7 +55,7 @@
}
}
else {
- SweetAlert.swal($filter("translate")("customField.failedToDetailUserDefinedFields"), result.data.message.message, "error"); // "�궗�슜�옄 �젙�쓽 �븘�뱶 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
+ SweetAlert.swal($filter("translate")("customField.failedToDetailCompanyFieldModify"), result.data.message.message, "error"); // "�뾽泥� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
}
});
}
@@ -89,7 +89,7 @@
$rootScope.$broadcast("getDepartmentList", {});
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedDepartmentRegistration"), result.data.message.message);
+ SweetAlert.error($filter("translate")("companyField.failedCompanyFieldRegistration"), result.data.message.message); //�뾽泥� �벑濡� �떎�뙣
}
$rootScope.spinner = false;
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index e4df3ef..9578e86 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -24,12 +24,12 @@
input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
autocomplete="off"
ng-model="vm.form.name"
- ng-maxlength="200"
- maxlength="200"
+ ng-maxlength="100"
+ maxlength="100"
required>
<!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
- <div class="row">
+ <!--<div class="row">
<div class="col-md-3">
<div class="form-group mb10">
<label for="companyFieldAddForm2" class="issue-label"> <span
@@ -101,64 +101,78 @@
ng-maxlength="200"
maxlength="200"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
- </div>
- <div class="form-group">
- <label for="companyFieldAddForm6" class="issue-label">
- <span translate="companyField.email">硫붿씪二쇱냼</span>
- </label>
- <input id="companyFieldAddForm6"
- name="email"
- type="text"
- class="form-control"
- kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
- autocomplete="off"
- ng-model="vm.form.email"
- ng-maxlength="200"
- maxlength="200"
- >
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
- </div>
- <div class="row">
- <div class="col-md-5">
- <div class="form-group">
- <label for="companyFieldAddForm7" class="issue-label">
- <span translate="companyField.tel">�뿰�씫泥�</span>
- </label>
- <input id="companyFieldAddForm7"
- name="tel"
- type="text"
- class="form-control"
- autofocus
- kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
- autocomplete="off"
- ng-model="vm.form.tel"
- ng-maxlength="200"
- maxlength="200"
- >
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
- </div>
+ <!–<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>–>
+ </div>-->
+ <div>
+ <div class="form-group">
+ <label for="companyFieldAddForm9" class="issue-label">
+ <span translate="companyField.manager">�떞�떦�옄</span>
+ </label>
+ <input id="companyFieldAddForm9"
+ name="manager"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.manager"
+ ng-maxlength="100"
+ maxlength="100"
+ >
+ <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
- <div class="col-md-7">
- <div class="form-group">
- <label for="companyFieldAddForm8" class="issue-label">
- <span translate="companyField.desc">硫붾え</span>
- </label>
- <input id="companyFieldAddForm8"
- name="desc"
- type="text"
- class="form-control"
- autofocus
- kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
- autocomplete="off"
- ng-model="vm.form.desc"
- ng-maxlength="200"
- maxlength="200"
- >
- </div>
+ </div>
+ <div>
+ <div class="form-group">
+ <label for="companyFieldAddForm7" class="issue-label">
+ <span translate="companyField.tel">�쟾�솕踰덊샇</span>
+ </label>
+ <input id="companyFieldAddForm7"
+ name="tel"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^0-9]"
+ autocomplete="off"
+ ng-model="vm.form.tel"
+ maxlength="20"
+ >
+ <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ </div>
+ </div>
+ <div>
+ <div class="form-group">
+ <label for="companyFieldAddForm6" class="issue-label">
+ <span translate="companyField.email">�씠硫붿씪</span>
+ </label>
+ <input id="companyFieldAddForm6"
+ name="email"
+ type="email"
+ class="form-control"
+ autocomplete="off"
+ maxLength="50"
+ ng-model="vm.form.email"
+ kr-input
+ ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
+ >
+ <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ </div>
+ </div>
+ <div>
+ <div class="form-group">
+ <label for="companyFieldAddForm8" class="issue-label">
+ <span translate="companyField.desc">鍮꾧퀬</span>
+ </label>
+ <input id="companyFieldAddForm8"
+ name="memo"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.memo"
+ ng-maxlength="200"
+ maxlength="200"
+ >
</div>
</div>
</form>
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index 5789270..7371acd 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -29,7 +29,7 @@
required>
<!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
- <div class="row">
+ <!--<div class="row">
<div class="col-md-3">
<div class="form-group mb10">
<label for="companyFieldAddForm2" class="issue-label"> <span
@@ -101,64 +101,83 @@
ng-maxlength="200"
maxlength="200"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
- </div>
- <div class="form-group">
- <label for="companyFieldAddForm6" class="issue-label">
- <span translate="companyField.email">硫붿씪二쇱냼</span>
- </label>
- <input id="companyFieldAddForm6"
- name="email"
- type="text"
- class="form-control"
- kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
- autocomplete="off"
- ng-model="vm.form.email"
- ng-maxlength="200"
- maxlength="200"
- >
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
- </div>
- <div class="row">
- <div class="col-md-5">
- <div class="form-group">
- <label for="companyFieldAddForm7" class="issue-label">
- <span translate="companyField.tel">�뿰�씫泥�</span>
- </label>
- <input id="companyFieldAddForm7"
- name="tel"
- type="text"
- class="form-control"
- autofocus
- kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
- autocomplete="off"
- ng-model="vm.form.tel"
- ng-maxlength="200"
- maxlength="200"
- >
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
- </div>
+ <!–<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>–>
+ </div>-->
+ <div class="col-md-7">
+ <div class="modal-body">
+ <label for="companyFieldAddForm9" class="issue-label">
+ <span translate="companyField.manager">�떞�떦�옄</span>
+ </label>
+ <input id="companyFieldAddForm9"
+ name="manager"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.manager"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
- <div class="col-md-7">
- <div class="form-group">
- <label for="companyFieldAddForm8" class="issue-label">
- <span translate="companyField.desc">硫붾え</span>
- </label>
- <input id="companyFieldAddForm8"
- name="desc"
- type="text"
- class="form-control"
- autofocus
- kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
- autocomplete="off"
- ng-model="vm.form.desc"
- ng-maxlength="200"
- maxlength="200"
- >
- </div>
+ </div>
+ <div class="col-md-7">
+ <div class="form-group">
+ <label for="companyFieldAddForm7" class="issue-label">
+ <span translate="companyField.tel">�쟾�솕踰덊샇</span>
+ </label>
+ <input id="companyFieldAddForm7"
+ name="tel"
+ type="text"
+ class="form-control"
+ autofocus
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.tel"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ </div>
+ </div>
+ <div class="col-md-7">
+ <div class="form-group">
+ <label for="companyFieldAddForm6" class="issue-label">
+ <span translate="companyField.email">�씠硫붿씪</span>
+ </label>
+ <input id="companyFieldAddForm6"
+ name="email"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.email"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ </div>
+ </div>
+ <div class="col-md-7">
+ <div class="form-group">
+ <label for="companyFieldAddForm8" class="issue-label">
+ <span translate="companyField.desc">鍮꾧퀬</span>
+ </label>
+ <input id="companyFieldAddForm8"
+ name="memo"
+ type="text"
+ class="form-control"
+ autofocus
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.memo"
+ ng-maxlength="200"
+ maxlength="200"
+ >
</div>
</div>
</form>
--
Gitblit v1.8.0