|
@@ -70,14 +70,14 @@ export default {
|
|
|
if (_self.startDate != null && _self.endDate != null) {
|
|
if (_self.startDate != null && _self.endDate != null) {
|
|
|
let startDate = _self.startDate + ' 00:00:00';
|
|
let startDate = _self.startDate + ' 00:00:00';
|
|
|
let endDate = _self.endDate + ' 23:59:59';
|
|
let endDate = _self.endDate + ' 23:59:59';
|
|
|
- let previewExcelUrl = 'plugin/x-spreadsheet/index.html?processReportNo=' + processReportNo + '&startDate=' + startDate + '&endDate=' + endDate;
|
|
|
|
|
|
|
+ let previewExcelUrl = '/static/x-spreadsheet/index.html?processReportNo=' + processReportNo + '&startDate=' + startDate + '&endDate=' + endDate;
|
|
|
window.open(previewExcelUrl);
|
|
window.open(previewExcelUrl);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(_self.taskCompleteStartDate != null && _self.taskCompleteEndDate != null){
|
|
if(_self.taskCompleteStartDate != null && _self.taskCompleteEndDate != null){
|
|
|
let taskCompleteStartDate = _self.taskCompleteStartDate + ' 00:00:00';
|
|
let taskCompleteStartDate = _self.taskCompleteStartDate + ' 00:00:00';
|
|
|
let taskCompleteEndDate = _self.taskCompleteEndDate + ' 23:59:59';
|
|
let taskCompleteEndDate = _self.taskCompleteEndDate + ' 23:59:59';
|
|
|
- let previewExcelUrl = 'plugin/x-spreadsheet/index.html?processReportNo='
|
|
|
|
|
|
|
+ let previewExcelUrl = '/static/x-spreadsheet/index.html?processReportNo='
|
|
|
+ processReportNo + '&taskCompleteStartDate='
|
|
+ processReportNo + '&taskCompleteStartDate='
|
|
|
+ taskCompleteStartDate + '&taskCompleteEndDate='
|
|
+ taskCompleteStartDate + '&taskCompleteEndDate='
|
|
|
+ taskCompleteEndDate;
|
|
+ taskCompleteEndDate;
|
|
@@ -89,7 +89,7 @@ export default {
|
|
|
let endDate = _self.endDate + ' 23:59:59';
|
|
let endDate = _self.endDate + ' 23:59:59';
|
|
|
let taskCompleteStartDate = _self.taskCompleteStartDate + ' 00:00:00';
|
|
let taskCompleteStartDate = _self.taskCompleteStartDate + ' 00:00:00';
|
|
|
let taskCompleteEndDate = _self.taskCompleteEndDate + ' 23:59:59';
|
|
let taskCompleteEndDate = _self.taskCompleteEndDate + ' 23:59:59';
|
|
|
- let previewExcelUrl = 'plugin/x-spreadsheet/index.html?processReportNo='
|
|
|
|
|
|
|
+ let previewExcelUrl = '/static/x-spreadsheet/index.html?processReportNo='
|
|
|
+ processReportNo + '&startDate='
|
|
+ processReportNo + '&startDate='
|
|
|
+ startDate + '&endDate=' + endDate + '&taskCompleteStartDate='
|
|
+ startDate + '&endDate=' + endDate + '&taskCompleteStartDate='
|
|
|
+ taskCompleteStartDate + '&taskCompleteEndDate=' + taskCompleteEndDate;
|
|
+ taskCompleteStartDate + '&taskCompleteEndDate=' + taskCompleteEndDate;
|