Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-12-07 4677f35851fd0daed02d12858e71c79056969d68

 src/main/webapp/scripts/app/issue/issueModify.controller.js

@@ -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.content;
                            $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();
            }]);
    });
    });