Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
2a7d9fe5
Commit
2a7d9fe5
authored
Mar 13, 2019
by
gary
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、fixbug
parent
948117e7
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
0 deletions
+8
-0
infrastructure.json
.../main/webapp/app-resources/i18n/en-us/infrastructure.json
+2
-0
infrastructure.json
.../main/webapp/app-resources/i18n/zh-CN/infrastructure.json
+1
-0
organization-manage.ctrl.js
...astructure/organizationManage/organization-manage.ctrl.js
+4
-0
organization-manage.html
...nfrastructure/organizationManage/organization-manage.html
+1
-0
No files found.
atms-web/src/main/webapp/app-resources/i18n/en-us/infrastructure.json
View file @
2a7d9fe5
...
@@ -113,6 +113,7 @@
...
@@ -113,6 +113,7 @@
"E-mailColon"
:
"E-mail:"
,
"E-mailColon"
:
"E-mail:"
,
"RequireUserName"
:
"User Name Required"
,
"RequireUserName"
:
"User Name Required"
,
"RequireEmail"
:
"E-mail Required"
,
"RequireEmail"
:
"E-mail Required"
,
"isNotHundred"
:
"Equity total radio is not 100%!"
,
"OrgNameOrCodeTaxPaymentNoIsExist"
:
"Name,code and tax payment number already exists !"
"OrgNameOrCodeTaxPaymentNoIsExist"
:
"Name,code and tax payment number already exists !"
}
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @
2a7d9fe5
...
@@ -492,5 +492,6 @@
...
@@ -492,5 +492,6 @@
"Records"
:
"条"
,
"Records"
:
"条"
,
"PerPage"
:
"每页"
,
"PerPage"
:
"每页"
,
"EnterpriseAccountSetOrgOnlyOncePerYear"
:
"账套设置,一年之内同一个账套不能出现两次及以上!"
,
"EnterpriseAccountSetOrgOnlyOncePerYear"
:
"账套设置,一年之内同一个账套不能出现两次及以上!"
,
"isNotHundred"
:
"股权总比不为100%!"
,
"Export"
:
"导出"
"Export"
:
"导出"
}
}
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @
2a7d9fe5
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
$scope
.
showTaxpayerQualification
=
false
;
$scope
.
showTaxpayerQualification
=
false
;
$scope
.
showEmployee
=
false
;
$scope
.
showEmployee
=
false
;
$scope
.
isInternational
=
false
;
$scope
.
isInternational
=
false
;
$scope
.
isNotHundred
=
false
;
$scope
.
editOrgExtraModel
=
{};
$scope
.
editOrgExtraModel
=
{};
var
translate
=
{
var
translate
=
{
...
@@ -2976,6 +2977,9 @@
...
@@ -2976,6 +2977,9 @@
amountTotal
:
amountTotal
,
amountTotal
:
amountTotal
,
proportionTotal
:
proportionTotal
proportionTotal
:
proportionTotal
}
}
if
(
$scope
.
EquitySumInfo
.
proportionTotal
!==
100
){
$scope
.
isNotHundred
=
true
;
}
}
else
{
}
else
{
SweetAlert
.
warning
(
$translate
.
instant
(
'NoEquityInfo'
));
SweetAlert
.
warning
(
$translate
.
instant
(
'NoEquityInfo'
));
}
}
...
...
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @
2a7d9fe5
...
@@ -338,6 +338,7 @@
...
@@ -338,6 +338,7 @@
title=
"{{EquitySumInfo.amountTotal}}"
>
{{EquitySumInfo.amountTotal}}
</strong>
万元
</span>
title=
"{{EquitySumInfo.amountTotal}}"
>
{{EquitySumInfo.amountTotal}}
</strong>
万元
</span>
<span
class=
"control-label"
>
{{'TotalEquityRatio' | translate}}:
<strong
class=
"label label-default"
<span
class=
"control-label"
>
{{'TotalEquityRatio' | translate}}:
<strong
class=
"label label-default"
title=
"{{EquitySumInfo.proportionTotal}}"
>
{{EquitySumInfo.proportionTotal}}
</strong>
%
</span>
title=
"{{EquitySumInfo.proportionTotal}}"
>
{{EquitySumInfo.proportionTotal}}
</strong>
%
</span>
<p
ng-show=
"isNotHundred"
class=
"has-error label"
>
{{'isNotHundred'|translate}}
</p>
</div>
</div>
<div
class=
"dx-viewport grid-container"
>
<div
class=
"dx-viewport grid-container"
>
<div
id=
"equityGridContainer"
dx-data-grid=
"equityGridOptions"
style=
"margin-top: 30px;"
>
<div
id=
"equityGridContainer"
dx-data-grid=
"equityGridOptions"
style=
"margin-top: 30px;"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment