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
4dd81ed2
Commit
4dd81ed2
authored
Jun 18, 2019
by
weizhikai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EBS数据抽取页面机构选择框改为bootstrap-selectpicker控件,以解决下拉框机构太多出错问题
parent
683d94f8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
37 deletions
+72
-37
extract-financial-data.ctrl.js
...ion/extract-financial-data/extract-financial-data.ctrl.js
+55
-36
extract-financial-data.html
...action/extract-financial-data/extract-financial-data.html
+6
-1
extract-financial-data.less
...action/extract-financial-data/extract-financial-data.less
+11
-0
No files found.
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.ctrl.js
View file @
4dd81ed2
dataImpModule
.
controller
(
'extractFinancialDataController'
,
[
'$scope'
,
'$log'
,
'$translate'
,
'$timeout'
,
'$q'
,
'$interval'
dataImpModule
.
controller
(
'extractFinancialDataController'
,
[
'$scope'
,
'$log'
,
'$translate'
,
'$timeout'
,
'$q'
,
'$interval'
,
'apiInterceptor'
,
'Upload'
,
'vatImportService'
,
'SweetAlert'
,
'uiGridConstants'
,
'$uibModal'
,
'apiInterceptor'
,
'Upload'
,
'vatImportService'
,
'SweetAlert'
,
'uiGridConstants'
,
'$uibModal'
,
'vatSessionService'
,
'enums'
,
'vatOperationLogService'
,
'vatSessionService'
,
'enums'
,
'vatOperationLogService'
,
'projectService'
,
'vatCommonService'
,
'orgService'
,
'dataImportService'
,
,
'projectService'
,
'vatCommonService'
,
'orgService'
,
'dataImportService'
,
function
(
$scope
,
$log
,
$translate
,
$timeout
,
$q
,
$interval
function
(
$scope
,
$log
,
$translate
,
$timeout
,
$q
,
$interval
,
apiInterceptor
,
Upload
,
vatImportService
,
SweetAlert
,
uiGridConstants
,
$uibModal
,
apiInterceptor
,
Upload
,
vatImportService
,
SweetAlert
,
uiGridConstants
,
$uibModal
,
vatSessionService
,
enums
,
vatOperationLogService
,
vatSessionService
,
enums
,
vatOperationLogService
,
projectService
,
vatCommonService
,
orgService
,
dataImportService
)
{
,
projectService
,
vatCommonService
,
orgService
,
dataImportService
)
{
'use strict'
;
'use strict'
;
var
comment
=
vatSessionService
.
project
.
name
+
" "
+
vatSessionService
.
project
.
year
+
"年"
+
vatSessionService
.
month
+
"月"
;
var
comment
=
vatSessionService
.
project
.
name
+
" "
+
vatSessionService
.
project
.
year
+
"年"
+
vatSessionService
.
month
+
"月"
;
$scope
.
period
=
$scope
.
periodId
;
$scope
.
period
=
$scope
.
periodId
;
$scope
.
moduleid
=
enums
.
vatModuleEnum
.
Import_TrialBalance
;
$scope
.
moduleid
=
enums
.
vatModuleEnum
.
Import_TrialBalance
;
$scope
.
chunkSize
=
100000
;
$scope
.
chunkSize
=
100000
;
$scope
.
success
=
false
;
$scope
.
success
=
false
;
$scope
.
showErrorTable
=
false
;
$scope
.
showErrorTable
=
false
;
$scope
.
showInitTable
=
false
;
$scope
.
showInitTable
=
false
;
$scope
.
showImportTable
=
false
;
$scope
.
showImportTable
=
false
;
...
@@ -21,11 +21,11 @@
...
@@ -21,11 +21,11 @@
$scope
.
projectID
=
vatSessionService
.
project
.
id
;
$scope
.
projectID
=
vatSessionService
.
project
.
id
;
$scope
.
startRowNum
=
2
;
$scope
.
startRowNum
=
2
;
$scope
.
validationType
=
0
;
$scope
.
validationType
=
0
;
$scope
.
sheetData
=
{
sheetNameList
:
[],
dataList
:
[],
selectedSheetIndex
:
0
};
$scope
.
sheetData
=
{
sheetNameList
:
[],
dataList
:
[],
selectedSheetIndex
:
0
};
$scope
.
sheetInfo
=
{
selectedSheetName
:
''
,
selectedSheetIndex
:
0
};
$scope
.
sheetInfo
=
{
selectedSheetName
:
''
,
selectedSheetIndex
:
0
};
$scope
.
balanceInputList
=
[];
$scope
.
balanceInputList
=
[];
$scope
.
toInputList
=
[];
$scope
.
toInputList
=
[];
$scope
.
importEnum
=
{
Import
:
0
,
CoverImport
:
1
,
AddImport
:
2
,
ApiImport
:
2
};
//导入方式
$scope
.
importEnum
=
{
Import
:
0
,
CoverImport
:
1
,
AddImport
:
2
,
ApiImport
:
2
};
//导入方式
$scope
.
selectedPeriod
=
null
;
$scope
.
selectedPeriod
=
null
;
$scope
.
showTotalSecondRow
=
false
;
$scope
.
showTotalSecondRow
=
false
;
$scope
.
maxTitleLength
=
constant
.
maxButtonTitleLength
;
$scope
.
maxTitleLength
=
constant
.
maxButtonTitleLength
;
...
@@ -106,6 +106,7 @@
...
@@ -106,6 +106,7 @@
//导入事件
//导入事件
var
callFinancialApi
=
function
()
{
var
callFinancialApi
=
function
()
{
$scope
.
formParam
.
orgIds
=
$
(
"#area1"
).
val
();
if
(
!
$scope
.
formParam
||
!
$scope
.
formParam
.
orgIds
||
!
$scope
.
formParam
.
dataTypes
if
(
!
$scope
.
formParam
||
!
$scope
.
formParam
.
orgIds
||
!
$scope
.
formParam
.
dataTypes
||
!
$scope
.
formParam
.
period
)
{
||
!
$scope
.
formParam
.
period
)
{
SweetAlert
.
warning
(
$translate
.
instant
(
'PleaseSelectAtLeastOneItem'
));
SweetAlert
.
warning
(
$translate
.
instant
(
'PleaseSelectAtLeastOneItem'
));
...
@@ -120,10 +121,9 @@
...
@@ -120,10 +121,9 @@
var
getGridHeight
=
function
()
{
var
getGridHeight
=
function
()
{
if
(
$scope
.
isLoadComplete
)
{
if
(
$scope
.
isLoadComplete
)
{
return
{
height
:
(
$
(
'.balance-ouput-grid-wrapper'
).
height
())
+
"px"
};
return
{
height
:
(
$
(
'.balance-ouput-grid-wrapper'
).
height
())
+
"px"
};
}
}
else
{
else
{
return
{
height
:
0
+
"px"
};
return
{
height
:
0
+
"px"
};
}
}
};
};
...
@@ -172,21 +172,21 @@
...
@@ -172,21 +172,21 @@
caption: $translate.instant('TMSPeriod')
caption: $translate.instant('TMSPeriod')
}, */
}, */
{
{
dataField
:
"periodMonth"
,
dataField
:
"periodMonth"
,
allowHeaderFiltering
:
false
,
allowHeaderFiltering
:
false
,
width
:
'75px'
,
width
:
'75px'
,
caption
:
$translate
.
instant
(
'Period'
)
caption
:
$translate
.
instant
(
'Period'
)
},
{
},
{
dataField
:
"recordSize"
,
dataField
:
"recordSize"
,
allowHeaderFiltering
:
false
,
allowHeaderFiltering
:
false
,
width
:
'75px'
,
width
:
'75px'
,
caption
:
$translate
.
instant
(
'RecordSize'
)
caption
:
$translate
.
instant
(
'RecordSize'
)
},
{
},
{
dataField
:
"errorMsg"
,
dataField
:
"errorMsg"
,
allowHeaderFiltering
:
false
,
allowHeaderFiltering
:
false
,
width
:
'350px'
,
width
:
'350px'
,
caption
:
$translate
.
instant
(
'Status'
)
caption
:
$translate
.
instant
(
'Status'
)
},
{
},
{
dataField
:
"operator"
,
dataField
:
"operator"
,
allowHeaderFiltering
:
false
,
allowHeaderFiltering
:
false
,
width
:
'100px'
,
width
:
'100px'
,
...
@@ -196,7 +196,7 @@
...
@@ -196,7 +196,7 @@
allowHeaderFiltering
:
false
,
allowHeaderFiltering
:
false
,
width
:
'150px'
,
width
:
'150px'
,
caption
:
$translate
.
instant
(
'LogOperationTime'
),
caption
:
$translate
.
instant
(
'LogOperationTime'
),
calculateCellValue
:
function
(
data
)
{
calculateCellValue
:
function
(
data
)
{
return
new
Date
(
data
.
operateTime
).
formatDateTime
(
'yyyy-MM-dd HH:mm:ss'
);
return
new
Date
(
data
.
operateTime
).
formatDateTime
(
'yyyy-MM-dd HH:mm:ss'
);
}
}
}
}
...
@@ -245,11 +245,11 @@
...
@@ -245,11 +245,11 @@
};
};
var
getFinancialDataStatus
=
function
()
{
var
getFinancialDataStatus
=
function
()
{
vatImportService
.
displayImportLog
(
$scope
.
pagingOptions
,
constant
.
importFileType
.
ExtractFinancialData
).
success
(
function
(
data
)
{
vatImportService
.
displayImportLog
(
$scope
.
pagingOptions
,
constant
.
importFileType
.
ExtractFinancialData
).
success
(
function
(
data
)
{
if
(
data
&&
data
.
list
)
{
if
(
data
&&
data
.
list
)
{
$scope
.
extractFinancialGridSource
=
data
.
list
;
$scope
.
extractFinancialGridSource
=
data
.
list
;
$scope
.
pagingOptions
.
totalItems
=
data
.
pageInfo
.
totalCount
;
$scope
.
pagingOptions
.
totalItems
=
data
.
pageInfo
.
totalCount
;
}
else
{
}
else
{
SweetAlert
.
error
(
$translate
.
instant
(
'SystemError'
));
SweetAlert
.
error
(
$translate
.
instant
(
'SystemError'
));
}
}
});
});
...
@@ -291,16 +291,15 @@
...
@@ -291,16 +291,15 @@
var
setButtonWrapStyle
=
function
()
{
var
setButtonWrapStyle
=
function
()
{
if
(
$scope
.
fileName
)
{
if
(
$scope
.
fileName
)
{
return
{
width
:
"100%"
};
return
{
width
:
"100%"
};
}
}
};
};
var
setGridStyle
=
function
()
{
var
setGridStyle
=
function
()
{
if
(
$scope
.
showTotalSecondRow
)
{
if
(
$scope
.
showTotalSecondRow
)
{
return
{
'margin-top'
:
'60px'
}
return
{
'margin-top'
:
'60px'
}
}
}
else
{
else
{
return
{
'margin-top'
:
'55px'
}
return
{
'margin-top'
:
'55px'
}
}
}
};
};
...
@@ -331,9 +330,7 @@
...
@@ -331,9 +330,7 @@
//开始
//开始
(
function
initialize
()
{
(
function
initialize
()
{
$log
.
debug
(
'ImportTBController.ctor()...'
);
$log
.
debug
(
'ImportTBController.ctor()...'
);
$scope
.
formParam
=
{
$scope
.
formParam
=
{};
};
//机构下拉设置
//机构下拉设置
$scope
.
selectOrgOptions
=
{
$scope
.
selectOrgOptions
=
{
displayExpr
:
'name'
,
displayExpr
:
'name'
,
...
@@ -382,6 +379,28 @@
...
@@ -382,6 +379,28 @@
format
:
$scope
.
dateFormat
//日期格式,详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
format
:
$scope
.
dateFormat
//日期格式,详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
});
});
ele1
.
datepicker
(
"setDate"
,
$scope
.
selectedDate
);
ele1
.
datepicker
(
"setDate"
,
$scope
.
selectedDate
);
var
control1
=
$
(
"#area1"
);
control1
.
empty
();
orgService
.
getOrgListByUserId
().
success
(
function
(
data
)
{
if
(
data
)
{
var
optionHtml
=
''
;
$
.
each
(
data
,
function
(
i
,
item
)
{
// control.append("<option value='" + item.id + "'> " + item.name + "</option>");
optionHtml
+=
"<option value='"
+
item
.
id
+
"'> "
+
item
.
name
+
"</option>"
;
});
control1
.
html
(
optionHtml
);
control1
.
selectpicker
({
liveSearch
:
true
,
actionsBox
:
true
,
selectAllText
:
'全选'
,
deselectAllText
:
'取消全选'
});
control1
.
selectpicker
(
'refresh'
);
}
});
initParam
();
initParam
();
checkUserOrganizationPermissionList
();
checkUserOrganizationPermissionList
();
getUserPermission
();
getUserPermission
();
...
...
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.html
View file @
4dd81ed2
...
@@ -13,7 +13,12 @@
...
@@ -13,7 +13,12 @@
<div
class=
"form-group"
style=
"margin-top: 10px; height: 10px;"
>
<div
class=
"form-group"
style=
"margin-top: 10px; height: 10px;"
>
<label
class=
"col-sm-1 control-label"
>
{{'Entity' | translate}}:
</label>
<label
class=
"col-sm-1 control-label"
>
{{'Entity' | translate}}:
</label>
<div
class=
"col-sm-3"
>
<div
class=
"col-sm-3"
>
<div
dx-tag-box=
"selectOrgOptions"
></div>
<!--<div dx-tag-box="selectOrgOptions"></div>-->
<!--<select id="area" class="select2" multiple="multiple"-->
<!--style="width: 100%;border-radius: 0 3px 3px 0 !important;max-height: 26px;overflow-y: auto !important;">-->
<!--</select>-->
<select
id=
"area1"
class=
"selectpicker"
multiple
style=
"width: 100%"
>
</select>
</div>
</div>
<label
class=
"col-sm-1 control-label"
>
{{'InvoiceQJ' | translate}}:
</label>
<label
class=
"col-sm-1 control-label"
>
{{'InvoiceQJ' | translate}}:
</label>
<div
class=
"col-sm-2"
>
<div
class=
"col-sm-2"
>
...
...
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.less
View file @
4dd81ed2
...
@@ -393,4 +393,14 @@
...
@@ -393,4 +393,14 @@
float:left;
float:left;
padding-left: 15px;
padding-left: 15px;
}
}
}
.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
width: 100%
}
.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}
}
\ No newline at end of file
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