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
9bd0a9d6
Commit
9bd0a9d6
authored
Aug 10, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[dev] revert celldatatype to formulaDataSourceType
parent
2175262a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
tax-report-cell-detail-modal.ctrl.js
...rt-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js
+8
-8
No files found.
atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js
View file @
9bd0a9d6
...
...
@@ -1287,7 +1287,7 @@
var
getAllDataGridColumns
=
function
()
{
var
dataGridColumns
;
switch
(
$scope
.
detail
.
allCellType
)
{
case
enums
.
cell
DataSourceType
.
InputInvoice
:
case
enums
.
formula
DataSourceType
.
InputInvoice
:
//进项明细数据源
dataGridColumns
=
[
{
...
...
@@ -1326,7 +1326,7 @@
{
dataField
:
'productionName'
,
caption
:
$translate
.
instant
(
'InvoiceHWMC'
),
alignment
:
'left'
}
];
break
;
case
enums
.
cell
DataSourceType
.
OutputInvoice
:
case
enums
.
formula
DataSourceType
.
OutputInvoice
:
//销项发票数据源
dataGridColumns
=
[
{
...
...
@@ -1367,7 +1367,7 @@
{
dataField
:
'invoiceType'
,
caption
:
$translate
.
instant
(
'InvoiceType'
),
alignment
:
'left'
}
];
break
;
case
enums
.
cell
DataSourceType
.
CustomInvoice
:
case
enums
.
formula
DataSourceType
.
CustomInvoice
:
//海关稽核
dataGridColumns
=
[
{
...
...
@@ -1403,7 +1403,7 @@
{
dataField
:
'auditResult'
,
caption
:
$translate
.
instant
(
'CustomsAuditResult'
),
alignment
:
'left'
}
];
break
;
case
enums
.
cell
DataSourceType
.
Voucher
:
case
enums
.
formula
DataSourceType
.
Voucher
:
//凭证选择
dataGridColumns
=
[
{
...
...
@@ -1442,7 +1442,7 @@
var
allDataFilter
=
function
(
config
,
data
)
{
var
dataGridColumns
;
switch
(
$scope
.
detail
.
allCellType
)
{
case
enums
.
cell
DataSourceType
.
Voucher
:
case
enums
.
formula
DataSourceType
.
Voucher
:
data
=
_
.
map
(
data
,
function
(
item
)
{
item
.
date
=
item
.
date
?
(
new
Date
(
item
.
date
)).
dateTimeToString
(
'yyyyMMdd'
)
:
""
return
item
;
...
...
@@ -1455,7 +1455,7 @@
return
_
.
contains
(
config
.
accountCodes
,
x
.
accountSubject
)
}
});
case
enums
.
cell
DataSourceType
.
InputInvoice
:
case
enums
.
formula
DataSourceType
.
InputInvoice
:
return
data
.
filter
(
function
(
x
)
{
return
(
config
.
taxRate
==
"99"
||
_
.
contains
(
config
.
taxRate
.
map
(
function
(
r
)
{
...
...
@@ -1463,7 +1463,7 @@
}),
x
.
rate
))
&&
_
.
contains
(
config
.
invoiceCategory
,
x
.
invoiceType
);
});
case
enums
.
cell
DataSourceType
.
OutputInvoice
:
case
enums
.
formula
DataSourceType
.
OutputInvoice
:
data
=
data
.
filter
(
function
(
x
)
{
return
(
_
.
contains
(
config
.
taxRate
.
map
(
function
(
r
)
{
return
percentToPoint
(
r
)
...
...
@@ -1475,7 +1475,7 @@
return
item
;
});
return
data
;
case
enums
.
cell
DataSourceType
.
CustomInvoice
:
case
enums
.
formula
DataSourceType
.
CustomInvoice
:
return
data
;
}
...
...
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