From 1951e84f213859fb4486b2f19dc827ff3406060d Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 19:30:32 +0900
Subject: [PATCH] - 업체의 카테고리 대분류가 공백인데 중분류 조회되는 문제 해결 - 업체 상태 직접입력 일 경우 사용자가 직접입력한 상태명을 보여주도록 수정
---
src/main/webapp/scripts/app/issue/issueImportExcel.controller.js | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
index 202c00a..2565985 100644
--- a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
@@ -31,6 +31,10 @@
},
projectName : "",
autoCompletePage : {
+ issue : {
+ page : 0,
+ totalPage : 0
+ },
project : {
page : 0,
totalPage : 0
@@ -46,9 +50,18 @@
$scope.vm.autoCompletePage.issue.totalPage = result.data.page.totalPage;
}
+ $scope.$on("projectListEvent", function (event, result) {
+ $scope.vm.form.projects = result;
+ $scope.vm.form.issues = "";
+ $scope.fn.getIssueTypes();
+ });
+
// �씠�뒋 �쑀�삎 紐⑸줉
function getIssueTypes() {
- IssueType.find($resourceProvider.getContent({},
+ if (!$rootScope.isDefined($scope.vm.form.projects[0])) {
+ return;
+ }
+ IssueType.find($resourceProvider.getContent({projectId : $scope.vm.form.projects[0].id},
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
if (result.data.message.status === "success") {
@@ -118,30 +131,30 @@
projectId : $scope.vm.form.projects[0].id,
issueTypeId : $scope.vm.form.issueTypeId,
parentIssueId : (function () {
- var id = -1;
- if ($scope.vm.form.issues != null) {
- id = $scope.vm.form.issues[0].id
+ let id = -1;
+ if ($rootScope.isDefined($scope.vm.form.issues)) {
+ if ($rootScope.isDefined($scope.vm.form.issues[0])) {
+ id = $scope.vm.form.issues[0].id;
+ }
}
return id;
})()
}
},
fileFormDataName : "file"
- })
- .then(function (result) {
+ }).then(function (result) {
if (result.data.message.status === "success") {
-
$timeout(function () {
SweetAlert.success($filter("translate")("issue.succeededIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �꽦怨�
$scope.fn.cancel();
$rootScope.$broadcast("getIssueList");
+ $rootScope.spinner = false;
}, 1000);
}
else {
SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣
+ $rootScope.spinner = false;
}
-
- $rootScope.spinner = false;
});
}
--
Gitblit v1.8.0