From ab7e04765622b7ef31bb891a91e89abcf203c31d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 09 12월 2021 14:35:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueCompanyFieldDetail.html | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/issue/issueCompanyFieldDetail.html b/src/main/webapp/views/issue/issueCompanyFieldDetail.html
index 8e78ee0..fc2c747 100644
--- a/src/main/webapp/views/issue/issueCompanyFieldDetail.html
+++ b/src/main/webapp/views/issue/issueCompanyFieldDetail.html
@@ -13,10 +13,10 @@
<div class="form-group">
<label><span translate="companyField.name">�뾽泥� �씠由�</span>
<code class="highlighter-rouge">*</code></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"
@@ -27,9 +27,9 @@
<button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.cancel">痍⑥냼</span></button>
<button type="button" class="btn btn-md btn-primary bold"
js-short-cut
- js-short-cut-action="(fn.formCheck(companyFieldModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ js-short-cut-action="(fn.formCheck(companyFieldModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit2()"
ng-disabled="fn.formCheck(companyFieldImportForm.$invalid)"
- ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
+ ng-click="fn.formSubmit2()"><span translate="common.save">���옣</span>
</button>
</div>
</form>
--
Gitblit v1.8.0