Skip to content

T
traffic-front
Commit a99e1084 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 4947f452 4d952889
Expand all Show whitespace changes
Inline Side-by-side
Showing with 116 additions and 16 deletions
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml
View file @ a99e1084
......@@ -356,13 +356,13 @@
and org_code = #{orgCode,jdbcType=VARCHAR}
</if>
<if test="subjectCode != null and subjectCode != ''">
and subject_code = #{subjectCode,jdbcType=VARCHAR}
and subject_code LIKE CONCAT('%' ,#{subjectCode},'%')
</if>
<if test="orgName != null and orgName != ''">
and org_name = #{orgName,jdbcType=VARCHAR}
</if>
<if test="subjectName != null and subjectName != ''">
and subject_name = #{subjectName,jdbcType=VARCHAR}
and subject_name LIKE CONCAT('%' ,#{subjectName},'%')
</if>
<if test="periodStart!=null">
AND account_period &gt;= #{periodStart,jdbcType=INTEGER}
......@@ -385,13 +385,13 @@
and segment1 = #{orgCode,jdbcType=VARCHAR}
</if>
<if test="subjectCode != null and subjectCode != ''">
and segment3 = #{subjectCode,jdbcType=VARCHAR}
and segment3 LIKE CONCAT('%' ,#{subjectCode},'%')
</if>
<if test="orgName != null and orgName != ''">
and segment1_name = #{orgName,jdbcType=VARCHAR}
</if>
<if test="subjectName != null and subjectName != ''">
and segment3_name = #{subjectName,jdbcType=VARCHAR}
and segment3_name LIKE CONCAT('%' ,#{segment3_name},'%')
</if>
<if test="periodStart!=null">
AND period &gt;= #{periodStart,jdbcType=INTEGER}
......
atms-orangeheap/.env.development
View file @ a99e1084
VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com:10000/OrangeHeap/
\ No newline at end of file
VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com/OrangeHeap/
\ No newline at end of file
atms-orangeheap/.env.production
View file @ a99e1084
VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com:10000/OrangeHeap/
\ No newline at end of file
VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com/OrangeHeap/
\ No newline at end of file
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.html
View file @ a99e1084
......@@ -146,11 +146,49 @@
</div>
</div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshAssetResultListGrid()"></ack-pagination>
<div class="ack-page">
<div class="ack-footer">
<div class="page-size">
<!--共有-->
<span>{{'TotalPage'| translate}}<span class="total-number">{{pagingOptions.totalItems}}</span>{{'RecordCount' | translate}}</span>
<!--每页显示-->
<span class="padding-span" ng-show="!hideSelector">{{'RowForPage'| translate}}</span>
<select class="padding-span page-box" ng-model="pagingOptions.pageSizeString"
ng-change="pagingService.pageSizeSelectionChanged()" ng-show="!hideSelector">
<option ng-repeat="option in pagingOptions.pagingSelection" value="{{option.id}}">
{{option.value}}
</option>
</select>
<!--条记录-->
<span class="padding-span" ng-show="!hideSelector">{{'RecordCount' | translate}}</span>
<!--跳至-->
<span class="padding-span" ng-show="!hideSelector">{{'JumpTo' | translate}} <span
class="padding-span"><input class="page-box " type="number"
ng-change="pagingService.pageIndexChanging()"
ng-model="pagingOptions.pageIndex"/></span>&nbsp;{{'Page' | translate}}</span>
<!--当前页-->
<span class="padding-span" ng-show="!hideSelector">{{'CurrentPage' | translate}} <span
class="normal-number">{{pagingOptions.pageIndex}}</span>/<span class="normal-number">{{pagingOptions.totalPages}}</span></span>
</div>
<ul uib-pagination total-items="pagingOptions.totalItems" items-per-page="pagingOptions.pageSize"
ng-model="pagingOptions.pageIndex" num-pages="pagingOptions.totalPages"
max-size="pagingOptions.maxSize" class="pagination-sm"
boundary-link-numbers="true" ng-change="pagingService.pageIndexChanging()" rotate="true"
boundary-links="true" first-text="{{pagingOptions.firstPage}}"
previous-text="{{pagingOptions.previousPage}}" last-text="{{pagingOptions.lastPage}}"
next-text="{{pagingOptions.nextPage}}"></ul>
</div>
</div>
</div>
<!--<div class="page-footer">-->
<!--<ack-pagination page-options="pagingOptions"-->
<!--refresh-table="refreshAssetResultListGrid()"></ack-pagination>-->
<!--</div>-->
</div>
<!--本年与上年数据差异界面-->
<script type="text/ng-template" id="set-asset-validate-modal.html">
<div class="modal-content" style="width:832px;">
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.less
View file @ a99e1084
......@@ -585,5 +585,63 @@
bottom: -10px;
}
.ack-page {
display: inline-block;
select {
border-radius: 3px;
}
.ack-footer {
display: inline-block;
float: right;
padding-right: 15px;
.page-size {
display: inline-block;
padding-right: 10px;
height: 100%;
float: left;
/* margin: 20px 0px; */
padding-top: 5px;
padding-left: 0;
margin: 20px 0;
border-radius: 4px;
clear: both;
color: #777777;
background-color: #ffffff;
border-color: #dddddd;
padding: 5px 10px;
font-size: 12px;
line-height: 1;
.total-number {
/*font-weight: bold;*/
padding: 0px 2px;
color: #dc6900;
}
.page-box {
width: 60px;
text-align: center;
}
.padding-span {
padding: 0px 2px;
}
.normal-number {
padding: 0px 2px;
color: #dc6900;
}
}
.page-uib {
float: right;
padding-right: 15px;
}
}
}
atms-web/src/main/webapp/app/cit/report/cit-report-sheet/cit-report-sheet.js
View file @ a99e1084
......@@ -658,7 +658,7 @@
// 更新数据源后，通过调用该方法计算所有当前sheet单元格，并通过比较原数据列表与spreadJS计算的新值列表，获取保存时需要修改库中Value的单元格信息列表
var updateCells = function () {
loadSheet(scope.templateId, true);
return cells;
// return cells;
};
(function initialize() {
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ a99e1084
......@@ -1436,9 +1436,13 @@ constant.EquityCurrency = [
constant.GroupTypeList = [
{code: 0, type: "增值税"},
{code: 1, type: "印花税"},
{code: 2, type: "企业所得税"},
{code: 3, type: "国际税"}
{code: 1, type: "企业所得税"},
{code: 2, type: "印花税"},
{code: 3, type: "城建税"},
{code: 4, type: "教育费附加"},
{code: 5, type: "地方教育费附加"},
{code: 6, type: "个人所得税"},
{code: 7, type: "国际税"}
];
constant.InvoiceTypeList = [
......
atms-web/src/main/webapp/orangeweb/index.html
View file @ a99e1084
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><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.b7d8d35c.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.b7d8d35c.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><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.224d7e8d.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.224d7e8d.js></script></body></html>
\ No newline at end of file
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