fixed entity page-- frank

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html

@@ -83,12 +83,8 @@
                                 {{selectCompany.name | limitString:50}}</p>
                         </div>
                         <div class="right-option">
-                            <!--<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="updateOrg()" ng-if="hasEditPermission"><i class="material-icons middle">create</i>{{'Change' | translate}}</button>-->
-                            <button type="button" id="organizationIsActiveBtn" class="btn"
-                                    ng-class="{true:'btn-secondary', false:'btn-in-grid'}[!selectCompany.isActive]"
-                                    ng-click="updateIsActive()" ng-disabled="!isCanOrganizationIsActiveBtn"><i
-                                    ng-show="selectCompany.isActive"
-                                    class="material-icons stop">block</i>{{selectCompany.isActiveStr}}
+                            <button type="button" id="organizationIsActiveBtn" class="btn" ng-class="{true:'btn-secondary', false:'btn-in-grid'}[!selectCompany.isActive]"
+                                    ng-click="updateIsActive()" ng-disabled="!isCanOrganizationIsActiveBtn"><i ng-show="selectCompany.isActive" class="material-icons stop">block</i>{{selectCompany.isActiveStr}}
                             </button>
                             <span class="right-operate"></span>
                         </div>

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html

@@ -13,13 +13,13 @@
                     <ul class="nav nav-tabs">
                         <li class="active">
                             <a href="#basicdata" data-toggle="tab">
-                                {{'OrganizationBasicData' | translate}}
+                                {{'FundamentalInfo' | translate}}
                                 <span class="glyphicon glyphicon-exclamation-sign" ng-if="isShowBasic"></span>
                             </a>
                         </li>
                         <li>
                             <a href="#advancedOptions" data-toggle="tab">
-                                {{'OrganizationAdvancedOptions' | translate}}
+                                {{'ShareholderInfo' | translate}}
                                 <span class="glyphicon glyphicon-exclamation-sign" ng-if="isShowAdvanced"></span>
                             </a>
                         </li>
@@ -30,7 +30,7 @@
                         <form class="form-horizontal" id="orgControlForm" name="orgControlForm">
                             <div class="local">
                                 <div style="margin-left: 20px;margin-top: 20px">
-                                    <span style="font-weight: bold;font-size: large;">{{'entityInfo'|translate}}</span>
+                                    <span style="font-weight: bold;font-size: large;">{{'EntityInfo'|translate}}</span>
                                 </div>
                                 <div class="bottom-row">
                                     <div class="quarter-div leftUp">
@@ -129,8 +129,7 @@
                                     <div class="quarter-div rightUp">
                                         <!--businessLicense-->
                                         <div class="form-group">
-                                            <label for="businessLicense" class="col-sm-3 control-label"><span
-                                                    class="must-input">*</span>{{'businessLicense' | translate}}：</label>
+                                            <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"
@@ -240,18 +239,10 @@
                         <!--Equity information-->
                         <div class="label-current-holding">
                             <label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' | translate}}</label>
-                        </div>
-                        <div class="right-option">
-                            <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="addEquity()">
+                            <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="current-holding-info">
-                                    <span class="control-label"><strong
-                                            class="label label-default"
-                                            title="{{EquitySumInfo.orgTotal}}"></strong>
-                                    </span>
-                        </div>
                         <div class="dx-viewport grid-container">
                             <div id="equityGridContainer" dx-data-grid="equityGridOptions" style="margin-top: 10px;">
                             </div>
@@ -260,18 +251,10 @@
                         <!--Direcotr information-->
                         <div class="label-director">
                             <label class="basic-label" style="font-weight: bold;font-size: large;">{{'DirectorInfo' | translate}}</label>
-                        </div>
-                        <div class="right-option">
-                            <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="addDirector()">
+                            <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>
                         </div>
-                        <div class="current-holding-info">
-                                    <span class="control-label"><strong
-                                            class="label label-default"
-                                            title="{{DirectorList.length}}"></strong>
-                                    </span>
-                        </div>
                         <div class="dx-viewport grid-container">
                             <div id="DirectorGridContainer" dx-data-grid="directorGridOptions" style="margin-top: 10px;">
                             </div>