Skip to content

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

save data to org -- frank

parent ecc42b3e
Hide whitespace changes
Inline Side-by-side
Showing with 775 additions and 693 deletions
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 79bd35d6
...@@ -240,6 +240,7 @@ ...@@ -240,6 +240,7 @@
$scope.orgOperateType = constant.Operation.Add; $scope.orgOperateType = constant.Operation.Add;
$scope.isAdd = true; $scope.isAdd = true;
$scope.selectedOrg = null; $scope.selectedOrg = null;
$scope.showEditModal = true;
}; };
// 编辑机构 // 编辑机构
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ 79bd35d6
...@@ -385,10 +385,10 @@ ...@@ -385,10 +385,10 @@
</div> </div>
<operate-log is-show="isShowLog"></operate-log> <operate-log is-show="isShowLog"></operate-log>
<edit-organization-modal operate-type="orgOperateType" is-update="isOrgUpdate" <edit-organization-modal is-show="showEditModal" parent-page=".system-manage" operate-type="orgOperateType" is-update="isOrgUpdate"
selected-organization="selectedOrg" dimension-id="showAttributeDimensionID"></edit-organization-modal> selected-organization="selectedOrg" dimension-id="showAttributeDimensionID"></edit-organization-modal>
<edit-organization-shareholder-modal is-show="isShowShareholderModal" parent-page=".system-manage" edit-model=""></edit-organization-shareholder-modal> <edit-organization-shareholder-modal is-show-s="isShowShareholderModal2" parent-page=".system-manage" edit-model=""></edit-organization-shareholder-modal>
<edit-organization-director-modal is-show="isShowDirectorModal" parent-page=".system-manage" edit-model=""></edit-organization-director-modal> <edit-organization-director-modal is-show-d="isShowDirectorModal2" parent-page=".system-manage" edit-model=""></edit-organization-director-modal>
<!--<edit-equity-modal operate-type="equityEditOperateType" is-update="isEquityUpdate"--> <!--<edit-equity-modal operate-type="equityEditOperateType" is-update="isEquityUpdate"-->
<!--selected-organization="selectedOrg"></edit-equity-modal>--> <!--selected-organization="selectedOrg"></edit-equity-modal>-->
<!--<edit-equity-change-modal operate-type="equityChangeOperateType" is-update="isEquityChange"--> <!--<edit-equity-change-modal operate-type="equityChangeOperateType" is-update="isEquityChange"-->
......
atms-web/src/main/webapp/app/common/controls/edit-organization-director-modal/edit-organization-director-modal.ctrl.js
View file @ 79bd35d6
commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$log', function ($scope, $log) { commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$log', 'ackUibModal', function ($scope, $log, ackUibModal) {
'use strict'; 'use strict';
$scope.isShow = false; $scope.isShow = false;
...@@ -9,16 +9,18 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -9,16 +9,18 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
$scope.modalInstance = ackUibModal($scope, $scope.modalInstance = ackUibModal($scope,
'edit-organization-director-modal.html', 'edit-organization-director-modal.html',
'edit-organization-director-modal', 'edit-organization-director-modal',
$scope.parentPage, 'static', function () { null, 'static', function () {
$scope.isShow = false; $scope.isShow = false;
ackMessageBox.close(); ackMessageBox.close();
}); });
$scope.modalInstance.open(); $scope.modalInstance.open();
}, },
close: function () { close: function () {
$scope.isShow = false;
$scope.modalInstance.close(); $scope.modalInstance.close();
}, },
cancel: function () { cancel: function () {
$scope.isShow = false;
$scope.modalInstance.cancel(); $scope.modalInstance.cancel();
} }
} }
...@@ -40,9 +42,9 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$ ...@@ -40,9 +42,9 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
}, },
initWatches: function () { initWatches: function () {
$scope.$watch('isShow', function (newValue, oldValue) { $scope.$watch('isShowD', function (newValue, oldValue) {
if (newValue) { if (newValue) {
$scope.modalManage.uploadInvoiceExtra.open(); $scope.modalManage.directorModal.open();
} }
}); });
} }
......
atms-web/src/main/webapp/app/common/controls/edit-organization-director-modal/edit-organization-director-modal.js
View file @ 79bd35d6
...@@ -7,7 +7,7 @@ commonModule.directive('editOrganizationDirectorModal', ['$log', function ($log) ...@@ -7,7 +7,7 @@ commonModule.directive('editOrganizationDirectorModal', ['$log', function ($log)
replace: true, replace: true,
controller: 'editOrganizationDirectorModalController', controller: 'editOrganizationDirectorModalController',
scope: { scope: {
isShow: '=?', isShowD: '=?',
parentPage: '@', parentPage: '@',
editModel: '=?' editModel: '=?'
}, },
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ 79bd35d6
commonModule.controller('editOrganizationModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', '$filter', 'SweetAlert', 'orgHKService', commonModule.controller('editOrganizationModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', '$filter', 'SweetAlert', 'orgHKService','ackUibModal',
function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, $filter, SweetAlert, orgHKService) { function ($scope, $log, $translate, uiGridConstants, $location, $timeout, $interval, $filter, SweetAlert, orgHKService,ackUibModal) {
var selectedModel = '.addOrgControlPop'; //'#addOrgControlPop' + $scope.dimensionId; var selectedModel = '.addOrgControlPop'; //'#addOrgControlPop' + $scope.dimensionId;
...@@ -77,12 +77,14 @@ ...@@ -77,12 +77,14 @@
// $scope.selfDimensionModel = getAddOrgSetDimension(); // $scope.selfDimensionModel = getAddOrgSetDimension();
// initIsCheckedServiceList(); // initIsCheckedServiceList();
// resetErrorStatus(); // resetErrorStatus();
$scope.orgControlForm.$setPristine(); if ($scope.isShow) {
$scope.orgControlForm.$setPristine();
$('#orgControlTab a:first').tab('show');
// $(selectedModel).modal('show');
}
// $scope.advancedControlForm.$setPristine(); // $scope.advancedControlForm.$setPristine();
// set first active page is basic info // set first active page is basic info
$('#orgControlTab a:first').tab('show');
// $('#orgModalFooter').css('padding-left','139px'); // $('#orgModalFooter').css('padding-left','139px');
$(selectedModel).modal('show');
}; };
$scope.nameKeyUp = function () { $scope.nameKeyUp = function () {
...@@ -392,6 +394,7 @@ ...@@ -392,6 +394,7 @@
$scope.closeModal = function () { $scope.closeModal = function () {
$scope.operateType = null; $scope.operateType = null;
$scope.modalManage.editOrgModal.cancel();
}; };
$scope.addEquity = function () { $scope.addEquity = function () {
...@@ -415,7 +418,7 @@ ...@@ -415,7 +418,7 @@
$scope.countryCNList = constant.countryCNList; $scope.countryCNList = constant.countryCNList;
$scope.legalFormTypeList = constant.organizationHK.legalFormTypeList; $scope.legalFormTypeList = constant.organizationHK.legalFormTypeList;
$scope.entityLevelTypeList = constant.organizationHK.EntityLevel; $scope.entityLevelTypeList = constant.organizationHK.EntityLevel;
$scope.jurisdictionOfFormationTypeList=constant.organizationHK.JurisdictionOfFormation; $scope.jurisdictionOfFormationTypeList = constant.organizationHK.JurisdictionOfFormation;
$scope.ownershipFormTypeList = constant.organizationHK.OwnershipForm; $scope.ownershipFormTypeList = constant.organizationHK.OwnershipForm;
$('.localRequired').attr("required", true); $('.localRequired').attr("required", true);
$('.orgAreaRequired').attr("required", true); $('.orgAreaRequired').attr("required", true);
...@@ -658,6 +661,36 @@ ...@@ -658,6 +661,36 @@
}; };
$scope.isShow = false;
//模态框管理
$scope.modalManage = {
editOrgModal: {
open: function () {
$scope.modalInstance = ackUibModal($scope,
'edit-organization-modal.html',
'edit-organization-modal-wrapper',
$scope.parentPage, 'static', function () {
$scope.isShow = false;
ackMessageBox.close();
});
$scope.modalInstance.open();
},
close: function () {
$scope.modalInstance.close();
},
cancel: function () {
$scope.modalInstance.cancel();
}
}
};
$scope.$watch('isShow', function (newValue, oldValue) {
if (newValue) {
$scope.modalManage.editOrgModal.open();
}
});
(function initialize() { (function initialize() {
$log.debug('editOrganizationModalController.ctor()...'); $log.debug('editOrganizationModalController.ctor()...');
$scope.maxdropLength = 20; $scope.maxdropLength = 20;
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html
View file @ 79bd35d6
<div class="edit-organization-modal-wrapper"> <div class="edit-organization-modal-wrapper">
<div class="modal fade addOrgControlPop" id="addOrgControlPop{{dimensionId}}" tabindex="-1" role="dialog" <script type="text/ng-template" id="edit-organization-modal.html">
aria-labelledby="myModalLabel"> <div class="modal-header">
<div class="modal-dialog" role="document"> <div class="modal-title" ng-if="isAdd">{{'AddOrganization' | translate}}
<div class="modal-content"> </div>
<div class="modal-header"> <div class="modal-title" ng-if="!isAdd">{{'EditOrganization' | translate}}
<div class="modal-title" ng-if="isAdd">{{'AddOrganization' | translate}} </div>
</div> </div>
<div class="modal-title" ng-if="!isAdd">{{'EditOrganization' | translate}} <div id="orgControlTab">
</div> <ul class="nav nav-tabs" ng-if="isAdd">
</div> <li class="active">
<div id="orgControlTab"> <a href="#basicdata" data-toggle="tab">
<ul class="nav nav-tabs" ng-if="isAdd"> {{'FundamentalInfo' | translate}}
<li class="active"> <span class="glyphicon glyphicon-exclamation-sign" ng-if="isShowBasic"></span>
<a href="#basicdata" data-toggle="tab"> </a>
{{'FundamentalInfo' | translate}} </li>
<span class="glyphicon glyphicon-exclamation-sign" ng-if="isShowBasic"></span> <li>
</a> <a href="#advancedOptions" data-toggle="tab">
</li> {{'ShareholderInfo' | translate}}
<li> <span class="glyphicon glyphicon-exclamation-sign" ng-if="isShowAdvanced"></span>
<a href="#advancedOptions" data-toggle="tab"> </a>
{{'ShareholderInfo' | translate}} </li>
<span class="glyphicon glyphicon-exclamation-sign" ng-if="isShowAdvanced"></span> </ul>
</a> </div>
</li> <div id="myTabContent" class="tab-content">
</ul> <div id="basicdata" class="tab-pane in active">
</div> <form class="form-horizontal" id="orgControlForm" name="orgControlForm">
<div id="myTabContent" class="tab-content"> <div class="local">
<div id="basicdata" class="tab-pane in active"> <div style="margin-left: 20px;margin-top: 20px">
<form class="form-horizontal" id="orgControlForm" name="orgControlForm"> <span style="font-weight: bold;font-size: large;">{{'EntityInfo'|translate}}</span>
<div class="local"> </div>
<div style="margin-left: 20px;margin-top: 20px"> <div class="bottom-row">
<span style="font-weight: bold;font-size: large;">{{'EntityInfo'|translate}}</span> <div class="quarter-div leftUp">
<!--机构名称-->
<div class="form-group">
<label class="col-sm-3 control-label"><span class="must-input">*</span>{{'OrganizationName' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.name.$invalid && (orgControlForm.name.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" id="name"
ng-model="editOrgModel.name" name="name"
placeholder="{{resources.OrganizationName}}" ng-keyup="nameKeyUp()"
maxlength="100">
<!--<p ng-show="orgControlForm.name.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label">{{resources.OrganizationMsgNameRequired}}-->
<!--</p>-->
<!--<p ng-show="editOrgModel.nameError" class="has-error label">-->
<!--{{editOrgModel.nameError}}</p>-->
</div>
</div> </div>
<div class="bottom-row">
<div class="quarter-div leftUp">
<!--机构名称-->
<div class="form-group">
<label class="col-sm-3 control-label"><span class="must-input">*</span>{{'OrganizationName' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.name.$invalid && (orgControlForm.name.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" id="name"
ng-model="editOrgModel.name" name="name"
placeholder="{{resources.OrganizationName}}" ng-keyup="nameKeyUp()"
maxlength="100">
<!--<p ng-show="orgControlForm.name.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label">{{resources.OrganizationMsgNameRequired}}-->
<!--</p>-->
<!--<p ng-show="editOrgModel.nameError" class="has-error label">-->
<!--{{editOrgModel.nameError}}</p>-->
</div>
</div>
<!--Internal Entity Code-->
<div class="form-group">
<label class="col-sm-3 control-label"></span>{{'EntityCode' | translate}}：</label>
<div class="col-sm-9">
<input class="form-control" id="entityCode"
ng-model="editOrgModel.code" name="entityCode"
placeholder="{{resources.EntityCode}}"
ng-keyup="nameKeyUp()" maxlength="100">
</div>
</div>
<!--Legal Form--> <!--Internal Entity Code-->
<div class="form-group"> <div class="form-group">
<label for="legalForm" class="col-sm-3 control-label"><span <label class="col-sm-3 control-label"></span>{{'EntityCode' | translate}}：</label>
class="must-input">*</span>{{'OrganizationLegalForm' | translate}}：</label> <div class="col-sm-9">
<div class="col-sm-9" <input class="form-control" id="entityCode"
ng-class="{'has-error':orgControlForm.legalForm.$invalid && (orgControlForm.legalForm.$dirty || orgControlForm.$submitted)}"> ng-model="editOrgModel.code" name="entityCode"
<select class="form-control" id='legalForm' placeholder="{{resources.EntityCode}}"
name="legalForm" ng-model="editOrgModel.legalForm" ng-keyup="nameKeyUp()" maxlength="100">
ng-options="item.type as item.type for item in legalFormTypeList"> </div>
<option value="">{{resources.LegalForm}}</option> </div>
</select>
<!--<p ng-show="orgControlForm.clientCode.$error.required && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label">-->
<!--{{resources.OrganizationMsgClientCodeRequired}}</p>-->
</div>
</div>
<!--registerAddress--> <!--Legal Form-->
<div class="form-group"> <div class="form-group">
<label for="registerAddress" <label for="legalForm" class="col-sm-3 control-label"><span
class="col-sm-3 control-label">{{'RegistrationLocation' | translate}}：</label> class="must-input">*</span>{{'OrganizationLegalForm' | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registerAddress.$invalid && (orgControlForm.registerAddress.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.legalForm.$invalid && (orgControlForm.legalForm.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="registerAddress" id="registerAddress" <select class="form-control" id='legalForm'
ng-model="editOrgModel.registerAddress" name="legalForm" ng-model="editOrgModel.legalForm"
placeholder="{{resources.registrationLocation}}" maxlength="100"> ng-options="item.type as item.type for item in legalFormTypeList">
<!--<p ng-show="orgControlForm.architectureType.$error.required && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)"--> <option value="">{{resources.LegalForm}}</option>
<!--class="has-error label">--> </select>
<!--{{resources.OrganizationMsgArchitectureTypeRequired}}</p>--> <!--<p ng-show="orgControlForm.clientCode.$error.required && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)"-->
</div> <!--class="has-error label">-->
</div> <!--{{resources.OrganizationMsgClientCodeRequired}}</p>-->
</div>
</div>
<!--authorisedCapital--> <!--registerAddress-->
<div class="form-group"> <div class="form-group">
<label for="authorisedCapital" class="col-sm-3 control-label">{{'authorisedCapital' | translate}}：</label> <label for="registerAddress"
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.authorisedCapital.$invalid && (orgControlForm.authorisedCapital.$dirty || orgControlForm.$submitted)}"> class="col-sm-3 control-label">{{'RegistrationLocation' | translate}}：</label>
<input class="form-control" name="authorisedCapital" id="authorisedCapital" <div class="col-sm-9"
ng-model="editOrgModel.authorisedCapital" ng-class="{'has-error':orgControlForm.registerAddress.$invalid && (orgControlForm.registerAddress.$dirty || orgControlForm.$submitted)}">
placeholder="{{resources.authorisedCapital}}" maxlength="100"> <input class="form-control" name="registerAddress" id="registerAddress"
</div> ng-model="editOrgModel.registerAddress"
</div> placeholder="{{resources.registrationLocation}}" maxlength="100">
<!--<p ng-show="orgControlForm.architectureType.$error.required && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label">-->
<!--{{resources.OrganizationMsgArchitectureTypeRequired}}</p>-->
</div>
</div>
<!--issuedCapital--> <!--authorisedCapital-->
<div class="form-group"> <div class="form-group">
<label for="issuedCapital" class="col-sm-3 control-label">{{'issuedCapital' | translate}}：</label> <label for="authorisedCapital" class="col-sm-3 control-label">{{'authorisedCapital' | translate}}：</label>
<!-- <div class="col-sm-9" <div class="col-sm-9" ng-class="{'has-error':orgControlForm.authorisedCapital.$invalid && (orgControlForm.authorisedCapital.$dirty || orgControlForm.$submitted)}">
ng-class="{'has-error':orgControlForm.registrationCapital.$invalid && (orgControlForm.registrationCapital.$dirty || orgControlForm.$submitted)}"> --> <input class="form-control" name="authorisedCapital" id="authorisedCapital"
<div class="col-sm-9"> ng-model="editOrgModel.authorisedCapital"
<input class="form-control" name="issuedCapital" placeholder="{{resources.authorisedCapital}}" maxlength="100">
id="issuedCapital" ng-model="editOrgModel.issuedCapital" </div>
placeholder="{{resources.issuedCapital}}" maxlength="50"> </div>
</div>
</div>
<!--industry--> <!--issuedCapital-->
<div class="form-group"> <div class="form-group">
<label for="industry" class="col-sm-3 control-label">{{'industry' | translate}}：</label> <label for="issuedCapital" class="col-sm-3 control-label">{{'issuedCapital' | translate}}：</label>
<div class="col-sm-9" <!-- <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.industry.$invalid && (orgControlForm.industry.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.registrationCapital.$invalid && (orgControlForm.registrationCapital.$dirty || orgControlForm.$submitted)}"> -->
<input class="form-control" name="industry" <div class="col-sm-9">
id="industry" ng-model="editOrgModel.industry" <input class="form-control" name="issuedCapital"
placeholder="{{resources.industry}}" maxlength="50"> id="issuedCapital" ng-model="editOrgModel.issuedCapital"
</div> placeholder="{{resources.issuedCapital}}" maxlength="50">
</div>
</div> </div>
<div class="quarter-div rightUp"> </div>
<!--businessLicense-->
<div class="form-group">
<label for="businessLicense" class="col-sm-3 control-label"><span class="must-input">*</span>{{'businessLicense' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.businessLicense.$invalid && (orgControlForm.businessLicense.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" name="businessLicense"
id="businessLicense" ng-model="editOrgModel.businessLicense"
maxlength="50" placeholder="{{resources.businessLicense}}">
<!--<p ng-show="orgControlForm.businessLicense.$error.taxPayerNumberUnique && (orgControlForm.businessLicense.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label">-->
<!--{{resources.OrganizationMsgTaxPayerNumberUnique}}</p>-->
</div>
</div>
<!--entityLevel--> <!--industry-->
<div class="form-group"> <div class="form-group">
<label for="entityLevel" class="col-sm-3 control-label"><span <label for="industry" class="col-sm-3 control-label">{{'industry' | translate}}：</label>
class="must-input">*</span>{{'entityLevel' | translate}}：</label> <div class="col-sm-9"
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.industry.$invalid && (orgControlForm.industry.$dirty || orgControlForm.$submitted)}">
ng-class="{'has-error':orgControlForm.entityLevel.$invalid && (orgControlForm.entityLevel.$dirty || orgControlForm.$submitted)}"> <input class="form-control" name="industry"
<select class="form-control" id='entityLevel' id="industry" ng-model="editOrgModel.industry"
name="entityLevel" ng-model="editOrgModel.entityLevel" placeholder="{{resources.industry}}" maxlength="50">
ng-options="item.type as item.type for item in entityLevelTypeList"> </div>
<option value="">{{resources.entityLevel}}</option> </div>
</select> </div>
</div> <div class="quarter-div rightUp">
</div> <!--businessLicense-->
<div class="form-group">
<label for="businessLicense" class="col-sm-3 control-label"><span class="must-input">*</span>{{'businessLicense' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.businessLicense.$invalid && (orgControlForm.businessLicense.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" name="businessLicense"
id="businessLicense" ng-model="editOrgModel.businessLicense"
maxlength="50" placeholder="{{resources.businessLicense}}">
<!--<p ng-show="orgControlForm.businessLicense.$error.taxPayerNumberUnique && (orgControlForm.businessLicense.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label">-->
<!--{{resources.OrganizationMsgTaxPayerNumberUnique}}</p>-->
</div>
</div>
<!--dateOfIncorporation--> <!--entityLevel-->
<div class="form-group"> <div class="form-group">
<label for="dateOfIncorporation" class="col-sm-3 control-label">{{'dateOfIncorporation' | translate}}：</label> <label for="entityLevel" class="col-sm-3 control-label"><span
<div class="col-sm-9" class="must-input">*</span>{{'entityLevel' | translate}}：</label>
ng-class="{'has-error':orgControlForm.dateOfIncorporation.$invalid && (orgControlForm.dateOfIncorporation.$dirty || orgControlForm.$submitted)}"> <div class="col-sm-9"
<div class="input-daterange startDatepicker"> ng-class="{'has-error':orgControlForm.entityLevel.$invalid && (orgControlForm.entityLevel.$dirty || orgControlForm.$submitted)}">
<input type="text" id="dateOfIncorporation" class="input-sm form-control" name="dateOfIncorporation" ng-model="editOrgModel.dateOfIncorporation" <select class="form-control" id='entityLevel'
required="required" placeholder="{{resources.dateOfIncorporation}}"/> name="entityLevel" ng-model="editOrgModel.entityLevel"
</div> ng-options="item.type as item.type for item in entityLevelTypeList">
<!-- <p ng-show="orgControlForm.regStatus.$error.required && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)" <option value="">{{resources.entityLevel}}</option>
class="has-error label"> </select>
{{resources.OrganizationMsgRegStatusRequired}}</p> --> </div>
</div> </div>
</div>
<!--jurisdictionOfFormation--> <!--dateOfIncorporation-->
<div class="form-group"> <div class="form-group">
<label for="jurisdictionOfFormation" class="col-sm-3 control-label"><span class="must-input">*</span>{{'jurisdictionOfFormation' | translate}}：</label> <label for="dateOfIncorporation" class="col-sm-3 control-label">{{'dateOfIncorporation' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.jurisdictionOfFormation.$invalid && (orgControlForm.jurisdictionOfFormation.$dirty || orgControlForm.$submitted)}"> <div class="col-sm-9"
<select class="form-control" id='jurisdictionOfFormation' ng-class="{'has-error':orgControlForm.dateOfIncorporation.$invalid && (orgControlForm.dateOfIncorporation.$dirty || orgControlForm.$submitted)}">
name="jurisdictionOfFormation" ng-model="editOrgModel.jurisdictionOfFormation" <div class="input-daterange startDatepicker">
ng-options="item.type as item.type for item in jurisdictionOfFormationTypeList"> <input type="text" id="dateOfIncorporation" class="input-sm form-control" name="dateOfIncorporation" ng-model="editOrgModel.dateOfIncorporation"
<option value="">{{resources.jurisdictionOfFormation}}</option> required="required" placeholder="{{resources.dateOfIncorporation}}"/>
</select>
<!-- <p ng-show="orgControlForm.code.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
class="has-error label">{{resources.OrganizationMsgCodeRequired}}</p>
<p ng-show="orgControlForm.code.$error.maxlength"
class="has-error label">
{{resources.OrganizationMsgCodeMaxLength}}</p>
<p ng-show="orgControlForm.code.$error.pattern" class="has-error label">
{{resources.OrganizationMsgCodePattern}}</p>
<p ng-show="orgControlForm.code.$error.codeUnique"
class="has-error label">{{resources.OrganizationMsgCodeUnique}}</p> -->
</div>
</div> </div>
<!-- <p ng-show="orgControlForm.regStatus.$error.required && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)"
class="has-error label">
{{resources.OrganizationMsgRegStatusRequired}}</p> -->
</div>
</div>
<!--financialYearEnd--> <!--jurisdictionOfFormation-->
<div class="form-group"> <div class="form-group">
<label for="financialYearEnd" class="col-sm-3 control-label">{{'financialYearEnd' | translate}}：</label> <label for="jurisdictionOfFormation" class="col-sm-3 control-label"><span class="must-input">*</span>{{'jurisdictionOfFormation' | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9" ng-class="{'has-error':orgControlForm.jurisdictionOfFormation.$invalid && (orgControlForm.jurisdictionOfFormation.$dirty || orgControlForm.$submitted)}">
ng-class="{'has-error':orgControlForm.financialYearEnd.$invalid && (orgControlForm.financialYearEnd.$dirty || orgControlForm.$submitted)}"> <select class="form-control" id='jurisdictionOfFormation'
<input class="form-control" name="financialYearEnd" id="financialYearEnd" ng-model="editOrgModel.financialYearEnd" name="jurisdictionOfFormation" ng-model="editOrgModel.jurisdictionOfFormation"
placeholder="{{resources.financialYearEnd}}" maxlength="50"> ng-options="item.type as item.type for item in jurisdictionOfFormationTypeList">
</div> <option value="">{{resources.jurisdictionOfFormation}}</option>
</div> </select>
<!-- <p ng-show="orgControlForm.code.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
class="has-error label">{{resources.OrganizationMsgCodeRequired}}</p>
<p ng-show="orgControlForm.code.$error.maxlength"
class="has-error label">
{{resources.OrganizationMsgCodeMaxLength}}</p>
<p ng-show="orgControlForm.code.$error.pattern" class="has-error label">
{{resources.OrganizationMsgCodePattern}}</p>
<p ng-show="orgControlForm.code.$error.codeUnique"
class="has-error label">{{resources.OrganizationMsgCodeUnique}}</p> -->
</div>
</div>
<!--registeredAgent--> <!--financialYearEnd-->
<div class="form-group"> <div class="form-group">
<label for="registeredAgent" class="col-sm-3 control-label">{{'registeredAgent' | translate}}：</label> <label for="financialYearEnd" class="col-sm-3 control-label">{{'financialYearEnd' | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registeredAgent.$invalid && (orgControlForm.registeredAgent.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.financialYearEnd.$invalid && (orgControlForm.financialYearEnd.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="registeredAgent" id="registeredAgent" ng-model="editOrgModel.registeredAgent" placeholder="{{resources.registeredAgent}}" maxlength="50"> <input class="form-control" name="financialYearEnd" id="financialYearEnd" ng-model="editOrgModel.financialYearEnd"
</div> placeholder="{{resources.financialYearEnd}}" maxlength="50">
</div> </div>
</div>
<!--ownershipForm--> <!--registeredAgent-->
<div class="form-group"> <div class="form-group">
<label for="ownershipForm" <label for="registeredAgent" class="col-sm-3 control-label">{{'registeredAgent' | translate}}：</label>
class="col-sm-3 control-label">{{'ownershipForm' | translate}}：</label> <div class="col-sm-9"
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.registeredAgent.$invalid && (orgControlForm.registeredAgent.$dirty || orgControlForm.$submitted)}">
ng-class="{'has-error':orgControlForm.ownershipForm.$invalid && (orgControlForm.ownershipForm.$dirty || orgControlForm.$submitted)}"> <input class="form-control" name="registeredAgent" id="registeredAgent" ng-model="editOrgModel.registeredAgent" placeholder="{{resources.registeredAgent}}" maxlength="50">
<select class="form-control" id='ownershipForm'
name="ownershipForm"
ng-model="editOrgModel.ownershipForm"
ng-options="item.type as item.type for item in ownershipFormTypeList">
<option value="">{{resources.ownershipForm}}
</option>
</select>
<!-- <p ng-show="orgControlForm.engageNationalProhibitIndustry.$error.required && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)"
class="has-error label">
{{resources.OrganizationMsgEngageNationalProhibitIndustryRequired}}
</p> -->
</div>
</div>
</div> </div>
</div> </div>
</div>
</form>
</div>
<div id="advancedOptions" class="tab-pane fade">
<!--Equity information-->
<div class="label-current-holding">
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' | translate}}</label>
<button type="button" class="btn btn-in-grid" style="width: 117px;float:right" ng-click="addEquity()">
<i class="material-icons middle">create</i>{{'Create' | translate}}
</button>
</div>
<div class="dx-viewport grid-container">
<div id="equityGridContainer" dx-data-grid="equityGridOptions" style="margin-top: 10px;">
</div>
</div>
<!--Direcotr information--> <!--ownershipForm-->
<div class="label-director"> <div class="form-group">
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'DirectorInfo' | translate}}</label> <label for="ownershipForm"
<button type="button" class="btn btn-in-grid" style="width: 117px;float:right" ng-click="addDirector()"> class="col-sm-3 control-label">{{'ownershipForm' | translate}}：</label>
<i class="material-icons middle">create</i>{{'Create' | translate}} <div class="col-sm-9"
</button> ng-class="{'has-error':orgControlForm.ownershipForm.$invalid && (orgControlForm.ownershipForm.$dirty || orgControlForm.$submitted)}">
</div> <select class="form-control" id='ownershipForm'
<div class="dx-viewport grid-container"> name="ownershipForm"
<div id="DirectorGridContainer" dx-data-grid="directorGridOptions" style="margin-top: 10px;"> ng-model="editOrgModel.ownershipForm"
ng-options="item.type as item.type for item in ownershipFormTypeList">
<option value="">{{resources.ownershipForm}}
</option>
</select>
<!-- <p ng-show="orgControlForm.engageNationalProhibitIndustry.$error.required && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)"
class="has-error label">
{{resources.OrganizationMsgEngageNationalProhibitIndustryRequired}}
</p> -->
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </form>
<div class="modal-footer" id="orgModalFooter" style="padding-left:139px;"> </div>
<button type="submit" class="btn btn-primary" ng-click="saveOrg()"> <div id="advancedOptions" class="tab-pane fade">
{{'Confirm' | translate}} <!--Equity information-->
<div class="label-current-holding">
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' | translate}}</label>
<button type="button" class="btn btn-in-grid" style="width: 117px;float:right" ng-click="addEquity()">
<i class="material-icons middle">create</i>{{'Create' | translate}}
</button> </button>
<button type="button" class="btn btn-third" ng-click="closeModal()" data-dismiss="modal"> </div>
{{'Cancel' | translate}} <div class="dx-viewport grid-container">
<div id="equityGridContainer" dx-data-grid="equityGridOptions" style="margin-top: 10px;">
</div>
</div>
<!--Direcotr information-->
<div class="label-director">
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'DirectorInfo' | translate}}</label>
<button type="button" class="btn btn-in-grid" style="width: 117px;float:right" ng-click="addDirector()">
<i class="material-icons middle">create</i>{{'Create' | translate}}
</button> </button>
</div> </div>
<div class="dx-viewport grid-container">
<div id="DirectorGridContainer" dx-data-grid="directorGridOptions" style="margin-top: 10px;">
</div>
</div>
</div> </div>
</div> </div>
</div> <div class="modal-footer" id="orgModalFooter" style="padding-left:139px;">
<edit-organization-shareholder-modal is-show="isShowShareholderModal" parent-page=".edit-organization-modal-wrapper" edit-model="editShareholder"></edit-organization-shareholder-modal> <span style="float:right">
<edit-organization-director-modal is-show="isShowDirectorModal" parent-page=".edit-organization-modal-wrapper" edit-model="editDirector"></edit-organization-director-modal> <button type="submit" class="btn btn-primary" ng-click="saveOrg()">
{{'Confirm' | translate}}
</button>
<button type="button" class="btn btn-third" ng-click="closeModal()" data-dismiss="modal">
{{'Cancel' | translate}}
</button>
</span>
</div>
<edit-organization-shareholder-modal is-show-s="isShowShareholderModal" parent-page=".edit-organization-modal-wrapper" edit-model="editShareholder"></edit-organization-shareholder-modal>
<edit-organization-director-modal is-show-d="isShowDirectorModal" parent-page=".edit-organization-modal-wrapper" edit-model="editDirector"></edit-organization-director-modal>
</script>
</div> </div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.js
View file @ 79bd35d6
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
controller: 'editOrganizationModalController', controller: 'editOrganizationModalController',
scope: scope:
{ {
isShow: '=?',
parentPage: '@',
//区分是添加还是编辑 //区分是添加还是编辑
operateType: '=', operateType: '=',
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.less
View file @ 79bd35d6
@footer-button-left: 159px; @footer-button-left: 159px;
.edit-organization-modal-wrapper { .edit-organization-modal-wrapper {
height: 100%;
.modal-title {
.addOrgControlPop { font-family: 'Arial Bold', 'Arial';
.modal-header{ font-weight: 700;
border-bottom: 0px; font-style: normal;
} font-size: 16px;
.modal-title { color: #000000;
font-size: 16px; line-height: 20px;
} }
.must-input {
color: red; .modal-dialog {
} width: 1100px;
height: 600px;
.modal-dialog {
width: 1100px; .modal-body {
height: 600px; height: 100%;
} padding-left: 0px !important;
width: auto;
.btn-default { .row {
height: 33px; height: 100%;
width: 250px; margin-bottom: 20px;
} }
input { .left-container {
width: 250px; height: 100%;
height: 33px;
} .pic-file-title {
.base-font-style;
.modal-body {
padding-left: 0px !important;
width: auto;
}
.dropdown-menu {
max-height: 220px;
overflow-y: auto;
width: 250px;
}
.scoreDropDownBtn {
width: 250px;
}
select {
width: 250px;
height: 33px;
padding-left: 8px !important;
}
form .col-sm-3 {
font-weight: normal;
width: 35%;
} }
form .col-sm-9 { .pic-file-wrapper {
width: 65%; width: 100%;
margin-left: -20px; /*height:480px!important;*/
height: calc(~"100% - 20px");
/*background: url('TestInvoice.JPG');*/
background-size: contain;
background-repeat: no-repeat;
} }
form input[type='radio'] { .show-full-pic {
margin: 0 5px; cursor: pointer;
float: right;
margin-top: 18px;
} }
}
.control-label { .right-container {
padding-left: 12px; }
white-space: nowrap; }
}
.modal-footer {
text-align: left;
}
}
.modal-header {
border-bottom: 0px;
}
.modal-title {
font-size: 16px;
}
.must-input {
color: red;
}
.btn-default {
height: 33px;
width: 250px;
}
input {
width: 250px;
height: 33px;
}
//.modal-body {
// padding-left: 0px !important;
// width: auto;
//}
.dropdown-menu {
max-height: 220px;
overflow-y: auto;
width: 250px;
}
.scoreDropDownBtn {
width: 250px;
}
select {
width: 250px;
height: 33px;
padding-left: 8px !important;
}
form .col-sm-3 {
font-weight: normal;
width: 35%;
}
form .col-sm-9 {
width: 65%;
margin-left: -20px;
}
form input[type='radio'] {
margin: 0 5px;
}
.control-label {
padding-left: 12px;
white-space: nowrap;
}
.dropdown-toggle .caret {
width: 10px;
height: 10px;
border: none; //IE
margin-top: -2px !important;
}
.dropdown-toggle .caret:before {
//IE
content: url(../../../../app-resources/images/ie11Trigangle.png);
margin-left: -12px !important;
margin-right: 1px;
}
.main {
margin: 20px 1px;
border-bottom: 1px;
}
//Target Chrome
@media screen and (-webkit-min-device-pixel-ratio: 0) {
.dropdown-toggle .caret {
width: 10px;
height: 10px;
border: none;
margin-top: 0px;
margin-right: -10px;
}
.dropdown-toggle .caret { .dropdown-toggle .caret:before {
width: 10px; content: url(../../../../app-resources/images/chromeTriangle.png);
height: 10px; margin-left: 3px;
border: none; //IE }
margin-top: -2px !important; }
.bottom-row {
display: block;
}
.quarter-div {
width: 50%;
float: left;
padding: 30px 10px 10px 10px;
}
.row-line {
height: 1px;
border-bottom: 1px solid #CDCDCD;
margin: 0px 20px;
}
.leftUp {
/*background-color: #5BC0DE;*/
width: 50%;
/*margin-left: 20px;*/
/*width: 44%;*/
}
.rightUp {
width: 45%;
/*background-color: #5CB85C;*/
}
.leftDown {
/*border-top: 1px solid #D5D5D5;*/
/*margin-left: 20px;*/
width: 50%;
/*background-color: #F0AD4E;*/
/*overflow-y: auto;*/
}
.rightDown {
/*border-top: 1px solid #D5D5D5;*/
width: 45%;
/*overflow-y: auto;*/
/*background-color: #FFC706;*/
}
.tab-pane {
/*height: 460px;*/
overflow-y: auto;
}
#basicdata {
max-height: 460px;
overflow-y: auto;
}
#orgControlTab {
padding: 0 10px;
ul {
color: #ffc107;
border-bottom: 0px;
li {
/*height: 30px;*/
width: 50%;
border: 1px solid #F2F2F2;
&:hover {
/*border: 1px solid #F2F2F2!important;*/
} }
a:hover {
.dropdown-toggle .caret:before { color: #D35412 !important;
//IE background-color: white !important;
content: url(../../../../app-resources/images/ie11Trigangle.png);
margin-left: -12px !important;
margin-right: 1px;
} }
}
.main {
margin: 20px 1px; li a {
border-bottom: 1px; font-size: 16px;
} //Target Chrome height: 38px;
@media screen and (-webkit-min-device-pixel-ratio:0) { line-height: 38px;
.dropdown-toggle .caret { border-radius: 1px;
width: 10px; padding: 0px 20px;
height: 10px; vertical-align: middle;
border: none; text-align: center;
margin-top: 0px; border: 0px;
margin-right: -10px; color: black !important;
} }
.dropdown-toggle .caret:before { li.active {
content: url(../../../../app-resources/images/chromeTriangle.png); background-color: #f3f2f0 !important;
margin-left: 3px; /*border:0px;*/
} a,
a:hover,
a:focus {
color: black !important;
background-color: #f3f2f0 !important;
} }
}
li a span {
float: right;
vertical-align: middle;
line-height: 30px;
margin-top: -2px;
}
.glyphicon-exclamation-sign {
color: red;
}
}
}
.bottom-row { .level-title {
display: block; padding: 18px 15px;
}
.quarter-div { span {
width: 50%; color: #D35412;
float: left; font-weight: bold;
padding: 30px 10px 10px 10px; }
} }
.row-line { .account-modal-table {
height: 1px; margin-left: 15px;
border-bottom: 1px solid #CDCDCD; margin-right: 15px;
margin: 0px 20px;
}
.leftUp { .account-set-select {
/*background-color: #5BC0DE;*/ width: 150px;
width: 50%; }
/*margin-left: 20px;*/
/*width: 44%;*/
}
.rightUp { .row {
width: 45%; margin-left: 0px;
/*background-color: #5CB85C;*/ margin-right: 0px;
}
.leftDown { span {
/*border-top: 1px solid #D5D5D5;*/ margin-top: 8px;
/*margin-left: 20px;*/ display: inline-block;
width: 50%; }
/*background-color: #F0AD4E;*/
/*overflow-y: auto;*/
}
.rightDown { select {
/*border-top: 1px solid #D5D5D5;*/ margin-right: 10px;
width: 45%; }
/*overflow-y: auto;*/
/*background-color: #FFC706;*/
}
.delete {
color: #D35412;
cursor: pointer;
}
.tab-pane { .add {
/*height: 460px;*/ cursor: pointer;
overflow-y: auto; }
} }
#basicdata { .box {
max-height: 460px; border-left: 1px solid #d4d4d4;
overflow-y: auto; border-top: 1px solid #d4d4d4;
} height: 54px;
padding: 9px;
.AccountName-span {
padding-right: 0px;
padding-left: 0px;
width: 80px;
}
.StartTime-span {
width: 56px;
padding-left: 0px;
padding-right: 0px;
margin-left: 55px;
}
.To-span {
width: 5px;
padding-left: 15px;
padding-right: 0px;
}
.test-select {
width: 130px;
}
.col-sm-5 {
padding-right: 0px;
width: 120px;
}
.col-sm-4 {
width: 180px;
}
.form_datetime {
width: 120px;
border-radius: 4px;
padding-left: 15px;
background-color: white;
}
}
#orgControlTab { .box-right {
border-right: 1px solid #d4d4d4;
padding: 0 10px; }
ul {
color: #ffc107;
border-bottom: 0px;
li {
/*height: 30px;*/
width: 50%;
border: 1px solid #F2F2F2;
&:hover{
/*border: 1px solid #F2F2F2!important;*/
}
a:hover {
color: #D35412!important;
background-color: white!important;
}
}
li a {
font-size: 16px;
height: 38px;
line-height: 38px;
border-radius: 1px;
padding: 0px 20px;
vertical-align: middle;
text-align: center;
border: 0px;
color: black!important;
}
li.active {
background-color: #f3f2f0!important;
/*border:0px;*/
a,
a:hover,
a:focus {
color: black!important;
background-color: #f3f2f0!important;
}
}
li a span {
float: right;
vertical-align: middle;
line-height: 30px;
margin-top: -2px;
}
.glyphicon-exclamation-sign {
color: red;
}
}
}
.level-title { .box-bottom {
padding: 18px 15px; border-bottom: 1px solid #d4d4d4;
}
}
.server-modal-table {
margin-left: 15px;
margin-right: 15px;
width: 800px;
height: 163px;
.row {
margin-left: 0px;
margin-right: 0px;
span {
margin-top: 8px;
display: inline-block;
}
select {
margin-right: 10px;
}
.delete {
color: #D35412;
cursor: pointer;
}
.add {
cursor: pointer;
}
}
span { .box {
color: #D35412; /*border-left: 1px solid #d4d4d4;*/
font-weight: bold; border-bottom: 1px solid #d4d4d4;
} height: 54px;
} padding: 9px;
width: 630px;
.serviceCheckBox {
width: 60px;
padding-top: 4px;
}
.ServiceName-span {
padding-right: 0px;
padding-left: 0px;
width: 150px;
font-weight: inherit;
font-size: 14px;
line-height: 1.42857143;
color: #333333;
margin-top: 6px;
}
.ReportTemplate-span {
width: 80px;
padding-left: 0px;
padding-right: 0px;
margin-left: 55px;
font-weight: inherit;
font-size: 14px;
line-height: 1.42857143;
color: #333333;
margin-top: 6px;
}
.test-select {
width: 130px;
}
.col-sm-5 {
padding-right: 0px;
width: 80px;
}
.col-sm-4 {
width: 180px;
}
.form_datetime {
width: 80px;
border: 1px solid #cccccc;
border-radius: 4px;
padding-left: 15px;
background-color: white;
}
}
.account-modal-table { .box-right {
margin-left: 15px; border-right: 1px solid #d4d4d4;
margin-right: 15px; }
.account-set-select {
width: 150px;
}
.row {
margin-left: 0px;
margin-right: 0px;
span {
margin-top: 8px;
display: inline-block;
}
select {
margin-right: 10px;
}
.delete {
color: #D35412;
cursor: pointer;
}
.add {
cursor: pointer;
}
}
.box {
border-left: 1px solid #d4d4d4;
border-top: 1px solid #d4d4d4;
height: 54px;
padding: 9px;
.AccountName-span {
padding-right: 0px;
padding-left: 0px;
width: 80px;
}
.StartTime-span {
width: 56px;
padding-left: 0px;
padding-right: 0px;
margin-left: 55px;
}
.To-span {
width: 5px;
padding-left: 15px;
padding-right: 0px;
}
.test-select {
width: 130px;
}
.col-sm-5 {
padding-right: 0px;
width: 120px;
}
.col-sm-4 {
width: 180px;
}
.form_datetime {
width: 120px;
border-radius: 4px;
padding-left: 15px;
background-color: white;
}
}
.box-right {
border-right: 1px solid #d4d4d4;
}
.box-bottom {
border-bottom: 1px solid #d4d4d4;
}
}
.server-modal-table { .box-bottom {
margin-left: 15px; border-bottom: 1px solid #d4d4d4;
margin-right: 15px; }
width: 800px;
height: 163px;
.row {
margin-left: 0px;
margin-right: 0px;
span {
margin-top: 8px;
display: inline-block;
}
select {
margin-right: 10px;
}
.delete {
color: #D35412;
cursor: pointer;
}
.add {
cursor: pointer;
}
}
.box {
/*border-left: 1px solid #d4d4d4;*/
border-bottom: 1px solid #d4d4d4;
height: 54px;
padding: 9px;
width: 630px;
.serviceCheckBox {
width: 60px;
padding-top: 4px;
}
.ServiceName-span {
padding-right: 0px;
padding-left: 0px;
width: 150px;
font-weight: inherit;
font-size: 14px;
line-height: 1.42857143;
color: #333333;
margin-top: 6px;
}
.ReportTemplate-span {
width: 80px;
padding-left: 0px;
padding-right: 0px;
margin-left: 55px;
font-weight: inherit;
font-size: 14px;
line-height: 1.42857143;
color: #333333;
margin-top: 6px;
}
.test-select {
width: 130px;
}
.col-sm-5 {
padding-right: 0px;
width: 80px;
}
.col-sm-4 {
width: 180px;
}
.form_datetime {
width: 80px;
border: 1px solid #cccccc;
border-radius: 4px;
padding-left: 15px;
background-color: white;
}
}
.box-right {
border-right: 1px solid #d4d4d4;
}
.box-bottom {
border-bottom: 1px solid #d4d4d4;
}
.checkService {
width: 16px;
height: 16px;
}
}
#advancedOptions { .checkService {
max-height: 100%; width: 16px;
height: 16px;
}
}
margin:10px 20px 0px 20px; #advancedOptions {
max-height: 100%;
.right-option { margin: 10px 20px 0px 20px;
height: 30px;
display: inline-block;
vertical-align: middle;
float: right;
}
#equityGridContainer { .right-option {
/*height: 600px;*/ height: 30px;
margin-bottom: 15px; display: inline-block;
} vertical-align: middle;
float: right;
}
.label-current-holding { #equityGridContainer {
padding-top: 10px; /*height: 600px;*/
} margin-bottom: 15px;
}
.current-holding-info { .label-current-holding {
padding-top: 10px; padding-top: 10px;
} }
.label { .current-holding-info {
padding-bottom: 2px; padding-top: 10px;
} }
.page-footer { .label {
display: inline-block; padding-bottom: 2px;
float: right; }
/*padding-right: 20px;*/
}
.page-form-group { .page-footer {
float: right; display: inline-block;
margin-top: 20px; float: right;
/*padding-right: 20px;*/
}
.page-size { .page-form-group {
margin: 0; float: right;
} margin-top: 20px;
.pagination { .page-size {
margin: 0; margin: 0;
} }
}
} .pagination {
margin: 0;
}
} }
}
} }
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.ctrl.js
View file @ 79bd35d6
commonModule.controller('editOrganizationShareholderModalController', ['$scope', '$log', function ($scope, $log) { commonModule.controller('editOrganizationShareholderModalController', ['$scope', '$log', 'ackUibModal', function ($scope, $log, ackUibModal) {
'use strict'; 'use strict';
$scope.isShow = false; $scope.isShow = false;
//模态框管理 //模态框管理
$scope.modalManage = { $scope.modalManage = {
directorModal: { shareholderModal: {
open: function () { open: function () {
$scope.modalInstance = ackUibModal($scope, $scope.modalInstance = ackUibModal($scope,
'edit-organization-shareholder-modal.html', 'edit-organization-shareholder-modal.html',
'edit-organization-shareholder-modal', 'edit-organization-shareholder-modal-wrapper',
$scope.parentPage, 'static', function () { null, 'static', function () {
$scope.isShow = false; $scope.isShow = false;
ackMessageBox.close(); ackMessageBox.close();
}); });
$scope.modalInstance.open(); $scope.modalInstance.open();
}, },
close: function () { close: function () {
$scope.isShow = false;
$scope.modalInstance.close(); $scope.modalInstance.close();
}, },
cancel: function () { cancel: function () {
$scope.isShow = false;
$scope.modalInstance.cancel(); $scope.modalInstance.cancel();
} }
} }
...@@ -40,9 +42,9 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope', ...@@ -40,9 +42,9 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope',
}, },
initWatches: function () { initWatches: function () {
$scope.$watch('isShow', function (newValue, oldValue) { $scope.$watch('isShowS', function (newValue, oldValue) {
if (newValue) { if (newValue) {
$scope.modalManage.uploadInvoiceExtra.open(); $scope.modalManage.shareholderModal.open();
} }
}); });
} }
......
atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.html
View file @ 79bd35d6
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<div class="modal-footer"> <div class="modal-footer">
<span style="float:right"> <span style="float:right">
<button class="btn btn-primary" type="button" ng-click="save()" translate="Submit"></button> <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> <button class="btn btn-third" type="button" ng-click="modalManage.shareholderModal.cancel()" translate="Cancel"></button>
</span> </span>
</div> </div>
</script> </script>
......
atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.js
View file @ 79bd35d6
...@@ -7,7 +7,7 @@ commonModule.directive('editOrganizationShareholderModal', ['$log', function ($l ...@@ -7,7 +7,7 @@ commonModule.directive('editOrganizationShareholderModal', ['$log', function ($l
replace: true, replace: true,
controller: 'editOrganizationShareholderModalController', controller: 'editOrganizationShareholderModalController',
scope: { scope: {
isShow: '=?', isShowS: '=?',
parentPage: '@', parentPage: '@',
editModel: '=?' editModel: '=?'
}, },
......
atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.less
View file @ 79bd35d6
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
.edit-organization-shareholder-modal-wrapper { .edit-organization-shareholder-modal-wrapper {
height: 100%; height: 100%;
.modal-title { .modal-title {
font-family: 'Arial Bold', 'Arial'; font-family: 'Arial Bold', 'Arial';
font-weight: 700; font-weight: 700;
...@@ -19,7 +18,7 @@ ...@@ -19,7 +18,7 @@
} }
.modal-dialog { .modal-dialog {
width: 80% !important; width: 50% !important;
.modal-body { .modal-body {
height: 100%; height: 100%;
......
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