From 7ae30b7ac631cf506a22e9d4b60a3b0a07fa2d27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 23 2월 2022 18:03:41 +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 |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 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 38e42de..a13a2d5 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">
@@ -60,20 +60,23 @@
                 </div>
             </div>
 
-            <div class="form-group">
-                <label><span translate="project.projectDepartment">�떞�떦 遺��꽌</span></label>
-                <div class="input-group">
-                    <select class="form-control input-sm issue-select-label"
-                            name="targetStatusId"
-                            ng-style="{ 'color' : fn.getOptionColor(vm.targetIssueStatusList, vm.targetStatusId) }"
-                            ng-model="vm.targetStatusId">
-                        <option value="" translate="common.choose">�꽑�깮�븯�꽭�슂.</option>
-                        <option value="{{issueStatus.id}}"
-                                ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }"
-                                ng-repeat="issueStatus in vm.targetIssueStatusList">
-                            �뿈&nbsp;{{issueStatus.name}}
-                        </option>
-                    </select>
+            <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>
 

--
Gitblit v1.8.0