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
05887d75
Commit
05887d75
authored
Feb 25, 2019
by
eddie.woo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify
parent
2258f171
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
11 deletions
+15
-11
customer.css
atms-web/src/main/webapp/app-resources/css/customer.css
+2
-0
vat-revenue-config.ctrl.js
.../dataImport/vat-revenue-config/vat-revenue-config.ctrl.js
+13
-11
No files found.
atms-web/src/main/webapp/app-resources/css/customer.css
View file @
05887d75
...
...
@@ -176,6 +176,8 @@ span.form-control-customer {
/* LOGIN */
body
.login-body
{
background
:
#999999
url('/app-resources/images/login_pic.jpg')
no-repeat
;
height
:
calc
(
100%
-
16px
);
background-size
:
cover
;
color
:
#333
;
overflow-y
:
auto
;
}
...
...
atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.ctrl.js
View file @
05887d75
...
...
@@ -7,26 +7,26 @@
$scope
.
revenueGridOptions
=
$
.
extend
(
true
,
{},
dxDataGridService
.
BASIC_GRID_OPTIONS
,
{
columns
:
[
// {dataField: 'serialNo', caption: $translate.instant('RevenueColSerialNo'), fixed: true, allowHeaderFiltering: true},
{
dataField
:
'name'
,
caption
:
$translate
.
instant
(
'RevenueColName'
),
fixed
:
true
,
allowHeaderFiltering
:
true
},
{
dataField
:
'orgId'
,
caption
:
$translate
.
instant
(
'RevenueColOrg'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
{
dataField
:
'name'
,
caption
:
$translate
.
instant
(
'RevenueColName'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
minWidth
:
'300px'
},
{
dataField
:
'orgId'
,
caption
:
$translate
.
instant
(
'RevenueColOrg'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
minWidth
:
'300px'
,
calculateCellValue
:
function
(
data
)
{
return
_
.
find
(
$scope
.
selectOrgList
,
function
(
o
)
{
return
o
.
id
===
data
.
orgId
;
}).
name
;
}},
//todo 组装accountName
{
dataField
:
'accountTypeStr'
,
caption
:
$translate
.
instant
(
'RevenueColAccountName'
),
fixed
:
true
,
allowHeaderFiltering
:
true
},
{
dataField
:
'taxRate'
,
caption
:
$translate
.
instant
(
'RevenueColTaxRate'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
{
dataField
:
'accountTypeStr'
,
caption
:
$translate
.
instant
(
'RevenueColAccountName'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
width
:
'100px'
},
{
dataField
:
'taxRate'
,
caption
:
$translate
.
instant
(
'RevenueColTaxRate'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
width
:
'50px'
,
calculateCellValue
:
function
(
data
)
{
return
(
data
.
taxRate
*
100
)
+
'%'
;
}},
{
dataField
:
'taxBaseStr'
,
caption
:
$translate
.
instant
(
'RevenueColTaxBase'
),
fixed
:
true
,
allowHeaderFiltering
:
true
},
{
dataField
:
'revenueTypeStr'
,
caption
:
$translate
.
instant
(
'RevenueColType'
),
fixed
:
true
,
allowHeaderFiltering
:
true
},
{
dataField
:
'taxTypeStr'
,
caption
:
$translate
.
instant
(
'RevenueColTaxType'
),
fixed
:
true
,
allowHeaderFiltering
:
true
},
{
dataField
:
'statusStr'
,
caption
:
$translate
.
instant
(
'RevenueColStatus'
),
fixed
:
true
,
allowHeaderFiltering
:
true
},
{
dataField
:
'startDate'
,
caption
:
$translate
.
instant
(
'RevenueColEnable'
),
fixed
:
true
,
allowHeaderFiltering
:
true
},
{
dataField
:
'endDate'
,
caption
:
$translate
.
instant
(
'RevenueColDisable'
),
fixed
:
true
,
allowHeaderFiltering
:
true
},
{
dataField
:
''
,
caption
:
$translate
.
instant
(
'RevenueColEdit'
),
fixed
:
true
,
{
dataField
:
'taxBaseStr'
,
caption
:
$translate
.
instant
(
'RevenueColTaxBase'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
width
:
'120px'
},
{
dataField
:
'revenueTypeStr'
,
caption
:
$translate
.
instant
(
'RevenueColType'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
minWidth
:
'250px'
},
{
dataField
:
'taxTypeStr'
,
caption
:
$translate
.
instant
(
'RevenueColTaxType'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
width
:
'120px'
},
{
dataField
:
'statusStr'
,
caption
:
$translate
.
instant
(
'RevenueColStatus'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
width
:
'50px'
},
{
dataField
:
'startDate'
,
caption
:
$translate
.
instant
(
'RevenueColEnable'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
width
:
'120px'
},
{
dataField
:
'endDate'
,
caption
:
$translate
.
instant
(
'RevenueColDisable'
),
fixed
:
true
,
allowHeaderFiltering
:
true
,
width
:
'120px'
},
{
dataField
:
''
,
caption
:
$translate
.
instant
(
'RevenueColEdit'
),
fixed
:
true
,
width
:
'80px'
,
alignment
:
'center'
,
cellTemplate
:
function
(
container
,
options
)
{
try
{
$
(
'<i class="fa fa-pencil-square-o" style="cursor: pointer"></i> '
)
...
...
@@ -300,6 +300,7 @@
acceptCustomValue
:
false
,
openOnFieldClick
:
true
,
displayFormat
:
'yyyy-MM'
,
maxZoomLevel
:
"year"
,
dateSerializationFormat
:
'yyyy-MM'
,
bindingOptions
:
{
value
:
'formParam.startDate'
...
...
@@ -311,6 +312,7 @@
acceptCustomValue
:
false
,
openOnFieldClick
:
true
,
displayFormat
:
'yyyy-MM'
,
maxZoomLevel
:
"year"
,
dateSerializationFormat
:
'yyyy-MM'
,
bindingOptions
:
{
value
:
'formParam.endDate'
...
...
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