From bdb1efdc604fce543e21152b4263a9362f64389f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 목, 10 3월 2022 15:35:19 +0900
Subject: [PATCH] - api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 ip 컬럼 추가 및 이슈 추가/수정 시 ip 대역대 항목 추가

---
 src/main/webapp/views/issueType/issueTypeModify.html |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/views/issueType/issueTypeModify.html b/src/main/webapp/views/issueType/issueTypeModify.html
index a43fb0a..5600d76 100644
--- a/src/main/webapp/views/issueType/issueTypeModify.html
+++ b/src/main/webapp/views/issueType/issueTypeModify.html
@@ -22,12 +22,12 @@
                        ng-model="vm.form.name"
                        ng-maxlength="15"
                        maxlength="15"
-                       input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+                       input-regex="/[^?a-zA-Z0-9/]/"
                        required>
                 <small ng-show="issueTypeModifyForm.name.$error.maxlength" class="help-block form-text text-danger" translate="common.upTo15Characters">
                     理쒕� 15湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
                 </small>
-                <small translate="managementType.limitNameToSpecialCharacters">�씠�뒋 ���엯 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>
+                <!--<small translate="managementType.limitNameToSpecialCharacters">�씠�뒋 ���엯 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
             </div>
 
             <div class="form-group">
@@ -63,16 +63,33 @@
             </div>
 
 
-            <div class="form-group">
-                <label><span
-                        translate="issue.companyInfo">�뾽泥�/ISP/�샇�뒪�똿 �젙蹂�</span></label>
-                <ng-dropdown-multiselect class="multiSelect cursor"
-                                         data-input-name="issueStatusTypes"
-                                         selected-model="vm.search.issueStatusTypes"
-                                         extra-settings="{ stringTypeOption : true }"
-                                         options="vm.options.emailTemplates"></ng-dropdown-multiselect>
+            <div class="form-group mgb5">
+                <label class="issue-label"> <span translate="issue.companyInfo">�뾽泥�/ISP/�샇�뒪�똿 �젙蹂�</span> </label>
+                <js-autocomplete-multi data-input-name="departments"
+                                       selected-model="vm.form.companies"
+                                       search="vm.companyName"
+                                       source="fn.getPartnerList(vm.companyName, vm.form.companies)"
+                                       input-disabled="false"
+                                       translation-texts="{ count : '', empty : 'common.emptyCompanyPartners' }"
+                                       extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+
+
+                <div class="select3-selection__choicediv mt-10">
+                                <span class="select3-selection__choice" ng-repeat="company in vm.form.companies">
+                                    <span>{{company.byName}}</span>
+                                    <span class="select3-selection__choice__remove" ng-click="fn.removeUsePartner($index)">횞</span>
+                                </span>
+                </div>
             </div>
 
+            <div>
+                <span class="issue-label mb-0" translate="issue.inheritPartners">�뙆�듃�꼫 �젙蹂� �긽�냽</span>
+            </div>
+            <div class="form-group mt-5 ml--12">
+                <label class='switch ml-3' style=""><input type='checkbox' ng-model='vm.form.inheritPartners'>
+                    <span class='slider round'></span>
+                </label>
+            </div>
 
             <div class="form-group">
                 <label for="issueTypeModifyForm2"><span translate="common.color">�깋�긽</span> <code class="highlighter-rouge">*</code></label>

--
Gitblit v1.8.0