Skip to content

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

fixed org -- frank

parent 2c0845dd
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 96 deletions
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ da552a57
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
<p>{{'NoOrganizationData' | translate}}</p> <p>{{'NoOrganizationData' | translate}}</p>
<p> <p>
<button type="button" class="btn btn-in-panel-big" ng-click="addOrg()" ng-if="hasAddPermission"><i <button type="button" class="btn btn-in-panel-big" ng-click="addOrg()" ng-if="hasAddPermission"><i
class="material-icons button-icons">add_circle_outline</i> 新增机构</button> class="material-icons button-icons">add_circle_outline</i> 新增机构
</button>
</p> </p>
</div> </div>
<div class="org-left-container flex-column-start-stretch" id="org-left-container" <div class="org-left-container flex-column-start-stretch" id="org-left-container"
...@@ -25,7 +26,8 @@ ...@@ -25,7 +26,8 @@
</div> </div>
<div class="flex-0-0-auto" style="margin:5px;"> <div class="flex-0-0-auto" style="margin:5px;">
<button type="button" class="btn btn-in-panel-big" ng-click="addOrg()" ng-if="hasAddPermission"><i <button type="button" class="btn btn-in-panel-big" ng-click="addOrg()" ng-if="hasAddPermission"><i
class="material-icons button-icons">add_circle_outline</i> 新增机构</button> class="material-icons button-icons">add_circle_outline</i> 新增机构
</button>
</div> </div>
<div class="orgpage-tree-container flex-1-1-auto"> <div class="orgpage-tree-container flex-1-1-auto">
...@@ -54,7 +56,8 @@ ...@@ -54,7 +56,8 @@
ng-class="{true:'btn-secondary', false:'btn-in-grid'}[!selectCompany.isActive]" ng-class="{true:'btn-secondary', false:'btn-in-grid'}[!selectCompany.isActive]"
ng-click="updateIsActive()" ng-disabled="!isCanOrganizationIsActiveBtn"><i ng-click="updateIsActive()" ng-disabled="!isCanOrganizationIsActiveBtn"><i
ng-show="selectCompany.isActive" ng-show="selectCompany.isActive"
class="material-icons stop">block</i>{{selectCompany.isActiveStr}}</button> class="material-icons stop">block</i>{{selectCompany.isActiveStr}}
</button>
<span class="right-operate"> <span class="right-operate">
<!-- board展示 --> <!-- board展示 -->
...@@ -97,7 +100,8 @@ ...@@ -97,7 +100,8 @@
<div class="right-option"> <div class="right-option">
<button type="button" class="btn btn-in-grid" style="width: 117px;" <button type="button" class="btn btn-in-grid" style="width: 117px;"
ng-click="updateOrg()" ng-if="hasEditPermission"><i ng-click="updateOrg()" ng-if="hasEditPermission"><i
class="material-icons middle">create</i>{{'Change' | translate}}</button> class="material-icons middle">create</i>{{'Change' | translate}}
</button>
</div> </div>
<div class="basic-org-info bottom-row"> <div class="basic-org-info bottom-row">
...@@ -111,8 +115,7 @@ ...@@ -111,8 +115,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span <span class="">{{'OrganizationNameEn' | translate}}：{{selectCompany.englishName?selectCompany.englishName:'无'}}</span>
class="">{{'OrganizationNameEn' | translate}}：{{selectCompany.englishName?selectCompany.englishName:'无'}}</span>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group" ng-show="!isInternational">
...@@ -151,8 +154,7 @@ ...@@ -151,8 +154,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span <span class="">{{'LegalPersonName' | translate}}：{{selectCompany.legalPersonName?selectCompany.legalPersonName:'无'}}</span>
class="">{{'LegalPersonName' | translate}}：{{selectCompany.legalPersonName?selectCompany.legalPersonName:'无'}}</span>
</div> </div>
</div> </div>
<!-- 分公司数量 --> <!-- 分公司数量 -->
...@@ -274,7 +276,7 @@ ...@@ -274,7 +276,7 @@
<div class="col-sm-4 company-property-border" ng-show="!isInternational"> <div class="col-sm-4 company-property-border" ng-show="!isInternational">
<i style="color: #757575;" class="material-icons">sort</i> <i style="color: #757575;" class="material-icons">sort</i>
<span translate="OrganizationParent"></span> <span translate="OrganizationParent"></span>
<br /> <br/>
<p><span <p><span
title="{{selectCompany.parentName}}">{{selectCompany.parentName ? (selectCompany.parentName):''}}</span> title="{{selectCompany.parentName}}">{{selectCompany.parentName ? (selectCompany.parentName):''}}</span>
</p> </p>
...@@ -290,7 +292,7 @@ ...@@ -290,7 +292,7 @@
<div class="col-sm-4 company-property-border" ng-show="!isInternational"> <div class="col-sm-4 company-property-border" ng-show="!isInternational">
<i style="color: #757575;" class="material-icons">sort</i> <i style="color: #757575;" class="material-icons">sort</i>
<span translate="AdministrativeRegion"></span> <span translate="AdministrativeRegion"></span>
<br /> <br/>
<p><span <p><span
title="{{selectCompany.regionName}}">{{selectCompany.regionName |limitString:maxValueLength}}</span> title="{{selectCompany.regionName}}">{{selectCompany.regionName |limitString:maxValueLength}}</span>
</p> </p>
...@@ -298,7 +300,7 @@ ...@@ -298,7 +300,7 @@
<div class="col-sm-4 company-property-border"> <div class="col-sm-4 company-property-border">
<i style="color: #757575;" class="material-icons">sort</i> <i style="color: #757575;" class="material-icons">sort</i>
<span translate="Business"></span> <span translate="Business"></span>
<br /> <br/>
<p><span <p><span
title="{{selectCompany.businessUnitName}}">{{selectCompany.businessUnitName |limitString:maxValueLength}}</span> title="{{selectCompany.businessUnitName}}">{{selectCompany.businessUnitName |limitString:maxValueLength}}</span>
</p> </p>
...@@ -313,7 +315,7 @@ ...@@ -313,7 +315,7 @@
<div class="col-sm-4 company-property-border"> <div class="col-sm-4 company-property-border">
<i style="color: #757575;" class="material-icons">sort</i> <i style="color: #757575;" class="material-icons">sort</i>
<span translate="OrganizationLevelType"></span> <span translate="OrganizationLevelType"></span>
<br /> <br/>
<p><span <p><span
title="{{selectCompany.structureName}}">{{selectCompany.structureName |limitString:maxValueLength}}</span> title="{{selectCompany.structureName}}">{{selectCompany.structureName |limitString:maxValueLength}}</span>
</p> </p>
...@@ -321,7 +323,7 @@ ...@@ -321,7 +323,7 @@
<div class="col-sm-4 company-property-border"> <div class="col-sm-4 company-property-border">
<i style="color: #757575;" class="material-icons">store mall directory</i> <i style="color: #757575;" class="material-icons">store mall directory</i>
<span translate="PIndustry"></span> <span translate="PIndustry"></span>
<br /> <br/>
<p><span <p><span
title="{{selectCompany.industryName}}">{{selectCompany.industryName |limitString:maxValueLength}}</span> title="{{selectCompany.industryName}}">{{selectCompany.industryName |limitString:maxValueLength}}</span>
</p> </p>
...@@ -329,7 +331,7 @@ ...@@ -329,7 +331,7 @@
<div class="col-sm-4 company-property-border"> <div class="col-sm-4 company-property-border">
<i style="color: #757575;" class="material-icons">place</i> <i style="color: #757575;" class="material-icons">place</i>
<span translate="Area"></span> <span translate="Area"></span>
<br /> <br/>
<p><span <p><span
title="{{selectCompany.areaName}}">{{selectCompany.areaName |limitString:maxValueLength}}</span> title="{{selectCompany.areaName}}">{{selectCompany.areaName |limitString:maxValueLength}}</span>
</p> </p>
...@@ -408,13 +410,16 @@ ...@@ -408,13 +410,16 @@
<div class="right-option"> <div class="right-option">
<button type="button" class="btn btn-in-grid" style="width: 117px;" <button type="button" class="btn btn-in-grid" style="width: 117px;"
ng-click="updateEquity()" ng-if="hasEditPermission"><i ng-click="updateEquity()" ng-if="hasEditPermission"><i
class="material-icons middle">create</i>{{'Change' | translate}}</button> class="material-icons middle">create</i>{{'Change' | 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="alterEquity()" ng-if="hasEditPermission"><i ng-click="alterEquity()" ng-if="hasEditPermission"><i
class="mdui-icon material-icons">&#xe145;</i>{{'Alter' | translate}}</button> class="mdui-icon material-icons">&#xe145;</i>{{'Alter' | 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="refreshEquityList()" ng-if="hasEditPermission"><i ng-click="refreshEquityList()" ng-if="hasEditPermission"><i
class="mdui-icon material-icons">&#xe5d5;</i>{{'Refresh' | translate}}</button> class="mdui-icon material-icons">&#xe5d5;</i>{{'Refresh' | translate}}
</button>
</div> </div>
<div class="current-holding-info"> <div class="current-holding-info">
<span class="control-label">{{'HoldingInstitution' | translate}}：<strong <span class="control-label">{{'HoldingInstitution' | translate}}：<strong
...@@ -516,7 +521,7 @@ ...@@ -516,7 +521,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.unifiedSocialCreditCode" ng-model="editOrgExtraModel.unifiedSocialCreditCode"
title="{{selectCompanyExtra.unifiedSocialCreditCode}}" title="{{selectCompanyExtra.unifiedSocialCreditCode}}"
value="{{selectCompanyExtra.unifiedSocialCreditCode | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.unifiedSocialCreditCode | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
...@@ -610,7 +615,7 @@ ...@@ -610,7 +615,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.legalPersonName" ng-model="editOrgExtraModel.legalPersonName"
title="{{selectCompanyExtra.legalPersonName}}" title="{{selectCompanyExtra.legalPersonName}}"
value="{{selectCompanyExtra.legalPersonName | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.legalPersonName | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
...@@ -623,7 +628,7 @@ ...@@ -623,7 +628,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.legalPersonPhoneNumber" ng-model="editOrgExtraModel.legalPersonPhoneNumber"
title="{{selectCompanyExtra.legalPersonPhoneNumber}}" title="{{selectCompanyExtra.legalPersonPhoneNumber}}"
value="{{selectCompanyExtra.legalPersonPhoneNumber | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.legalPersonPhoneNumber | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
...@@ -638,7 +643,7 @@ ...@@ -638,7 +643,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.legalPersonLandlineNum" ng-model="editOrgExtraModel.legalPersonLandlineNum"
title="{{selectCompanyExtra.legalPersonLandlineNum}}" title="{{selectCompanyExtra.legalPersonLandlineNum}}"
value="{{selectCompanyExtra.legalPersonLandlineNum | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.legalPersonLandlineNum | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
...@@ -651,7 +656,7 @@ ...@@ -651,7 +656,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.legalPersonEmailAddress" ng-model="editOrgExtraModel.legalPersonEmailAddress"
title="{{selectCompanyExtra.legalPersonEmailAddress}}" title="{{selectCompanyExtra.legalPersonEmailAddress}}"
value="{{selectCompanyExtra.legalPersonEmailAddress | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.legalPersonEmailAddress | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
...@@ -666,7 +671,7 @@ ...@@ -666,7 +671,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.regFinancialOfficerName" ng-model="editOrgExtraModel.regFinancialOfficerName"
title="{{selectCompanyExtra.regFinancialOfficerName}}" title="{{selectCompanyExtra.regFinancialOfficerName}}"
value="{{selectCompanyExtra.regFinancialOfficerName | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.regFinancialOfficerName | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
<span <span
...@@ -678,7 +683,7 @@ ...@@ -678,7 +683,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.regFinancialOfficerPhoneNum" ng-model="editOrgExtraModel.regFinancialOfficerPhoneNum"
title="{{selectCompanyExtra.regFinancialOfficerPhoneNum}}" title="{{selectCompanyExtra.regFinancialOfficerPhoneNum}}"
value="{{selectCompanyExtra.regFinancialOfficerPhoneNum | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.regFinancialOfficerPhoneNum | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
...@@ -693,7 +698,7 @@ ...@@ -693,7 +698,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.regFinancialOfficerLandlineNum" ng-model="editOrgExtraModel.regFinancialOfficerLandlineNum"
title="{{selectCompanyExtra.regFinancialOfficerLandlineNum}}" title="{{selectCompanyExtra.regFinancialOfficerLandlineNum}}"
value="{{selectCompanyExtra.regFinancialOfficerLandlineNum | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.regFinancialOfficerLandlineNum | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
...@@ -707,7 +712,7 @@ ...@@ -707,7 +712,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.regFinancialOfficerEmailAddress" ng-model="editOrgExtraModel.regFinancialOfficerEmailAddress"
title="{{selectCompanyExtra.regFinancialOfficerEmailAddress}}" title="{{selectCompanyExtra.regFinancialOfficerEmailAddress}}"
value="{{selectCompanyExtra.regFinancialOfficerEmailAddress | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.regFinancialOfficerEmailAddress | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
...@@ -722,7 +727,7 @@ ...@@ -722,7 +727,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxClientPersonName" ng-model="editOrgExtraModel.taxClientPersonName"
title="{{selectCompanyExtra.taxClientPersonName}}" title="{{selectCompanyExtra.taxClientPersonName}}"
value="{{selectCompanyExtra.taxClientPersonName | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.taxClientPersonName | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
<span <span
...@@ -734,7 +739,7 @@ ...@@ -734,7 +739,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxClientPersonPhoneNum" ng-model="editOrgExtraModel.taxClientPersonPhoneNum"
title="{{selectCompanyExtra.taxClientPersonPhoneNum}}" title="{{selectCompanyExtra.taxClientPersonPhoneNum}}"
value="{{selectCompanyExtra.taxClientPersonPhoneNum | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.taxClientPersonPhoneNum | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
...@@ -749,7 +754,7 @@ ...@@ -749,7 +754,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxClientPersonIdNum" ng-model="editOrgExtraModel.taxClientPersonIdNum"
title="{{selectCompanyExtra.taxClientPersonIdNum}}" title="{{selectCompanyExtra.taxClientPersonIdNum}}"
value="{{selectCompanyExtra.taxClientPersonIdNum | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.taxClientPersonIdNum | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
...@@ -762,7 +767,7 @@ ...@@ -762,7 +767,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxClientPersonEmailAddress" ng-model="editOrgExtraModel.taxClientPersonEmailAddress"
title="{{selectCompanyExtra.taxClientPersonEmailAddress}}" title="{{selectCompanyExtra.taxClientPersonEmailAddress}}"
value="{{selectCompanyExtra.taxClientPersonEmailAddress | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.taxClientPersonEmailAddress | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
...@@ -777,7 +782,7 @@ ...@@ -777,7 +782,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.ticketHolderName" ng-model="editOrgExtraModel.ticketHolderName"
title="{{selectCompanyExtra.ticketHolderName}}" title="{{selectCompanyExtra.ticketHolderName}}"
value="{{selectCompanyExtra.ticketHolderName | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.ticketHolderName | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
...@@ -790,7 +795,7 @@ ...@@ -790,7 +795,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.ticketHolderPhoneNum" ng-model="editOrgExtraModel.ticketHolderPhoneNum"
title="{{selectCompanyExtra.ticketHolderPhoneNum}}" title="{{selectCompanyExtra.ticketHolderPhoneNum}}"
value="{{selectCompanyExtra.ticketHolderPhoneNum | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.ticketHolderPhoneNum | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
...@@ -805,7 +810,7 @@ ...@@ -805,7 +810,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.nationalTaxAdministratorName" ng-model="editOrgExtraModel.nationalTaxAdministratorName"
title="{{selectCompanyExtra.nationalTaxAdministratorName}}" title="{{selectCompanyExtra.nationalTaxAdministratorName}}"
value="{{selectCompanyExtra.nationalTaxAdministratorName | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.nationalTaxAdministratorName | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
...@@ -818,7 +823,7 @@ ...@@ -818,7 +823,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.localTaxAdministratorName" ng-model="editOrgExtraModel.localTaxAdministratorName"
title="{{selectCompanyExtra.localTaxAdministratorName}}" title="{{selectCompanyExtra.localTaxAdministratorName}}"
value="{{selectCompanyExtra.localTaxAdministratorName | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.localTaxAdministratorName | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
...@@ -833,7 +838,7 @@ ...@@ -833,7 +838,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.nationalTaxHallAddress" ng-model="editOrgExtraModel.nationalTaxHallAddress"
title="{{selectCompanyExtra.nationalTaxHallAddress}}" title="{{selectCompanyExtra.nationalTaxHallAddress}}"
value="{{selectCompanyExtra.nationalTaxHallAddress | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.nationalTaxHallAddress | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
...@@ -846,7 +851,7 @@ ...@@ -846,7 +851,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.localTaxHallAddress" ng-model="editOrgExtraModel.localTaxHallAddress"
title="{{selectCompanyExtra.localTaxHallAddress}}" title="{{selectCompanyExtra.localTaxHallAddress}}"
value="{{selectCompanyExtra.localTaxHallAddress | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.localTaxHallAddress | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -860,7 +865,7 @@ ...@@ -860,7 +865,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.nationalTaxAdministratorPhoneNum" ng-model="editOrgExtraModel.nationalTaxAdministratorPhoneNum"
title="{{selectCompanyExtra.nationalTaxAdministratorPhoneNum}}" title="{{selectCompanyExtra.nationalTaxAdministratorPhoneNum}}"
value="{{selectCompanyExtra.nationalTaxAdministratorPhoneNum | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.nationalTaxAdministratorPhoneNum | limitString:maxValueLength}}"/>
</div> </div>
<div class="col-sm-2" style="text-align: right;margin-top: 7px;"> <div class="col-sm-2" style="text-align: right;margin-top: 7px;">
<span class="control-label"> <span class="control-label">
...@@ -872,7 +877,7 @@ ...@@ -872,7 +877,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.localTaxAdministratorPhoneNum" ng-model="editOrgExtraModel.localTaxAdministratorPhoneNum"
title="{{selectCompanyExtra.localTaxAdministratorPhoneNum}}" title="{{selectCompanyExtra.localTaxAdministratorPhoneNum}}"
value="{{selectCompanyExtra.localTaxAdministratorPhoneNum | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.localTaxAdministratorPhoneNum | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -896,7 +901,7 @@ ...@@ -896,7 +901,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxPayerNumberVat" ng-model="editOrgExtraModel.taxPayerNumberVat"
title="{{selectCompanyExtra.taxPayerNumberVat}}" title="{{selectCompanyExtra.taxPayerNumberVat}}"
value="{{selectCompanyExtra.taxPayerNumberVat}}" /> value="{{selectCompanyExtra.taxPayerNumberVat}}"/>
</span> </span>
</div> </div>
...@@ -947,7 +952,7 @@ ...@@ -947,7 +952,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.accountingSoftware" ng-model="editOrgExtraModel.accountingSoftware"
title="{{selectCompanyExtra.accountingSoftware}}" title="{{selectCompanyExtra.accountingSoftware}}"
value="{{selectCompanyExtra.accountingSoftware | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.accountingSoftware | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
...@@ -961,7 +966,7 @@ ...@@ -961,7 +966,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.bankAccountName" ng-model="editOrgExtraModel.bankAccountName"
title="{{selectCompanyExtra.bankAccountName}}" title="{{selectCompanyExtra.bankAccountName}}"
value="{{selectCompanyExtra.bankAccountName | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.bankAccountName | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
...@@ -977,7 +982,7 @@ ...@@ -977,7 +982,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.reportingCurrency" ng-model="editOrgExtraModel.reportingCurrency"
title="{{selectCompanyExtra.reportingCurrency}}" title="{{selectCompanyExtra.reportingCurrency}}"
value="{{selectCompanyExtra.reportingCurrency | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.reportingCurrency | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
...@@ -1009,7 +1014,7 @@ ...@@ -1009,7 +1014,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxAgent" ng-model="editOrgExtraModel.taxAgent"
title="{{selectCompanyExtra.taxAgent}}" title="{{selectCompanyExtra.taxAgent}}"
value="{{selectCompanyExtra.taxAgent | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.taxAgent | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group" ng-show="!isInternational">
...@@ -1023,7 +1028,7 @@ ...@@ -1023,7 +1028,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.secondaryApprovalAmount" ng-model="editOrgExtraModel.secondaryApprovalAmount"
title="{{selectCompanyExtra.secondaryApprovalAmount}}" title="{{selectCompanyExtra.secondaryApprovalAmount}}"
value="{{selectCompanyExtra.secondaryApprovalAmount | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.secondaryApprovalAmount | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="isInternational"> <div class="form-group" ng-show="isInternational">
...@@ -1037,7 +1042,7 @@ ...@@ -1037,7 +1042,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.fiscalYearDeadline" ng-model="editOrgExtraModel.fiscalYearDeadline"
title="{{selectCompanyExtra.fiscalYearDeadline}}" title="{{selectCompanyExtra.fiscalYearDeadline}}"
value="{{selectCompanyExtra.fiscalYearDeadline | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.fiscalYearDeadline | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="isInternational"> <div class="form-group" ng-show="isInternational">
...@@ -1051,7 +1056,7 @@ ...@@ -1051,7 +1056,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxRuleIntroduction" ng-model="editOrgExtraModel.taxRuleIntroduction"
title="{{selectCompanyExtra.taxRuleIntroduction}}" title="{{selectCompanyExtra.taxRuleIntroduction}}"
value="{{selectCompanyExtra.taxRuleIntroduction | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.taxRuleIntroduction | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="isInternational"> <div class="form-group" ng-show="isInternational">
...@@ -1066,7 +1071,7 @@ ...@@ -1066,7 +1071,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.businessRegistrationNumber" ng-model="editOrgExtraModel.businessRegistrationNumber"
title="{{selectCompanyExtra.businessRegistrationNumber}}" title="{{selectCompanyExtra.businessRegistrationNumber}}"
value="{{selectCompanyExtra.businessRegistrationNumber | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.businessRegistrationNumber | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="isInternational"> <div class="form-group" ng-show="isInternational">
...@@ -1080,7 +1085,7 @@ ...@@ -1080,7 +1085,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.issuedShares" ng-model="editOrgExtraModel.issuedShares"
title="{{selectCompanyExtra.issuedShares}}" title="{{selectCompanyExtra.issuedShares}}"
value="{{selectCompanyExtra.issuedShares | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.issuedShares | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group" ng-show="!isInternational">
...@@ -1117,7 +1122,7 @@ ...@@ -1117,7 +1122,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxPayerNumberCit" ng-model="editOrgExtraModel.taxPayerNumberCit"
title="{{selectCompanyExtra.taxPayerNumberCit}}" title="{{selectCompanyExtra.taxPayerNumberCit}}"
value="{{selectCompanyExtra.taxPayerNumberCit}}" /> value="{{selectCompanyExtra.taxPayerNumberCit}}"/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group" ng-show="!isInternational">
...@@ -1132,7 +1137,7 @@ ...@@ -1132,7 +1137,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.actualBusinessAddress" ng-model="editOrgExtraModel.actualBusinessAddress"
title="{{selectCompanyExtra.actualBusinessAddress}}" title="{{selectCompanyExtra.actualBusinessAddress}}"
value="{{selectCompanyExtra.actualBusinessAddress | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.actualBusinessAddress | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
...@@ -1179,7 +1184,7 @@ ...@@ -1179,7 +1184,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.bankAccountNumber" ng-model="editOrgExtraModel.bankAccountNumber"
title="{{selectCompanyExtra.bankAccountNumber}}" title="{{selectCompanyExtra.bankAccountNumber}}"
value="{{selectCompanyExtra.bankAccountNumber | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.bankAccountNumber | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
...@@ -1194,7 +1199,7 @@ ...@@ -1194,7 +1199,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.etaWebsite" ng-model="editOrgExtraModel.etaWebsite"
title="{{selectCompanyExtra.etaWebsite}}" title="{{selectCompanyExtra.etaWebsite}}"
value="{{selectCompanyExtra.etaWebsite | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.etaWebsite | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
...@@ -1209,7 +1214,7 @@ ...@@ -1209,7 +1214,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxAgentContact" ng-model="editOrgExtraModel.taxAgentContact"
title="{{selectCompanyExtra.taxAgentContact}}" title="{{selectCompanyExtra.taxAgentContact}}"
value="{{selectCompanyExtra.taxAgentContact | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.taxAgentContact | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group" ng-show="!isInternational">
...@@ -1240,7 +1245,7 @@ ...@@ -1240,7 +1245,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.auditRequirements" ng-model="editOrgExtraModel.auditRequirements"
title="{{selectCompanyExtra.auditRequirements}}" title="{{selectCompanyExtra.auditRequirements}}"
value="{{selectCompanyExtra.auditRequirements | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.auditRequirements | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="isInternational"> <div class="form-group" ng-show="isInternational">
...@@ -1255,7 +1260,7 @@ ...@@ -1255,7 +1260,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.directors" ng-model="editOrgExtraModel.directors"
title="{{selectCompanyExtra.directors}}" title="{{selectCompanyExtra.directors}}"
value="{{selectCompanyExtra.directors | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.directors | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="isInternational"> <div class="form-group" ng-show="isInternational">
...@@ -1270,7 +1275,7 @@ ...@@ -1270,7 +1275,7 @@
<input class="input-group" style="display: none" <input class="input-group" style="display: none"
ng-model="editOrgExtraModel.parValue" ng-model="editOrgExtraModel.parValue"
title="{{selectCompanyExtra.parValue}}" title="{{selectCompanyExtra.parValue}}"
value="{{selectCompanyExtra.parValue | limitString:maxValueLength}}" /> value="{{selectCompanyExtra.parValue | limitString:maxValueLength}}"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -1325,7 +1330,8 @@ ...@@ -1325,7 +1330,8 @@
<div class="tax-acct-rate-info-table" ng-show="!isInternational"> <div class="tax-acct-rate-info-table" ng-show="!isInternational">
<div class="label-acct-rate-info border-bottom-divide"> <div class="label-acct-rate-info border-bottom-divide">
<label class="basic-label" <label class="basic-label"
ng-click="visiableAccountingRateInfo()">{{'AccountingRateInformation' | translate}}</label> ng-click="visiableAccountingRateInfo()">{{'AccountingRateInformation' |
translate}}</label>
</div> </div>
<div class="dx-viewport grid-container" ng-show="showAccountingRateInfo"> <div class="dx-viewport grid-container" ng-show="showAccountingRateInfo">
...@@ -1376,7 +1382,8 @@ ...@@ -1376,7 +1382,8 @@
<div class="tax-taxpayer-qual-table" ng-show="!isInternational"> <div class="tax-taxpayer-qual-table" ng-show="!isInternational">
<div class="label-taxpayer-qual-info border-bottom-divide"> <div class="label-taxpayer-qual-info border-bottom-divide">
<label class="basic-label" <label class="basic-label"
ng-click="visiableTaxpayerQualification()">{{'TaxpayerQualificationInformation' | translate}}</label> ng-click="visiableTaxpayerQualification()">{{'TaxpayerQualificationInformation' |
translate}}</label>
</div> </div>
<div class="dx-viewport grid-container" ng-show="showTaxpayerQualification"> <div class="dx-viewport grid-container" ng-show="showTaxpayerQualification">
...@@ -1411,7 +1418,8 @@ ...@@ -1411,7 +1418,8 @@
<div class="right-part" ng-if="hasEditPermission"> <div class="right-part" ng-if="hasEditPermission">
<button type="button" ng-show="!selectCompany.isUpdate" class="btn btn-in-grid" <button type="button" ng-show="!selectCompany.isUpdate" class="btn btn-in-grid"
style="width: 117px;" ng-click="editAdvancedConfigurationStatus()"><i style="width: 117px;" ng-click="editAdvancedConfigurationStatus()"><i
class="material-icons middle">create</i>{{'Change' | translate}}</button> class="material-icons middle">create</i>{{'Change' | translate}}
</button>
<button ng-show="selectCompany.isUpdate" type="submit" class="btn btn-primary" <button ng-show="selectCompany.isUpdate" type="submit" class="btn btn-primary"
ng-click="saveAdvancedConfiguration()"> ng-click="saveAdvancedConfiguration()">
{{'Confirm' | translate}} {{'Confirm' | translate}}
...@@ -1433,13 +1441,11 @@ ...@@ -1433,13 +1441,11 @@
<tr ng-repeat='set in selectCompany.enterpriseAccountSetOrgList'> <tr ng-repeat='set in selectCompany.enterpriseAccountSetOrgList'>
<td><span class="span-index">{{$index + 1}}</span></td> <td><span class="span-index">{{$index + 1}}</span></td>
<td> <td>
<span <span class="block-span">{{'EnterpriseAccountNameShort'|translate}}：</span>
class="block-span">{{'EnterpriseAccountNameShort'|translate}}：</span>
<!-- 账套名称 --> <!-- 账套名称 -->
<span class="block-span" <span class="block-span"
ng-show="!selectCompany.isUpdate" ng-click="jumpToAccount(set.enterpriseAccountSetID)">{{set.enterpriseAccountSetName}}</span> ng-show="!selectCompany.isUpdate"
ng-click="jumpToAccount(set.enterpriseAccountSetID)">{{set.enterpriseAccountSetName}}</span>
<select ng-show="selectCompany.isUpdate" <select ng-show="selectCompany.isUpdate"
class="form-control account-set-select" class="form-control account-set-select"
ng-change="checkEnterpriseAccountSetSelect(set)" ng-change="checkEnterpriseAccountSetSelect(set)"
...@@ -1447,9 +1453,9 @@ ...@@ -1447,9 +1453,9 @@
ng-model="set.enterpriseAccountSetID" required> ng-model="set.enterpriseAccountSetID" required>
<option ng-repeat="x in enterpriseAccountSetList" <option ng-repeat="x in enterpriseAccountSetList"
value="{{x.id}}" title="{{x.name}}"> value="{{x.id}}" title="{{x.name}}">
{{x.name | limitString:20}}</option> {{x.name | limitString:20}}
</option>
</select> </select>
</td> </td>
<td class="time-column"> <td class="time-column">
...@@ -1465,7 +1471,7 @@ ...@@ -1465,7 +1471,7 @@
ng-class="{'has-error':set.startDateError}"> ng-class="{'has-error':set.startDateError}">
<input type="text" class="form_datetime form-control" <input type="text" class="form_datetime form-control"
ng-model="set.effectiveDateStr" id="{{set.fromID}}" ng-model="set.effectiveDateStr" id="{{set.fromID}}"
ng-change="checkStartDate(set)" required /> ng-change="checkStartDate(set)" required/>
<p ng-show="set.startDateError" class="has-error label"> <p ng-show="set.startDateError" class="has-error label">
{{set.startDateError}}</p> {{set.startDateError}}</p>
</div> </div>
...@@ -1480,7 +1486,7 @@ ...@@ -1480,7 +1486,7 @@
ng-class="{'has-error':set.endDateError}"> ng-class="{'has-error':set.endDateError}">
<input type="text" class="form_datetime form-control" <input type="text" class="form_datetime form-control"
ng-change="checkEndDate(set)" ng-model="set.expiredDateStr" ng-change="checkEndDate(set)" ng-model="set.expiredDateStr"
id="{{set.toID}}" /> id="{{set.toID}}"/>
<!--<p ng-show="set.endDateError" class="has-error label">{{set.endDateError}}</p>--> <!--<p ng-show="set.endDateError" class="has-error label">{{set.endDateError}}</p>-->
</div> </div>
</td> </td>
...@@ -1502,8 +1508,7 @@ ...@@ -1502,8 +1508,7 @@
<div class="org-set-list-wrap" <div class="org-set-list-wrap"
ng-if="selectCompany.isUpdate || selectCompany.organizationServiceTemplateGroupList.length > 0"> ng-if="selectCompany.isUpdate || selectCompany.organizationServiceTemplateGroupList.length > 0">
<table class="org-set-list"> <table class="org-set-list">
<tr <tr ng-repeat='service in selectCompany.organizationServiceTemplateGroupList'>
ng-repeat='service in selectCompany.organizationServiceTemplateGroupList'>
<td><span class="span-index">{{$index + 1}}</span></td> <td><span class="span-index">{{$index + 1}}</span></td>
<td> <td>
<!-- 服务名称 --> <!-- 服务名称 -->
...@@ -1515,7 +1520,8 @@ ...@@ -1515,7 +1520,8 @@
name="serviceTypeID" ng-model="service.serviceTypeID" name="serviceTypeID" ng-model="service.serviceTypeID"
ng-change="serviceTypeChange(service)" required> ng-change="serviceTypeChange(service)" required>
<option ng-repeat="x in serviceList" value="{{x.id}}" <option ng-repeat="x in serviceList" value="{{x.id}}"
title="{{x.name}}">{{x.name | limitString:20}}</option> title="{{x.name}}">{{x.name | limitString:20}}
</option>
</select> </select>
<p ng-show="service.serviceTypeError" class="has-error label"> <p ng-show="service.serviceTypeError" class="has-error label">
{{service.serviceTypeError}}</p> {{service.serviceTypeError}}</p>
...@@ -1535,7 +1541,8 @@ ...@@ -1535,7 +1541,8 @@
ng-change="checkTemplate(service)" name="templateGroupID"> ng-change="checkTemplate(service)" name="templateGroupID">
<option ng-repeat="x in service.templateGroupList" <option ng-repeat="x in service.templateGroupList"
value="{{x.id}}" title="{{x.name}}"> value="{{x.id}}" title="{{x.name}}">
{{x.name | limitString:30}}</option> {{x.name | limitString:30}}
</option>
</select> </select>
<p ng-show="service.selectedTemplateError" <p ng-show="service.selectedTemplateError"
class="has-error label">{{service.selectedTemplateError}} class="has-error label">{{service.selectedTemplateError}}
...@@ -1550,8 +1557,9 @@ ...@@ -1550,8 +1557,9 @@
<tr ng-show="selectCompany.isUpdate"> <tr ng-show="selectCompany.isUpdate">
<td> <td>
<span ng-click="addOrganizationServiceTemplateGroupRow()"><i <span ng-click="addOrganizationServiceTemplateGroupRow()">
class="material-icons button-icons middle add">add_circle_outline</i></span> <i class="material-icons button-icons middle add">add_circle_outline</i>
</span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -1561,44 +1569,40 @@ ...@@ -1561,44 +1569,40 @@
</div> </div>
<div ng-show="currentNavItem==='page6'" class="user-table"> <div ng-show="currentNavItem==='page6'" class="user-table">
<div class="item-row"> <div class="item-row">
<div class="left-item">{{userCount}} {{'UserStatisticsCount'| translate}}</div> <div class="left-item">{{userCount}} {{'UserStatisticsCount'| translate}}</div>
<div class="right-item" ng-if="hasEditPermission"><button class="btn btn-in-grid" <div class="right-item" ng-if="hasEditPermission">
ng-click="addUser()"><i <button class="btn btn-in-grid" ng-click="addUser()">
class="material-icons middle">add_circle_outline</i><span> <i class="material-icons middle">add_circle_outline</i>
{{'AddUser' | translate }}</span></button></div> <span>{{'AddUser' | translate }}</span>
</button>
</div>
</div> </div>
<div class="user-card card"> <div class="user-card card">
<div class="user-card-header card-header"> <div class="user-card-header card-header">
<div class="title"> <div class="title">
<span class="sub-title-bu"> {{businessUnitName}}</span> <span class="sub-title-bu"> {{businessUnitName}}</span>
</div> </div>
<div class="sub-title"> <div class="sub-title">
<div class="sub-card bu-card-left" ng-repeat="x in roleStaticsList"> <div class="sub-card bu-card-left" ng-repeat="x in roleStaticsList">
<span style="cursor:pointer" ng-click="showPermission(x)" <span style="cursor:pointer" ng-click="showPermission(x)"
popover-trigger="outsideClick" popover-placement="bottom-left" popover-trigger="outsideClick" popover-placement="bottom-left"
uib-popover-template="permissionPopover.templateUrl" uib-popover-template="permissionPopover.templateUrl"
popover-title="{{permissionPopover.title}}"><img popover-title="{{permissionPopover.title}}">
src="../../Content/images/manager.png" /><span <img src="../../Content/images/manager.png"/>
class="sub-title-span" <span class="sub-title-span" title="{{x.name}}">{{x.name}}</span>
title="{{x.name}}">{{x.name}}</span></span> </span>
<div class="title-num-bg"> <div class="title-num-bg">
<span class="title-num">{{x.count}}</span> <span class="title-num">{{x.count}}</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="user-card-body"> <div class="user-card-body">
<div class="dx-viewport grid-container"> <div class="dx-viewport grid-container">
<!--<div id="userRoleGridContainer" dx-data-grid="BUDataGridOptions" dx-item-alias="userModel"></div>--> <!--<div id="userRoleGridContainer" dx-data-grid="BUDataGridOptions" dx-item-alias="userModel"></div>-->
<div id="user-role-grid" ui-grid="userRoleGridOptions" ui-grid-selection <div id="user-role-grid" ui-grid="userRoleGridOptions" ui-grid-selection ui-grid-auto-resize
ui-grid-auto-resize ng-style="getGridHeight()"></div> ng-style="getGridHeight()"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -1627,9 +1631,12 @@ ...@@ -1627,9 +1631,12 @@
<tr class="dx-row main-row"> <tr class="dx-row main-row">
<td>{{userModel.data.userName}}</td> <td>{{userModel.data.userName}}</td>
<td>{{userModel.data.roleNameList}}</td> <td>{{userModel.data.roleNameList}}</td>
<td><span ng-click="deleteUserRole(userModel)" class="operate-span" role="button" tabindex="0" <td>
aria-hidden="false" style=""><i <span ng-click="deleteUserRole(userModel)" class="operate-span" role="button" tabindex="0" aria-hidden="false"
class="material-icons button-icons middle delete">delete</i></span></td> style="">
<i class="material-icons button-icons middle delete">delete</i>
</span>
</td>
</tr> </tr>
</tbody> </tbody>
</script> </script>
...@@ -1643,7 +1650,8 @@ ...@@ -1643,7 +1650,8 @@
style="position: relative;max-height:180px; "> style="position: relative;max-height:180px; ">
<div ng-if="permissionList==0" translate="NoDataText"></div> <div ng-if="permissionList==0" translate="NoDataText"></div>
<div class="grid-container"> <div class="grid-container">
<div id="permissionContainerPermission" dx-tree-view="permissionTreeViewOptions" style="max-height:180px;font-size:13px;"> <div id="permissionContainerPermission" dx-tree-view="permissionTreeViewOptions"
style="max-height:180px;font-size:13px;">
</div> </div>
</div> </div>
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html
View file @ da552a57
...@@ -543,7 +543,6 @@ ...@@ -543,7 +543,6 @@
<div class="level-title"> <div class="level-title">
<span>{{'EnterpriseAccountManage'|translate}}</span> <span>{{'EnterpriseAccountManage'|translate}}</span>
</div> </div>
<div class="account-modal-table"> <div class="account-modal-table">
<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">
...@@ -600,7 +599,6 @@ ...@@ -600,7 +599,6 @@
<div class="col-sm-1 box"></div> <div class="col-sm-1 box"></div>
</div> </div>
</div> </div>
<div class="level-title"> <div class="level-title">
<span>{{'OrganizationServiceTemplateGroup'|translate}}</span> <span>{{'OrganizationServiceTemplateGroup'|translate}}</span>
</div> </div>
......
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