From 37a8f89d5062e1882c1581bfbfe8664ee4846d60 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 08 11월 2021 20:20:01 +0900
Subject: [PATCH] 업체 관리 프론트 수정
---
src/main/webapp/views/companyField/companyFieldList.html | 14 ++--
src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js | 85 +++++++++++++++-------------
src/main/webapp/i18n/ko/global.json | 3
src/main/webapp/views/companyField/companyFieldModify.html | 42 +++++++-------
4 files changed, 75 insertions(+), 69 deletions(-)
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 23233ec..6923aa0 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -802,7 +802,8 @@
"delete" : "�뾽泥� �궘�젣",
"wantToDeleteSelectCompanyField" : "�꽑�깮�븳 �뾽泥대�� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �뾽泥대뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
"failedCompanyFieldRegistration" : "�뾽泥� �벑濡� �떎�뙣",
- "failedToDetailCompanyFieldModify" : "�뾽泥� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
+ "failedToDetailCompanyFieldModify" : "�뾽泥� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
+ "pleaseEnterCompanyFieldName": "�뾽泥대챸�쓣 �엯�젰�븯�꽭�슂."
},
"ispField" : {
"add" : "ISP �깮�꽦",
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
index eca409e..9da36d8 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
@@ -8,8 +8,8 @@
'angular'
],
function (app, angular) {
- app.controller('companyFieldModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'CompanyField', 'parameter', 'SweetAlert', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, CompanyField, parameter, SweetAlert, $filter) {
+ app.controller('companyFieldModifyController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'CompanyField', 'parameter', 'SweetAlert', '$filter', '$q',
+ function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, CompanyField, parameter, SweetAlert, $filter, $q) {
$scope.fn = {
detail : detail, // �긽�꽭 議고쉶
@@ -22,43 +22,12 @@
id : parameter.id,
form : {
name : "", //�뾽泥대챸
- companyType : "", //�뾽泥대텇瑜�
- profitYN : "", //�쁺由�/鍮꾩쁺由�
- industry : "", //�궛�뾽遺꾨쪟
- domain : "", //�룄硫붿씤
- email : "", //�씠硫붿씪
+ manager : "", //�떞�떦�옄
tel : "", //�쟾�솕踰덊샇
- desc : "" //硫붾え(鍮꾧퀬)
+ email : "", //�씠硫붿씪
+ memo : "" //硫붾え(鍮꾧퀬)
}
};
-
- // �긽�꽭 �젙蹂�
- function detail() {
- var conditions = {
- id : parameter.id
- }
-
- CompanyField.detail($resourceProvider.getContent(
- conditions,
- $resourceProvider.getPageContent(0, 1))).then(function (result) {
-
- if (result.data.message.status === "success") {
- if (angular.isDefined(result.data.data)) {
- $scope.vm.form.name = result.data.data.name;
- $scope.vm.form.companyType = result.data.data.companyType;
- $scope.vm.form.profitYN = result.data.data.profitYN;
- $scope.vm.form.industry = result.data.data.industry;
- $scope.vm.form.domain = result.data.data.domain;
- $scope.vm.form.email = result.data.data.email;
- $scope.vm.form.tel = result.data.data.tel;
- $scope.vm.form.desc = result.data.data.desc;
- }
- }
- else {
- SweetAlert.swal($filter("translate")("customField.failedToDetailCompanyFieldModify"), result.data.message.message, "error"); // "�뾽泥� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
- }
- });
- }
function formCheck(formInvalid) {
if (formInvalid) {
@@ -74,11 +43,18 @@
var content = {
id : parameter.id,
- departmentName : $rootScope.preventXss($scope.vm.form.departmentName),
- departmentDescription : $rootScope.preventXss($scope.vm.form.departmentDescription)
+ name : $rootScope.preventXss($scope.vm.form.name),
+ /*companyType : $rootScope.preventXss($scope.vm.form.companyType),
+ profitYN : $rootScope.preventXss($scope.vm.form.profitYN),
+ industry : $rootScope.preventXss($scope.vm.form.industry),
+ domain : $rootScope.preventXss($scope.vm.form.domain),*/
+ manager : $rootScope.preventXss($scope.vm.form.manager),
+ tel : $rootScope.preventXss($scope.vm.form.tel),
+ email : $rootScope.preventXss($scope.vm.form.email),
+ memo : $rootScope.preventXss($scope.vm.form.memo)
};
- UserWorkspace.departmentModify($resourceProvider.getContent(
+ CompanyField.modify($resourceProvider.getContent(
content,
$resourceProvider.getPageContent(0, 0))).then(function (result) {
@@ -86,7 +62,7 @@
$scope.fn.cancel();
// 紐⑸줉 �솕硫� 媛깆떊
- $rootScope.$broadcast("getDepartmentList", {});
+ $rootScope.$broadcast("getPageList", {});
}
else {
SweetAlert.error($filter("translate")("companyField.failedCompanyFieldRegistration"), result.data.message.message); //�뾽泥� �벑濡� �떎�뙣
@@ -104,6 +80,35 @@
$(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
}
+ // �긽�꽭 �젙蹂�
+ function detail() {
+ var deferred = $q.defer();
+
+ var conditions = {
+ id : parameter.id
+ }
+
+ CompanyField.detail($resourceProvider.getContent(
+ conditions,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ if (angular.isDefined(result.data.content)) {
+ $scope.vm.form.name = result.data.content.name;
+ $scope.vm.form.manager = result.data.content.manager;
+ $scope.vm.form.email = result.data.content.email;
+ $scope.vm.form.tel = result.data.content.tel;
+ $scope.vm.form.memo = result.data.content.memo;
+ }
+ }
+ else {
+ SweetAlert.swal($filter("translate")("customField.failedToDetailCompanyFieldModify"), result.data.message.message, "error"); // "�뾽泥� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
+ }
+ deferred.resolve(result.data.data);
+ });
+ return deferred.promise;
+ }
+
$scope.fn.detail();
}]);
diff --git a/src/main/webapp/views/companyField/companyFieldList.html b/src/main/webapp/views/companyField/companyFieldList.html
index d1a5d7c..acd7c68 100644
--- a/src/main/webapp/views/companyField/companyFieldList.html
+++ b/src/main/webapp/views/companyField/companyFieldList.html
@@ -13,20 +13,20 @@
<div class="row">
<div class="col-sm-12">
<div class="searchdiv">
- <form name="customFieldListForm" role="form" ng-enter="fn.getPageList(0)">
+ <form name="companyFieldListForm" role="form" ng-enter="fn.getPageList(0)">
<div class="row">
<div class="col-lg-3">
<div class="form-group">
- <label for="customFieldListForm1"><span translate="companyField.name">�궗�슜�옄 �젙�쓽 �븘�뱶 紐�</span></label>
+ <label for="companyFieldListForm1"><span translate="companyField.name">�궗�슜�옄 �젙�쓽 �븘�뱶 紐�</span></label>
<input type="text"
name="name"
- id="customFieldListForm1"
+ id="companyFieldListForm1"
autocomplete="off"
maxlength="15"
kr-input
owl-auto-focus
class="form-control"
- ng-model="vm.search.name" placeholder="{{'customField.pleaseEnterUserDefinedFieldName' | translate}}">
+ ng-model="vm.search.name" placeholder="{{'companyField.pleaseEnterCompanyFieldName' | translate}}">
</div>
</div>
@@ -66,8 +66,8 @@
</div>
<div class="col-5 text-right" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')">
<form class="form-inline justify-content-sm-end pull-right" method="post"
- action="/customField/downloadExcel"
- name="customFieldListForm">
+ action="/companyField/downloadExcel"
+ name="companyFieldListForm">
<input type="hidden" name="conditions">
<div class="btn-group">
<button aria-expanded="false" aria-haspopup="true"
@@ -76,7 +76,7 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start">
- <a class="dropdown-item cursor" form-submit="customFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" form-submit="companyFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
<a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
</div>
</div>
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index b9a7793..fab3375 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -9,13 +9,13 @@
</div>
<div class="modal-body">
- <form role="form" name="companyFieldAddForm">
+ <form role="form" name="companyFieldModifyForm">
<div class="form-group">
- <label for="companyFieldAddForm1">
+ <label for="companyFieldModifyForm1">
<span translate="companyField.name">�뾽泥대챸</span>
<code class="highlighter-rouge">*</code>
</label>
- <input id="companyFieldAddForm1"
+ <input id="companyFieldModifyForm1"
name="name"
type="text"
class="form-control"
@@ -32,10 +32,10 @@
<!--<div class="row">
<div class="col-md-3">
<div class="form-group mb10">
- <label for="companyFieldAddForm2" class="issue-label"> <span
+ <label for="companyFieldModifyForm2" class="issue-label"> <span
translate="companyField.company">�뾽泥� 遺꾨쪟</span>
</label>
- <select id="companyFieldAddForm2"
+ <select id="companyFieldModifyForm2"
name="companyType"
class="form-control input-sm issue-select-label"
ng-model="vm.form.companyType"
@@ -50,10 +50,10 @@
</div>
<div class="col-md-3">
<div class="form-group mb10">
- <label for="companyFieldAddForm3" class="issue-label">
+ <label for="companyFieldModifyForm3" class="issue-label">
<span translate="companyField.profitYN">�쁺由�/鍮꾩쁺由�</span>
</label>
- <select id="companyFieldAddForm3"
+ <select id="companyFieldModifyForm3"
name="profitYN"
class="form-control input-sm issue-select-label"
ng-model="vm.form.profitYN"
@@ -68,10 +68,10 @@
</div>
<div class="col-md-6">
<div class="form-group mb10">
- <label for="companyFieldAddForm4" class="issue-label"> <span
+ <label for="companyFieldModifyForm4" class="issue-label"> <span
translate="companyField.industry">�궛�뾽 遺꾨쪟</span>
</label>
- <input id="companyFieldAddForm4"
+ <input id="companyFieldModifyForm4"
name="industry"
type="text"
class="form-control"
@@ -87,10 +87,10 @@
</div>
<div class="form-group">
- <label for="companyFieldAddForm5" class="issue-label">
+ <label for="companyFieldModifyForm5" class="issue-label">
<span translate="companyField.domain">�룄硫붿씤</span>
</label>
- <input id="companyFieldAddForm5"
+ <input id="companyFieldModifyForm5"
name="domain"
type="text"
class="form-control"
@@ -105,10 +105,10 @@
</div>-->
<div>
<div class="form-group">
- <label for="companyFieldAddForm9" class="issue-label">
+ <label for="companyFieldModifyForm9" class="issue-label">
<span translate="companyField.manager">�떞�떦�옄</span>
</label>
- <input id="companyFieldAddForm9"
+ <input id="companyFieldModifyForm9"
name="manager"
type="text"
class="form-control"
@@ -124,10 +124,10 @@
</div>
<div>
<div class="form-group">
- <label for="companyFieldAddForm7" class="issue-label">
+ <label for="companyFieldModifyForm7" class="issue-label">
<span translate="companyField.tel">�쟾�솕踰덊샇</span>
</label>
- <input id="companyFieldAddForm7"
+ <input id="companyFieldModifyForm7"
name="tel"
type="text"
class="form-control"
@@ -142,10 +142,10 @@
</div>
<div>
<div class="form-group">
- <label for="companyFieldAddForm6" class="issue-label">
+ <label for="companyFieldModifyForm6" class="issue-label">
<span translate="companyField.email">�씠硫붿씪</span>
</label>
- <input id="companyFieldAddForm6"
+ <input id="companyFieldModifyForm6"
name="email"
type="email"
class="form-control"
@@ -160,10 +160,10 @@
</div>
<div>
<div class="form-group">
- <label for="companyFieldAddForm8" class="issue-label">
+ <label for="companyFieldModifyForm8" class="issue-label">
<span translate="companyField.desc">鍮꾧퀬</span>
</label>
- <input id="companyFieldAddForm8"
+ <input id="companyFieldModifyForm8"
name="memo"
type="text"
class="form-control"
@@ -182,8 +182,8 @@
<button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.cancel">痍⑥냼</span></button>
<button type="button" class="btn btn-md btn-primary bold"
js-short-cut
- js-short-cut-action="(fn.formCheck(companyFieldAddForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
- ng-disabled="fn.formCheck(companyFieldAddForm.$invalid)"
+ js-short-cut-action="(fn.formCheck(companyFieldModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ ng-disabled="fn.formCheck(companyFieldModifyForm.$invalid)"
ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
</button>
</div>
--
Gitblit v1.8.0