Skip to content

T
traffic-front
Commit 98448d0a authored by Ken you's avatar Ken you
Browse files
Options

fix admin bug ----Ken

parent 4683dffa
Hide whitespace changes
Inline Side-by-side
Showing with 268 additions and 205 deletions
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ 98448d0a
...@@ -864,7 +864,7 @@ ...@@ -864,7 +864,7 @@
"ApproveEndTime":"Approved Time", "ApproveEndTime":"Approved Time",
"ApproveTaskList":"Approve Task List", "ApproveTaskList":"Approve Task List",
"ApproveRole":"Approve Role", "ApproveRole":"Approve Role",
"NumOfBranches":"分公司数量",
"ConditionColumnNum": "Search Condition Column Num", "ConditionColumnNum": "Search Condition Column Num",
"Condition": "Search Condition", "Condition": "Search Condition",
"RevenueTypeConfiguration":"Revenue Type Config" "RevenueTypeConfiguration":"Revenue Type Config"
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ 98448d0a
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
"BusinessAllottedTimeTo": "营业期限截止", "BusinessAllottedTimeTo": "营业期限截止",
"BusinessPromition": "业务宣传费", "BusinessPromition": "业务宣传费",
"BusinessScope": "经营范围", "BusinessScope": "经营范围",
"RegStatus": "登记状态", "RegStatus": "工商登记状态",
"BusinessUnit": "所属业务线", "BusinessUnit": "所属业务线",
"BusinessUnitDesc": "业务线", "BusinessUnitDesc": "业务线",
"BusinessUnitID": "业务线", "BusinessUnitID": "业务线",
...@@ -371,6 +371,7 @@ ...@@ -371,6 +371,7 @@
"RegFinancialOfficerEmailAddress": "注册登记财务负责人邮箱", "RegFinancialOfficerEmailAddress": "注册登记财务负责人邮箱",
"SecondaryApprovalAmount": "二级审批金额", "SecondaryApprovalAmount": "二级审批金额",
"BusinessRegistrationNumber": "Business registration number", "BusinessRegistrationNumber": "Business registration number",
"NumOfBranches":"分公司数量",
"ParValue": "Par Value", "ParValue": "Par Value",
"IssuedShares": "Issued shares", "IssuedShares": "Issued shares",
"Directors": "Directors", "Directors": "Directors",
...@@ -595,7 +596,7 @@ ...@@ -595,7 +596,7 @@
"UpdateType": "更新方式", "UpdateType": "更新方式",
"RegistrationDate": "注册日期", "RegistrationDate": "注册日期",
"RegistrationLocation": "注册地址(住所)", "RegistrationLocation": "注册地址(住所)",
"RegistrationLocationEn": "注册地地址(住所)-英文", "RegistrationLocationEn": "注册地址(住所)-英文",
"RegistrationType": "注册类型", "RegistrationType": "注册类型",
"ArchitectureType": "架构类型", "ArchitectureType": "架构类型",
"RemarkColon": "备注：", "RemarkColon": "备注：",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @ 98448d0a
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
"OrganizationMsgClientCodeRequired": "请输入客户代码", "OrganizationMsgClientCodeRequired": "请输入客户代码",
"OrganizationCode": "公司代码", "OrganizationCode": "公司代码",
"UnifiedSocialCreditCode": "统一社会信用代码", "UnifiedSocialCreditCode": "统一社会信用代码",
"RegistrationStatus": "登记状态", "RegistrationStatus": "工商登记状态",
"LogoutTime": "注销时间", "LogoutTime": "注销时间",
"RegistrationAuthority": "登记机关", "RegistrationAuthority": "登记机关",
"ChangeType": "变更类型", "ChangeType": "变更类型",
......
atms-web/src/main/webapp/app/common/controls/add-exist-organization-modal/add-exist-organization-modal.ctrl.js
View file @ 98448d0a
...@@ -68,8 +68,9 @@ controller('addExistOrganizationModalController', ['$scope', '$log', '$translate ...@@ -68,8 +68,9 @@ controller('addExistOrganizationModalController', ['$scope', '$log', '$translate
var getOrgList = function () { var getOrgList = function () {
orgService.getOrgListLevel().success(function (data) { orgService.getOrgListLevel().success(function (data) {
if (data) { if (data) {
$scope.DataGridSource = data; $scope.DataGridSource = _.filter(data, function (row) {
return row.isActive == true;
});
setSelectItems($scope.selectedKeyItems); setSelectItems($scope.selectedKeyItems);
} }
}); });
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ 98448d0a
...@@ -198,7 +198,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -198,7 +198,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
return false; return false;
} }
}); });
} };
$('.orgAreaRequired').each( function (index,ele){
if(null==ele.innerText||""===ele.innerText){
SweetAlert.error("请检查必填项");
fail = true;
return false;
}
});
if(fail) return; if(fail) return;
...@@ -481,6 +488,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -481,6 +488,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
}); });
$scope.editOrgModel = orgData; $scope.editOrgModel = orgData;
$scope.editOrgModel.foundationDate=($filter('date')(new Date($scope.editOrgModel.foundationDate), "yyyy-MM-dd"));
// 设置地区 // 设置地区
loadProvinceList(); loadProvinceList();
...@@ -513,6 +521,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -513,6 +521,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
if($scope.isInternational){ if($scope.isInternational){
$('.localRequired').removeAttr("required"); $('.localRequired').removeAttr("required");
$('.orgAreaRequired').removeAttr("required");
} }
// set first active page is basic info // set first active page is basic info
...@@ -955,6 +964,19 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -955,6 +964,19 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
// 说明 // 说明
$scope.resources = { $scope.resources = {
OrganizationName: $translate.instant('OrganizationName'), OrganizationName: $translate.instant('OrganizationName'),
OrganizationNameEn: $translate.instant('OrganizationNameEn'),
RegistrationCapital: $translate.instant('RegistrationCapital'),
LegalPersonName: $translate.instant('LegalPersonName'),
NumOfBranches: $translate.instant('NumOfBranches'),
BusinessScope: $translate.instant('BusinessScope'),
UnifiedSocialCreditCode: $translate.instant('UnifiedSocialCreditCode'),
Abbreviation: $translate.instant('Abbreviation'),
RegistrationLocationEn: $translate.instant('RegistrationLocationEn'),
PaidInCapital: $translate.instant('PaidInCapital'),
FoundationDate: $translate.instant('FoundationDate'),
registrationLocation: $translate.instant('RegistrationLocation'),
OrganizationMsgNameRequired: $translate.instant('OrganizationMsgNameRequired'), OrganizationMsgNameRequired: $translate.instant('OrganizationMsgNameRequired'),
OrganizationParent: $translate.instant('OrganizationParent'), OrganizationParent: $translate.instant('OrganizationParent'),
OrganizationLevelType: $translate.instant('OrganizationLevelType'), OrganizationLevelType: $translate.instant('OrganizationLevelType'),
...@@ -1057,12 +1079,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -1057,12 +1079,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$scope.isLocal = false; $scope.isLocal = false;
$scope.isInternational = true; $scope.isInternational = true;
$('.localRequired').removeAttr("required"); $('.localRequired').removeAttr("required");
$('.orgAreaRequired').removeAttr("required");
}; };
$scope.changeLocal = function () { $scope.changeLocal = function () {
$scope.isLocal = true; $scope.isLocal = true;
$scope.isInternational = false; $scope.isInternational = false;
$('.localRequired').attr("required",true); $('.localRequired').attr("required",true);
$('.orgAreaRequired').attr("required",true);
}; };
// 强制刷新机构控件里的机构 // 强制刷新机构控件里的机构
...@@ -1094,6 +1118,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -1094,6 +1118,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$scope.trueFalse = constant.trueFalse; $scope.trueFalse = constant.trueFalse;
$scope.countryCNList = constant.countryCNList; $scope.countryCNList = constant.countryCNList;
$('.localRequired').attr("required",true); $('.localRequired').attr("required",true);
$('.orgAreaRequired').attr("required",true);
// $('.localRequired').attr("required","true"); required="required" // $('.localRequired').attr("required","true"); required="required"
}; };
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html
View file @ 98448d0a
<div class="edit-organization-modal-wrapper"> <div class="edit-organization-modal-wrapper">
<div class="modal fade addOrgControlPop" id="addOrgControlPop{{dimensionId}}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> <div class="modal fade addOrgControlPop" id="addOrgControlPop{{dimensionId}}" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title" ng-if="isAdd">{{'AddOrganization' | translate}} <div class="modal-title" ng-if="isAdd">{{'AddOrganization' | translate}}
<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button> <button type="button" class="btn btn-in-grid" style="width: 117px;"
<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()" ng-show="isAdd&&!isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button> ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i
class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()"
ng-show="isAdd&&!isLocal"><i
class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
</div> </div>
<div class="modal-title" ng-if="!isAdd">{{'EditOrganization' | translate}} <div class="modal-title" ng-if="!isAdd">{{'EditOrganization' | translate}}
<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button> <button type="button" class="btn btn-in-grid" style="width: 117px;"
<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()" ng-show="isAdd&&!isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button> ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i
class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()"
ng-show="isAdd&&!isLocal"><i
class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
</div> </div>
</div> </div>
<div id="orgControlTab" ng-if="isAdd"> <div id="orgControlTab" ng-if="isAdd">
...@@ -36,7 +45,6 @@ ...@@ -36,7 +45,6 @@
</div> </div>
<div id="myTabContent" class="tab-content"> <div id="myTabContent" class="tab-content">
<div id="basicdata" class="tab-pane in active"> <div id="basicdata" class="tab-pane in active">
<form class="form-horizontal" id="orgControlForm" name="orgControlForm"> <form class="form-horizontal" id="orgControlForm" name="orgControlForm">
<div class="local"> <div class="local">
<div class="bottom-row"> <div class="bottom-row">
...@@ -46,16 +54,16 @@ ...@@ -46,16 +54,16 @@
<label class="col-sm-3 control-label"><span class="must-input">*</span>{{'OrganizationName' <label class="col-sm-3 control-label"><span class="must-input">*</span>{{'OrganizationName'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.name.$invalid && (orgControlForm.name.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.name.$invalid && (orgControlForm.name.$dirty || orgControlForm.$submitted)}">
<!--<input class="form-control localRequired" id="name" ng-model="editOrgModel.name"--> <input class="form-control localRequired" id="name"
<input class="form-control localRequired" id="name" ng-model="editOrgModel.name" ng-model="editOrgModel.name" name="name"
name="name" placeholder="{{resources.OrganizationName}}" placeholder="{{resources.OrganizationName}}" ng-keyup="nameKeyUp()"
ng-keyup="nameKeyUp()" maxlength="100"> maxlength="100">
<p ng-show="orgControlForm.name.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)" <p ng-show="orgControlForm.name.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
class="has-error label">{{resources.OrganizationMsgNameRequired}}</p> class="has-error label">{{resources.OrganizationMsgNameRequired}}
</p>
<p ng-show="editOrgModel.nameError" class="has-error label"> <p ng-show="editOrgModel.nameError" class="has-error label">
{{editOrgModel.nameError}}</p> {{editOrgModel.nameError}}</p>
</div> </div>
</div> </div>
...@@ -65,9 +73,9 @@ ...@@ -65,9 +73,9 @@
translate}}：</label> translate}}：</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input class="form-control" id="englishName" <input class="form-control" id="englishName"
ng-model="editOrgModel.englishName" name="englishName" ng-model="editOrgModel.englishName" name="englishName"
placeholder="{{resources.OrganizationNameEn}}" placeholder="{{resources.OrganizationNameEn}}"
ng-keyup="nameKeyUp()" maxlength="100" > ng-keyup="nameKeyUp()" maxlength="100">
</div> </div>
</div> </div>
...@@ -76,12 +84,12 @@ ...@@ -76,12 +84,12 @@
<label for="clientCode" class="col-sm-3 control-label"><span <label for="clientCode" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'OrganizationClientCode' | translate}}：</label> class="must-input">*</span>{{'OrganizationClientCode' | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.clientCode.$invalid && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.clientCode.$invalid && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" name="clientCode" id="clientCode" <input class="form-control localRequired" name="clientCode"
ng-model="editOrgModel.clientCode" id="clientCode" ng-model="editOrgModel.clientCode"
placeholder="{{resources.OrganizationClientCode}}" maxlength="50"> placeholder="{{resources.OrganizationClientCode}}" maxlength="50">
<p ng-show="orgControlForm.clientCode.$error.required && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)" <p ng-show="orgControlForm.clientCode.$error.required && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)"
class="has-error label"> class="has-error label">
{{resources.OrganizationMsgClientCodeRequired}}</p> {{resources.OrganizationMsgClientCodeRequired}}</p>
</div> </div>
</div> </div>
...@@ -96,16 +104,17 @@ ...@@ -96,16 +104,17 @@
ng-model="editOrgModel.architectureType" ng-model="editOrgModel.architectureType"
placeholder="{{resources.ArchitectureType}}" maxlength="50"> placeholder="{{resources.ArchitectureType}}" maxlength="50">
</div>--> </div>-->
<label for="architectureType" class="col-sm-3 control-label">{{'ArchitectureType' | translate}}：</label> <label for="architectureType"
class="col-sm-3 control-label">{{'ArchitectureType' | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.architectureType.$invalid && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.architectureType.$invalid && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='architectureType' name="architectureType" <select class="form-control" id='architectureType'
ng-model="editOrgModel.architectureType" name="architectureType" ng-model="editOrgModel.architectureType"
ng-options="item for item in architectureTypeList"> ng-options="item for item in architectureTypeList">
<option value="">{{resources.ArchitectureType}}</option> <option value="">{{resources.ArchitectureType}}</option>
</select> </select>
<p ng-show="orgControlForm.architectureType.$error.required && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)" <p ng-show="orgControlForm.architectureType.$error.required && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)"
class="has-error label"> class="has-error label">
{{resources.OrganizationMsgArchitectureTypeRequired}}</p> {{resources.OrganizationMsgArchitectureTypeRequired}}</p>
</div> </div>
</div> </div>
...@@ -115,24 +124,23 @@ ...@@ -115,24 +124,23 @@
<label for="registerAddress" class="col-sm-3 control-label">{{'RegistrationLocation' <label for="registerAddress" class="col-sm-3 control-label">{{'RegistrationLocation'
| translate}}：</label> | 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.registerAddress.$invalid && (orgControlForm.registerAddress.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="registerAddress" <input class="form-control" name="registerAddress" id="registerAddress"
id="registerAddress" ng-model="editOrgModel.registerAddress"
ng-model="editOrgModel.registerAddress" placeholder="{{resources.registrationLocation}}" maxlength="100">
placeholder="{{resources.registerAddress}}" maxlength="100">
</div> </div>
</div> </div>
<!--注册资本(万元)--> <!--注册资本(万元)-->
<div class="form-group"> <div class="form-group">
<label for="registrationCapital" class="col-sm-3 control-label"><span class="must-input">*</span>{{'RegistrationCapital' <label for="registrationCapital" class="col-sm-3 control-label">{{'RegistrationCapital'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <!-- <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registrationCapital.$invalid && (orgControlForm.registrationCapital.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.registrationCapital.$invalid && (orgControlForm.registrationCapital.$dirty || orgControlForm.$submitted)}"> -->
<div class="col-sm-9">
<input class="form-control" name="registrationCapital" <input class="form-control" name="registrationCapital"
id="registrationCapital" id="registrationCapital" ng-model="editOrgModel.registrationCapital"
ng-model="editOrgModel.registrationCapital" placeholder="{{resources.RegistrationCapital}}" maxlength="50">
placeholder="{{resources.RegistrationCapital}}" maxlength="50" required>
</div> </div>
</div> </div>
...@@ -141,14 +149,15 @@ ...@@ -141,14 +149,15 @@
<label for="nationalEconomicIndustry" class="col-sm-3 control-label">{{'NationalEconomicIndustry' <label for="nationalEconomicIndustry" class="col-sm-3 control-label">{{'NationalEconomicIndustry'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.nationalEconomicIndustry.$invalid && (orgControlForm.nationalEconomicIndustry.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.nationalEconomicIndustry.$invalid && (orgControlForm.nationalEconomicIndustry.$dirty || orgControlForm.$submitted)}">
<!--<input class="form-control" name="nationalEconomicIndustry" <!--<input class="form-control" name="nationalEconomicIndustry"
id="nationalEconomicIndustry" id="nationalEconomicIndustry"
ng-model="editOrgModel.nationalEconomicIndustry" ng-model="editOrgModel.nationalEconomicIndustry"
placeholder="{{resources.NationalEconomicIndustry}}" maxlength="50">--> placeholder="{{resources.NationalEconomicIndustry}}" maxlength="50">-->
<select class="form-control" id='nationalEconomicIndustry' name="nationalEconomicIndustry" <select class="form-control" id='nationalEconomicIndustry'
ng-model="editOrgModel.nationalEconomicIndustry" name="nationalEconomicIndustry"
ng-options="x.code as x.type for x in nationalEconomicIndustryList"> ng-model="editOrgModel.nationalEconomicIndustry"
ng-options="x.code as x.type for x in nationalEconomicIndustryList">
<option value="">{{resources.NationalEconomicIndustry}}</option> <option value="">{{resources.NationalEconomicIndustry}}</option>
</select> </select>
</div> </div>
...@@ -159,11 +168,10 @@ ...@@ -159,11 +168,10 @@
<label for="legalPersonName" class="col-sm-3 control-label">{{'LegalPersonName' <label for="legalPersonName" class="col-sm-3 control-label">{{'LegalPersonName'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.legalPersonName.$invalid && (orgControlForm.legalPersonName.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.legalPersonName.$invalid && (orgControlForm.legalPersonName.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="legalPersonName" <input class="form-control" name="legalPersonName" id="legalPersonName"
id="legalPersonName" ng-model="editOrgModel.legalPersonName"
ng-model="editOrgModel.legalPersonName" placeholder="{{resources.LegalPersonName}}" maxlength="50">
placeholder="{{resources.LegalPersonName}}" maxlength="50">
</div> </div>
</div> </div>
...@@ -172,11 +180,10 @@ ...@@ -172,11 +180,10 @@
<label for="numOfBranches" class="col-sm-3 control-label">{{'NumOfBranches' <label for="numOfBranches" class="col-sm-3 control-label">{{'NumOfBranches'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.numOfBranches.$invalid && (orgControlForm.numOfBranches.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.numOfBranches.$invalid && (orgControlForm.numOfBranches.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="numOfBranches" <input class="form-control" name="numOfBranches" id="numOfBranches"
id="numOfBranches" ng-model="editOrgModel.numOfBranches"
ng-model="editOrgModel.numOfBranches" placeholder="{{resources.NumOfBranches}}" maxlength="50">
placeholder="{{resources.NumOfBranches}}" maxlength="50">
</div> </div>
</div> </div>
...@@ -185,10 +192,11 @@ ...@@ -185,10 +192,11 @@
<label for="logoutTime" class="col-sm-3 control-label">{{'LogoutTime' <label for="logoutTime" class="col-sm-3 control-label">{{'LogoutTime'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.logoutTime.$invalid && (orgControlForm.logoutTime.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.logoutTime.$invalid && (orgControlForm.logoutTime.$dirty || orgControlForm.$submitted)}">
<div class="input-daterange startDatepicker" > <div class="input-daterange startDatepicker">
<input type="text" id="logoutTime" class="input-sm form-control" name="logoutTime" ng-model="editOrgModel.logoutTime" <input type="text" id="logoutTime" class="input-sm form-control"
placeholder="{{resources.LogoutTime}}"/> name="logoutTime" ng-model="editOrgModel.logoutTime"
placeholder="{{resources.LogoutTime}}" />
</div> </div>
</div> </div>
</div> </div>
...@@ -198,69 +206,70 @@ ...@@ -198,69 +206,70 @@
<label for="businessScope" class="col-sm-3 control-label">{{'BusinessScope' <label for="businessScope" class="col-sm-3 control-label">{{'BusinessScope'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.businessScope.$invalid && (orgControlForm.businessScope.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.businessScope.$invalid && (orgControlForm.businessScope.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="businessScope" id="businessScope" <input class="form-control" name="businessScope" id="businessScope"
ng-model="editOrgModel.businessScope" ng-model="editOrgModel.businessScope"
placeholder="{{resources.BusinessScope}}"> placeholder="{{resources.BusinessScope}}">
</div> </div>
</div> </div>
</div> </div>
<div class="quarter-div rightUp"> <div class="quarter-div rightUp">
<!--统一社会信用代码-->
<!--纳税人识别号-->
<div class="form-group" ng-show="isLocal"> <div class="form-group" ng-show="isLocal">
<label for="taxPayerNumber" class="col-sm-3 control-label">{{'UnifiedSocialCreditCode' <label for="taxPayerNumber" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'UnifiedSocialCreditCode'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.taxPayerNumber.$invalid && (orgControlForm.taxPayerNumber.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.taxPayerNumber.$invalid && (orgControlForm.taxPayerNumber.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="taxPayerNumber" id="taxPayerNumber" <input class="form-control localRequired" name="taxPayerNumber"
ng-model="editOrgModel.taxPayerNumber" maxlength="50" id="taxPayerNumber" ng-model="editOrgModel.taxPayerNumber"
placeholder="{{resources.OrganizationTaxPayerNumber}}" maxlength="50" placeholder="{{resources.UnifiedSocialCreditCode}}"
tax-payer-number-unique> tax-payer-number-unique>
<p ng-show="orgControlForm.taxPayerNumber.$error.taxPayerNumberUnique && (orgControlForm.taxPayerNumber.$dirty || orgControlForm.$submitted)" <p ng-show="orgControlForm.taxPayerNumber.$error.taxPayerNumberUnique && (orgControlForm.taxPayerNumber.$dirty || orgControlForm.$submitted)"
class="has-error label"> class="has-error label">
{{resources.OrganizationMsgTaxPayerNumberUnique}}</p> {{resources.OrganizationMsgTaxPayerNumberUnique}}</p>
</div> </div>
</div> </div>
<!--缩写--> <!--公司简称-->
<div class="form-group" ng-show="isLocal"> <div class="form-group" ng-show="isLocal">
<label for="abbreviation" class="col-sm-3 control-label">{{'Abbreviation' | translate}}：</label> <label for="abbreviation" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'Abbreviation' | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.clientCode.$invalid && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.clientCode.$invalid && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="abbreviation" id="abbreviation" <input class="form-control localRequired" name="abbreviation"
ng-model="editOrgModel.abbreviation" id="abbreviation" ng-model="editOrgModel.abbreviation"
placeholder="{{resources.Abbreviation}}" maxlength="50" > placeholder="{{resources.Abbreviation}}" maxlength="50">
</div> </div>
</div> </div>
<!--工商登记状态--> <!--工商登记状态-->
<div class="form-group"> <div class="form-group">
<label for="regStatus" class="col-sm-3 control-label">{{'RegStatus' | translate}}：</label> <label for="regStatus"
class="col-sm-3 control-label">{{'RegStatus' | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.regStatus.$invalid && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.regStatus.$invalid && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='regStatus' name="regStatus" <select class="form-control" id='regStatus' name="regStatus"
ng-model="editOrgModel.regStatus" ng-model="editOrgModel.regStatus"
ng-options="x.type as x.type for x in regStatusList "> ng-options="x.type as x.type for x in regStatusList ">
</select> </select>
<p ng-show="orgControlForm.regStatus.$error.required && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)" <!-- <p ng-show="orgControlForm.regStatus.$error.required && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)"
class="has-error label"> class="has-error label">
{{resources.OrganizationMsgRegStatusRequired}}</p> {{resources.OrganizationMsgRegStatusRequired}}</p> -->
</div> </div>
</div> </div>
<!--机构代码--> <!--公司代码-->
<div class="form-group" ng-show="isLocal"> <div class="form-group" ng-show="isLocal">
<label for="code" class="col-sm-3 control-label"><span <label for="code" class="col-sm-3 control-label">{{'OrganizationCode' |
class="must-input">*</span>{{'OrganizationCode' |
translate}}：</label> translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.code.$invalid && (orgControlForm.code.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.code.$invalid && (orgControlForm.code.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" name="code" ng-disabled="!isAdd" id="code" <input class="form-control" name="code" ng-disabled="!isAdd" id="code"
ng-model="editOrgModel.code" ng-model="editOrgModel.code"
placeholder="{{resources.OrganizationCode}}" placeholder="{{resources.OrganizationCode}}" maxlength="50"
maxlength="50" ng-pattern="/^[A-Za-z0-9]+$/" code-unique> ng-pattern="/^[A-Za-z0-9]+$/" code-unique>
<p ng-show="orgControlForm.code.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)" <!-- <p ng-show="orgControlForm.code.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
class="has-error label">{{resources.OrganizationMsgCodeRequired}}</p> class="has-error label">{{resources.OrganizationMsgCodeRequired}}</p>
<p ng-show="orgControlForm.code.$error.maxlength" <p ng-show="orgControlForm.code.$error.maxlength"
class="has-error label"> class="has-error label">
...@@ -268,7 +277,7 @@ ...@@ -268,7 +277,7 @@
<p ng-show="orgControlForm.code.$error.pattern" class="has-error label"> <p ng-show="orgControlForm.code.$error.pattern" class="has-error label">
{{resources.OrganizationMsgCodePattern}}</p> {{resources.OrganizationMsgCodePattern}}</p>
<p ng-show="orgControlForm.code.$error.codeUnique" <p ng-show="orgControlForm.code.$error.codeUnique"
class="has-error label">{{resources.OrganizationMsgCodeUnique}}</p> class="has-error label">{{resources.OrganizationMsgCodeUnique}}</p> -->
</div> </div>
</div> </div>
...@@ -277,11 +286,11 @@ ...@@ -277,11 +286,11 @@
<label for="registrationLocationEn" class="col-sm-3 control-label">{{'RegistrationLocationEn' <label for="registrationLocationEn" class="col-sm-3 control-label">{{'RegistrationLocationEn'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registrationLocationEn.$invalid && (orgControlForm.registrationLocationEn.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.registrationLocationEn.$invalid && (orgControlForm.registrationLocationEn.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="registrationLocationEn" <input class="form-control" name="registrationLocationEn"
id="registrationLocationEn" id="registrationLocationEn"
ng-model="editOrgModel.registrationLocationEn" ng-model="editOrgModel.registrationLocationEn"
placeholder="{{resources.RegistrationLocationEn}}" maxlength="50"> placeholder="{{resources.RegistrationLocationEn}}" maxlength="50">
</div> </div>
</div> </div>
...@@ -290,38 +299,45 @@ ...@@ -290,38 +299,45 @@
<label for="paidInCapital" class="col-sm-3 control-label">{{'PaidInCapital' <label for="paidInCapital" class="col-sm-3 control-label">{{'PaidInCapital'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.paidInCapital.$invalid && (orgControlForm.paidInCapital.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.paidInCapital.$invalid && (orgControlForm.paidInCapital.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="paidInCapital" id="paidInCapital" <input class="form-control" name="paidInCapital" id="paidInCapital"
ng-model="editOrgModel.paidInCapital" ng-model="editOrgModel.paidInCapital"
placeholder="{{resources.PaidInCapital}}" maxlength="50"> placeholder="{{resources.PaidInCapital}}" maxlength="50">
</div> </div>
</div> </div>
<!--从事国家限制或禁止行业--> <!--从事国家限制或禁止行业-->
<div class="form-group" ng-show="isLocal"> <div class="form-group" ng-show="isLocal">
<label for="engageNationalProhibitIndustry" class="col-sm-3 control-label">{{'EngageNationalProhibitIndustry' | translate}}：</label> <label for="engageNationalProhibitIndustry"
class="col-sm-3 control-label">{{'EngageNationalProhibitIndustry' | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.engageNationalProhibitIndustry.$invalid && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.engageNationalProhibitIndustry.$invalid && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='engageNationalProhibitIndustry' name="engageNationalProhibitIndustry" <select class="form-control" id='engageNationalProhibitIndustry'
ng-model="editOrgModel.engageNationalProhibitIndustry" name="engageNationalProhibitIndustry"
ng-options="x.code as x.type for x in trueFalse"> ng-model="editOrgModel.engageNationalProhibitIndustry"
<option value="">{{resources.EngageNationalProhibitIndustry}}</option> ng-options="x.code as x.type for x in trueFalse">
<option value="">{{resources.EngageNationalProhibitIndustry}}
</option>
</select> </select>
<p ng-show="orgControlForm.engageNationalProhibitIndustry.$error.required && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)" <!-- <p ng-show="orgControlForm.engageNationalProhibitIndustry.$error.required && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)"
class="has-error label"> class="has-error label">
{{resources.OrganizationMsgEngageNationalProhibitIndustryRequired}}</p> {{resources.OrganizationMsgEngageNationalProhibitIndustryRequired}}
</p> -->
</div> </div>
</div> </div>
<!--成立日期--> <!--成立日期-->
<div class="form-group"> <div class="form-group">
<label for="foundationDate" class="col-sm-3 control-label">{{'FoundationDate' <label for="foundationDate" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'FoundationDate'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.foundationDate.$invalid && (orgControlForm.foundationDate.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.foundationDate.$invalid && (orgControlForm.foundationDate.$dirty || orgControlForm.$submitted)}">
<div class="input-daterange startDatepicker"> <div class="input-daterange startDatepicker">
<input type="text" id="foundationDate" class="input-sm form-control" name="foundationDate" ng-model="editOrgModel.foundationDate" <input type="text" id="foundationDate" class="input-sm form-control"
placeholder="{{resources.FoundationDate}}"/> name="foundationDate" ng-model="editOrgModel.foundationDate"
required="required"
placeholder="{{resources.FoundationDate}}" />
</div> </div>
</div> </div>
</div> </div>
...@@ -331,14 +347,14 @@ ...@@ -331,14 +347,14 @@
<label for="country" class="col-sm-3 control-label">{{'Country' <label for="country" class="col-sm-3 control-label">{{'Country'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.country.$invalid && (orgControlForm.country.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.country.$invalid && (orgControlForm.country.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='country' name="country" <select class="form-control" id='country' name="country"
ng-model="editOrgModel.country" ng-model="editOrgModel.country"
ng-options="x for x in countryCNList"> ng-options="x for x in countryCNList">
<option value="">{{resources.Country}}</option> <option value="">{{resources.Country}}</option>
</select> </select>
<p ng-show="orgControlForm.country.$error.required && (orgControlForm.country.$dirty || orgControlForm.$submitted)" <p ng-show="orgControlForm.country.$error.required && (orgControlForm.country.$dirty || orgControlForm.$submitted)"
class="has-error label"> class="has-error label">
{{resources.OrganizationMsgcountryRequired}}</p> {{resources.OrganizationMsgcountryRequired}}</p>
</div> </div>
</div> </div>
...@@ -355,23 +371,24 @@ ...@@ -355,23 +371,24 @@
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9"> <div class="col-sm-9">
<org-selector id="OrgParent" selected-org-name="editOrgModel.parentName" <org-selector id="OrgParent" selected-org-name="editOrgModel.parentName"
selected-org-id="editOrgModel.parentID" selected-org-id="editOrgModel.parentID"
component-selected-org="editOrgModel.componentSelectedOrg" component-selected-org="editOrgModel.componentSelectedOrg"
is-show-all=false select-no-option="true" is-show-all=false select-no-option="true" item-max-length="22"
item-max-length="22" is-require="false"> is-require="false">
</org-selector> </org-selector>
</div> </div>
</div> </div>
<!--事业部--> <!--所属业务线-->
<div class="form-group"> <div class="form-group">
<label for="selectBusinessUnit" class="col-sm-3 control-label">{{'BusinessUnit' <label for="selectBusinessUnit" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'BusinessUnit'
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9"> <div class="col-sm-9">
<select class="form-control" id='selectBusinessUnit' <select class="form-control localRequired" id='selectBusinessUnit'
ng-model="selectBusinessUnit" ng-model="selectBusinessUnit"
ng-options="item as item.name disable when item.disabled for item in businessUnitList" ng-options="item as item.name disable when item.disabled for item in businessUnitList"
name='selectBusinessUnit'> name='selectBusinessUnit'>
<!--<option value="">{{pleaseSelect}}</option>--> <!--<option value="">{{pleaseSelect}}</option>-->
</select> </select>
</div> </div>
...@@ -383,16 +400,15 @@ ...@@ -383,16 +400,15 @@
class="must-input">*</span>{{'StandardAccountIndustry' | class="must-input">*</span>{{'StandardAccountIndustry' |
translate}}：</label> translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.selectProjectIndustry.$invalid && (orgControlForm.selectProjectIndustry.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.selectProjectIndustry.$invalid && (orgControlForm.selectProjectIndustry.$dirty || orgControlForm.$submitted)}">
<select class="form-control localRequired" id='selectProjectIndustry' <select class="form-control localRequired" id='selectProjectIndustry'
ng-model="selectProjectIndustry" ng-model="selectProjectIndustry"
ng-options="x.name for x in projectIndustryList" ng-options="x.name for x in projectIndustryList"
name='selectProjectIndustry' name='selectProjectIndustry' ng-change="ProjectIndustryChanged()">
ng-change="ProjectIndustryChanged()" >
<option value="">{{pleaseSelect}}</option> <option value="">{{pleaseSelect}}</option>
</select> </select>
<p ng-show="orgControlForm.selectProjectIndustry.$error.required && (orgControlForm.selectProjectIndustry.$dirty || orgControlForm.$submitted)" <p ng-show="orgControlForm.selectProjectIndustry.$error.required && (orgControlForm.selectProjectIndustry.$dirty || orgControlForm.$submitted)"
class="has-error label"> class="has-error label">
{{resources.OrganizationMsgProjectIndustryRequired}}</p> {{resources.OrganizationMsgProjectIndustryRequired}}</p>
</div> </div>
</div> </div>
...@@ -400,15 +416,15 @@ ...@@ -400,15 +416,15 @@
<!--自定义属性左边--> <!--自定义属性左边-->
<div class="form-group" ng-repeat="x in selfDimensionModel.leftList"> <div class="form-group" ng-repeat="x in selfDimensionModel.leftList">
<label class="col-sm-3 control-label"><span class="must-input" <label class="col-sm-3 control-label"><span class="must-input"
ng-if="x.isMandatory">*</span><span ng-if="x.isMandatory">*</span><span
title="{{x.name}}">{{x.name|limitString:maxTitleLength}}：</span></label> title="{{x.name}}">{{x.name|limitString:maxTitleLength}}：</span></label>
<div class="col-sm-9" ng-class="{'has-error':x.error}"> <div class="col-sm-9" ng-class="{'has-error':x.error}">
<select class="form-control account-set-select" <select class="form-control account-set-select"
ng-model="x.selectDimensionValueID" ng-model="x.selectDimensionValueID"
ng-change="checkSelfDimension(x)"> ng-change="checkSelfDimension(x)">
<option value="" id="">{{pleaseSelect}}</option> <option value="" id="">{{pleaseSelect}}</option>
<option ng-repeat="y in x.dimensionValueList" value="{{y.id}}" <option ng-repeat="y in x.dimensionValueList" value="{{y.id}}"
title="{{y.name}}">{{y.name | limitString:maxdropLength}} title="{{y.name}}">{{y.name | limitString:maxdropLength}}
</option> </option>
</select> </select>
<p ng-show="x.error" class="has-error label">{{x.error}}</p> <p ng-show="x.error" class="has-error label">{{x.error}}</p>
...@@ -418,32 +434,34 @@ ...@@ -418,32 +434,34 @@
<div class="quarter-div rightDown"> <div class="quarter-div rightDown">
<!--地区--> <!--地区-->
<div class="form-group" ng-show="isLocal"> <div class="form-group" ng-show="isLocal">
<label class="col-sm-3 control-label"><span class="must-input">*</span>{{'AdministrativeRegion' | translate}}：</label> <label class="col-sm-3 control-label"><span
class="must-input">*</span>{{'AdministrativeRegion' | translate}}：</label>
<div class="col-sm-9 row"> <div class="col-sm-9 row">
<div class="col-sm-6" style="padding-left: 0px;" <div class="col-sm-5" style="padding-left: 0px;"
ng-class="{'has-error':orgControlForm.selectProvince.$invalid && (orgControlForm.selectProvince.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.selectProvince.$invalid && (orgControlForm.selectProvince.$dirty || orgControlForm.$submitted)}">
<select class="form-control localRequired" name="selectProvince" <select class="form-control localRequired" name="selectProvince"
style="width: 130px; " ng-change="populateCities()" style="width: 120px; " ng-change="populateCities()"
ng-model="selectProvince" ng-model="selectProvince"
ng-options="x.regionName for x in ProvinceList" > ng-options="x.regionName for x in ProvinceList">
<option value="">{{pleaseSelect}}</option> <option value="">{{pleaseSelect}}</option>
</select> </select>
<p ng-show="orgControlForm.selectProvince.$error.required && (orgControlForm.selectProvince.$dirty || orgControlForm.$submitted)" <p ng-show="orgControlForm.selectProvince.$error.required && (orgControlForm.selectProvince.$dirty || orgControlForm.$submitted)"
class="has-error label" style="margin-left: -16px"> class="has-error label" style="margin-left: -16px">
{{resources.OrganizationMsgProvinceRequired}}</p> {{resources.OrganizationMsgProvinceRequired}}</p>
</div> </div>
<div class="col-sm-6" style="padding-left: 10px;" <div class="col-sm-5" style="padding-left: 10px;"
ng-class="{'has-error':orgControlForm.selectCity.$invalid && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.selectCity.$invalid && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)}">
<select class="form-control localRequired" name="selectCity" id="selectCity" <select class="form-control localRequired" name="selectCity"
style="width: 130px; " ng-model="selectRegionID" > id="selectCity" style="width: 119px; "
ng-model="selectRegionID">
<option value="">{{pleaseSelect}}</option> <option value="">{{pleaseSelect}}</option>
<option ng-repeat="x in CityList" value="{{x.regionID}}" <option ng-repeat="x in CityList" value="{{x.regionID}}"
title="{{x.regionName}}">{{x.regionName | title="{{x.regionName}}">{{x.regionName |
limitString:10}} limitString:10}}
</option> </option>
</select> </select>
<p ng-show="orgControlForm.selectCity.$error.required && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)" <p ng-show="orgControlForm.selectCity.$error.required && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)"
class="has-error label" style="margin-left: 30px"> class="has-error label" style="margin-left: 30px">
{{resources.OrganizationMsgCityRequired}}</p> {{resources.OrganizationMsgCityRequired}}</p>
</div> </div>
</div> </div>
...@@ -453,46 +471,48 @@ ...@@ -453,46 +471,48 @@
<label for="selectLevelType" class="col-sm-3 control-label"><span <label for="selectLevelType" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'OrganizationLevelType' | translate}}：</label> class="must-input">*</span>{{'OrganizationLevelType' | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.selectLevelType.$invalid && (orgControlForm.selectLevelType.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.selectLevelType.$invalid && (orgControlForm.selectLevelType.$dirty || orgControlForm.$submitted)}">
<select class="form-control localRequired" id='selectLevelType' name="selectLevelType" <select class="form-control localRequired" id='selectLevelType'
ng-model="selectLevelType" name="selectLevelType" ng-model="selectLevelType"
ng-options="(x.name | limitString:25) for x in levelTypeList"> ng-options="(x.name | limitString:25) for x in levelTypeList">
<option value="">{{pleaseSelect}}</option> <option value="">{{pleaseSelect}}</option>
</select> </select>
<p ng-show="orgControlForm.selectLevelType.$error.required && (orgControlForm.selectLevelType.$dirty || orgControlForm.$submitted)" <p ng-show="orgControlForm.selectLevelType.$error.required && (orgControlForm.selectLevelType.$dirty || orgControlForm.$submitted)"
class="has-error label"> class="has-error label">
{{resources.OrganizationMsgLevelTypeRequired}}</p> {{resources.OrganizationMsgLevelTypeRequired}}</p>
</div> </div>
</div> </div>
<!--区域--> <!--区域-->
<div class="form-group"> <div class="form-group">
<label for="AreaParent" class="col-sm-3 control-label">{{'AreaTabTitle' | <label for="AreaParent" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'AreaTabTitle' |
translate}}：</label> translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.AreaName.$invalid && (orgControlForm.AreaName.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.AreaName.$invalid && (orgControlForm.AreaName.$dirty || orgControlForm.$submitted)}">
<area-selector id="AreaParent" name="AreaName" <area-selector id="AreaParent" name="AreaName" class="orgAreaRequired"
selected-area-name="editOrgModel.areaName" selected-area-name="editOrgModel.areaName"
selected-area-id="editOrgModel.areaID" selected-area-id="editOrgModel.areaID"
component-selected-area="editOrgModel.componentSelectedArea" component-selected-area="editOrgModel.componentSelectedArea"
is-show-all=false> is-show-all=false>
</area-selector> </area-selector>
<p ng-show="orgControlForm.AreaName.$error.required && (orgControlForm.AreaName.$dirty || orgControlForm.$submitted)" <p ng-show="orgControlForm.AreaName.$error.required && (orgControlForm.AreaName.$dirty || orgControlForm.$submitted)"
class="has-error label">{{resources.OrganizationMsgAreaRequired}}</p> class="has-error label">{{resources.OrganizationMsgAreaRequired}}
</p>
</div> </div>
</div> </div>
<!--自定义属性右边--> <!--自定义属性右边-->
<div class="form-group" ng-repeat="x in selfDimensionModel.rightList"> <div class="form-group" ng-repeat="x in selfDimensionModel.rightList">
<label class="col-sm-3 control-label"><span class="must-input" <label class="col-sm-3 control-label"><span class="must-input"
ng-if="x.isMandatory">*</span><span ng-if="x.isMandatory">*</span><span
title="{{x.name}}">{{x.name|limitString:maxTitleLength}}：</span></label> title="{{x.name}}">{{x.name|limitString:maxTitleLength}}：</span></label>
<div class="col-sm-9" ng-class="{'has-error':x.error}"> <div class="col-sm-9" ng-class="{'has-error':x.error}">
<select class="form-control account-set-select" <select class="form-control account-set-select"
ng-model="x.selectDimensionValueID" ng-model="x.selectDimensionValueID"
ng-change="checkSelfDimension(x)"> ng-change="checkSelfDimension(x)">
<option value="" id="">{{pleaseSelect}}</option> <option value="" id="">{{pleaseSelect}}</option>
<option ng-repeat="y in x.dimensionValueList" value="{{y.id}}" <option ng-repeat="y in x.dimensionValueList" value="{{y.id}}"
title="{{y.name}}">{{y.name | limitString:maxdropLength}} title="{{y.name}}">{{y.name | limitString:maxdropLength}}
</option> </option>
</select> </select>
<p ng-show="x.error" class="has-error label">{{x.error}}</p> <p ng-show="x.error" class="has-error label">{{x.error}}</p>
...@@ -503,11 +523,9 @@ ...@@ -503,11 +523,9 @@
<div style="clear: both;"></div> <div style="clear: both;"></div>
</div> </div>
</form> </form>
</div> </div>
<div class="tab-pane fade" id="advancedOptions"> <div class="tab-pane fade" id="advancedOptions">
<form class="form-horizontal" id="advancedControlForm" name="advancedControlForm"> <form class="form-horizontal" id="advancedControlForm" name="advancedControlForm">
<div class="level-title"> <div class="level-title">
<span>{{'EnterpriseAccountManage'|translate}}</span> <span>{{'EnterpriseAccountManage'|translate}}</span>
...@@ -517,38 +535,54 @@ ...@@ -517,38 +535,54 @@
<div ng-repeat="accountModule in orgAccountList track by $index"> <div ng-repeat="accountModule in orgAccountList track by $index">
<div class="row box-right"> <div class="row box-right">
<div class="col-sm-1 box"><span>{{$index + 1}}</span></div> <div class="col-sm-1 box"><span>{{$index + 1}}</span></div>
<div class="col-sm-10 box"> <div class="col-sm-10 box">
<span class="col-sm-2 AccountName-span">{{'EnterpriseAccountNameShort'|translate}}：</span> <span
<div class="col-sm-4" ng-class="{'has-error':accountModule.enterpriseAccountSetSelectError}"> class="col-sm-2 AccountName-span">{{'EnterpriseAccountNameShort'|translate}}：</span>
<select style="width:200px;" class=" form-control account-set-select" id='enterpriseAccountSetSelect' ng-change="checkEnterpriseAccountSetSelect(accountModule)" name="enterpriseAccountSetSelect" ng-model="accountModule.enterpriseAccountSetSelectID" required> <div class="col-sm-4"
ng-class="{'has-error':accountModule.enterpriseAccountSetSelectError}">
<select style="width:200px;" class=" form-control account-set-select"
id='enterpriseAccountSetSelect'
ng-change="checkEnterpriseAccountSetSelect(accountModule)"
name="enterpriseAccountSetSelect"
ng-model="accountModule.enterpriseAccountSetSelectID" required>
<option value="">{{pleaseSelect}}</option> <option value="">{{pleaseSelect}}</option>
<option ng-repeat="x in enterpriseAccountSetList" value="{{x.id}}" title="{{x.name}}">{{x.name | limitString:maxdropLength}}</option> <option ng-repeat="x in enterpriseAccountSetList" value="{{x.id}}"
title="{{x.name}}">{{x.name | limitString:maxdropLength}}
</option>
</select> </select>
<p ng-show="accountModule.enterpriseAccountSetSelectError" class="has-error label">{{accountModule.enterpriseAccountSetSelectError}}</p> <p ng-show="accountModule.enterpriseAccountSetSelectError"
class="has-error label">
{{accountModule.enterpriseAccountSetSelectError}}</p>
</div> </div>
<span class="col-sm-2 StartTime-span">{{'EffectiveDate' | translate}}</span> <span class="col-sm-2 StartTime-span">{{'EffectiveDate' | translate}}</span>
<div class="col-sm-5" ng-class="{'has-error':accountModule.startDateError}"> <div class="col-sm-5" ng-class="{'has-error':accountModule.startDateError}">
<input type="text" class="form_datetime form-control" ng-model="accountModule.startDate" id="{{accountModule.fromID}}" ng-change="checkStartDate(accountModule)" required /> <input type="text" class="form_datetime form-control"
<p ng-show="accountModule.startDateError" class="has-error label">{{accountModule.startDateError}}</p> ng-model="accountModule.startDate" id="{{accountModule.fromID}}"
ng-change="checkStartDate(accountModule)" required />
<p ng-show="accountModule.startDateError" class="has-error label">
{{accountModule.startDateError}}</p>
</div> </div>
<span class="col-sm-2 To-span">{{'ExpiredDateTo'|translate}}</span> <span class="col-sm-2 To-span">{{'ExpiredDateTo'|translate}}</span>
<div class="col-sm-5" ng-class="{'has-error':accountModule.endDateError}"> <div class="col-sm-5" ng-class="{'has-error':accountModule.endDateError}">
<input type="text" class="form_datetime form-control" ng-model="accountModule.endDate" id="{{accountModule.toID}}" ng-change="checkEndDate(accountModule)" required /> <input type="text" class="form_datetime form-control"
<p ng-show="accountModule.endDateError" class="has-error label">{{accountModule.endDateError}}</p> ng-model="accountModule.endDate" id="{{accountModule.toID}}"
ng-change="checkEndDate(accountModule)" required />
<p ng-show="accountModule.endDateError" class="has-error label">
{{accountModule.endDateError}}</p>
</div> </div>
</div> </div>
<div class="col-sm-1 box"><span ng-click="deleteAccountModule(accountModule)"><i
<div class="col-sm-1 box"><span ng-click="deleteAccountModule(accountModule)"><i class="material-icons button-icons middle delete">delete</i></span></div> class="material-icons button-icons middle delete">delete</i></span>
</div>
</div> </div>
</div> </div>
<div class="row box-right box-bottom"> <div class="row box-right box-bottom">
<div class="col-sm-1 box"><span ng-click="newOrgAccountRow()"><i class="material-icons button-icons middle add">add_circle_outline</i></span></div> <div class="col-sm-1 box"><span ng-click="newOrgAccountRow()">
<i
class="material-icons button-icons middle add">add_circle_outline</i></span>
</div>
<div class="col-sm-10 box"> <div class="col-sm-10 box">
</div> </div>
<div class="col-sm-1 box"></div> <div class="col-sm-1 box"></div>
</div> </div>
...@@ -561,19 +595,22 @@ ...@@ -561,19 +595,22 @@
<div ng-repeat="serviceModule in isCheckedServiceList track by $index"> <div ng-repeat="serviceModule in isCheckedServiceList track by $index">
<div class="row box-right"> <div class="row box-right">
<div class="col-sm-10 box"> <div class="col-sm-10 box">
<div class="col-sm-2 serviceCheckBox"><input class="checkService" type="checkbox" ng-model="serviceModule.isChecked"></div> <div class="col-sm-2 serviceCheckBox"><input class="checkService"
type="checkbox" ng-model="serviceModule.isChecked"></div>
<span class="col-sm-2 ServiceName-span">{{serviceModule.name}}</span> <span class="col-sm-2 ServiceName-span">{{serviceModule.name}}</span>
<span class="col-sm-2 ReportTemplate-span">{{'ReportTemplate'|translate}}:</span> <span
class="col-sm-2 ReportTemplate-span">{{'ReportTemplate'|translate}}:</span>
<div class="col-sm-5" ng-class="{'has-error':serviceModule.selectedTemplateError}"> <div class="col-sm-5"
ng-class="{'has-error':serviceModule.selectedTemplateError}">
<select class="form-control" style="display: inline-block;" ng-change="checkTemplate(serviceModule)" ng-model="serviceModule.selectedTemplate" ng-options="template.name for template in serviceModule.templateGroupList" <select class="form-control" style="display: inline-block;"
name="selectedModule"> ng-change="checkTemplate(serviceModule)"
ng-model="serviceModule.selectedTemplate"
ng-options="template.name for template in serviceModule.templateGroupList"
name="selectedModule">
<option value="">{{pleaseSelect}}</option> <option value="">{{pleaseSelect}}</option>
</select> </select>
<p ng-show="serviceModule.selectedTemplateError"
<p ng-show="serviceModule.selectedTemplateError" class="has-error label">{{serviceModule.selectedTemplateError}}</p> class="has-error label">{{serviceModule.selectedTemplateError}}</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -586,7 +623,6 @@ ...@@ -586,7 +623,6 @@
<p>权限设置待开发，敬请期待！</p> <p>权限设置待开发，敬请期待！</p>
</div>--> </div>-->
</div> </div>
<div class="modal-footer" id="orgModalFooter" style="padding-left:139px;"> <div class="modal-footer" id="orgModalFooter" style="padding-left:139px;">
<button type="submit" class="btn btn-primary" ng-click="saveOrg()"> <button type="submit" class="btn btn-primary" ng-click="saveOrg()">
{{'Confirm' | translate}} {{'Confirm' | translate}}
...@@ -598,6 +634,4 @@ ...@@ -598,6 +634,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> \ No newline at end of file
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.less
View file @ 98448d0a
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
.btn-default { .btn-default {
height: 33px; height: 33px;
width: 250px;
} }
input { input {
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 98448d0a
...@@ -1479,7 +1479,7 @@ constant.TaxpayerQualificationTypeList = [ ...@@ -1479,7 +1479,7 @@ constant.TaxpayerQualificationTypeList = [
constant.RegStatusList = [ constant.RegStatusList = [
{code: 0, type: "存续"}, {code: 0, type: "存续"},
{code: 1, type: "存续中"}, {code: 1, type: "注销中"},
{code: 2, type: "已注销"} {code: 2, type: "已注销"}
]; ];
......
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