Skip to content

T
traffic-front
Commit 8583d5c7 authored by sherlock's avatar sherlock
Browse files
Options

Merge branch 'dev_oracle_sherlock' into 'dev_oracle' 

import template & datasource

See merge request root/atms!229
parents b856130e 9bea8758
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js
View file @ 8583d5c7
...@@ -251,9 +251,10 @@ ...@@ -251,9 +251,10 @@
// if ($scope.detail.inputValue && (isNaN($scope.detail.inputValue) || r.test($scope.detail.inputValue))) { // if ($scope.detail.inputValue && (isNaN($scope.detail.inputValue) || r.test($scope.detail.inputValue))) {
// message = $translate.instant('CheckInputValueFormat'); // message = $translate.instant('CheckInputValueFormat');
// } else // } else
if ($scope.detail.inputValue && parseFloat($scope.detail.inputValue).toFixed(2) > 9999999999999) { // if ($scope.detail.inputValue && parseFloat($scope.detail.inputValue).toFixed(2) > 9999999999999) {
message = $translate.instant('CheckInputValueLength'); // message = $translate.instant('CheckInputValueLength');
} else if ($scope.detail.dataType === 5) { // } else
if ($scope.detail.dataType === 5) {
r = /^(-[1-9]\d*|[1-9]\d*|[0]{1,1})$/; r = /^(-[1-9]\d*|[1-9]\d*|[0]{1,1})$/;
if (!r.test($scope.detail.inputValue)) { if (!r.test($scope.detail.inputValue)) {
message = $translate.instant('CheckIntInputValue'); message = $translate.instant('CheckIntInputValue');
......
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