From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경
---
src/main/webapp/scripts/app/issue/issueModify.controller.js | 83 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 94a67ae..d5395d2 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -60,7 +60,7 @@
issueCompanyFields : [], // �뾽泥댁젙蹂�
issueIspFields : [], // ISP �젙蹂�
issueHostingFields : [], // �샇�뒪�똿�젙蹂�
- issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒
+ issueTypeId : parameter.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
issueStatusId : "", // �씠�뒋 �긽�깭 �븘�씠�뵒
@@ -435,6 +435,27 @@
return false;
}
+ $scope.$on("companyTypeEvent", function (event, result) {
+ $scope.vm.form.companyTypeId = result[0].id;
+ });
+ $scope.$on("parentSectorEvent", function (event, result) {
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ }
+
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ });
+ $scope.$on("childSectorEvent", function (event, result) {
+ $scope.vm.form.childSectorId = result[0].id;
+ });
+ $scope.$on("regionEvent", function (event, result) {
+ $scope.vm.form.regionId = result[0].id;
+ });
+ $scope.$on("statusEvent", function (event, result) {
+ $scope.vm.form.statusId = result[0].id;
+ });
+
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
var ispFieldVo = result[0].ispFieldVo;
@@ -477,6 +498,7 @@
$scope.vm.hostingMemo = "";
if (ispFieldVo != null){
+ $scope.vm.form.issueIspFields[0] = angular.copy(ispFieldVo);
$scope.vm.ispId = ispFieldVo.id;
$scope.vm.ispName = ispFieldVo.name;
$scope.vm.ispCode = ispFieldVo.code;
@@ -487,6 +509,7 @@
$scope.vm.ispMemo = ispFieldVo.memo;
}
if (hostingFieldVo != null){
+ $scope.vm.form.issueHostingFields[0] = angular.copy(hostingFieldVo);
$scope.vm.hostingId = hostingFieldVo.id;
$scope.vm.hostingName = hostingFieldVo.name;
$scope.vm.hostingCode = hostingFieldVo.code;
@@ -538,46 +561,46 @@
companyTypeId : (function () {
var companyTypeId = -1;
- if ($scope.vm.form.companyType !== "" && $scope.vm.form.companyTypeId !== "" && $scope.vm.form.companyTypeId !== -1) {
- companyTypeId = $scope.vm.form.companyTypeId;
- }else if ($scope.vm.form.companyTypes != null) {
+ if ($scope.vm.form.companyTypes != null) {
companyTypeId = $scope.vm.form.companyTypes[0].id;
+ } else {
+ companyTypeId = $scope.vm.form.companyTypeId;
}
return companyTypeId;
})(),
parentSectorId : (function () {
var parentSectorId = -1;
- if ($scope.vm.form.parentSector !== "" && $scope.vm.form.parentSectorId !== "" && $scope.vm.form.parentSectorId !== -1) {
- parentSectorId = $scope.vm.form.parentSectorId;
- }else if ($scope.vm.form.parentSectors != null) {
+ if ($scope.vm.form.parentSectors != null) {
parentSectorId = $scope.vm.form.parentSectors[0].id;
+ } else {
+ parentSectorId = $scope.vm.form.parentSectorId;
}
return parentSectorId;
})(),
childSectorId : (function () {
var childSectorId = -1;
- if ($scope.vm.form.childSector !== "" && $scope.vm.form.childSectorId !== "" && $scope.vm.form.childSectorId !== -1) {
- childSectorId = $scope.vm.form.childSectorId;
- }else if ($scope.vm.form.childSectors != null) {
+ if ($scope.vm.form.childSectors != null) {
childSectorId = $scope.vm.form.childSectors[0].id;
+ } else {
+ childSectorId = $scope.vm.form.childSectorId;
}
return childSectorId;
})(),
regionId : (function () {
var regionId = -1;
- if ($scope.vm.form.region !== "" && $scope.vm.form.regionId !== "" && $scope.vm.form.regionId !== -1) {
- regionId = $scope.vm.form.regionId;
- }else if ($scope.vm.form.regions != null) {
+ if ($scope.vm.form.regions != null) {
regionId = $scope.vm.form.regions[0].id;
+ } else {
+ regionId = $scope.vm.form.regionId;
}
return regionId;
})(),
statusId : (function () {
var statusId = -1;
- if ($scope.vm.form.status !== "" && $scope.vm.form.statusId !== "" && $scope.vm.form.statusId !== -1) {
- statusId = $scope.vm.form.statusId;
- }else if ($scope.vm.form.statuses != null) {
+ if ($scope.vm.form.statuses != null) {
statusId = $scope.vm.form.statuses[0].id;
+ } else {
+ statusId = $scope.vm.form.statusId;
}
return statusId;
})(),
@@ -677,7 +700,11 @@
issueCompanyFields : (function () {
var issueCompanyFields = [];
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0 ){
+
var companyField = $scope.vm.form.issueCompanyFields[0];
+ if (companyField.name !== $scope.vm.companyName) { //�궗�슜�옄媛� 吏곸젒 �뾽泥� 異붽� �븷 寃쎌슦
+ return issueCompanyFields;
+ }
issueCompanyFields.push({
id : companyField.id,
@@ -688,11 +715,11 @@
email :$scope.vm.companyEmail,
url :$scope.vm.companyUrl,
memo : $scope.vm.companyMemo,
- companyTypeId : companyField.companyTypeId,
- parentSectorId : companyField.parentSectorId,
- childSectorId : companyField.childSectorId,
- regionId : companyField.regionId,
- statusId : companyField.statusId
+ companyTypeId : $scope.vm.form.companyTypeId,
+ parentSectorId : $scope.vm.form.parentSectorId,
+ childSectorId : $scope.vm.form.childSectorId,
+ regionId : $scope.vm.form.regionId,
+ statusId : $scope.vm.form.statusId
});
}
@@ -704,6 +731,11 @@
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
&& $scope.vm.form.issueCompanyFields[0].ispFieldVo != null
|| $scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
+
+ var ispField = $scope.vm.form.issueIspFields[0];
+ if (ispField.name !== $scope.vm.ispName) { //�궗�슜�옄媛� 吏곸젒 ISP 異붽� �븷 寃쎌슦
+ return issueIspFields;
+ }
issueIspFields.push({
ispId : $scope.vm.ispId,
@@ -726,6 +758,11 @@
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
&& $scope.vm.form.issueCompanyFields[0].hostingFieldVo != null
|| $scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
+
+ var hostingField = $scope.vm.form.issueHostingFields[0];
+ if (hostingField.name !== $scope.vm.hostingName) { //�궗�슜�옄媛� 吏곸젒 �샇�뒪�똿 異붽� �븷 寃쎌슦
+ return issueHostingFields;
+ }
issueHostingFields.push({
hostingId : $scope.vm.hostingId,
@@ -1108,7 +1145,9 @@
function getPartners() {
if($scope.vm.form.issueTypeId === ""){
- $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
+ if ($rootScope.issueTypeMenu != null) {
+ $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
+ }
}
var content = {
issueTypeId : $scope.vm.form.issueTypeId,
--
Gitblit v1.8.0