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

jhjang

2021-12-08 7b4b71ee33c7a42383d3e6a69885d521fd7b6688

 src/main/webapp/scripts/app/companyField/companyFieldList.controller.js

@@ -17,8 +17,8 @@
                    makeTableConfigs : makeTableConfigs, //  테이블 설정
                    initSearch : initSearch, //검색 조건 초기화
                    add : add, //업체 생성
                    makeSearchConditions : makeSearchConditions, //엑셀 다운로드
                    removes : removes, //업체 삭제
                    makeSearchConditions : makeSearchConditions //엑셀 다운로드
                };

                //  변수
@@ -54,6 +54,13 @@
                    $scope.fn.getPageList(0);
                }

                //  업체 관리 검색 조건을 만든다.
                function makeSearchConditions() {
                    return{
                        name: $scope.vm.search.name
                    };
                }

                //  사용자 정의 필드 목록 테이블 설정
                function makeTableConfigs() {
                    $scope.vm.tableConfigs = [];
@@ -85,7 +92,12 @@
                        .setDName("email")
                        .setDAlign("text-center"));
                    $scope.vm.tableConfigs.push($tableProvider.config()
                        .setHName("companyField.desc")
                        .setHName("companyField.url")
                        .setHWidth("bold")
                        .setDName("url")
                        .setDAlign("text-center"));
                    $scope.vm.tableConfigs.push($tableProvider.config()
                        .setHName("companyField.memo")
                        .setHWidth("bold")
                        .setDName("memo")
                        .setDAlign("text-center"));
@@ -107,9 +119,8 @@
                        currentPage = selectedPage;
                    }

                    var conditions = {
                        name : $scope.vm.search.name //업체명
                    };
                    //  업체 관리 검색 조건을 만든다.
                    var conditions = $scope.fn.makeSearchConditions();

                    //테이블 리스트 데이터 컨트롤러 요청
                    CompanyField.find($resourceProvider.getContent(conditions,
@@ -217,13 +228,6 @@
                                });
                            }
                        });
                }

                function makeSearchConditions() {
                    var conditions = {
                        name: $scope.vm.search.name
                    }
                    return conditions;
                }

                $scope.fn.makeTableConfigs();