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
bca1fd47
Commit
bca1fd47
authored
Dec 10, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BugFix] fixed page bugs
parent
7d3a110e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
vat-report-view.ctrl.js
...p/common/controls/vat-report-view/vat-report-view.ctrl.js
+2
-1
vat-report-view.html
.../app/common/controls/vat-report-view/vat-report-view.html
+1
-1
No files found.
atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js
View file @
bca1fd47
...
...
@@ -2755,6 +2755,7 @@
var
manualSheet
=
$scope
.
manualSpread
.
getActiveSheet
();
var
currentSheet
=
$scope
.
spread
.
getActiveSheet
()
currentSheet
.
options
.
isProtected
=
false
;
var
text
=
$
(
".li"
).
find
(
".active"
).
text
();
for
(
var
rowIndex
=
0
;
rowIndex
<
currentSheet
.
getRowCount
();
rowIndex
++
)
{
for
(
var
columnIndex
=
0
;
columnIndex
<
currentSheet
.
getColumnCount
();
columnIndex
++
)
{
var
tagInfo
=
currentSheet
.
getTag
(
rowIndex
,
columnIndex
);
...
...
@@ -2768,7 +2769,7 @@
var
r
=
/^00
\d
*|^
\.\d
+|
\.
$/
;
if
(
typeof
cellValue
==
"undefined"
||
cellValue
==
null
||
cellValue
==
""
||
cellValue
==
"NaN"
)
continue
;
if
(
cellValue
&&
(
isNaN
(
cellValue
)
||
r
.
test
(
cellValue
)))
{
if
(
cellValue
&&
(
isNaN
(
cellValue
)
||
r
.
test
(
cellValue
))
||
(
text
==
'代扣代缴税收通用缴款书取数'
&&
columnIndex
==
0
)
)
{
cellString
=
cellValue
;
}
else
if
(
cellValue
&&
parseFloat
(
cellValue
).
toFixed
(
2
)
>
9999999999999
)
{
SweetAlert
.
warning
(
$translate
.
instant
(
'CheckInputValueLength'
));
...
...
atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.html
View file @
bca1fd47
...
...
@@ -199,7 +199,7 @@
</div>
<br/>
<div
class=
"row"
style=
"
margin-left:12px; margin-right:12px;
width:850px;height:500px"
>
<div
class=
"row"
style=
"width:850px;height:500px"
>
<div
id=
"ss"
class=
"sample-spreadsheets"
style=
"height:100%;width:100%"
></div>
</div>
...
...
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