Commit 2a7d9fe5 authored by gary's avatar gary

1、fixbug

parent 948117e7
...@@ -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
...@@ -492,5 +492,6 @@ ...@@ -492,5 +492,6 @@
"Records":"条", "Records":"条",
"PerPage":"每页", "PerPage":"每页",
"EnterpriseAccountSetOrgOnlyOncePerYear":"账套设置,一年之内同一个账套不能出现两次及以上!", "EnterpriseAccountSetOrgOnlyOncePerYear":"账套设置,一年之内同一个账套不能出现两次及以上!",
"isNotHundred": "股权总比不为100%!",
"Export": "导出" "Export": "导出"
} }
...@@ -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'));
} }
......
...@@ -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;">
......
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