Skip to content

T
traffic-front
Commit 898fd303 authored by zhkwei's avatar zhkwei
Browse files
Options

Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

parents 0e8a9868 ed183558
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 126 deletions
atms-api/src/main/java/pwc/taxtech/atms/constant/Constant.java
View file @ 898fd303
......@@ -179,4 +179,5 @@ public final class Constant {
}
}
\ No newline at end of file
atms-api/src/main/java/pwc/taxtech/atms/controller/CitDataPreviewController.java
View file @ 898fd303
......@@ -23,6 +23,7 @@ import static javax.servlet.http.HttpServletResponse.SC_OK;
/**
* CIT数据预览功能模块Controller
*
* @author zhikai.z.wei
*/
@RestController
......@@ -34,6 +35,7 @@ public class CitDataPreviewController extends BaseController {
/**
* 日记账合并版数据的获取
*
* @param citJournalAdjustDto
* @return
*/
......@@ -45,12 +47,15 @@ public class CitDataPreviewController extends BaseController {
/**
* 日记账合并版导出
*
* @param paras
* @param response
*/
@RequestMapping(value = "exportJournalMergeData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void exportJournalMergeData(@RequestBody CitJournalAdjustDto paras, HttpServletResponse response) {
int count = citDataPreviewService.exportJournalMergeData2(paras, response);
if (count == 0) {
response.setStatus(SC_NO_CONTENT);
} else {
......@@ -61,6 +66,7 @@ public class CitDataPreviewController extends BaseController {
/**
* 试算平衡表生成版的数据获取
*
* @param citTrialBalanceDto
* @return
*/
......@@ -72,6 +78,7 @@ public class CitDataPreviewController extends BaseController {
/**
* 试算平衡表生成版的导出
*
* @param paras
* @param response
*/
......@@ -108,6 +115,7 @@ public class CitDataPreviewController extends BaseController {
/**
* 试算平衡表Mapping版的数据获取
*
* @param citTrialBalanceDto
* @return
*/
......@@ -120,6 +128,7 @@ public class CitDataPreviewController extends BaseController {
/**
* 试算平衡表Mapping版的导出
*
* @param paras
* @param response
*/
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisJobServiceImpl.java
View file @ 898fd303
......@@ -203,12 +203,19 @@ public class AnalysisJobServiceImpl extends BaseService {
String regionMeg = regionMap.get(o.getRegionId());
List<String> regionMs = Lists.newArrayList();
if (StringUtils.isNotEmpty(regionMeg)) {
regionMs = Arrays.asList(regionMeg.split("."));
regionMs = Arrays.asList(regionMeg.split(","));
}
if (!regionMs.isEmpty()) {
am.setProvince(regionMs.get(1) != null ? regionMs.get(1) : "");
am.setCity(regionMs.get(2) != null ? regionMs.get(2) : "");
am.setDistrict(regionMs.get(3) != null ? regionMs.get(4) : "");
if(regionMs.size() == 4){
am.setProvince(regionMs.get(1) != null ? regionMs.get(1) : "");
am.setCity(regionMs.get(2) != null ? regionMs.get(2) : "");
am.setDistrict(regionMs.get(3) != null ? regionMs.get(3) : "");
}else if(regionMs.size() == 3){
am.setProvince(regionMs.get(1) != null ? regionMs.get(1) : "");
am.setCity(regionMs.get(2) != null ? regionMs.get(2) : "");
}else if(regionMs.size() == 2){
am.setProvince(regionMs.get(1) != null ? regionMs.get(1) : "");
}
}
am.setBusinessLine(buMap.get(o.getBusinessUnitId()));
am.setCode(o.getCode());
......@@ -223,7 +230,8 @@ public class AnalysisJobServiceImpl extends BaseService {
}
analysisMasterMapper.insertSelective(am);
} catch (Exception e) {
logger.error(String.format("公司:[%s]生成机构分析数据失败!", o.getName()), e);
e.printStackTrace();
logger.error(String.format("生成机构分析数据失败!", e.getMessage()));
}
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisServiceImpl.java
View file @ 898fd303
......@@ -932,7 +932,7 @@ public class AnalysisServiceImpl extends BaseService {
.andCompanyNameEqualTo(getCellValue(sheetAt.getRow(i).getCell(3), false).toString())
.andPeriodEqualTo(period);
List<AnalysisMaster> analysisMasters = analysisMasterMapper.selectByExample(example);
if (breakFlag > 3) {
if (breakFlag > 20) {
logger.info("大于三条数据不匹配,直接停止进程");
break;
}
......@@ -962,8 +962,14 @@ public class AnalysisServiceImpl extends BaseService {
salesList.add(sales);
}
}
int salesInt = analysisSalesMapper.insertBatch(salesList);
int taxInt = analysisTaxMapper.insertBatch(taxList);
int salesInt = 0;
if (salesList.size() != 0) {
salesInt = analysisSalesMapper.insertBatch(salesList);
}
int taxInt = 0;
if (taxList.size() != 0) {
taxInt = analysisTaxMapper.insertBatch(taxList);
}
logger.info("analysis_salesInt 更新数据条数" + salesInt);
logger.info("analysis_tax 更新数据条数" + taxInt);
System.out.println("数据初始化消耗: " + (System.currentTimeMillis() - now));
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 898fd303
......@@ -51,6 +51,7 @@ import pwc.taxtech.atms.vat.entity.*;
import javax.annotation.Resource;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
......@@ -965,7 +966,7 @@ public class DataImportService extends BaseService {
rlits.stream().collect(Collectors.groupingBy(RedLetterInfoTable::getSubjectNum));
atsGroupRes.forEach((k, v) -> processRlits(k, v, orgIds, tmsPeriod, importType, dataImportLogs));
}
if(dataImportLogs.size() == 0)
if (dataImportLogs.size() == 0)
return OperationResultDto.error(ErrorMessage.NoData);
addDataImportLog(dataImportLogs);
......@@ -1074,7 +1075,7 @@ public class DataImportService extends BaseService {
atsGroupRes.forEach((k, v) -> processAts(k, v, orgIds, tmsPeriod, importType, dataImportLogs));
}
addDataImportLog(dataImportLogs);
if(dataImportLogs.size() == 0)
if (dataImportLogs.size() == 0)
return OperationResultDto.error(ErrorMessage.NoData);
int isSuccess = (int) dataImportLogs.stream().filter(di -> Boolean.TRUE.equals(di.getImportResult())).count();
if (isSuccess < 1) {
......@@ -1180,7 +1181,7 @@ public class DataImportService extends BaseService {
atsGroupRes.forEach((k, v) -> processCprs(k, v, orgIds, tmsPeriod, importType, dataImportLogs));
}
int isSuccess = (int) dataImportLogs.stream().filter(di -> Boolean.TRUE.equals(di.getImportResult())).count();
if(dataImportLogs.size() == 0)
if (dataImportLogs.size() == 0)
return OperationResultDto.error(ErrorMessage.NoData);
addDataImportLog(dataImportLogs);
......@@ -1582,7 +1583,7 @@ public class DataImportService extends BaseService {
irs.stream().collect(Collectors.groupingBy(InvoiceRecord::getBillingBody));
atsGroupRes.forEach((k, v) -> processIrs(k, v, orgIds, tmsPeriod, importType, dataImportLogs));
}
if(dataImportLogs.size() == 0)
if (dataImportLogs.size() == 0)
return OperationResultDto.error(ErrorMessage.NoData);
int isSuccess = (int) dataImportLogs.stream().filter(di -> Boolean.TRUE.equals(di.getImportResult())).count();
addDataImportLog(dataImportLogs);
......@@ -2037,7 +2038,7 @@ public class DataImportService extends BaseService {
private int addDataImportLog(List<DataImportLog> dataImportLogs) {
if(dataImportLogs.size() == 0) return 0;
if (dataImportLogs.size() == 0) return 0;
dataImportLogMapper.displayOld(dataImportLogs.get(0).getType());
int res = 0;
for (DataImportLog dataImportLog : dataImportLogs) {
......@@ -2063,6 +2064,7 @@ public class DataImportService extends BaseService {
List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList());
// 这里会导致任何人都可以看到未映射到主体的数据
orgIds.add("");
orgIds.add(Constant.ALL);
if (!EnumImportType.Undefined.getCode().equals(param.getType())) {
criteria.andTypeEqualTo(param.getType()).andDisplayEqualTo(true);
criteria.andOrganizationIdIn(orgIds);
......@@ -2085,20 +2087,28 @@ public class DataImportService extends BaseService {
* @author Gary J Li
*/
public PageInfo<DataImportLogDto> displayImportLogAll(DataImportAllParam param) {
Date strDate = DateUtils.strToDate2(param.getStartDate());
String startStr=param.getStartDate();
Date strDate = DateUtils.strToDate2(startStr);
String endStr=param.getEndDate();
Date endDateO = DateUtils.strToDate2(endStr);
long endDateLong =endDateO.getTime()+86399000;
Date endDate=new Date(endDateLong);
/*Date strDate = DateUtils.strToDate2(param.getStartDate());
Date endDate = DateUtils.strToDate2(param.getEndDate());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
try {
strDate = format.parse(format.format(strDate) + "00:00:00");
endDate = format.parse(format.format(endDate) + "23:59:59");
} catch (ParseException e) {
e.printStackTrace();
}*/
DataImportLogExample example = new DataImportLogExample();
DataImportLogExample.Criteria criteria = example.createCriteria();
Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList());
criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate);
example.setOrderByClause("update_time desc");
PageInfo<DataImportLogDto> pageInfo = new PageInfo<>(dataImportLogMapper.selectByExample(example).stream()
.map(o -> beanUtil.copyProperties(o, new DataImportLogDto())).collect(Collectors.toList()));
pageInfo.setTotal(page.getTotal());
......@@ -2115,9 +2125,16 @@ public class DataImportService extends BaseService {
* @author Gary J Li
*/
public PageInfo<DataValidateLogDto> displayProcessLog(DataProcessParam param) {
/*
Date strDate = DateUtils.strToDate2(param.getStartDate());
Date endDate = DateUtils.strToDate2(param.getEndDate());
Date endDate = DateUtils.strToDate2(param.getEndDate());*/
String startStr=param.getStartDate();
Date strDate = DateUtils.strToDate2(startStr);
String endStr=param.getEndDate();
Date endDateO = DateUtils.strToDate2(endStr);
long endDateLong =endDateO.getTime()+86399000;
Date endDate=new Date(endDateLong);
DataValidateLogExample example = new DataValidateLogExample();
......@@ -2131,11 +2148,9 @@ public class DataImportService extends BaseService {
orgIds.add(Constant.ALL);
criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate);
example.setOrderByClause("update_time desc");
PageInfo<DataValidateLogDto> pageInfo = new PageInfo<>(dataValidateLogMapper.selectByExample(example).stream()
.map(o -> beanUtil.copyProperties(o, new DataValidateLogDto())).collect(Collectors.toList()));
pageInfo.setTotal(page.getTotal());
return pageInfo;
}
......@@ -2165,7 +2180,7 @@ public class DataImportService extends BaseService {
List<Organization> tmpOrgList = Collections.emptyList();
if (type == EbsExtractTypeConstant.RATE) {
tmpOrgList = orgs.stream().limit(1).collect(Collectors.toList());
}else {
} else {
tmpOrgList = orgs;
}
tmpOrgList.forEach(o -> {
......@@ -2317,13 +2332,13 @@ public class DataImportService extends BaseService {
int year = periodInt / 100;
int month = periodInt % 100;
DataImportLog log = new DataImportLog();
log.setTaxpayerIdNum(org.getTaxPayerNumber());
if (type == EbsExtractTypeConstant.RATE) {
log.setTaxpayerIdNum(Constant.ALL);
log.setCompanyName(Constant.ALL);
log.setOrganizationId(Constant.ALL);
log.setCompanyCode(Constant.ALL);
} else {
log.setTaxpayerIdNum(org.getTaxPayerNumber());
log.setCompanyName(org.getName());
log.setOrganizationId(org.getId());
log.setCompanyCode(code);
......@@ -2337,7 +2352,9 @@ public class DataImportService extends BaseService {
log.setOperator(operator);
log.setId(idService.nextId());
try {
if (StringUtils.isEmpty(org.getEnterpriseAccountCode())) {
if (type == EbsExtractTypeConstant.RATE) {
//do nothing
}else if (StringUtils.isEmpty(org.getEnterpriseAccountCode())) {
log.setImportResult(false);
log.setErrorMsg(String.format(EnumApiCodeMsg.CALLFAILED.getMsg(), ErrorMessageCN.NoLedgerID));
} else if (StringUtils.isEmpty(org.getCode())) {
......
atms-api/src/test/java/pwc/taxtech/atms/service/impl/AnalysisTest.java
View file @ 898fd303
......@@ -10,6 +10,7 @@ import pwc.taxtech.atms.common.util.DateUtils;
import pwc.taxtech.atms.constant.enums.EnumTbImportType;
import pwc.taxtech.atms.entity.Organization;
import pwc.taxtech.atms.entity.OrganizationExample;
import pwc.taxtech.atms.vat.entity.EbitCellData;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
......
atms-orangeheap/src/components/Panel.vue
View file @ 898fd303
<template>
<v-container>
<v-container >
<v-navigation-drawer
v-model="drawerRight"
fixed
......@@ -16,7 +16,7 @@
<!-- <v-list-tile-title>Ope Temporary Drawer</v-list-tile-title>-->
<!-- </v-list-tile-content>-->
<!-- </v-list-tile>-->
<v-list subheader>
<v-list subheader >
<v-subheader>列表</v-subheader>
<v-list-tile
v-for="item in items"
......@@ -24,19 +24,19 @@
@click="switchTable(item)"
avatar
>
<v-list-tile-action>
<v-list-tile-action >
<svg class="icon" aria-hidden="true">
<use :xlink:href="item.iconName"></use>
</svg>
</v-list-tile-action>
<v-list-tile-content>
<v-list-tile-content >
<v-list-tile-title v-html="item.title"></v-list-tile-title>
</v-list-tile-content>
<v-list-tile-action>
<v-icon v-show="item.active"
color="green"
color="#333333"
>check
</v-icon>
</v-list-tile-action>
......@@ -48,18 +48,20 @@
fixed
app
clipped-right
height="90"
color="#ffffff"
>
<!-- <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>-->
<v-toolbar-title>仪表盘</v-toolbar-title>
<v-spacer></v-spacer>
<!--<v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
<v-toolbar-title></v-toolbar-title>
<v-spacer ></v-spacer>-->
<span class="body-2"
@click.stop="drawerRight = !drawerRight"
@click.stop="drawerRight = !drawerRight" style="vertical-align: middle; margin-right: 5px; width:100%"
>
<svg class="icon" aria-hidden="true" style="vertical-align: middle; margin-right: 5px"><use
<svg class="icon" aria-hidden="true" ><use
:xlink:href="selectedItem.iconName"></use></svg>
<span style="vertical-align: middle; margin-right: 2px" v-text="selectedItem.title"></span>
<v-icon style="vertical-align: middle">menu</v-icon>
<span style="vertical-align: middle; margin-left: 10px; font-size:27px" v-text="selectedItem.title"></span>
<v-icon style="vertical-align: middle;margin-top:5px;float:right;height:28px;width:28px;color:#333333;">menu</v-icon>
</span>
<!-- <v-btn large-->
......@@ -242,4 +244,8 @@
<style scoped>
.head {
height: 90px;
background-color: red;
}
</style>
\ No newline at end of file
atms-orangeheap/src/views/ChartApp.vue
View file @ 898fd303
......@@ -11,7 +11,8 @@
style=" overflow: hidden;
position: fixed;
bottom: 0;
width: 100%;"
width: 100%;
border-top:1px solid #dddddd;"
>
<v-btn
......@@ -21,8 +22,8 @@
depressed
:to="{name: 'panel'}"
>
<span>仪表盘</span>
<v-icon>table_chart</v-icon>
<span style="font-size:20px ; color:#999999">仪表盘</span>
<v-icon color="#dddddd">table_chart</v-icon>
</v-btn>
<v-btn
......@@ -32,8 +33,8 @@
depressed
:to="{name: 'mine'}"
>
<span>我的</span>
<v-icon>account_box</v-icon>
<span style="font-size:20px ;color:#999999 " > 我的</span>
<v-icon color="#dddddd" >account_box</v-icon>
</v-btn>
</v-bottom-nav>
......@@ -49,10 +50,39 @@
}
},
components: {}
components: {
}
/* ,
mounted :function() {
var color = 'rgb(221, 221, 221)';
var targetColor = "red";
setTimeout(function(){
document.getElementsByClassName('v-btn__content')[3].addEventListener('click', function(e){
if(e.target.style.color != targetColor){
e.target.style.color = targetColor;
document.getElementsByClassName('v-btn__content')[3].getElementsByTagName('i')[0].style.color = targetColor;
}else{
e.target.style.color = color;
document.getElementsByClassName('v-btn__content')[3].getElementsByTagName('i')[0].style.color = color;
}
});
document.getElementsByClassName('v-btn__content')[4].addEventListener('click', function(e){
if(e.target.style.color != targetColor){
e.target.style.color = targetColor;
document.getElementsByClassName('v-btn_content')[4].getElementsByTagName('i')[0].style.color = targetColor;
}else{
e.target.style.color = color;
document.getElementsByClassName('v-btn__content')[4].getElementsByTagName('i')[0].style.color = color;
}
})
}, 500);
}*/
}
</script>
<style scoped>
.color_active{
color:red!important;
}
</style>
\ No newline at end of file
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.ctrl.js
View file @ 898fd303
......@@ -112,7 +112,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, 'EAM资产处置金额记录表.xlsx', true);
vatExportService.exportToExcel(data, status, headers, 'EAM资产处置金额记录表', true);
}).error(function (error) {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js
View file @ 898fd303
......@@ -153,7 +153,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '日记账信息.xlsx',true);
vatExportService.exportToExcel(data, status, headers, '日记账信息');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.ctrl.js
View file @ 898fd303
......@@ -125,7 +125,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '预提重分类数据源.xlsx', true);
vatExportService.exportToExcel(data, status, headers, '预提重分类数据源', true);
}).error(function (error) {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.ctrl.js
View file @ 898fd303
......@@ -140,7 +140,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '试算平衡表信息.xlsx',true);
vatExportService.exportToExcel(data, status, headers, '试算平衡表信息',true);
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.ctrl.js
View file @ 898fd303
......@@ -144,7 +144,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '试算平衡表+Mapping信息.xlsx',true);
vatExportService.exportToExcel(data, status, headers, '试算平衡表+Mapping信息',true);
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/cit/preview/vat-preview-customInvoice-sheet/vat-preview-customInvoice-sheet.ctrl.js
View file @ 898fd303
......@@ -85,7 +85,7 @@
criteria = "";
vatImportService.getExportCustomInvoiceList(criteria).success(function (data, status, headers) {
vatExportService.exportToExcel(data, status, headers, 'CustomInvoice.xlsx');
vatExportService.exportToExcel(data, status, headers, '海关发票信息');
});
};
//************ EXCEL EXPORT FUNCTION ***************/
......
atms-web/src/main/webapp/app/cit/preview/vat-preview-input-invoice/vat-preview-input-invoice.ctrl.js
View file @ 898fd303
......@@ -512,7 +512,7 @@
//导出进项发票数据
var downloadInputInvoice = function () {
vatPreviewService.getExportInputInvoiceList($scope.queryParams).success(function (data, status, headers) {
vatExportService.exportToExcel(data, status, headers, '进项发票信息.xlsx');
vatExportService.exportToExcel(data, status, headers, '进项发票信息');
});
};
......
atms-web/src/main/webapp/app/cit/preview/vat-preview-output-invoice/vat-preview-output-invoice.ctrl.js
View file @ 898fd303
......@@ -445,7 +445,7 @@
var doExport = function ()
{
vatPreviewService.getExportOutputInvoiceList($scope.queryParams).success(function (data, status, headers) {
vatExportService.exportToExcel(data, status, headers, '销项发票信息.xlsx');
vatExportService.exportToExcel(data, status, headers, '销项发票信息');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.ctrl.js
View file @ 898fd303
......@@ -161,7 +161,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, 'CIT.WP01901_固定资产.xlsx');
vatExportService.exportToExcel(data, status, headers, 'CIT.WP01901_固定资产');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.ctrl.js
View file @ 898fd303
......@@ -172,7 +172,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, 'A202000.xlsx');
vatExportService.exportToExcel(data, status, headers, 'A202000');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.ctrl.js
View file @ 898fd303
......@@ -185,6 +185,7 @@
withCredentials: true
}).then(function(resp) {
var ret = resp.data;
$scope.fileName='';
$('#busy-indicator-container').hide();
deferred.resolve();
if (ret.result) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js
View file @ 898fd303
......@@ -171,6 +171,7 @@
__RequestVerificationToken: token,
withCredentials: true
}).then(function(data) {
$scope.fileName='';
$('#busy-indicator-container').hide();
var resp = data.data;
deferred.resolve();
......
atms-web/src/main/webapp/app/common/vatservices/vatExportService.js
View file @ 898fd303
webservices.factory('vatExportService', ['$log', '$http', 'apiConfig', '$q', function ($log, $http, apiConfig, $q) {
webservices.factory('vatExportService', ['$log', '$http', 'apiConfig', '$q','vatSessionService', function ($log, $http, apiConfig, $q ,vatSessionService) {
'use strict';
$log.debug('vatExportService.ctor()...');
//下载服务器上的xls文件
var exportToExcel = function (data, status, headers, defaultFileName, noExtendFileName) {
$('#busy-indicator-container').show();
var defer = $q.defer();
......@@ -16,10 +15,10 @@
// Get the filename from the x-filename header or default to "download.bin"
var filename = null;
if(noExtendFileName){
filename = defaultFileName
}else{
filename = decodeURI(headers['x-file-name']) + defaultFileName
if (noExtendFileName) {
filename = defaultFileName+ "_" +vatSessionService.project.name+'.xls'
} else {
filename = defaultFileName+"_"+decodeURI(headers['x-file-name']).replace('???','').replace(',','')+ "_" +vatSessionService.project.name+'.xls'
}
......@@ -29,7 +28,7 @@
try {
// Try using msSaveBlob if supported
//console.log("Trying saveBlob method ...");
var blob = new Blob([data], { type: contentType });
var blob = new Blob([data], {type: contentType});
if (navigator.msSaveBlob)
navigator.msSaveBlob(blob, filename);
else {
......@@ -56,7 +55,7 @@
try {
// Prepare a blob URL
//console.log("Trying download link method with simulated click ...");
var blobdownload = new Blob([data], { type: contentType });
var blobdownload = new Blob([data], {type: contentType});
var urldownload = urlCreator.createObjectURL(blobdownload);
link.setAttribute('href', urldownload);
......@@ -83,7 +82,7 @@
// Prepare a blob URL
// Use application/octet-stream when using window.location to force download
//console.log("Trying download link method with window.location ...");
var blobsuccess = new Blob([data], { type: octetStreamMime });
var blobsuccess = new Blob([data], {type: octetStreamMime});
var urlsuccess = urlCreator.createObjectURL(blobsuccess);
window.location = urlsuccess;
//console.log("Download link method with window.location succeeded");
......@@ -118,7 +117,7 @@
return {
exportToExcel: exportToExcel,
exportReport: function (jsonData) {
return $http.post('/Report/export', { ReportData: jsonData }, apiConfig.createVat());
return $http.post('/Report/export', {ReportData: jsonData}, apiConfig.createVat());
}
}
}]);
\ No newline at end of file
atms-web/src/main/webapp/app/common/vatservices/vatPreviewService.js
View file @ 898fd303
webservices.factory('vatPreviewService', ['$http', 'apiConfig','FileSaver', function ($http, apiConfig,FileSaver) {
webservices.factory('vatPreviewService', ['$http', 'apiConfig','FileSaver', 'vatSessionService',function ($http, apiConfig,FileSaver,vatSessionService) {
'use strict';
return {
sample: function () {
......@@ -195,7 +195,7 @@
thisConfig.responseType = "arraybuffer";
return $http.post('/dataPreview/exportCFData/get', queryParm, thisConfig).then(function (response) {
var data = new Blob([response.data], {type: response.headers('Content-Type')});
FileSaver.saveAs(data, fileName + '.xlsx');
FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'-'+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
});
},
getPLDataForDisplay: function (queryParams) {
......@@ -224,7 +224,7 @@
thisConfig.responseType = "arraybuffer";
return $http.post('/dataPreview/exportIRData/get', queryParm, thisConfig).then(function (response) {
var data = new Blob([response.data], {type: response.headers('Content-Type')});
FileSaver.saveAs(data, fileName + '.xlsx');
FileSaver.saveAs(data,fileName + '_'+vatSessionService.year+(queryParm.periodStart<10?'0'+queryParm.periodStart:queryParm.periodStart)+'-'+vatSessionService.year+(queryParm.periodEnd<10?'0'+queryParm.periodEnd:queryParm.periodEnd)+'_'+vatSessionService.project.name+'.xlsx');
});
},
getCPRDataForDisplay: function (queryParams) {
......@@ -235,7 +235,7 @@
thisConfig.responseType = "arraybuffer";
return $http.post('/dataPreview/exportCPRData/get', queryParm, thisConfig).then(function (response) {
var data = new Blob([response.data], {type: response.headers('Content-Type')});
FileSaver.saveAs(data, fileName + '.xlsx');
FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'-'+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
});
},
getRLITDataForDisplay: function (queryParams) {
......@@ -246,7 +246,7 @@
thisConfig.responseType = "arraybuffer";
return $http.post('/dataPreview/exportRLITData/get', queryParm, thisConfig).then(function (response) {
var data = new Blob([response.data], {type: response.headers('Content-Type')});
FileSaver.saveAs(data, fileName + '.xlsx');
FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'-'+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
});
},
getCILDataForDisplay: function (queryParams) {
......@@ -257,7 +257,7 @@
thisConfig.responseType = "arraybuffer";
return $http.post('/dataPreview/exportCILData/get', queryParm, thisConfig).then(function (response) {
var data = new Blob([response.data], {type: response.headers('Content-Type')});
FileSaver.saveAs(data, fileName + '.xlsx');
FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'-'+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
});
},
getIDDataForDisplay: function (queryParams) {
......@@ -268,7 +268,7 @@
thisConfig.responseType = "arraybuffer";
return $http.post('/dataPreview/exportIDData/get', queryParm, thisConfig).then(function (response) {
var data = new Blob([response.data], {type: response.headers('Content-Type')});
FileSaver.saveAs(data, fileName + '.xlsx');
FileSaver.saveAs(data,fileName + '_'+queryParm.periodStart+'-'+queryParm.periodEnd+'_'+vatSessionService.project.name+'.xlsx');
});
}
};
......
atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.ctrl.js
View file @ 898fd303
......@@ -18,7 +18,7 @@
$scope.startRowNum = 2;
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth()+1;
var month = date.getMonth() + 1;
var day = date.getDate();
$scope.dateFormat = $translate.instant('dateFormat4YearMonth');
......@@ -51,9 +51,9 @@
nextPage: $translate.instant('PagingNextPage'),
lastPage: $translate.instant('PagingLastPage')
},
type : constant.importFileType.undefined,
startDate: year+'/'+month+'/'+day,
endDate : year+'/'+month+'/'+day
type: constant.importFileType.undefined,
startDate: year + '/' + month + '/' + day,
endDate: year + '/' + month + '/' + day
};
var loadImportLogInfoDatagrid = function () {
......@@ -155,7 +155,7 @@
if (data && data.list) {
$scope.ImportLogGridSource = data.list;
$scope.pagingOptions.totalItems = data.pageInfo.totalCount;
}else {
} else {
SweetAlert.error($translate.instant('SystemError'));
}
});
......@@ -191,34 +191,41 @@
var setButtonWrapStyle = function () {
if ($scope.fileName) {
return { width: "100%" };
return {width: "100%"};
}
};
var setGridStyle = function () {
if ($scope.showTotalSecondRow) {
return { 'margin-top': '60px' }
return {'margin-top': '60px'}
}
else {
return { 'margin-top': '55px' }
return {'margin-top': '55px'}
}
};
var initDatePicker = function () {
var ele = $(".startDatepicker");
ele.datepicker({
var _ele1 = $("#startDate");
var _ele2 = $("#endDate");
_ele1.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
endDate: $scope.queryParams.endDate,
viewMode: $scope.viewMode,
minViewMode: $scope.viewMode,
autoclose: true, //选中之后自动隐藏日期选择框
clearBtn: true, //清除按钮
todayBtn: false, //今日按钮
format: 'yyyy/mm/dd' //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
}).on('changeDate', function (ev) {
if (ev.date != undefined) {
_ele2.datepicker('setStartDate', ev.date);
_ele1.datepicker('setFormat', 'yyyy/mm/dd');
}
});
ele.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
var ele2 = $(".endDatepicker");
ele2.datepicker({
_ele1.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
_ele2.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
viewMode: $scope.viewMode,
......@@ -227,8 +234,15 @@
clearBtn: true, //清除按钮
todayBtn: false, //今日按钮
format: 'yyyy/mm/dd' //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
}).on('changeDate', function (ev) {
if (ev.date != undefined) {
_ele1.datepicker('setEndDate', ev.date);
_ele1.datepicker('setFormat', 'yyyy/mm/dd');
$('.datepicker').css('display', 'none');
}
});
ele2.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
_ele2.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
};
var initParam = function () {
......@@ -237,6 +251,7 @@
$scope.setGridStyle = setGridStyle;
$scope.$watch('queryParams.startDate', function (newValue, oldValue) {
getImportLog();
});
$scope.$watch('queryParams.endDate', function (newValue, oldValue) {
getImportLog();
......
atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.html
View file @ 898fd303
......@@ -6,7 +6,7 @@
<div id="tab_total">
<div class="select-period" style="height: 10px;">
<span class="text-bold"style="float: left; margin-top: 5px;">{{'StartDateMao'|translate}}</span>
<div class="input-daterange input-group startDatepicker" style="float: left;width: 10%;">
<div class="input-daterange input-group " style="float: left;width: 10%;">
<input type="text" id="startDate" class="input-sm form-control" name="startDate"
ng-model="queryParams.startDate" style="width: 120px;margin-left: 50px;"/>
</div>
......
atms-web/src/main/webapp/app/dataImport/log/process-log/process-log.ctrl.js
View file @ 898fd303
......@@ -18,7 +18,7 @@
$scope.startRowNum = 2;
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth()+1;
var month = date.getMonth() + 1;
var day = date.getDate();
$scope.selectedDate = new Date(vatSessionService.year, vatSessionService.month - 1, 1);
......@@ -53,8 +53,8 @@
nextPage: $translate.instant('PagingNextPage'),
lastPage: $translate.instant('PagingLastPage')
},
startDate: year+'/'+month+'/'+day,
endDate : year+'/'+month+'/'+day
startDate: year + '/' + month + '/' + day,
endDate: year + '/' + month + '/' + day
};
var loadProcessLogInfoDatagrid = function () {
......@@ -111,7 +111,7 @@
}, {
dataField: "createTime",
allowHeaderFiltering: false,
dataType : "date",
dataType: "date",
width: '10%',
caption: $translate.instant('OperateTime')
}
......@@ -162,7 +162,7 @@
if (data && data.list) {
$scope.ProcessLogGridSource = data.list;
$scope.pagingOptions.totalItems = data.pageInfo.totalCount;
}else {
} else {
SweetAlert.error($translate.instant('SystemError'));
}
});
......@@ -198,42 +198,55 @@
var setButtonWrapStyle = function () {
if ($scope.fileName) {
return { width: "100%" };
return {width: "100%"};
}
};
var setGridStyle = function () {
if ($scope.showTotalSecondRow) {
return { 'margin-top': '60px' }
return {'margin-top': '60px'}
}
else {
return { 'margin-top': '55px' }
return {'margin-top': '55px'}
}
};
var initDatePicker = function () {
var ele = $(".startDatepicker");
var ele = $("#startDate");
ele.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
//startDate: $scope.startDate,
endDate: $scope.queryParams.endDate,
viewMode: $scope.viewMode,
minViewMode: $scope.viewMode,
autoclose: true, //选中之后自动隐藏日期选择框
clearBtn: true, //清除按钮
todayBtn: false, //今日按钮
format: 'yyyy/mm/dd' //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
}).on('changeDate', function (ev) {
if (ev.date != undefined) {
ele.datepicker('setStartDate', ev.date);
ele.datepicker('setFormat', 'yyyy/mm/dd');
}
});
;
ele.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
var ele2 = $(".endDatepicker");
var ele2 = $("#endDate");
ele2.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
//startDate: $scope.startDate,
//endDate: $scope.endDate,
viewMode: $scope.viewMode,
minViewMode: $scope.viewMode,
autoclose: true, //选中之后自动隐藏日期选择框
clearBtn: true, //清除按钮
todayBtn: false, //今日按钮
format: 'yyyy/mm/dd' //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
}).on('changeDate', function (ev) {
if (ev.date != undefined) {
ele2.datepicker('setEndDate', ev.date);
ele2.datepicker('setFormat', 'yyyy/mm/dd');
$('.datepicker').css('display', 'none');
}
});
;
ele2.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.ctrl.js
View file @ 898fd303
......@@ -541,7 +541,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '进项发票信息.xls');
vatExportService.exportToExcel(data, status, headers, '进项发票信息');
});
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow/vat-preview-cash-flow.ctrl.js
View file @ 898fd303
......@@ -193,10 +193,10 @@
})
};
//导出进项发票数据
//导出现金流量信息
$scope.downloadCashFlow = function () {
var localDate=$filter('date')(new Date(), 'yyyyMMddHHmmss');
var fileName="cash_flow_"+localDate;
var fileName="现金流量信息";
vatPreviewService.initExportCFData($scope.queryParams,fileName).then(function (data) {
if (data) {
ackMessageBox.success(translate('FileExportSuccess'));
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-certified-invoices-list/vat-preview-certified-invoices-list.ctrl.js
View file @ 898fd303
......@@ -234,7 +234,7 @@
var downloadCertifiedInvoicesList = function () {
var localDate=$filter('date')(new Date(), 'yyyyMMddHHmmss');
var fileName= constant.exportExcelFileName.certifiedInvoicesList + localDate;
var fileName= '已认证发票清单'; //constant.exportExcelFileName.invoicesRecord
vatPreviewService.initExportCILData($scope.queryParams,fileName).then(function (data) {
if (data) {
ackMessageBox.success(translate('FileExportSuccess'));
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-customInvoice-sheet/vat-preview-customInvoice-sheet.ctrl.js
View file @ 898fd303
......@@ -86,7 +86,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, 'CustomInvoice.xlsx');
vatExportService.exportToExcel(data, status, headers, '海关发票信息');
});
};
//************ EXCEL EXPORT FUNCTION ***************/
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-direct-method-cash-flow-statement/vat-preview-direct-method-cash-flow-statement.ctrl.js
View file @ 898fd303
......@@ -541,7 +541,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '进项发票信息.xls');
vatExportService.exportToExcel(data, status, headers, '进项发票信息');
});
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-input-invoice/vat-preview-input-invoice.ctrl.js
View file @ 898fd303
......@@ -540,7 +540,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '进项发票信息.xls');
vatExportService.exportToExcel(data, status, headers, '进项发票信息');
});
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-record/vat-preview-invoice-record.ctrl.js
View file @ 898fd303
......@@ -278,7 +278,7 @@
var downloadIR = function () {
var localDate = $filter('date')(new Date(), 'yyyyMMddHHmmss');
var fileName = constant.exportExcelFileName.invoicesRecord + localDate;
var fileName = '已开增值发票记录' ; //constant.exportExcelFileName.invoicesRecord+ localDate
vatPreviewService.initExportIRData($scope.queryParams, fileName).then(function (data) {
if (data) {
ackMessageBox.success(translate('FileExportSuccess'));
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.ctrl.js
View file @ 898fd303
......@@ -5,8 +5,8 @@
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
$scope.endDate = new Date(vatSessionService.project.year, 11, 31);
$scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
$scope.startMonth = vatSessionService.month;
$scope.endMonth = vatSessionService.month;
$scope.startMonth = vatSessionService.year+vatSessionService.month;
$scope.endMonth = vatSessionService.year+vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
......@@ -264,7 +264,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '日记账信息.xls');
vatExportService.exportToExcel(data, status, headers, '日记账信息');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.ctrl.js
View file @ 898fd303
......@@ -494,7 +494,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '资产负债表信息.xls');
vatExportService.exportToExcel(data, status, headers, '资产负债表信息');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.ctrl.js
View file @ 898fd303
......@@ -476,7 +476,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '销项发票信息.xls');
vatExportService.exportToExcel(data, status, headers, '销项发票信息');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-outputoff-invoice/vat-preview-outputoff-invoice.ctrl.js
View file @ 898fd303
......@@ -476,7 +476,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '销项发票信息.xls');
vatExportService.exportToExcel(data, status, headers, '销项发票信息');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss.ctrl.js
View file @ 898fd303
......@@ -512,7 +512,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '利润表信息.xls');
vatExportService.exportToExcel(data, status, headers, '利润表信息');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-quarterly-owners-equity-change-tab/vat-preview-quarterly-owners-equity-change-tab.ctrl.js
View file @ 898fd303
......@@ -541,7 +541,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '进项发票信息.xls');
vatExportService.exportToExcel(data, status, headers, '进项发票信息');
});
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.ctrl.js
View file @ 898fd303
......@@ -5,8 +5,8 @@
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
$scope.endDate = new Date(vatSessionService.project.year, 11, 31);
$scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
$scope.startMonth = vatSessionService.month;
$scope.endMonth = vatSessionService.month;
$scope.startMonth =vatExportService.year+vatSessionService.month;
$scope.endMonth = vatExportService.year+vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
......@@ -261,7 +261,7 @@
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, '科目余额表信息.xls');
vatExportService.exportToExcel(data, status, headers, '科目余额表信息');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
......
atms-web/src/main/webapp/orangeweb/css/app.8f5ac7e7.css 0 → 100644
View file @ 898fd303
.color_active[data-v-1ced4d0d]{color:red!important}.head[data-v-0817fb63]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}.color_active{color:red!important}
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/css/app.cf16809e.css deleted 100644 → 0
View file @ 0e8a9868
.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/index.html
View file @ 898fd303
......@@ -49,4 +49,4 @@
//send 发送
xmlhttp.send();
}*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.e819e3a1.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.e819e3a1.js></script></body></html>
\ No newline at end of file
}*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.8f5ac7e7.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.cf3691a6.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.8f5ac7e7.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.cf3691a6.js></script></body></html>
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/js/app.cf3691a6.js.map 0 → 100644
View file @ 898fd303
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment