Skip to content

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

1、CIT导入各个模板减少里面的数据；2、CIT归档；3、总分机构分配表页面优化；4、固资损失计算页面优化

parent b16820a0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 493 additions and 298 deletions
atms-api/src/main/java/pwc/taxtech/atms/constant/enums/ReportFileUploadEnum.java
View file @ d51b58d4
...@@ -12,7 +12,31 @@ public class ReportFileUploadEnum { ...@@ -12,7 +12,31 @@ public class ReportFileUploadEnum {
NORMAL_DECLARATION("增值税纳税申报表", "增值税纳税申报表"), NORMAL_DECLARATION("增值税纳税申报表", "增值税纳税申报表"),
CORR_DECLARATION("增值税更正申报表", "增值税更正申报表"), CORR_DECLARATION("增值税更正申报表", "增值税更正申报表"),
NORMAL_TAX_RECEIPT("增值税纳税税票", "增值税纳税税票"), 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 code;
private String name; private String name;
public static final Map<String, String> MAPPING = new HashMap<>(); public static final Map<String, String> MAPPING = new HashMap<>();
...@@ -42,6 +66,7 @@ public class ReportFileUploadEnum { ...@@ -42,6 +66,7 @@ public class ReportFileUploadEnum {
*/ */
public enum SuorceType { public enum SuorceType {
VAT("VAT", "VAT"), VAT("VAT", "VAT"),
CIT("CIT", "CIT"),
RECORD("RECORD", "档案"); RECORD("RECORD", "档案");
private String code; private String code;
private String name; private String name;
......
atms-api/src/main/java/pwc/taxtech/atms/controller/CitReportUploadDetailController.java
View file @ d51b58d4
...@@ -10,6 +10,7 @@ import pwc.taxtech.atms.dto.reportFileUpload.ReportFileUploadResult; ...@@ -10,6 +10,7 @@ import pwc.taxtech.atms.dto.reportFileUpload.ReportFileUploadResult;
import pwc.taxtech.atms.dto.reportUpload.ReportUploadParam; import pwc.taxtech.atms.dto.reportUpload.ReportUploadParam;
import pwc.taxtech.atms.dto.reportUpload.ReportUploadResult; import pwc.taxtech.atms.dto.reportUpload.ReportUploadResult;
import pwc.taxtech.atms.exception.ServiceException; 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.CitReportUploadService;
import pwc.taxtech.atms.service.impl.ReportFileUploadService; import pwc.taxtech.atms.service.impl.ReportFileUploadService;
import pwc.taxtech.atms.service.impl.ReportUploadService; import pwc.taxtech.atms.service.impl.ReportUploadService;
...@@ -27,7 +28,7 @@ public class CitReportUploadDetailController extends BaseController { ...@@ -27,7 +28,7 @@ public class CitReportUploadDetailController extends BaseController {
@Resource @Resource
private ReportFileUploadService reportFileUploadService; private CitReportFileUploadService citReportFileUploadService;
@PostMapping("queryPage") @PostMapping("queryPage")
public CamelPagingResultDto<ReportUploadResult> queryPage(@RequestBody ReportUploadParam param) { public CamelPagingResultDto<ReportUploadResult> queryPage(@RequestBody ReportUploadParam param) {
return new CamelPagingResultDto<>(citReportUploadService.queryPage(param)); return new CamelPagingResultDto<>(citReportUploadService.queryPage(param));
...@@ -36,7 +37,7 @@ public class CitReportUploadDetailController extends BaseController { ...@@ -36,7 +37,7 @@ public class CitReportUploadDetailController extends BaseController {
@PostMapping("queryFileUpload") @PostMapping("queryFileUpload")
public List<ReportFileUploadResult> queryFileUpload(@RequestBody ReportFileUploadParam param) { public List<ReportFileUploadResult> queryFileUpload(@RequestBody ReportFileUploadParam param) {
return reportFileUploadService.queryData(param); return citReportFileUploadService.queryData(param);
} }
@ResponseBody @ResponseBody
...@@ -48,7 +49,7 @@ public class CitReportUploadDetailController extends BaseController { ...@@ -48,7 +49,7 @@ public class CitReportUploadDetailController extends BaseController {
data.setProjectId(projectId); data.setProjectId(projectId);
data.setReportType(reportType); data.setReportType(reportType);
data.setSourceType(sourceType); data.setSourceType(sourceType);
reportFileUploadService.saveData(file,data); citReportFileUploadService.saveData(file,data);
return OperationResultDto.success(); return OperationResultDto.success();
} catch (ServiceException e) { } catch (ServiceException e) {
return OperationResultDto.error(e.getMessage()); return OperationResultDto.error(e.getMessage());
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html
View file @ d51b58d4
...@@ -20,31 +20,17 @@ ...@@ -20,31 +20,17 @@
<!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>--> <!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>-->
<!--</div>--> <!--</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>: <div id="tab_total">
<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow"> <div class="dt-init-wrapper">
<span title="{{criteria.fullName}}"> <div class="dx-viewport grid-container">
{{criteria.name}} <div id="extractFinancialGridContainer" dx-data-grid="gridOptions"
</span> style="margin-top: 30px;">
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a> </div>
</span> </div>
<span ng-if="criteriaList.length>6"><br /></span> <div class="page-footer">
<span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span> <ack-pagination page-options="pagingOptions"
<span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow"> refresh-table="refreshConfigGrid()"></ack-pagination>
<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> </div>
</div> </div>
</div> </div>
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.less
View file @ d51b58d4
@import "~/app-resources/less/theme.less"; @import "~/app-resources/less/theme.less";
.cit-asset-eam-mapping { .cit-asset-eam-mapping {
background-color: white; /*background-color: @color-white;*/
height: 100%; padding-left: 20px;
/*min-height: 800px;*/
.numAmount { height: 96%;
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;
}
.top-area-wrapper { .dropdown-common() {
height: 60px; display: inline-block;
width: 98%;
margin: 0 20px;
.filter-button { .select-button {
width: 30px; background-color: #F5F5F5;
margin-top: 16px; padding: 6px 0;
width: 100px;
} }
.operation-wrapper { .caret {
margin: 15px 25px 10px 10px; margin-top: 8px;
}
span { .dropdown-menu {
cursor: pointer; 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 { #tab_total {
display: none; 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 { .checkbox-custom {
margin-left: 20px; float: left;
} position: relative;
/*******************************************/ margin-right : 10px;
/*Filter Criteria tags:*/ margin-top: 0;
.tag { display: inline-block;
font-size: 12px; }
padding: .3em .4em .4em;
margin: 0 .1em;
a {
color: #bbb;
cursor: pointer;
opacity: 0.6;
margin: 0 0 0 .3em;
.divider{
height: 1px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
}
&:hover { .checkbox-custom input[type="checkbox"] {
opacity: 1.0; cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px;
} }
.glyphicon-white { .checkbox-custom label:before {
color: #fff; content: '';
margin-bottom: 2px; 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 { .checkbox-custom input[type="checkbox"]:checked +label:after {
vertical-align: bottom; position: absolute;
top: 0; display: inline-block;
} font-family: 'Glyphicons Halflings';
} content: "\e013";
/*Filter Criteria tags:*/ top: 42%;
/*******************************************/ left: 3px;
.main-area { margin-top: -5px;
height: 100%; font-size: 11px;
margin: 0 20px; 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 { .period-picker {
position: absolute; width: 110px;
top: 50%; border: 1px solid #c7c5c0;
transform: translateY(-50%); display: inline-block;
opacity: .25; line-height: 20px;
font-size: 3em; margin-top: 7px;
width: 100%; }
text-align: center;
z-index: 1000;
}
.inputInvoiceGrid { .imp-subheader {
width: 100%; display: inline-block;
height: calc(~'100% - 158px'); 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 { select {
display: none; appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
background: transparent;
} }
} }
}
}
.dropdown {
.dropdown-common();
}
.form-control { input {
width: 50px;
&:focus { outline: none;
border-color: transparent; border-radius: 3px;
-webkit-box-shadow: none; border: 1px solid #3c3a36;
box-shadow: none; padding: 2px;
border: 1px solid #ccc; text-align: center;
} }
}
.input-width-middle { > button:last-child {
width: 217px; 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 { .dt-init-wrapper {
min-width: 370px; //margin: 60px 0;
max-width: 99%;
height: calc(100% - 200px);
position: relative;
.arrow { .dropdown {
left: 5% !important; .dropdown-common();
}
}
.popover-content { i {
td { color: #F85550;
text-align: right; }
padding: 6px; }
span { .extractFinancialGridContainer {
float: left; height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
} }
}
.form-control { .error-info-wrapper {
display: inline-block; position: absolute;
height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -40px;
}
&:focus { #content-resizer {
border-color: transparent; width: 110%;
-webkit-box-shadow: none; position: absolute;
box-shadow: none; height: 4px;
border: 1px solid #ccc; 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 { .dt-import-wrapper {
width: 100px; margin: 60px 0;
max-width: 99%;
overflow: auto;
height: calc(~"100% - 35px");
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
}
} }
.input-width-middle { /*覆写ack-pagination.less中：.page-size, .pagination 中的margin演示 */
width: 217px; .page-form-group{
float:right;
.page-size{
margin:0;
}
.pagination {
margin:0;
}
} }
} }
.nav-wrapper { .nav-wrapper {
padding-bottom: 10px; padding-bottom: 10px;
border-bottom: 1px solid #DBD8D3; border-bottom: 1px solid #DBD8D3;
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.html
View file @ d51b58d4
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="nav-header">{{'DistributionTable' | translate}}</div> <div class="nav-header">{{'DistributionTable' | translate}}</div>
<div class="nav-tab"> <div class="nav-tab">
<span style="width: auto" ng-click="startCalculateData()">{{'startCaculateData' | translate}}</span> <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> </div>
<div class="top-area-wrapper" style="margin-top: 10px;display: none"> <div class="top-area-wrapper" style="margin-top: 10px;display: none">
...@@ -20,31 +20,16 @@ ...@@ -20,31 +20,16 @@
<!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>--> <!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>-->
<!--</div>--> <!--</div>-->
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0"> <div id="tab_total">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>: <div class="dt-init-wrapper">
<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow"> <div class="dx-viewport grid-container">
<span title="{{criteria.fullName}}"> <div id="extractFinancialGridContainer" dx-data-grid="gridOptions"
{{criteria.name}} style="margin-top: 30px;">
</span> </div>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a> </div>
</span> <div class="page-footer">
<span ng-if="criteriaList.length>6"><br /></span> <ack-pagination page-options="pagingOptions"
<span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span> refresh-table="refreshConfigGrid()"></ack-pagination>
<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> </div>
</div> </div>
</div> </div>
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.less
View file @ d51b58d4
@import "~/app-resources/less/theme.less"; @import "~/app-resources/less/theme.less";
.cit-distribution-table { .cit-distribution-table {
background-color: white; /*background-color: @color-white;*/
height: 100%; padding-left: 20px;
/*min-height: 800px;*/
.numAmount { height: 96%;
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;
}
.top-area-wrapper { .dropdown-common() {
height: 60px; display: inline-block;
width: 98%;
margin: 0 20px;
.filter-button { .select-button {
width: 30px; background-color: #F5F5F5;
margin-top: 16px; padding: 6px 0;
width: 100px;
} }
.operation-wrapper { .caret {
margin: 15px 25px 10px 10px; margin-top: 8px;
}
span { .dropdown-menu {
cursor: pointer; 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 { #tab_total {
display: none; 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 { .checkbox-custom {
margin-left: 20px; float: left;
} position: relative;
/*******************************************/ margin-right : 10px;
/*Filter Criteria tags:*/ margin-top: 0;
.tag { display: inline-block;
font-size: 12px; }
padding: .3em .4em .4em;
margin: 0 .1em;
a {
color: #bbb;
cursor: pointer;
opacity: 0.6;
margin: 0 0 0 .3em;
.divider{
height: 1px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
}
&:hover { .checkbox-custom input[type="checkbox"] {
opacity: 1.0; cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px;
} }
.glyphicon-white { .checkbox-custom label:before {
color: #fff; content: '';
margin-bottom: 2px; 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 { .checkbox-custom input[type="checkbox"]:checked +label:after {
vertical-align: bottom; position: absolute;
top: 0; display: inline-block;
} font-family: 'Glyphicons Halflings';
} content: "\e013";
/*Filter Criteria tags:*/ top: 42%;
/*******************************************/ left: 3px;
.main-area { margin-top: -5px;
height: 100%; font-size: 11px;
//margin: 0 20px; 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 { .period-picker {
position: absolute; width: 110px;
top: 50%; border: 1px solid #c7c5c0;
transform: translateY(-50%); display: inline-block;
opacity: .25; line-height: 20px;
font-size: 3em; margin-top: 7px;
width: 100%; }
text-align: center;
z-index: 1000;
}
.inputInvoiceGrid { .imp-subheader {
width: 100%; display: inline-block;
height: calc(~'100% - 158px'); 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 { select {
display: none; 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 { .btn-vat-primary {
border-color: transparent; min-width: 80px;
-webkit-box-shadow: none; }
box-shadow: none; }
border: 1px solid #ccc;
} }
}
.input-width-middle { .dt-init-wrapper {
width: 217px; //margin: 60px 0;
} max-width: 99%;
} height: calc(100% - 200px);
position: relative;
.popover { .dropdown {
min-width: 370px; .dropdown-common();
.arrow { i {
left: 5% !important; color: #F85550;
} }
} }
.popover-content {
td {
text-align: right;
padding: 6px;
span { .extractFinancialGridContainer {
float: left; height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
} }
}
.form-control { .error-info-wrapper {
display: inline-block; position: absolute;
height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -40px;
}
&:focus { #content-resizer {
border-color: transparent; width: 110%;
-webkit-box-shadow: none; position: absolute;
box-shadow: none; height: 4px;
border: 1px solid #ccc; 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 { .dt-import-wrapper {
width: 100px; margin: 60px 0;
} max-width: 99%;
overflow: auto;
height: calc(~"100% - 35px");
.input-width-middle { .dropdown {
width: 217px; .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 { .nav-wrapper {
......
atms-web/src/main/webapp/app/cit/report/cit-report-upload-view/cit-report-upload-detail.ctrl.js
View file @ d51b58d4
...@@ -319,10 +319,18 @@ ...@@ -319,10 +319,18 @@
$scope.reportTwoDataSource = []; $scope.reportTwoDataSource = [];
$scope.reportThreeDataSource = []; $scope.reportThreeDataSource = [];
angular.forEach(res, function (data) { 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); $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); $scope.reportThreeDataSource.push(data);
} }
}); });
......
atms-web/src/main/webapp/app/cit/report/cit-report-upload-view/cit-report-upload-detail.html
View file @ d51b58d4
<div class="cit-report-upload-detail"> <div class="cit-report-upload-detail" style="overflow-y: auto">
<div class="header-title"> <div class="header-title">
<div style="display:inline-block"><span class="title-name">{{'ReportUploadDetail' | translate }}</span></div> <div style="display:inline-block"><span class="title-name">{{'ReportUploadDetail' | translate }}</span></div>
</div> </div>
......
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