From 571503a6f8d3ef2eb3d6929d4a584644fff7c896 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 15:53:04 +0900
Subject: [PATCH] 이슈 업체 메일 보내기 수정
---
src/main/webapp/views/issue/issueAddDown.html | 1 +
src/main/webapp/views/issue/issueAddRelation.html | 1 +
src/main/webapp/views/issue/issueModify.html | 1 +
src/main/webapp/views/issue/issueSendMailPartners.html | 2 +-
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 40 ++++++++++++++++++++++++++++------------
5 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index 14d5895..b90049a 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -126,9 +126,9 @@
sendEmails : (function () {
var sendEmails = [];
- angular.forEach($scope.vm.form.mailUsers, function (user) {
- sendEmails.push($rootScope.encryption(user.account));
- });
+ for(var i=0; i < $scope.vm.form.account[0].account.length; i++) {
+ sendEmails.push($rootScope.encryption($scope.vm.form.account[0].account[i]));
+ }
return sendEmails;
})(),
@@ -189,12 +189,19 @@
var index = partners.length-1;
var id = partners[index].id;
var name = partners[index].name;
- var account = partners[index].account.split(",");
+ var account = partners[index].account;
- for (var i = 0; i < account.length; i++) {
- $scope.vm.form.account[0].id[index+i] = id;
- $scope.vm.form.account[0].account[index+i] = account[i].trim();
- $scope.vm.form.account[0].name[index+i] = name;
+ if(account.indexOf(",") !== -1) {
+ account = partners[index].account.split(",");
+ for (var i = 0; i < account.length; i++) {
+ $scope.vm.form.account[0].account[index+i] = account[i].trim();
+ $scope.vm.form.account[0].name[index+i] = name;
+ $scope.vm.form.account[0].id[index+i] = id;
+ }
+ } else {
+ $scope.vm.form.account[0].account[index] = account;
+ $scope.vm.form.account[0].name[index] = name;
+ $scope.vm.form.account[0].id[index] = id;
}
} else {
if (parameter.partners != null) {
@@ -203,13 +210,22 @@
var id = "";
angular.forEach(parameter.partners, function (partner) {
id = partner.id;
- account = partner.account.split(",");
+ account = partner.account;
+ if(account.indexOf(",") !== -1) {
+ account = partner.account.split(",");
+ }
name = partner.name;
});
- for (var i = 0; i < account.length; i++) {
- $scope.vm.form.account[0].id[i] = id;
- $scope.vm.form.account[0].account[i] = account[i].trim();
+ if(account.size > 1) {
+ for (var i = 0; i < account.size; i++) {
+ $scope.vm.form.account[0].account[i] = account[i].trim();
+ $scope.vm.form.account[0].name[i] = name;
+ $scope.vm.form.account[0].id[i] = id;
+ }
+ } else {
+ $scope.vm.form.account[0].account[i] = account;
$scope.vm.form.account[0].name[i] = name;
+ $scope.vm.form.account[0].id[i] = id;
}
}
}
diff --git a/src/main/webapp/views/issue/issueAddDown.html b/src/main/webapp/views/issue/issueAddDown.html
index a82a7ff..f528873 100644
--- a/src/main/webapp/views/issue/issueAddDown.html
+++ b/src/main/webapp/views/issue/issueAddDown.html
@@ -382,6 +382,7 @@
<js-autocomplete-single data-input-name="issueCompanyField"
selected-model="vm.form.issueCompanyFields"
search="vm.companyName"
+ custom-input="true"
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"
diff --git a/src/main/webapp/views/issue/issueAddRelation.html b/src/main/webapp/views/issue/issueAddRelation.html
index 90ed519..990ee6d 100644
--- a/src/main/webapp/views/issue/issueAddRelation.html
+++ b/src/main/webapp/views/issue/issueAddRelation.html
@@ -393,6 +393,7 @@
<js-autocomplete-single data-input-name="issueCompanyField"
selected-model="vm.form.issueCompanyFields"
search="vm.companyName"
+ custom-input="true"
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"
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index 2204d49..836b664 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -425,6 +425,7 @@
<js-autocomplete-single data-input-name="issueCompanyField"
selected-model="vm.form.issueCompanyFields"
search="vm.companyName"
+ custom-input="true"
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"
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index ab05a33..0020adf 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -13,7 +13,7 @@
<div class="form-group">
<small translate="issue.sendIssueSelectedPartners">�봽濡쒖젥�듃�뿉 李몄뿬�븯怨� �엳�뒗 �떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.</small>
<div class="select3-selection__choicediv">
- <span class="select3-selection__choice" ng-repeat="user in vm.form.account[0].account">
+ <span class="select3-selection__choice" ng-repeat="user in vm.form.account[0].account track by $index">
<span>{{vm.form.account[0].name[$index]}}({{user}})</span>
<span class="select3-selection__choice__remove"
ng-click="fn.removeMailTarget($index)">횞</span>
--
Gitblit v1.8.0