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/scripts/app/companyField/companyFieldModify.controller.js | 85 ++++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 40 deletions(-) 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(); }]); -- Gitblit v1.8.0