save data to org -- frank

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

@@ -240,6 +240,7 @@
                 $scope.orgOperateType = constant.Operation.Add;
                 $scope.isAdd = true;
                 $scope.selectedOrg = null;
+                $scope.showEditModal = true;
             };
 
             // 编辑机构

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

@@ -385,10 +385,10 @@
         </div>
 
         <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>
-        <edit-organization-shareholder-modal is-show="isShowShareholderModal" 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-shareholder-modal is-show-s="isShowShareholderModal2" parent-page=".system-manage" edit-model=""></edit-organization-shareholder-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"-->
         <!--selected-organization="selectedOrg"></edit-equity-modal>-->
         <!--<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

-commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$log', function ($scope, $log) {
+commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$log', 'ackUibModal', function ($scope, $log, ackUibModal) {
     'use strict';
     $scope.isShow = false;
 
@@ -9,16 +9,18 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
                 $scope.modalInstance = ackUibModal($scope,
                     'edit-organization-director-modal.html',
                     'edit-organization-director-modal',
-                    $scope.parentPage, 'static', function () {
+                    null, 'static', function () {
                         $scope.isShow = false;
                         ackMessageBox.close();
                     });
                 $scope.modalInstance.open();
             },
             close: function () {
+                $scope.isShow = false;
                 $scope.modalInstance.close();
             },
             cancel: function () {
+                $scope.isShow = false;
                 $scope.modalInstance.cancel();
             }
         }
@@ -40,9 +42,9 @@ commonModule.controller('editOrganizationDirectorModalController', ['$scope', '$
         },
 
         initWatches: function () {
-            $scope.$watch('isShow', function (newValue, oldValue) {
+            $scope.$watch('isShowD', function (newValue, oldValue) {
                 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

@@ -7,7 +7,7 @@ commonModule.directive('editOrganizationDirectorModal', ['$log', function ($log)
         replace: true,
         controller: 'editOrganizationDirectorModalController',
         scope: {
-            isShow: '=?',
+            isShowD: '=?',
             parentPage: '@',
             editModel: '=?'
         },

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

-commonModule.controller('editOrganizationModalController', ['$scope', '$log', '$translate', 'uiGridConstants', '$location', '$timeout', '$interval', '$filter', 'SweetAlert', 'orgHKService',
-    function ($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,ackUibModal) {
 
         var selectedModel = '.addOrgControlPop'; //'#addOrgControlPop' + $scope.dimensionId;
 
@@ -77,12 +77,14 @@
             // $scope.selfDimensionModel = getAddOrgSetDimension();
             // initIsCheckedServiceList();
             // resetErrorStatus();
+            if ($scope.isShow) {
                 $scope.orgControlForm.$setPristine();
+                $('#orgControlTab a:first').tab('show');
+                // $(selectedModel).modal('show');
+            }
             // $scope.advancedControlForm.$setPristine();
             // set first active page is basic info
-            $('#orgControlTab a:first').tab('show');
             // $('#orgModalFooter').css('padding-left','139px');
-            $(selectedModel).modal('show');
         };
 
         $scope.nameKeyUp = function () {
@@ -392,6 +394,7 @@
 
         $scope.closeModal = function () {
             $scope.operateType = null;
+            $scope.modalManage.editOrgModal.cancel();
         };
 
         $scope.addEquity = function () {
@@ -415,7 +418,7 @@
             $scope.countryCNList = constant.countryCNList;
             $scope.legalFormTypeList = constant.organizationHK.legalFormTypeList;
             $scope.entityLevelTypeList = constant.organizationHK.EntityLevel;
-            $scope.jurisdictionOfFormationTypeList=constant.organizationHK.JurisdictionOfFormation;
+            $scope.jurisdictionOfFormationTypeList = constant.organizationHK.JurisdictionOfFormation;
             $scope.ownershipFormTypeList = constant.organizationHK.OwnershipForm;
             $('.localRequired').attr("required", true);
             $('.orgAreaRequired').attr("required", true);
@@ -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() {
             $log.debug('editOrganizationModalController.ctor()...');
             $scope.maxdropLength = 20;

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

 <div class="edit-organization-modal-wrapper">
-    <div class="modal fade addOrgControlPop" id="addOrgControlPop{{dimensionId}}" tabindex="-1" role="dialog"
-         aria-labelledby="myModalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
+    <script type="text/ng-template" id="edit-organization-modal.html">
         <div class="modal-header">
             <div class="modal-title" ng-if="isAdd">{{'AddOrganization' | translate}}
             </div>
@@ -261,16 +258,16 @@
             </div>
         </div>
         <div class="modal-footer" id="orgModalFooter" style="padding-left:139px;">
+            <span style="float:right">
             <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>
-            </div>
-        </div>
-    </div>
-    <edit-organization-shareholder-modal is-show="isShowShareholderModal" parent-page=".edit-organization-modal-wrapper" edit-model="editShareholder"></edit-organization-shareholder-modal>
-    <edit-organization-director-modal is-show="isShowDirectorModal" parent-page=".edit-organization-modal-wrapper" edit-model="editDirector"></edit-organization-director-modal>
+        <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>
\ No newline at end of file

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

@@ -10,6 +10,8 @@
             controller: 'editOrganizationModalController',
             scope:
             {
+                isShow: '=?',
+                parentPage: '@',
                 //区分是添加还是编辑
                 operateType: '=',
 

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

 @footer-button-left: 159px;
 
 .edit-organization-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: 1100px;
+    height: 600px;
+
+    .modal-body {
+      height: 100%;
+      padding-left: 0px !important;
+      width: auto;
+      .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 {
+      }
+    }
 
-    .addOrgControlPop {
-        .modal-header{
+    .modal-footer {
+      text-align: left;
+    }
+  }
+
+  .modal-header {
     border-bottom: 0px;
   }
   .modal-title {
@@ -14,11 +66,6 @@
     color: red;
   }
 
-        .modal-dialog {
-            width: 1100px;
-            height: 600px;
-        }
-
   .btn-default {
     height: 33px;
     width: 250px;
@@ -29,10 +76,10 @@
     height: 33px;
   }
 
-        .modal-body {
-            padding-left: 0px !important;
-            width: auto;
-        }
+  //.modal-body {
+  //    padding-left: 0px !important;
+  //    width: auto;
+  //}
 
   .dropdown-menu {
     max-height: 220px;
@@ -69,7 +116,6 @@
     white-space: nowrap;
   }
 
-
   .dropdown-toggle .caret {
     width: 10px;
     height: 10px;
@@ -87,8 +133,9 @@
   .main {
     margin: 20px 1px;
     border-bottom: 1px;
-        } //Target Chrome
-        @media screen and (-webkit-min-device-pixel-ratio:0) {
+  }
+  //Target Chrome
+  @media screen and (-webkit-min-device-pixel-ratio: 0) {
     .dropdown-toggle .caret {
       width: 10px;
       height: 10px;
@@ -146,7 +193,6 @@
     /*background-color: #FFC706;*/
   }
 
-
   .tab-pane {
     /*height: 460px;*/
     overflow-y: auto;
@@ -169,12 +215,12 @@
         width: 50%;
         border: 1px solid #F2F2F2;
 
-                    &:hover{
+        &:hover {
           /*border: 1px solid #F2F2F2!important;*/
         }
         a:hover {
-                        color: #D35412!important;
-                        background-color: white!important;
+          color: #D35412 !important;
+          background-color: white !important;
         }
       }
 
@@ -187,17 +233,17 @@
         vertical-align: middle;
         text-align: center;
         border: 0px;
-                    color: black!important;
+        color: black !important;
       }
 
       li.active {
-                    background-color: #f3f2f0!important;
+        background-color: #f3f2f0 !important;
         /*border:0px;*/
         a,
         a:hover,
         a:focus {
-                        color: black!important;
-                        background-color: #f3f2f0!important;
+          color: black !important;
+          background-color: #f3f2f0 !important;
         }
       }
 
@@ -373,7 +419,6 @@
         margin-top: 6px;
       }
 
-
       .test-select {
         width: 130px;
       }
@@ -413,7 +458,7 @@
   #advancedOptions {
     max-height: 100%;
 
-            margin:10px 20px 0px 20px;
+    margin: 10px 20px 0px 20px;
 
     .right-option {
       height: 30px;
@@ -459,5 +504,4 @@
     }
 
   }
-    }
 }
\ No newline at end of file

atms-web/src/main/webapp/app/common/controls/edit-organization-shareholder-modal/edit-organization-shareholder-modal.ctrl.js

-commonModule.controller('editOrganizationShareholderModalController', ['$scope', '$log', function ($scope, $log) {
+commonModule.controller('editOrganizationShareholderModalController', ['$scope', '$log', 'ackUibModal', function ($scope, $log, ackUibModal) {
     'use strict';
     $scope.isShow = false;
 
     //模态框管理
     $scope.modalManage = {
-        directorModal: {
+        shareholderModal: {
             open: function () {
                 $scope.modalInstance = ackUibModal($scope,
                     'edit-organization-shareholder-modal.html',
-                    'edit-organization-shareholder-modal',
-                    $scope.parentPage, 'static', function () {
+                    'edit-organization-shareholder-modal-wrapper',
+                    null, 'static', function () {
                         $scope.isShow = false;
                         ackMessageBox.close();
                     });
                 $scope.modalInstance.open();
             },
             close: function () {
+                $scope.isShow = false;
                 $scope.modalInstance.close();
             },
             cancel: function () {
+                $scope.isShow = false;
                 $scope.modalInstance.cancel();
             }
         }
@@ -40,9 +42,9 @@ commonModule.controller('editOrganizationShareholderModalController', ['$scope',
         },
 
         initWatches: function () {
-            $scope.$watch('isShow', function (newValue, oldValue) {
+            $scope.$watch('isShowS', function (newValue, oldValue) {
                 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

@@ -76,7 +76,7 @@
         <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>
+                <button class="btn btn-third" type="button" ng-click="modalManage.shareholderModal.cancel()" translate="Cancel"></button>
         </span>
         </div>
     </script>

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

@@ -7,7 +7,7 @@ commonModule.directive('editOrganizationShareholderModal', ['$log', function ($l
         replace: true,
         controller: 'editOrganizationShareholderModalController',
         scope: {
-            isShow: '=?',
+            isShowS: '=?',
             parentPage: '@',
             editModel: '=?'
         },

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

@@ -8,7 +8,6 @@
 
 .edit-organization-shareholder-modal-wrapper {
   height: 100%;
-
   .modal-title {
     font-family: 'Arial Bold', 'Arial';
     font-weight: 700;
@@ -19,7 +18,7 @@
   }
 
   .modal-dialog {
-    width: 80% !important;
+    width: 50% !important;
 
     .modal-body {
       height: 100%;