From 4677f35851fd0daed02d12858e71c79056969d68 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 11:02:12 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/scripts/app/issue/issueModify.controller.js |   46 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 8d55538..8c15c9c 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -59,7 +59,7 @@
                         priorityId : "",    //  �슦�꽑�닚�쐞 �븘�씠�뵒
                         severityId : "",    //  以묒슂�룄 �븘�씠�뵒
                         issueStatusId : "", //  �씠�뒋 �긽�깭 �븘�씠�뵒
-                        users : [],     //  �떞�떦�옄
+                        // users : [],     //  �떞�떦�옄
                         departments : [], // �떞�떦遺��꽌
                         files : [], //  �뾽濡쒕뱶 �뙆�씪
                         attachedFiles : [], //  �꽟癒몃끂�듃濡� �뙆�씪 �뾽濡쒕뱶瑜� �븷 寃쎌슦 �꽌踰꾩뿉�꽌 pk瑜� �뵲怨� issue id�� �뿰�룞 �옉�뾽�씠 �븘�슂�븯�떎.
@@ -72,7 +72,6 @@
                     departmentName : "",  // 遺��꽌紐� 寃��깋
                     companyId : -1,
                     companyName : "",   // �뾽泥대챸 寃��깋
-                    companyCode : "",   // �뾽泥� 肄붾뱶
                     companyManager : "",   // �뾽泥� �떞�떦�옄
                     companyTel : "",  // �뾽泥� �쟾�솕踰덊샇
                     companyEmail : "",  // �뾽泥� �씠硫붿씪
@@ -87,6 +86,7 @@
                     hostingId : -1,
                     hostingName : "", // �샇�뒪�똿紐� 寃��깋
                     hostingManager : "", // �샇�뒪�똿 �떞�떦�옄
+                    hostingCode : "", // �샇�뒪�똿 肄붾뱶
                     hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇
                     hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪
                     hostingMemo : "", // �샇�뒪�똿 鍮꾧퀬
@@ -126,6 +126,18 @@
                     fileTableConfigs : [],   //  �뙆�씪 �뾽濡쒕뱶 �젙蹂� �뀒�씠釉�
                 };
 
+                // �뿰愿� �씪媛� 愿��젴
+                $scope.vm.relationIssueTypes =
+                    [
+                        { id: 0, name: $filter("translate")("issue.relationIssueType1") },
+                        { id: 1, name: $filter("translate")("issue.relationIssueType2") },
+                        { id: 2, name: $filter("translate")("issue.relationIssueType3") },
+                        { id: 3, name: $filter("translate")("issue.relationIssueType4") },
+                        { id: 4, name: $filter("translate")("issue.relationIssueType5") },
+                        { id: 5, name: $filter("translate")("issue.relationIssueType6") }
+                    ];
+                $scope.vm.relationIssueType = $scope.vm.relationIssueTypes[0];
+
                 angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
 
                 //  �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �떞�떦遺��꽌 珥덇린�솕
@@ -144,7 +156,7 @@
                 });
 
                 $scope.$watch("vm.form.issueTypeId", function (newValue, oldValue) {
-                     $scope.vm.partnerVos = $scope.fn.getPartners();
+                    $scope.vm.partnerVos = $scope.fn.getPartners();
                 });
 
 
@@ -169,9 +181,9 @@
                 }
 
                 //  �떞�떦�옄 �궘�젣
-                 function removeManager(index) {
-                     $scope.vm.form.users.splice(index, 1);
-                 }
+                function removeManager(index) {
+                    $scope.vm.form.users.splice(index, 1);
+                }
 
                 // �떞�떦遺��꽌 �궘�젣
                 function removeDepartment(index) {
@@ -737,6 +749,12 @@
                         switch (issueTypeCustomField.customFieldVo.customFieldType) {
                             case "INPUT" :
                             case "SINGLE_SELECT" :
+                            case "NUMBER" :
+                            case "DATETIME" :
+                            case "IP_ADDRESS" :
+                            case "EMAIL" :
+                            case "SITE" :
+                            case "TEL" :
                                 issueTypeCustomField.useValues = "";
                                 break;
 
@@ -896,12 +914,17 @@
                 }
 
                 function getPartners() {
-
-                    HostingField.getPartnerList($resourceProvider.getContent(
-                        {},
+                    if($scope.vm.form.issueTypeId === ""){
+                        $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
+                    }
+                    var content = {
+                        issueTypeId : $scope.vm.form.issueTypeId,
+                    };
+                    Issue.findPartners($resourceProvider.getContent(
+                        content,
                         $resourceProvider.getPageContent(0, 1))).then(function (result) {
                         if (result.data.message.status === "success") {
-                            $scope.vm.partnerVos = result.data.data.usePartnerVos;
+                            $scope.vm.partnerVos = result.data.data;
                         }
                     });
 
@@ -913,6 +936,7 @@
                     var promises = {
                         detail : $scope.fn.detail(),
                         getIssueTypes : $scope.fn.getIssueTypes(),
+                        getPriorities : $scope.fn.getPriorities(),
                         getSeverities : $scope.fn.getSeverities(),
                         getPartners : $scope.fn.getPartners()
                     };
@@ -924,4 +948,4 @@
 
                 $scope.fn.startExecute();
             }]);
-    });
+    });
\ No newline at end of file

--
Gitblit v1.8.0