From 40f1a602453b72e5aac18cf502e40270349e2a3e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 30 11월 2021 16:24:29 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueAdd.html | 102 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 82 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index db3d11e..a6b1a34 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -128,13 +128,13 @@
search="vm.departmentName"
source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyDepartment'}"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment'}"
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="department in vm.form.departments">
<span>{{department.byName}}</span>
- <span class="select3-selection__choice__remove" ng-click="fn.removeManager($index)">횞</span>
+ <span class="select3-selection__choice__remove" ng-click="fn.removeDepartment($index)">횞</span>
</span>
</div>
</div>
@@ -210,6 +210,7 @@
</div>
</div>
</div>
+ <hr>
<div class="row">
<div class="col-lg-4 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="common.detectingInfo">�깘吏��젙蹂�</span></label>
@@ -232,6 +233,60 @@
<div ng-switch on="issueCustomField.customFieldVo.customFieldType">
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="NUMBER">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="DATETIME">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="IP_ADDRESS">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="EMAIL">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="SITE">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="TEL">
<input type="text" class="form-control input-sm"
ng-model="issueCustomField.useValues"
maxlength="100"
@@ -269,21 +324,22 @@
</div>
</div>
<hr>
- <div class="row">
+ <div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="companyField.info">�뾽泥댁젙蹂�</span>
- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> 媛� �젙蹂댁쓽 �씠由� �겢由��떆 �빐�떦 �씠由꾩쓽 �젙蹂닿� 議고쉶�맗�땲�떎.</span></label>
+ <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �뾽泥� �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �뾽泥� �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ </label>
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="companyField.name">�뾽泥댁씠由�</span> </label>
- <js-autocomplete-single data-input-name="companyField"
- selected-model="vm.form.companyFields"
+ <js-autocomplete-single data-input-name="issueCompanyField"
+ selected-model="vm.form.issueCompanyFields"
search="vm.companyName"
- source="fn.getCompanyFieldList(vm.companyName, vm.form.companyFields, vm.autoCompletePage.companyField.page, fn.getCompanyFieldListCallBack)"
+ source="fn.getIssueCompanyFieldList(vm.companyName, vm.form.issueCompanyFields, vm.autoCompletePage.companyField.page, fn.getIssueCompanyFieldListCallBack)"
page="vm.autoCompletePage.companyField.page"
total-page="vm.autoCompletePage.companyField.totalPage"
input-disabled="false"
@@ -359,20 +415,23 @@
</div>
</div>
</div>
- <div class="row">
- <div class="col-lg-4 fontcolor_green">
- <label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP �젙蹂�</span></label>
+ <p></p>
+ <div ng-show="fn.containsPartner('ISP')" class="row">
+ <div class="col-lg-8 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP �젙蹂�</span>
+ <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 ISP �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ </label>
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('ISP')" class="row">
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
<js-autocomplete-single data-input-name="ispField"
- selected-model="vm.form.ispFields"
+ selected-model="vm.form.issueIspFields"
search="vm.ispName"
- source="fn.getIspFieldList(vm.ispName, vm.form.ispFields, vm.autoCompletePage.ispField.page, fn.getIspFieldListCallBack)"
+ source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.ispField.page, fn.getIssueIspFieldListCallBack)"
page="vm.autoCompletePage.ispField.page"
total-page="vm.autoCompletePage.ispField.totalPage"
input-disabled="false"
@@ -462,20 +521,23 @@
</div>
</div>
</div>
- <div class="row">
- <div class="col-lg-4 fontcolor_green">
- <label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">�샇�뒪�똿 �젙蹂�</span></label>
+ <p></p>
+ <div ng-show="fn.containsPartner('�샇�뒪�똿')" class="row">
+ <div class="col-lg-8 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">�샇�뒪�똿 �젙蹂�</span>
+ <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �샇�뒪�똿 �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �샇�뒪�똿 �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ </label>
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('�샇�뒪�똿')" class="row">
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
<js-autocomplete-single data-input-name="hostingField"
- selected-model="vm.form.hostingFields"
+ selected-model="vm.form.issueHostingFields"
search="vm.hostingName"
- source="fn.getHostingFieldList(vm.hostingName, vm.form.hostingFields, vm.autoCompletePage.hostingField.page, fn.getHostingFieldListCallBack)"
+ source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
page="vm.autoCompletePage.hostingField.page"
total-page="vm.autoCompletePage.hostingField.totalPage"
input-disabled="false"
--
Gitblit v1.8.0