From dd229df18cae147af8e3e5ee9a4a3654efc4bd80 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 07 3월 2022 17:09:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa

---
 src/main/webapp/custom_components/js-workflow/js-workflow.html |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/custom_components/js-workflow/js-workflow.html b/src/main/webapp/custom_components/js-workflow/js-workflow.html
index 298aa36..691b1e1 100644
--- a/src/main/webapp/custom_components/js-workflow/js-workflow.html
+++ b/src/main/webapp/custom_components/js-workflow/js-workflow.html
@@ -12,7 +12,7 @@
                         <option ng-repeat="issueStatus in vm.issueStatuses"
                                 value="{{issueStatus.id}}"
                                 ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }">
-                            �뿈&nbsp; {{issueStatus.name}}
+                            �뿈&nbsp; {{issueStatus.name}} ({{issueStatus.issueStatusTypeKr}})
                         </option>
                     </select>
                     <div class="input-group-prepend">
@@ -33,7 +33,7 @@
                         <option ng-repeat="issueStatus in fn.getAvailableStartStatus()"
                                 ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }"
                                 value="{{issueStatus.id}}">
-                            �뿈&nbsp;{{issueStatus.name}}
+                            �뿈&nbsp;{{issueStatus.name}} ({{issueStatus.issueStatusTypeKr}})
                         </option>
                     </select>
                 </div>
@@ -50,7 +50,7 @@
                         <option value="{{issueStatus.id}}"
                                 ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }"
                                 ng-repeat="issueStatus in vm.targetIssueStatusList">
-                            �뿈&nbsp;{{issueStatus.name}}
+                            �뿈&nbsp;{{issueStatus.name}} ({{issueStatus.issueStatusTypeKr}})
                         </option>
                     </select>
                     <div class="input-group-prepend">
@@ -59,6 +59,27 @@
                     </div>
                 </div>
             </div>
+
+            <div class="form-group" ng-if="vm.activeTarget != null" ng-show="vm.activeTarget.type === '01'">
+                <label><span translate="project.projectDepartment">遺��꽌紐�</span><span>[{{vm.activeTarget.name}}]</span></label>
+                <js-autocomplete-multi data-input-name="departments"
+                                       selected-model="vm.departments"
+                                       search="vm.departmentName"
+                                       source="fn.getUserDepartmentList(vm.departmentName, vm.departments)"
+                                       input-disabled="false"
+                                       change-event="fn.changeDepartment()"
+                                       translation-texts="{ count : 'common.userNum', empty : 'common.emptyDepartment' }"
+                                       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.departments">
+                        <span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
+                        <span class="select3-selection__choice__remove" ng-click="fn.removeDepartment($index)">횞</span>
+                    </span>
+                </div>
+            </div>
+
         </div>
         <div class="col-md-9">
             <div class="form-group workflowbox">

--
Gitblit v1.8.0