Skip to content

T
traffic-front
Commit 9ecc84fd authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

fixed entity page-- frank

parent 99c9b754
Show whitespace changes
Inline Side-by-side
Showing with 465 additions and 8 deletions
atms-web/src/main/webapp/app/common/controls/edit-organization-director-modal/edit-organization-director-modal.ctrl.js 0 → 100644
View file @ 9ecc84fd
commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$log', function ($scope, $log) {
'use strict';
$scope.isShow = false;
//模态框管理
$scope.modalManage = {
directorModal: {
open: function () {
$scope.modalInstance = ackUibModal($scope,
'edit-organization-director-modal.html',
'edit-organization-director-modal',
$scope.parentPage, 'static', function () {
$scope.isShow = false;
ackMessageBox.close();
});
$scope.modalInstance.open();
},
close: function () {
$scope.modalInstance.close();
},
cancel: function () {
$scope.modalInstance.cancel();
}
}
};
var initParams = function () {
};
var init = function () {
};
var thisModuleService = {
initEvents: function () {
$scope.save = function () {
};
},
initWatches: function () {
$scope.$watch('isShow', function (newValue, oldValue) {
if (newValue) {
$scope.modalManage.uploadInvoiceExtra.open();
}
});
}
};
(function initialize() {
$log.debug('editOrganizationDirectorModalController.ctor()...');
initParams();
init();
thisModuleService.initWatches();
thisModuleService.initEvents();
})();
}]);
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-director-modal/edit-organization-director-modal.html 0 → 100644
View file @ 9ecc84fd
<div class="edit-organization-director-modal-wrapper">
<script type="text/ng-template" id="edit-organization-director-modal.html">
<div class="modal-header">
<h4 class="modal-title" style="margin-top: 5px;" ng-if="isAdd">{{'addDirector' | translate}}</h4>
<h4 class="modal-title" style="margin-top: 5px;" ng-if="!isAdd">{{'editDirector' | translate}}</h4>
</div>
<div class="modal-body" id="modal-body" style="height:628px;">
<!--add director-->
<div>
<form class="form-horizontal" id="orgControlForm" name="orgControlForm">
<div class="local">
<div class="bottom-row">
<!--investmentEntity-->
<div class="form-group">
<label for="investmentEntity" class="col-sm-3 control-label"><span class="must-input">*</span>{{'investmentEntity' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.name.$invalid && (orgControlForm.name.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='investmentEntity'
name="investmentEntity" ng-model="editOrgModel.investmentEntity"
ng-options="item for item in investmentEntityTypeList">
<option value="">{{resources.investmentEntity}}</option>
</select>
</div>
</div>
<!--ownershipForm-->
<div class="form-group">
<label for="ownershipForm" class="col-sm-3 control-label"><span class="must-input">*</span>{{'ownershipForm' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.ownershipForm.$invalid && (orgControlForm.ownershipForm.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='ownershipForm'
name="ownershipForm" ng-model="editOrgModel.ownershipForm"
ng-options="item for item in ownershipFormTypeList">
<option value="">{{resources.ownershipForm}}</option>
</select>
</div>
</div>
<!--commonOrPreferred-->
<div class="form-group">
<label for="commonOrPreferred" class="col-sm-3 control-label"><span class="must-input">*</span>{{'commonOrPreferred' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.commonOrPreferred.$invalid && (orgControlForm.commonOrPreferred.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='commonOrPreferred'
name="commonOrPreferred" ng-model="editOrgModel.commonOrPreferred"
ng-options="item for item in commonOrPreferredTypeList">
<option value="">{{resources.commonOrPreferred}}</option>
</select>
</div>
</div>
<!--classOfShares-->
<div class="form-group">
<label for="classOfShares" class="col-sm-3 control-label"><span class="must-input">*</span>{{'classOfShares' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.classOfShares.$invalid && (orgControlForm.classOfShares.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='classOfShares'
name="classOfShares" ng-model="editOrgModel.classOfShares"
ng-options="item for item in classOfSharesTypeList">
<option value="">{{resources.classOfShares}}</option>
</select>
</div>
</div>
<!--votingPercentage-->
<div class="form-group">
<label class="col-sm-3 control-label" for="votingPercentage"><span class="must-input">*</span>{{'votingPercentage' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.votingPercentage.$invalid && (orgControlForm.votingPercentage.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" id="votingPercentage"
ng-model="editOrgModel.votingPercentage" name="votingPercentage"
placeholder="{{resources.votingPercentage}}" ng-keyup="votingPercentageKeyUp()"
maxlength="100" ng-pattern="/^[0-9]+$/">
</div>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="modal-footer">
<span style="float:right">
<button class="btn btn-primary" type="button" ng-click="save()" translate="Submit"></button>
<button class="btn btn-third" type="button" ng-click="modalManage.directorModal.cancel()" translate="Cancel"></button>
</span>
</div>
</script>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-director-modal/edit-organization-director-modal.js 0 → 100644
View file @ 9ecc84fd
commonModule.directive('editOrganizationDirectorModal', '$log', function ($log) {
'use strict';
$log.debug('editOrganizationDirectorModal.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/common/controls/edit-organization-director-modal/edit-organization-director-modal.html' + '?_=' + Math.random(),
replace: true,
controller: 'editOrganizationDirectorModalController',
scope: {
isShow: '=?',
parentPage: '@',
editModel: '=?'
},
link: function (scope, element) {
}
};
});
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-director-modal/edit-organization-director-modal.less 0 → 100644
View file @ 9ecc84fd
.base-font-style() {
font-family: "Microsoft YaHei";
font-style: normal;
font-size: 14px;
color: #1E1E1E;
line-height: 20px;
}
.edit-organization-director-modal-wrapper {
height: 100%;
.modal-title {
font-family: 'Arial Bold', 'Arial';
font-weight: 700;
font-style: normal;
font-size: 16px;
color: #000000;
line-height: 20px;
}
.modal-dialog {
width: 80% !important;
.modal-body {
height: 100%;
.row {
height: 100%;
margin-bottom: 20px;
}
.left-container {
height: 100%;
.pic-file-title {
.base-font-style;
}
.pic-file-wrapper {
width: 100%;
/*height:480px!important;*/
height: calc(~"100% - 20px");
/*background: url('TestInvoice.JPG');*/
background-size: contain;
background-repeat: no-repeat;
}
.show-full-pic {
cursor: pointer;
float: right;
margin-top: 18px;
}
}
.right-container {
}
}
.modal-footer {
text-align: left;
}
}
.borderless td, .borderless th {
border: none !important;
vertical-align: middle !important;
}
}
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ 9ecc84fd
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
id: 0, id: 0,
name: '', name: '',
shortName: '', shortName: '',
mergerName: '', mergerName: ''
}; };
$scope.showPage = function (pageIndex) { $scope.showPage = function (pageIndex) {
...@@ -594,7 +594,6 @@ ...@@ -594,7 +594,6 @@
$('.localRequired').attr("required", true); $('.localRequired').attr("required", true);
$('.orgAreaRequired').attr("required", true); $('.orgAreaRequired').attr("required", true);
$scope.equityGridOptions = { $scope.equityGridOptions = {
bindingOptions: { bindingOptions: {
dataSource: 'shareholderDatasource' dataSource: 'shareholderDatasource'
...@@ -815,8 +814,6 @@ ...@@ -815,8 +814,6 @@
} }
} }
}; };
// $('.localRequired').attr("required","true"); required="required"
}; };
var initDatePicker = function () { var initDatePicker = function () {
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html
View file @ 9ecc84fd
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<div class="modal-title" ng-if="!isAdd">{{'EditOrganization' | translate}} <div class="modal-title" ng-if="!isAdd">{{'EditOrganization' | translate}}
</div> </div>
</div> </div>
<div id="orgControlTab" ng-if="isAdd"> <div id="orgControlTab">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs" ng-if="isAdd">
<li class="active"> <li class="active">
<a href="#basicdata" data-toggle="tab"> <a href="#basicdata" data-toggle="tab">
{{'FundamentalInfo' | translate}} {{'FundamentalInfo' | translate}}
...@@ -234,8 +234,7 @@ ...@@ -234,8 +234,7 @@
</div> </div>
</form> </form>
</div> </div>
<div id="advancedOptions" class="tab-pane fade" ng-if="isAdd">
<div id="advancedOptions" class="tab-pane fade">
<!--Equity information--> <!--Equity information-->
<div class="label-current-holding"> <div class="label-current-holding">
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' | translate}}</label> <label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' | translate}}</label>
...@@ -272,4 +271,6 @@ ...@@ -272,4 +271,6 @@
</div> </div>
</div> </div>
</div> </div>
<edit-organization-shareholder-modal is-show="isShowShareholderModal" parent-page=".edit-organization-modal-wrapper" edit-model=""></edit-organization-shareholder-modal>
<edit-organization-director-modal is-show="isShowDirectorModal" parent-page=".edit-organization-modal-wrapper" edit-model=""></edit-organization-director-modal>
</div> </div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.ctrl.js 0 → 100644
View file @ 9ecc84fd
commonModule.controller('editOrganizationShareholderModalController', ['$scope', '$log', function ($scope, $log) {
'use strict';
$scope.isShow = false;
//模态框管理
$scope.modalManage = {
directorModal: {
open: function () {
$scope.modalInstance = ackUibModal($scope,
'edit-organization-shareholder-modal.html',
'edit-organization-shareholder-modal',
$scope.parentPage, 'static', function () {
$scope.isShow = false;
ackMessageBox.close();
});
$scope.modalInstance.open();
},
close: function () {
$scope.modalInstance.close();
},
cancel: function () {
$scope.modalInstance.cancel();
}
}
};
var initParams = function () {
};
var init = function () {
};
var thisModuleService = {
initEvents: function () {
$scope.save = function () {
};
},
initWatches: function () {
$scope.$watch('isShow', function (newValue, oldValue) {
if (newValue) {
$scope.modalManage.uploadInvoiceExtra.open();
}
});
}
};
(function initialize() {
$log.debug('editOrganizationShareholderModalController.ctor()...');
initParams();
init();
thisModuleService.initWatches();
thisModuleService.initEvents();
})();
}]);
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.html 0 → 100644
View file @ 9ecc84fd
<div class="edit-organization-shareholder-modal-wrapper">
<script type="text/ng-template" id="edit-organization-shareholder-modal.html">
<div class="modal-header">
<h4 class="modal-title" style="margin-top: 5px;" ng-if="isAdd">{{'addShardholder' | translate}}</h4>
<h4 class="modal-title" style="margin-top: 5px;" ng-if="!isAdd">{{'editShardholder' | translate}}</h4>
</div>
<div class="modal-body" id="modal-body" style="height:628px;">
<!--add director-->
<div>
<form class="form-horizontal" id="shareholderControlForm" name="shareholderControlForm">
<div class="local">
<div class="bottom-row">
<!--investmentEntity-->
<div class="form-group">
<label for="investmentEntity" class="col-sm-3 control-label"><span class="must-input">*</span>{{'investmentEntity' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':shareholderControlForm.name.$invalid && (shareholderControlForm.name.$dirty || shareholderControlForm.$submitted)}">
<select class="form-control" id='investmentEntity'
name="investmentEntity" ng-model="editOrgModel.investmentEntity"
ng-options="item for item in investmentEntityTypeList">
<option value="">{{resources.investmentEntity}}</option>
</select>
</div>
</div>
<!--ownershipForm-->
<div class="form-group">
<label for="ownershipForm" class="col-sm-3 control-label"><span class="must-input">*</span>{{'ownershipForm' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':shareholderControlForm.ownershipForm.$invalid && (shareholderControlForm.ownershipForm.$dirty || shareholderControlForm.$submitted)}">
<select class="form-control" id='ownershipForm'
name="ownershipForm" ng-model="editOrgModel.ownershipForm"
ng-options="item for item in ownershipFormTypeList">
<option value="">{{resources.ownershipForm}}</option>
</select>
</div>
</div>
<!--commonOrPreferred-->
<div class="form-group">
<label for="commonOrPreferred" class="col-sm-3 control-label"><span class="must-input">*</span>{{'commonOrPreferred' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':shareholderControlForm.commonOrPreferred.$invalid && (shareholderControlForm.commonOrPreferred.$dirty || shareholderControlForm.$submitted)}">
<select class="form-control" id='commonOrPreferred'
name="commonOrPreferred" ng-model="editOrgModel.commonOrPreferred"
ng-options="item for item in commonOrPreferredTypeList">
<option value="">{{resources.commonOrPreferred}}</option>
</select>
</div>
</div>
<!--classOfShares-->
<div class="form-group">
<label for="classOfShares" class="col-sm-3 control-label"><span class="must-input">*</span>{{'classOfShares' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':shareholderControlForm.classOfShares.$invalid && (shareholderControlForm.classOfShares.$dirty || shareholderControlForm.$submitted)}">
<select class="form-control" id='classOfShares'
name="classOfShares" ng-model="editOrgModel.classOfShares"
ng-options="item for item in classOfSharesTypeList">
<option value="">{{resources.classOfShares}}</option>
</select>
</div>
</div>
<!--votingPercentage-->
<div class="form-group">
<label class="col-sm-3 control-label" for="votingPercentage"><span class="must-input">*</span>{{'votingPercentage' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':shareholderControlForm.votingPercentage.$invalid && (shareholderControlForm.votingPercentage.$dirty || shareholderControlForm.$submitted)}">
<input class="form-control localRequired" id="votingPercentage"
ng-model="editOrgModel.votingPercentage" name="votingPercentage"
placeholder="{{resources.votingPercentage}}" ng-keyup="votingPercentageKeyUp()"
maxlength="100" ng-pattern="/^[0-9]+$/">
</div>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="modal-footer">
<span style="float:right">
<button class="btn btn-primary" type="button" ng-click="save()" translate="Submit"></button>
<button class="btn btn-third" type="button" ng-click="modalManage.directorModal.cancel()" translate="Cancel"></button>
</span>
</div>
</script>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.js 0 → 100644
View file @ 9ecc84fd
commonModule.directive('editOrganizationShareholderModal', '$log', function ($log) {
'use strict';
$log.debug('editOrganizationShareholderModal.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.html' + '?_=' + Math.random(),
replace: true,
controller: 'editOrganizationShareholderModalController',
scope: {
isShow: '=?',
parentPage: '@',
editModel: '=?'
},
link: function (scope, element) {
}
};
});
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.less 0 → 100644
View file @ 9ecc84fd
.base-font-style() {
font-family: "Microsoft YaHei";
font-style: normal;
font-size: 14px;
color: #1E1E1E;
line-height: 20px;
}
.edit-organization-shareholder-modal-wrapper {
height: 100%;
.modal-title {
font-family: 'Arial Bold', 'Arial';
font-weight: 700;
font-style: normal;
font-size: 16px;
color: #000000;
line-height: 20px;
}
.modal-dialog {
width: 80% !important;
.modal-body {
height: 100%;
.row {
height: 100%;
margin-bottom: 20px;
}
.left-container {
height: 100%;
.pic-file-title {
.base-font-style;
}
.pic-file-wrapper {
width: 100%;
/*height:480px!important;*/
height: calc(~"100% - 20px");
/*background: url('TestInvoice.JPG');*/
background-size: contain;
background-repeat: no-repeat;
}
.show-full-pic {
cursor: pointer;
float: right;
margin-top: 18px;
}
}
.right-container {
}
}
.modal-footer {
text-align: left;
}
}
.borderless td, .borderless th {
border: none !important;
vertical-align: middle !important;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment