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
Show whitespace changes
Inline Side-by-side
Showing with 183 additions and 122 deletions
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ 98448d0a
......@@ -864,7 +864,7 @@
"ApproveEndTime":"Approved Time",
"ApproveTaskList":"Approve Task List",
"ApproveRole":"Approve Role",
"NumOfBranches":"分公司数量",
"ConditionColumnNum": "Search Condition Column Num",
"Condition": "Search Condition",
"RevenueTypeConfiguration":"Revenue Type Config"
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ 98448d0a
......@@ -89,7 +89,7 @@
"BusinessAllottedTimeTo": "营业期限截止",
"BusinessPromition": "业务宣传费",
"BusinessScope": "经营范围",
"RegStatus": "登记状态",
"RegStatus": "工商登记状态",
"BusinessUnit": "所属业务线",
"BusinessUnitDesc": "业务线",
"BusinessUnitID": "业务线",
......@@ -371,6 +371,7 @@
"RegFinancialOfficerEmailAddress": "注册登记财务负责人邮箱",
"SecondaryApprovalAmount": "二级审批金额",
"BusinessRegistrationNumber": "Business registration number",
"NumOfBranches":"分公司数量",
"ParValue": "Par Value",
"IssuedShares": "Issued shares",
"Directors": "Directors",
......@@ -595,7 +596,7 @@
"UpdateType": "更新方式",
"RegistrationDate": "注册日期",
"RegistrationLocation": "注册地址(住所)",
"RegistrationLocationEn": "注册地地址(住所)-英文",
"RegistrationLocationEn": "注册地址(住所)-英文",
"RegistrationType": "注册类型",
"ArchitectureType": "架构类型",
"RemarkColon": "备注：",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @ 98448d0a
......@@ -257,7 +257,7 @@
"OrganizationMsgClientCodeRequired": "请输入客户代码",
"OrganizationCode": "公司代码",
"UnifiedSocialCreditCode": "统一社会信用代码",
"RegistrationStatus": "登记状态",
"RegistrationStatus": "工商登记状态",
"LogoutTime": "注销时间",
"RegistrationAuthority": "登记机关",
"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
var getOrgList = function () {
orgService.getOrgListLevel().success(function (data) {
if (data) {
$scope.DataGridSource = data;
$scope.DataGridSource = _.filter(data, function (row) {
return row.isActive == true;
});
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', '
return false;
}
});
};
$('.orgAreaRequired').each( function (index,ele){
if(null==ele.innerText||""===ele.innerText){
SweetAlert.error("请检查必填项");
fail = true;
return false;
}
});
if(fail) return;
......@@ -481,6 +488,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
});
$scope.editOrgModel = orgData;
$scope.editOrgModel.foundationDate=($filter('date')(new Date($scope.editOrgModel.foundationDate), "yyyy-MM-dd"));
// 设置地区
loadProvinceList();
......@@ -513,6 +521,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
if($scope.isInternational){
$('.localRequired').removeAttr("required");
$('.orgAreaRequired').removeAttr("required");
}
// set first active page is basic info
......@@ -955,6 +964,19 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
// 说明
$scope.resources = {
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'),
OrganizationParent: $translate.instant('OrganizationParent'),
OrganizationLevelType: $translate.instant('OrganizationLevelType'),
......@@ -1057,12 +1079,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$scope.isLocal = false;
$scope.isInternational = true;
$('.localRequired').removeAttr("required");
$('.orgAreaRequired').removeAttr("required");
};
$scope.changeLocal = function () {
$scope.isLocal = true;
$scope.isInternational = false;
$('.localRequired').attr("required",true);
$('.orgAreaRequired').attr("required",true);
};
// 强制刷新机构控件里的机构
......@@ -1094,6 +1118,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$scope.trueFalse = constant.trueFalse;
$scope.countryCNList = constant.countryCNList;
$('.localRequired').attr("required",true);
$('.orgAreaRequired').attr("required",true);
// $('.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="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-content">
<div class="modal-header">
<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;" ng-click="changeLocal()" ng-show="isAdd&&!isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
<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;" ng-click="changeLocal()"
ng-show="isAdd&&!isLocal"><i
class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
</div>
<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;" ng-click="changeLocal()" ng-show="isAdd&&!isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
<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;" ng-click="changeLocal()"
ng-show="isAdd&&!isLocal"><i
class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
</div>
</div>
<div id="orgControlTab" ng-if="isAdd">
......@@ -36,7 +45,6 @@
</div>
<div id="myTabContent" class="tab-content">
<div id="basicdata" class="tab-pane in active">
<form class="form-horizontal" id="orgControlForm" name="orgControlForm">
<div class="local">
<div class="bottom-row">
......@@ -47,15 +55,15 @@
| 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"-->
<input class="form-control localRequired" id="name" ng-model="editOrgModel.name"
name="name" placeholder="{{resources.OrganizationName}}"
ng-keyup="nameKeyUp()" maxlength="100">
<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>
class="has-error label">{{resources.OrganizationMsgNameRequired}}
</p>
<p ng-show="editOrgModel.nameError" class="has-error label">
{{editOrgModel.nameError}}</p>
</div>
</div>
......@@ -67,7 +75,7 @@
<input class="form-control" id="englishName"
ng-model="editOrgModel.englishName" name="englishName"
placeholder="{{resources.OrganizationNameEn}}"
ng-keyup="nameKeyUp()" maxlength="100" >
ng-keyup="nameKeyUp()" maxlength="100">
</div>
</div>
......@@ -77,8 +85,8 @@
class="must-input">*</span>{{'OrganizationClientCode' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.clientCode.$invalid && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" name="clientCode" id="clientCode"
ng-model="editOrgModel.clientCode"
<input class="form-control localRequired" name="clientCode"
id="clientCode" ng-model="editOrgModel.clientCode"
placeholder="{{resources.OrganizationClientCode}}" maxlength="50">
<p ng-show="orgControlForm.clientCode.$error.required && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)"
class="has-error label">
......@@ -96,11 +104,12 @@
ng-model="editOrgModel.architectureType"
placeholder="{{resources.ArchitectureType}}" maxlength="50">
</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"
ng-class="{'has-error':orgControlForm.architectureType.$invalid && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='architectureType' name="architectureType"
ng-model="editOrgModel.architectureType"
<select class="form-control" id='architectureType'
name="architectureType" ng-model="editOrgModel.architectureType"
ng-options="item for item in architectureTypeList">
<option value="">{{resources.ArchitectureType}}</option>
</select>
......@@ -116,23 +125,22 @@
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registerAddress.$invalid && (orgControlForm.registerAddress.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="registerAddress"
id="registerAddress"
<input class="form-control" name="registerAddress" id="registerAddress"
ng-model="editOrgModel.registerAddress"
placeholder="{{resources.registerAddress}}" maxlength="100">
placeholder="{{resources.registrationLocation}}" maxlength="100">
</div>
</div>
<!--注册资本(万元)-->
<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>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registrationCapital.$invalid && (orgControlForm.registrationCapital.$dirty || orgControlForm.$submitted)}">
<!-- <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registrationCapital.$invalid && (orgControlForm.registrationCapital.$dirty || orgControlForm.$submitted)}"> -->
<div class="col-sm-9">
<input class="form-control" name="registrationCapital"
id="registrationCapital"
ng-model="editOrgModel.registrationCapital"
placeholder="{{resources.RegistrationCapital}}" maxlength="50" required>
id="registrationCapital" ng-model="editOrgModel.registrationCapital"
placeholder="{{resources.RegistrationCapital}}" maxlength="50">
</div>
</div>
......@@ -146,7 +154,8 @@
id="nationalEconomicIndustry"
ng-model="editOrgModel.nationalEconomicIndustry"
placeholder="{{resources.NationalEconomicIndustry}}" maxlength="50">-->
<select class="form-control" id='nationalEconomicIndustry' name="nationalEconomicIndustry"
<select class="form-control" id='nationalEconomicIndustry'
name="nationalEconomicIndustry"
ng-model="editOrgModel.nationalEconomicIndustry"
ng-options="x.code as x.type for x in nationalEconomicIndustryList">
<option value="">{{resources.NationalEconomicIndustry}}</option>
......@@ -160,8 +169,7 @@
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.legalPersonName.$invalid && (orgControlForm.legalPersonName.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="legalPersonName"
id="legalPersonName"
<input class="form-control" name="legalPersonName" id="legalPersonName"
ng-model="editOrgModel.legalPersonName"
placeholder="{{resources.LegalPersonName}}" maxlength="50">
</div>
......@@ -173,8 +181,7 @@
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.numOfBranches.$invalid && (orgControlForm.numOfBranches.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="numOfBranches"
id="numOfBranches"
<input class="form-control" name="numOfBranches" id="numOfBranches"
ng-model="editOrgModel.numOfBranches"
placeholder="{{resources.NumOfBranches}}" maxlength="50">
</div>
......@@ -186,9 +193,10 @@
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.logoutTime.$invalid && (orgControlForm.logoutTime.$dirty || orgControlForm.$submitted)}">
<div class="input-daterange startDatepicker" >
<input type="text" id="logoutTime" class="input-sm form-control" name="logoutTime" ng-model="editOrgModel.logoutTime"
placeholder="{{resources.LogoutTime}}"/>
<div class="input-daterange startDatepicker">
<input type="text" id="logoutTime" class="input-sm form-control"
name="logoutTime" ng-model="editOrgModel.logoutTime"
placeholder="{{resources.LogoutTime}}" />
</div>
</div>
</div>
......@@ -206,16 +214,16 @@
</div>
</div>
<div class="quarter-div rightUp">
<!--纳税人识别号-->
<!--统一社会信用代码-->
<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>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.taxPayerNumber.$invalid && (orgControlForm.taxPayerNumber.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="taxPayerNumber" id="taxPayerNumber"
ng-model="editOrgModel.taxPayerNumber" maxlength="50"
placeholder="{{resources.OrganizationTaxPayerNumber}}"
<input class="form-control localRequired" name="taxPayerNumber"
id="taxPayerNumber" ng-model="editOrgModel.taxPayerNumber"
maxlength="50" placeholder="{{resources.UnifiedSocialCreditCode}}"
tax-payer-number-unique>
<p ng-show="orgControlForm.taxPayerNumber.$error.taxPayerNumberUnique && (orgControlForm.taxPayerNumber.$dirty || orgControlForm.$submitted)"
class="has-error label">
......@@ -223,44 +231,45 @@
</div>
</div>
<!--缩写-->
<!--公司简称-->
<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"
ng-class="{'has-error':orgControlForm.clientCode.$invalid && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="abbreviation" id="abbreviation"
ng-model="editOrgModel.abbreviation"
placeholder="{{resources.Abbreviation}}" maxlength="50" >
<input class="form-control localRequired" name="abbreviation"
id="abbreviation" ng-model="editOrgModel.abbreviation"
placeholder="{{resources.Abbreviation}}" maxlength="50">
</div>
</div>
<!--工商登记状态-->
<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"
ng-class="{'has-error':orgControlForm.regStatus.$invalid && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='regStatus' name="regStatus"
ng-model="editOrgModel.regStatus"
ng-options="x.type as x.type for x in regStatusList ">
</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">
{{resources.OrganizationMsgRegStatusRequired}}</p>
{{resources.OrganizationMsgRegStatusRequired}}</p> -->
</div>
</div>
<!--机构代码-->
<!--公司代码-->
<div class="form-group" ng-show="isLocal">
<label for="code" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'OrganizationCode' |
<label for="code" class="col-sm-3 control-label">{{'OrganizationCode' |
translate}}：</label>
<div class="col-sm-9"
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"
placeholder="{{resources.OrganizationCode}}"
maxlength="50" ng-pattern="/^[A-Za-z0-9]+$/" code-unique>
<p ng-show="orgControlForm.code.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
placeholder="{{resources.OrganizationCode}}" maxlength="50"
ng-pattern="/^[A-Za-z0-9]+$/" code-unique>
<!-- <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">
......@@ -268,7 +277,7 @@
<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>
class="has-error label">{{resources.OrganizationMsgCodeUnique}}</p> -->
</div>
</div>
......@@ -299,29 +308,36 @@
<!--从事国家限制或禁止行业-->
<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"
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'
name="engageNationalProhibitIndustry"
ng-model="editOrgModel.engageNationalProhibitIndustry"
ng-options="x.code as x.type for x in trueFalse">
<option value="">{{resources.EngageNationalProhibitIndustry}}</option>
<option value="">{{resources.EngageNationalProhibitIndustry}}
</option>
</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">
{{resources.OrganizationMsgEngageNationalProhibitIndustryRequired}}</p>
{{resources.OrganizationMsgEngageNationalProhibitIndustryRequired}}
</p> -->
</div>
</div>
<!--成立日期-->
<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>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.foundationDate.$invalid && (orgControlForm.foundationDate.$dirty || orgControlForm.$submitted)}">
<div class="input-daterange startDatepicker">
<input type="text" id="foundationDate" class="input-sm form-control" name="foundationDate" ng-model="editOrgModel.foundationDate"
placeholder="{{resources.FoundationDate}}"/>
<input type="text" id="foundationDate" class="input-sm form-control"
name="foundationDate" ng-model="editOrgModel.foundationDate"
required="required"
placeholder="{{resources.FoundationDate}}" />
</div>
</div>
</div>
......@@ -357,18 +373,19 @@
<org-selector id="OrgParent" selected-org-name="editOrgModel.parentName"
selected-org-id="editOrgModel.parentID"
component-selected-org="editOrgModel.componentSelectedOrg"
is-show-all=false select-no-option="true"
item-max-length="22" is-require="false">
is-show-all=false select-no-option="true" item-max-length="22"
is-require="false">
</org-selector>
</div>
</div>
<!--事业部-->
<!--所属业务线-->
<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>
<div class="col-sm-9">
<select class="form-control" id='selectBusinessUnit'
<select class="form-control localRequired" id='selectBusinessUnit'
ng-model="selectBusinessUnit"
ng-options="item as item.name disable when item.disabled for item in businessUnitList"
name='selectBusinessUnit'>
......@@ -387,8 +404,7 @@
<select class="form-control localRequired" id='selectProjectIndustry'
ng-model="selectProjectIndustry"
ng-options="x.name for x in projectIndustryList"
name='selectProjectIndustry'
ng-change="ProjectIndustryChanged()" >
name='selectProjectIndustry' ng-change="ProjectIndustryChanged()">
<option value="">{{pleaseSelect}}</option>
</select>
<p ng-show="orgControlForm.selectProjectIndustry.$error.required && (orgControlForm.selectProjectIndustry.$dirty || orgControlForm.$submitted)"
......@@ -418,24 +434,26 @@
<div class="quarter-div rightDown">
<!--地区-->
<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-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)}">
<select class="form-control localRequired" name="selectProvince"
style="width: 130px; " ng-change="populateCities()"
style="width: 120px; " ng-change="populateCities()"
ng-model="selectProvince"
ng-options="x.regionName for x in ProvinceList" >
ng-options="x.regionName for x in ProvinceList">
<option value="">{{pleaseSelect}}</option>
</select>
<p ng-show="orgControlForm.selectProvince.$error.required && (orgControlForm.selectProvince.$dirty || orgControlForm.$submitted)"
class="has-error label" style="margin-left: -16px">
{{resources.OrganizationMsgProvinceRequired}}</p>
</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)}">
<select class="form-control localRequired" name="selectCity" id="selectCity"
style="width: 130px; " ng-model="selectRegionID" >
<select class="form-control localRequired" name="selectCity"
id="selectCity" style="width: 119px; "
ng-model="selectRegionID">
<option value="">{{pleaseSelect}}</option>
<option ng-repeat="x in CityList" value="{{x.regionID}}"
title="{{x.regionName}}">{{x.regionName |
......@@ -454,8 +472,8 @@
class="must-input">*</span>{{'OrganizationLevelType' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.selectLevelType.$invalid && (orgControlForm.selectLevelType.$dirty || orgControlForm.$submitted)}">
<select class="form-control localRequired" id='selectLevelType' name="selectLevelType"
ng-model="selectLevelType"
<select class="form-control localRequired" id='selectLevelType'
name="selectLevelType" ng-model="selectLevelType"
ng-options="(x.name | limitString:25) for x in levelTypeList">
<option value="">{{pleaseSelect}}</option>
</select>
......@@ -466,18 +484,20 @@
</div>
<!--区域-->
<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>
<div class="col-sm-9"
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-id="editOrgModel.areaID"
component-selected-area="editOrgModel.componentSelectedArea"
is-show-all=false>
</area-selector>
<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>
......@@ -503,11 +523,9 @@
<div style="clear: both;"></div>
</div>
</form>
</div>
<div class="tab-pane fade" id="advancedOptions">
<form class="form-horizontal" id="advancedControlForm" name="advancedControlForm">
<div class="level-title">
<span>{{'EnterpriseAccountManage'|translate}}</span>
......@@ -517,38 +535,54 @@
<div ng-repeat="accountModule in orgAccountList track by $index">
<div class="row box-right">
<div class="col-sm-1 box"><span>{{$index + 1}}</span></div>
<div class="col-sm-10 box">
<span class="col-sm-2 AccountName-span">{{'EnterpriseAccountNameShort'|translate}}：</span>
<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>
<span
class="col-sm-2 AccountName-span">{{'EnterpriseAccountNameShort'|translate}}：</span>
<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 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>
<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>
<span class="col-sm-2 StartTime-span">{{'EffectiveDate' | translate}}</span>
<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 />
<p ng-show="accountModule.startDateError" class="has-error label">{{accountModule.startDateError}}</p>
<input type="text" class="form_datetime form-control"
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>
<span class="col-sm-2 To-span">{{'ExpiredDateTo'|translate}}</span>
<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 />
<p ng-show="accountModule.endDateError" class="has-error label">{{accountModule.endDateError}}</p>
<input type="text" class="form_datetime form-control"
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 class="col-sm-1 box"><span ng-click="deleteAccountModule(accountModule)"><i class="material-icons button-icons middle delete">delete</i></span></div>
<div class="col-sm-1 box"><span ng-click="deleteAccountModule(accountModule)"><i
class="material-icons button-icons middle delete">delete</i></span>
</div>
</div>
</div>
<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>
<div class="col-sm-1 box"></div>
</div>
......@@ -561,19 +595,22 @@
<div ng-repeat="serviceModule in isCheckedServiceList track by $index">
<div class="row box-right">
<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 ReportTemplate-span">{{'ReportTemplate'|translate}}:</span>
<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"
<span
class="col-sm-2 ReportTemplate-span">{{'ReportTemplate'|translate}}:</span>
<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"
name="selectedModule">
<option value="">{{pleaseSelect}}</option>
</select>
<p ng-show="serviceModule.selectedTemplateError" class="has-error label">{{serviceModule.selectedTemplateError}}</p>
<p ng-show="serviceModule.selectedTemplateError"
class="has-error label">{{serviceModule.selectedTemplateError}}</p>
</div>
</div>
</div>
......@@ -586,7 +623,6 @@
<p>权限设置待开发，敬请期待！</p>
</div>-->
</div>
<div class="modal-footer" id="orgModalFooter" style="padding-left:139px;">
<button type="submit" class="btn btn-primary" ng-click="saveOrg()">
{{'Confirm' | translate}}
......@@ -598,6 +634,4 @@
</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 @@
.btn-default {
height: 33px;
width: 250px;
}
input {
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 98448d0a
......@@ -1479,7 +1479,7 @@ constant.TaxpayerQualificationTypeList = [
constant.RegStatusList = [
{code: 0, type: "存续"},
{code: 1, type: "存续中"},
{code: 1, 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