Skip to content

T
traffic-front
Commit f3001234 authored by kevin's avatar kevin
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents bc0ba2ea a0f4d5d8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 551 additions and 309 deletions
atms-api/src/main/java/pwc/taxtech/atms/constant/enums/ReportFileUploadEnum.java
View file @ f3001234
......@@ -12,7 +12,31 @@ public class ReportFileUploadEnum {
NORMAL_DECLARATION("增值税纳税申报表", "增值税纳税申报表"),
CORR_DECLARATION("增值税更正申报表", "增值税更正申报表"),
NORMAL_TAX_RECEIPT("增值税纳税税票", "增值税纳税税票"),
CORR_TAX_RECEIPT("增值税更正税票", "增值税更正税票");
CORR_TAX_RECEIPT("增值税更正税票", "增值税更正税票"),
CIT_FIRST_QUARTERLY("企业所得税第一季度预缴表", "企业所得税第一季度预缴表"),
CIT_CORRECT_FIRST_QUARTERLY("企业所得税更正第一季度预缴表", "企业所得税更正第一季度预缴表"),
CIT_SECOND_QUARTERLY("企业所得税第二季度预缴表", "企业所得税第二季度预缴表"),
CIT_CORRECT_SECOND_QUARTERLY("企业所得税更正第二季度预缴表", "企业所得税更正第二季度预缴表"),
CIT_THIRD_QUARTERLY("企业所得税第三季度预缴表", "企业所得税第三季度预缴表"),
CIT_CORRECT_THIRD_QUARTERLY("企业所得税更正第三季度预缴表", "企业所得税更正第三季度预缴表"),
CIT_FORTH_QUARTERLY("企业所得税第四季度预缴表", "企业所得税第四季度预缴表"),
CIT_CORRECT_FORTH_QUARTERLY("企业所得税更正第四季度预缴表", "企业所得税更正第四季度预缴表"),
CIT_FINAL_SETTLEMENT_DECLARATION_FORM("企业所得税汇算清缴纳税申报表", "企业所得税汇算清缴纳税申报表"),
CIT_CORRECT_FINAL_SETTLEMENT_DECLARATION_FORM("企业所得税更正汇算清缴纳税申报表", "企业所得税更正汇算清缴纳税申报表"),
CIT_FIRST_TAX_STAMP("企业所得税第一季度纳税税票", "企业所得税第一季度纳税税票"),
CIT_CORRECT_FIRST_TAX_STAMP("企业所得税第一季度更正纳税税票", "企业所得税第一季度更正纳税税票"),
CIT_SECOND_TAX_STAMP("企业所得税第二季度纳税税票", "企业所得税第二季度纳税税票"),
CIT_CORRECT_SECOND_TAX_STAMP("企业所得税更正第二季度纳税税票", "企业所得税更正第二季度纳税税票"),
CIT_THIRD_TAX_STAMP("企业所得税第三季度纳税税票", "企业所得税第三季度纳税税票"),
CIT_CORRECT_THIRD_TAX_STAMP("企业所得税更正第三季度纳税税票", "企业所得税更正第三季度纳税税票"),
CIT_FORTH_TAX_STAMP("企业所得税第四季度纳税税票", "企业所得税第四季度纳税税票"),
CIT_CORRECT_FORTH_TAX_STAMP("企业所得税更正第四季度纳税税票", "企业所得税更正第四季度纳税税票"),
CIT_FINAL_SETTLEMENT_TAX_STAMP("企业所得税汇算清缴纳税税票", "企业所得税汇算清缴纳税税票"),
CIT_CORRECT_FINAL_SETTLEMENT_TAX_STAMP("企业所得税更正汇算清缴纳税税票", "企业所得税更正汇算清缴纳税税票");
private String code;
private String name;
public static final Map<String, String> MAPPING = new HashMap<>();
......@@ -42,6 +66,7 @@ public class ReportFileUploadEnum {
*/
public enum SuorceType {
VAT("VAT", "VAT"),
CIT("CIT", "CIT"),
RECORD("RECORD", "档案");
private String code;
private String name;
......
atms-api/src/main/java/pwc/taxtech/atms/controller/CitReportUploadDetailController.java
View file @ f3001234
......@@ -10,6 +10,7 @@ import pwc.taxtech.atms.dto.reportFileUpload.ReportFileUploadResult;
import pwc.taxtech.atms.dto.reportUpload.ReportUploadParam;
import pwc.taxtech.atms.dto.reportUpload.ReportUploadResult;
import pwc.taxtech.atms.exception.ServiceException;
import pwc.taxtech.atms.service.impl.CitReportFileUploadService;
import pwc.taxtech.atms.service.impl.CitReportUploadService;
import pwc.taxtech.atms.service.impl.ReportFileUploadService;
import pwc.taxtech.atms.service.impl.ReportUploadService;
......@@ -27,7 +28,7 @@ public class CitReportUploadDetailController extends BaseController {
@Resource
private ReportFileUploadService reportFileUploadService;
private CitReportFileUploadService citReportFileUploadService;
@PostMapping("queryPage")
public CamelPagingResultDto<ReportUploadResult> queryPage(@RequestBody ReportUploadParam param) {
return new CamelPagingResultDto<>(citReportUploadService.queryPage(param));
......@@ -36,7 +37,7 @@ public class CitReportUploadDetailController extends BaseController {
@PostMapping("queryFileUpload")
public List<ReportFileUploadResult> queryFileUpload(@RequestBody ReportFileUploadParam param) {
return reportFileUploadService.queryData(param);
return citReportFileUploadService.queryData(param);
}
@ResponseBody
......@@ -48,7 +49,7 @@ public class CitReportUploadDetailController extends BaseController {
data.setProjectId(projectId);
data.setReportType(reportType);
data.setSourceType(sourceType);
reportFileUploadService.saveData(file,data);
citReportFileUploadService.saveData(file,data);
return OperationResultDto.success();
} catch (ServiceException e) {
return OperationResultDto.error(e.getMessage());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitImportExcelServiceImpl.java
View file @ f3001234
......@@ -244,9 +244,9 @@ public class CitImportExcelServiceImpl extends BaseService {
}
citJournal.setSubjectCode(cellValue.toString());
citJournal.setSegment4(CitCommonUtil.getValue(rowData.getCell(12)).toString());
citJournal.setSegment5(CitCommonUtil.getValue(rowData.getCell(13)).toString());
citJournal.setSegment6(CitCommonUtil.getValue(rowData.getCell(14)).toString());
citJournal.setSegment7(CitCommonUtil.getValue(rowData.getCell(15)).toString());
citJournal.setSegment5(CitCommonUtil.getValue(rowData.getCell(13)).toString().replace(".0",""));
citJournal.setSegment6(CitCommonUtil.getValue(rowData.getCell(14)).toString().replace(".0",""));
citJournal.setSegment7(CitCommonUtil.getValue(rowData.getCell(15)).toString().replace(".0",""));
citJournal.setSegment8(CitCommonUtil.getValue(rowData.getCell(16)).toString());
citJournal.setSegment9(CitCommonUtil.getValue(rowData.getCell(17)).toString());
citJournal.setSegment10(CitCommonUtil.getValue(rowData.getCell(18)).toString());
......@@ -401,7 +401,6 @@ public class CitImportExcelServiceImpl extends BaseService {
continue;
}
DecimalFormat df=new DecimalFormat("0");
String companyCode = cellValue.toString().replace(".0","");
//根据code（主体）获取机构相关信息
List<Organization> organizations = getOrganizationByCode(companyCode);
......@@ -442,25 +441,64 @@ public class CitImportExcelServiceImpl extends BaseService {
trialBalance.setOrganizationId(orgId);
trialBalance.setProjectId(project.getId());
trialBalance.setAccountCategory(CitCommonUtil.getValue(rowData.getCell(0)).toString());
trialBalance.setAcctCode1(CitCommonUtil.getValue(rowData.getCell(1)).toString());
trialBalance.setAcctName1(CitCommonUtil.getValue(rowData.getCell(2)).toString());
trialBalance.setAcctName2(CitCommonUtil.getValue(rowData.getCell(3)).toString());
trialBalance.setAcctName3(CitCommonUtil.getValue(rowData.getCell(4)).toString());
trialBalance.setSegment1(companyCode);
trialBalance.setSegment2(CitCommonUtil.getValue(rowData.getCell(6)).toString());
cellValue = CitCommonUtil.getValue(rowData.getCell(7));
if("".equals(cellValue)){
citDataImportLogError.setErrorMsg("数据错误，第"+(rowNum+1)+"行科目为空");
citDataImportLogList.add(citDataImportLogError);
continue;
}
trialBalance.setAccountCode(cellValue.toString().replace(".0",""));
trialBalance.setSegment4(CitCommonUtil.getValue(rowData.getCell(8)).toString());
trialBalance.setSegment5(CitCommonUtil.getValue(rowData.getCell(9)).toString());
trialBalance.setSegment6(CitCommonUtil.getValue(rowData.getCell(10)).toString());
trialBalance.setSegment7(CitCommonUtil.getValue(rowData.getCell(11)).toString());
trialBalance.setSegment8(CitCommonUtil.getValue(rowData.getCell(12)).toString());
trialBalance.setSegment9(CitCommonUtil.getValue(rowData.getCell(13)).toString());
trialBalance.setSegment10(CitCommonUtil.getValue(rowData.getCell(14)).toString());
trialBalance.setSegment1Name(CitCommonUtil.getValue(rowData.getCell(15)).toString());
trialBalance.setSegment2Name(CitCommonUtil.getValue(rowData.getCell(16)).toString());
trialBalance.setAccountCode(cellValue.toString().substring(0,cellValue.toString().indexOf(".")));
trialBalance.setAccountDescription(CitCommonUtil.getValue(rowData.getCell(17)).toString());
trialBalance.setSegment4Name(CitCommonUtil.getValue(rowData.getCell(18)).toString());
trialBalance.setSegment5Name(CitCommonUtil.getValue(rowData.getCell(19)).toString());
trialBalance.setSegment6Name(CitCommonUtil.getValue(rowData.getCell(20)).toString());
trialBalance.setSegment7Name(CitCommonUtil.getValue(rowData.getCell(21)).toString());
trialBalance.setSegment8Name(CitCommonUtil.getValue(rowData.getCell(22)).toString());
trialBalance.setSegment9Name(CitCommonUtil.getValue(rowData.getCell(23)).toString());
trialBalance.setSegment10Name(CitCommonUtil.getValue(rowData.getCell(24)).toString());
//此期间默认为12
trialBalance.setAccountPeriod(12);
trialBalance.setBeginningBalance(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(25)).toString()));
trialBalance.setJan(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(26)).toString()));
trialBalance.setFeb(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(27)).toString()));
trialBalance.setMar(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(28)).toString()));
trialBalance.setApr(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(29)).toString()));
trialBalance.setMay(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(30)).toString()));
trialBalance.setJun(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(31)).toString()));
trialBalance.setJul(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(32)).toString()));
trialBalance.setAug(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(33)).toString()));
trialBalance.setSep(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(34)).toString()));
trialBalance.setOct(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(35)).toString()));
trialBalance.setNov(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(36)).toString()));
trialBalance.setDecember(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(37)).toString()));
trialBalance.setThirteen(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(38)).toString()));
trialBalance.setEndingBalance(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(39)).toString()));
trialBalanceList.add(trialBalance);
}
//判断导入的方式
String msg = "追加导入成功";
if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
if (EnumTbImportType.CoverImport.getCode().equals(importType) && projectIdList.size()>0) {
//覆盖导入要删除原有的该操作人在当前期间导入的数据，且更改之前导入的日志记录状态
msg = "覆盖导入成功";
CitTrialBalanceExample citTrialBalanceExample = new CitTrialBalanceExample();
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ f3001234
......@@ -1554,7 +1554,10 @@ public class DataImportService extends BaseService {
rlit.setId(plId);
rlit.setSubjectNum(getCellStringValue(row.getCell(0)));
rlit.setSubjectName(getCellStringValue(row.getCell(1)));
rlit.setRedLetterInvoiceInfoTableNum(getCellStringValue(row.getCell(2)));
Object value = CitCommonUtil.getValue(row.getCell(2));
if(!"".equals(value)){
rlit.setRedLetterInvoiceInfoTableNum(new BigDecimal(value.toString()).toPlainString());
}
rlit.setPeriod(DateUtils.dateToPeriod(row.getCell(3).getDateCellValue()));
rlit.setFillInDate(row.getCell(3).getDateCellValue());
rlit.setSalesTaxNumber(getCellStringValue(row.getCell(4)));
......
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ f3001234
......@@ -1156,6 +1156,8 @@
"ProcessFail": "Process Fail",
"EndOfThisYear": "End Of This Year",
"BeginOfNextYear": "Begin Of Next Year",
"PreClassified": "Pre Classified"
"PreClassified": "Pre Classified",
"AssetType": "Asset Type",
"TaxGroupName": "TaxGroupName"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ f3001234
......@@ -1209,7 +1209,9 @@
"ProcessFail": "处理失败",
"EndOfThisYear": "本年底",
"BeginOfNextYear": "下年初",
"PreClassified": "预提重分类"
"PreClassified": "预提重分类",
"AssetType": "资产类型",
"TaxGroupName": "税务资产分类"
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html
View file @ f3001234
......@@ -20,31 +20,17 @@
<!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>-->
<!--</div>-->
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>:
<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
<span ng-if="criteriaList.length>6"><br /></span>
<span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
<span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
</div>
<div id="mainAreaDiv" class="main-area">
<div class="inputInvoiceGrid" ui-grid="gridOptions">
<div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
</div>
<div class="pagination-container">
<span>本页{{curPageItemCount}}条记录，共{{queryJournalEntryResult.pageInfo.total}}条记录</span>
<div id="totalInvoicePage" class="common-pagination" style="display:none;">
<!--导航栏-->
<div id="tab_total">
<div class="dt-init-wrapper">
<div class="dx-viewport grid-container">
<div id="extractFinancialGridContainer" dx-data-grid="gridOptions"
style="margin-top: 30px;">
</div>
</div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshConfigGrid()"></ack-pagination>
</div>
</div>
</div>
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.less
View file @ f3001234
@import "~/app-resources/less/theme.less";
.cit-asset-eam-mapping {
background-color: white;
height: 100%;
.numAmount {
padding: 0 3px;
height: 21px;
margin-left: 5px;
/* font-family: 'Arial'; */
font-weight: 600;
border-radius: 2px;
font-style: normal;
outline: none;
border: none;
min-width: 20px;
background-color: #DDDDDD;
color: #AA0000;
}
/*background-color: @color-white;*/
padding-left: 20px;
/*min-height: 800px;*/
height: 96%;
.top-area-wrapper {
height: 60px;
width: 98%;
margin: 0 20px;
.dropdown-common() {
display: inline-block;
.filter-button {
width: 30px;
margin-top: 16px;
.select-button {
background-color: #F5F5F5;
padding: 6px 0;
width: 100px;
}
.operation-wrapper {
margin: 15px 25px 10px 10px;
.caret {
margin-top: 8px;
}
span {
cursor: pointer;
.dropdown-menu {
min-width: 100px;
li {
text-align: center;
min-height: 0px;
height: 30px;
line-height: 30px;
color: #000;
font-weight: normal;
&:hover {
background-color: #F91000;
color: #FFF;
}
}
}
}
.filter-popup-wrapper {
display: none;
}
#tab_total {
display: block;
height: calc(~'100% - 40px');
position: relative;
.import-wrapper {
span {
margin-left: 10px;
color: #333;
font-family: "Microsoft YaHei";
font-style: normal;
font-size: 14px;
font-weight: bold;
}
.margin-left20 {
margin-left: 20px;
}
/*******************************************/
/*Filter Criteria tags:*/
.tag {
font-size: 12px;
padding: .3em .4em .4em;
margin: 0 .1em;
a {
color: #bbb;
cursor: pointer;
opacity: 0.6;
margin: 0 0 0 .3em;
.checkbox-custom {
float: left;
position: relative;
margin-right : 10px;
margin-top: 0;
display: inline-block;
}
.divider{
height: 1px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
}
&:hover {
opacity: 1.0;
.checkbox-custom input[type="checkbox"] {
cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px;
}
.glyphicon-white {
color: #fff;
margin-bottom: 2px;
.checkbox-custom label:before {
content: '';
position: absolute;
top: 50%;
left: 0;
margin-top: -9px;
width: 19px;
height: 18px;
display: inline-block;
border-radius: 2px;
border: 1px solid #bbb;
background: #fff;
}
}
.remove {
vertical-align: bottom;
top: 0;
}
}
/*Filter Criteria tags:*/
/*******************************************/
.main-area {
height: 100%;
margin: 0 20px;
.checkbox-custom input[type="checkbox"]:checked +label:after {
position: absolute;
display: inline-block;
font-family: 'Glyphicons Halflings';
content: "\e013";
top: 42%;
left: 3px;
margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333;
}
.checkbox-custom label {
cursor: pointer;
line-height: 1.2;
font-weight: normal;
margin-bottom: 0;
text-align: left;
}
.watermark {
position: absolute;
top: 50%;
transform: translateY(-50%);
opacity: .25;
font-size: 3em;
width: 100%;
text-align: center;
z-index: 1000;
}
.period-picker {
width: 110px;
border: 1px solid #c7c5c0;
display: inline-block;
line-height: 20px;
margin-top: 7px;
}
.inputInvoiceGrid {
width: 100%;
height: calc(~'100% - 158px');
.imp-subheader {
display: inline-block;
font-size: 15px;
height: 30px;
line-height: 30px;
vertical-align: middle;
border: none;
.ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents {
height: 40px;
i {
display: none;
select {
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
background: transparent;
}
}
}
}
.dropdown {
.dropdown-common();
}
.form-control {
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
}
}
input {
width: 50px;
outline: none;
border-radius: 3px;
border: 1px solid #3c3a36;
padding: 2px;
text-align: center;
}
.input-width-middle {
width: 217px;
}
}
> button:last-child {
float: right;
margin-right: 20px;
}
.btn-wrapper {
border-radius: 5px;
background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
.btn-vat-primary {
min-width: 80px;
}
}
}
.popover {
min-width: 370px;
.dt-init-wrapper {
//margin: 60px 0;
max-width: 99%;
height: calc(100% - 200px);
position: relative;
.arrow {
left: 5% !important;
}
}
.dropdown {
.dropdown-common();
.popover-content {
td {
text-align: right;
padding: 6px;
i {
color: #F85550;
}
}
span {
float: left;
.extractFinancialGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
}
}
.form-control {
display: inline-block;
.error-info-wrapper {
position: absolute;
height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -40px;
}
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
#content-resizer {
width: 110%;
position: absolute;
height: 4px;
bottom: 150px;
left: 0;
right: 0;
background-color: red;
cursor: n-resize;
margin-left: -40px;
#topIcon {
cursor: pointer;
margin-top: -19px;
width: 38px;
margin-left: 46%;
z-index: 999;
bottom: -381px;
text-align: center;
display: block !important;
}
}
}
.input-width-small {
width: 100px;
.dt-import-wrapper {
margin: 60px 0;
max-width: 99%;
overflow: auto;
height: calc(~"100% - 35px");
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
}
}
.input-width-middle {
width: 217px;
/*覆写ack-pagination.less中：.page-size, .pagination 中的margin演示 */
.page-form-group{
float:right;
.page-size{
margin:0;
}
.pagination {
margin:0;
}
}
}
.nav-wrapper {
padding-bottom: 10px;
border-bottom: 1px solid #DBD8D3;
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.html
View file @ f3001234
......@@ -3,7 +3,7 @@
<div class="nav-header">{{'DistributionTable' | translate}}</div>
<div class="nav-tab">
<span style="width: auto" ng-click="startCalculateData()">{{'startCaculateData' | translate}}</span>
<span ng-click="downloadJE()" style="float: right;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
<span ng-click="downloadJE()" style="float: right;margin-right: 20px"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
</div>
<div class="top-area-wrapper" style="margin-top: 10px;display: none">
......@@ -20,31 +20,16 @@
<!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>-->
<!--</div>-->
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>:
<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
<span ng-if="criteriaList.length>6"><br /></span>
<span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
<span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
</div>
<div id="mainAreaDiv" class="main-area">
<div class="inputInvoiceGrid" ui-grid="gridOptions">
<div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
</div>
<div class="pagination-container">
<span>本页{{curPageItemCount}}条记录，共{{queryJournalEntryResult.pageInfo.total}}条记录</span>
<div id="totalInvoicePage" class="common-pagination" style="display:none;">
<div id="tab_total">
<div class="dt-init-wrapper">
<div class="dx-viewport grid-container">
<div id="extractFinancialGridContainer" dx-data-grid="gridOptions"
style="margin-top: 30px;">
</div>
</div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshConfigGrid()"></ack-pagination>
</div>
</div>
</div>
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.less
View file @ f3001234
@import "~/app-resources/less/theme.less";
.cit-distribution-table {
background-color: white;
height: 100%;
.numAmount {
padding: 0 3px;
height: 21px;
margin-left: 5px;
/* font-family: 'Arial'; */
font-weight: 600;
border-radius: 2px;
font-style: normal;
outline: none;
border: none;
min-width: 20px;
background-color: #DDDDDD;
color: #AA0000;
}
/*background-color: @color-white;*/
padding-left: 20px;
/*min-height: 800px;*/
height: 96%;
.top-area-wrapper {
height: 60px;
width: 98%;
margin: 0 20px;
.dropdown-common() {
display: inline-block;
.filter-button {
width: 30px;
margin-top: 16px;
.select-button {
background-color: #F5F5F5;
padding: 6px 0;
width: 100px;
}
.operation-wrapper {
margin: 15px 25px 10px 10px;
.caret {
margin-top: 8px;
}
span {
cursor: pointer;
.dropdown-menu {
min-width: 100px;
li {
text-align: center;
min-height: 0px;
height: 30px;
line-height: 30px;
color: #000;
font-weight: normal;
&:hover {
background-color: #F91000;
color: #FFF;
}
}
}
}
.filter-popup-wrapper {
display: none;
}
#tab_total {
display: block;
height: calc(~'100% - 40px');
position: relative;
.import-wrapper {
span {
margin-left: 10px;
color: #333;
font-family: "Microsoft YaHei";
font-style: normal;
font-size: 14px;
font-weight: bold;
}
.margin-left20 {
margin-left: 20px;
}
/*******************************************/
/*Filter Criteria tags:*/
.tag {
font-size: 12px;
padding: .3em .4em .4em;
margin: 0 .1em;
a {
color: #bbb;
cursor: pointer;
opacity: 0.6;
margin: 0 0 0 .3em;
.checkbox-custom {
float: left;
position: relative;
margin-right : 10px;
margin-top: 0;
display: inline-block;
}
.divider{
height: 1px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
}
&:hover {
opacity: 1.0;
.checkbox-custom input[type="checkbox"] {
cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px;
}
.glyphicon-white {
color: #fff;
margin-bottom: 2px;
.checkbox-custom label:before {
content: '';
position: absolute;
top: 50%;
left: 0;
margin-top: -9px;
width: 19px;
height: 18px;
display: inline-block;
border-radius: 2px;
border: 1px solid #bbb;
background: #fff;
}
}
.remove {
vertical-align: bottom;
top: 0;
}
}
/*Filter Criteria tags:*/
/*******************************************/
.main-area {
height: 100%;
//margin: 0 20px;
.checkbox-custom input[type="checkbox"]:checked +label:after {
position: absolute;
display: inline-block;
font-family: 'Glyphicons Halflings';
content: "\e013";
top: 42%;
left: 3px;
margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333;
}
.checkbox-custom label {
cursor: pointer;
line-height: 1.2;
font-weight: normal;
margin-bottom: 0;
text-align: left;
}
.watermark {
position: absolute;
top: 50%;
transform: translateY(-50%);
opacity: .25;
font-size: 3em;
width: 100%;
text-align: center;
z-index: 1000;
}
.period-picker {
width: 110px;
border: 1px solid #c7c5c0;
display: inline-block;
line-height: 20px;
margin-top: 7px;
}
.inputInvoiceGrid {
width: 100%;
height: calc(~'100% - 158px');
.imp-subheader {
display: inline-block;
font-size: 15px;
height: 30px;
line-height: 30px;
vertical-align: middle;
border: none;
.ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents {
height: 40px;
i {
display: none;
select {
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
background: transparent;
}
}
}
}
.dropdown {
.dropdown-common();
}
input {
width: 50px;
outline: none;
border-radius: 3px;
border: 1px solid #3c3a36;
padding: 2px;
text-align: center;
}
> button:last-child {
float: right;
margin-right: 20px;
}
.form-control {
.btn-wrapper {
border-radius: 5px;
background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
.btn-vat-primary {
min-width: 80px;
}
}
}
}
.input-width-middle {
width: 217px;
}
}
.dt-init-wrapper {
//margin: 60px 0;
max-width: 99%;
height: calc(100% - 200px);
position: relative;
.popover {
min-width: 370px;
.dropdown {
.dropdown-common();
.arrow {
left: 5% !important;
}
}
.popover-content {
td {
text-align: right;
padding: 6px;
i {
color: #F85550;
}
}
span {
float: left;
.extractFinancialGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
}
}
.form-control {
display: inline-block;
.error-info-wrapper {
position: absolute;
height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -40px;
}
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
#content-resizer {
width: 110%;
position: absolute;
height: 4px;
bottom: 150px;
left: 0;
right: 0;
background-color: red;
cursor: n-resize;
margin-left: -40px;
#topIcon {
cursor: pointer;
margin-top: -19px;
width: 38px;
margin-left: 46%;
z-index: 999;
bottom: -381px;
text-align: center;
display: block !important;
}
}
}
.input-width-small {
width: 100px;
}
.dt-import-wrapper {
margin: 60px 0;
max-width: 99%;
overflow: auto;
height: calc(~"100% - 35px");
.input-width-middle {
width: 217px;
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
}
}
/*覆写ack-pagination.less中：.page-size, .pagination 中的margin演示 */
.page-form-group{
float:right;
.page-size{
margin:0;
}
.pagination {
margin:0;
}
}
}
.nav-wrapper {
......
atms-web/src/main/webapp/app/cit/report/cit-report-upload-view/cit-report-upload-detail.ctrl.js
View file @ f3001234
......@@ -319,10 +319,18 @@
$scope.reportTwoDataSource = [];
$scope.reportThreeDataSource = [];
angular.forEach(res, function (data) {
if ("增值税纳税申报表" === data.reportType || "增值税更正申报表" === data.reportType) {
if ("企业所得税第一季度预缴表" === data.reportType || "企业所得税更正第一季度预缴表" === data.reportType
|| "企业所得税第二季度预缴表" === data.reportType || "企业所得税更正第二季度预缴表" === data.reportType
|| "企业所得税第三季度预缴表" === data.reportType || "企业所得税更正第三季度预缴表" === data.reportType
|| "企业所得税第四季度预缴表" === data.reportType || "企业所得税更正第四季度预缴表" === data.reportType
|| "企业所得税汇算清缴纳税申报表" === data.reportType || "企业所得税更正汇算清缴纳税申报表" === data.reportType) {
$scope.reportTwoDataSource.push(data);
}
if ("增值税纳税税票" === data.reportType || "增值税更正税票" === data.reportType) {
if ("企业所得税第一季度纳税税票" === data.reportType || "企业所得税第一季度更正纳税税票" === data.reportType
|| "企业所得税第二季度纳税税票" === data.reportType || "企业所得税更正第二季度纳税税票" === data.reportType
|| "企业所得税第三季度纳税税票" === data.reportType || "企业所得税更正第三季度纳税税票" === data.reportType
|| "企业所得税第四季度纳税税票" === data.reportType || "企业所得税更正第四季度纳税税票" === data.reportType
|| "企业所得税汇算清缴纳税税票" === data.reportType || "企业所得税更正汇算清缴纳税税票" === data.reportType) {
$scope.reportThreeDataSource.push(data);
}
});
......
atms-web/src/main/webapp/app/cit/report/cit-report-upload-view/cit-report-upload-detail.html
View file @ f3001234
<div class="cit-report-upload-detail">
<div class="cit-report-upload-detail" style="overflow-y: auto">
<div class="header-title">
<div style="display:inline-block"><span class="title-name">{{'ReportUploadDetail' | translate }}</span></div>
</div>
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js
View file @ f3001234
......@@ -170,10 +170,11 @@
},
__RequestVerificationToken: token,
withCredentials: true
}).then(function(resp) {
}).then(function(data) {
$('#busy-indicator-container').hide();
var resp = data.data;
deferred.resolve();
if (resp.data || resp.result) {
if (resp.result) {
logDto.UpdateState = $translate.instant('ImportSuccess')+" "+resp.data + $translate.instant('ItemData');
vatOperationLogService.addOperationLog(logDto);
SweetAlert.success($translate.instant('ImportSuccess')+" "+resp.data + $translate.instant('ItemData'));
......
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