From caa6e4cb9d9077dc0fa5f81e26e6e5655e41567b Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 월, 08 11월 2021 17:53:16 +0900 Subject: [PATCH] 업체 관리 백엔드 수정 --- src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js index fef5e19..4e80b88 100644 --- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js +++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js @@ -17,7 +17,8 @@ makeTableConfigs : makeTableConfigs, // �뀒�씠釉� �꽕�젙 initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕 add : add, //�뾽泥� �깮�꽦 - removes : removes //�뾽泥� �궘�젣 + removes : removes, //�뾽泥� �궘�젣 + makeSearchConditions : makeSearchConditions //�뿊�� �떎�슫濡쒕뱶 }; // 蹂��닔 @@ -31,6 +32,11 @@ $scope.vm.search = { name : "", // �뾽泥대챸 + }; + + $scope.vm.page = { + selectedPage : 0, + selectedPageRowCount : String(10) }; $scope.vm.responseData = { @@ -123,7 +129,7 @@ } else { - SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣 + SweetAlert.error($filter("translate")("companyField.failedToSelectCompanyFieldFullList"), result.data.message.message); // �뾽泥� 愿�由� 紐⑸줉 議고쉶 �떎�뙣 } }); } @@ -133,7 +139,7 @@ $uibModal.open({ templateUrl : 'views/companyField/companyFieldAdd.html', size : "md", - controller : 'companyFieldModifyController', + controller : 'companyFieldAddController', backdrop : 'static', resolve : { parameter : function () { @@ -182,8 +188,8 @@ // �궘�젣 �븣由� SweetAlert.swal({ - title : $filter("translate")("managementWorkspace.deleteDepartment"), // "�뾽泥� �궘�젣" - text : $filter("translate")("customField.wantToDeleteSelectDepartment"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎." + title : $filter("translate")("companyField.delete"), // "�뾽泥� �궘�젣" + text : $filter("translate")("companyField.wantToDeleteSelectCompanyField"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎." type : "warning", showCancelButton : true, confirmButtonColor : "#DD6B55", @@ -221,8 +227,15 @@ }); } + function makeSearchConditions() { + var conditions = { + name: $scope.vm.search.name + } + return conditions; + } + $scope.fn.makeTableConfigs(); - //$scope.fn.getPageList(); + $scope.fn.getPageList(); } ]); } -- Gitblit v1.8.0