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
Show whitespace changes
Inline Side-by-side
Showing with 488 additions and 150 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.ctrl.js
View file @ a99e1084
......@@ -38,15 +38,59 @@
//分页的设置
$scope.pagingOptions = {
pageIndex: 1, //当前页码
totalItems: 4187, //总数据
totalItems: 0, //总数据
totalPages: 0,//总页数
maxSize: 10, //分页数字的限制。
pageSize: 100, //每页多少条数据
pageSizeString: "100"
pageSizeString: "100",
pagingSelection: [],
firstPage: '<<', //$translate.instant('PagingFirstPage'),
previousPage: '<', //$translate.instant('PagingPreviousPage'),
nextPage: '>',// $translate.instant('PagingNextPage'),
lastPage: '>>' //$translate.instant('PagingLastPage'),
};
//赋值
$scope.pageOptions = $scope.pagingOptions;
$scope.hideSelector = $scope.hidePageSizeSelector ? true : false;
//分页里面的处理
$scope.pagingService = {
//分页下拉组装
populatePagingSelection: function () {
if($scope.pageOptions.pagingSelection.length==0){
var pagingSelection = [];
var pageArray = constant.page.pageSizeArrary;
for (var i = 0 ; i < pageArray.length; i++) {
var selection = { id: pageArray[i], value: pageArray[i] };
pagingSelection.push(selection);
}
$scope.pageOptions.pagingSelection = pagingSelection;
}
},
//分页的时候改变数字
pageIndexChanging: function () {
if ($scope.pageOptions.pageIndex > $scope.pageOptions.totalPages) {
$scope.pagingOptions.pageIndex = $scope.pageOptions.totalPages;
}
if ($scope.pageOptions.pageIndex <= 0) {
$scope.pageOptions.pageIndex = 1;
}
$log.log('Page changed to: ' + $scope.pageOptions.pageIndex);
refreshDataTable();
},
//每页显示的数据下拉改变
pageSizeSelectionChanged: function () {
$scope.pageOptions.pageSize = parseInt($scope.pageOptions.pageSizeString);
refreshDataTable();
},
};
//导入方式
$scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 };
$scope.sheetData = { sheetNameList: [], dataList: [], selectedSheetIndex: 0 };
$scope.sheetInfo = { selectedSheetName: '', selectedSheetIndex: 0 };
$scope.importEnum = {Import: 0, CoverImport: 1, AddImport: 2};
$scope.sheetData = {sheetNameList: [], dataList: [], selectedSheetIndex: 0};
$scope.sheetInfo = {selectedSheetName: '', selectedSheetIndex: 0};
$scope.invoiceData = [];
$scope.errorMsgMap = [];
//初始化参数
......@@ -57,18 +101,18 @@
$scope.SelectAll = false;
$scope.citAssetsListDto = {
pageInfo : {
pageInfo: {
totalCount: 0,
pageIndex: 1,
pageSize: 100,
totalPage: 0
},
assetType : 1,
projectId : projectId,
taxAccountCompare : 2,
assetGroupName:'',
depreciationPeriod:'',
taxGroupType:''
assetType: 1,
projectId: projectId,
taxAccountCompare: 2,
assetGroupName: '',
depreciationPeriod: '',
taxGroupType: ''
};
$scope.refreshAssetResultListGrid = function () {
$log.debug("refreshAssetResultListGrid");
......@@ -144,7 +188,7 @@
},
__RequestVerificationToken: token,
withCredentials: true
}).then(uploadSuccess).error(function(){
}).then(uploadSuccess).error(function () {
SweetAlert('系统内部错误');
});
}
......@@ -176,22 +220,21 @@
if (_.isString($scope.tempFileName)) {
$scope.selectedColumnMap = [];
//$scope.columnNum = 0;
$scope.sheetData = { sheetNameList: [], dataList: [], selectedSheetIndex: 0 };
$scope.sheetData = {sheetNameList: [], dataList: [], selectedSheetIndex: 0};
vatImportService.getFileContent($scope.tempFileName, $scope.sheetInfo.selectedSheetIndex, 0).success(function (data) {
if (data.result === false) {
$scope.showInitTable = true;
$scope.showImportTable = false;
//initTableTitle();
SweetAlert.warning(data.resultMsg);
}
else {
} else {
$scope.showInitTable = false;
$scope.showImportTable = true
}
$scope.sheetData = data;
var sheetNameObjectArray = [];
data.sheetNameList.forEach(function (v) {
sheetNameObjectArray.push({ 'name': v });
sheetNameObjectArray.push({'name': v});
});
$scope.sheetData.sheetNameList = sheetNameObjectArray;
$scope.sheetInfo.selectedSheetName = $scope.sheetData.sheetNameList[$scope.sheetInfo.selectedSheetIndex];
......@@ -210,7 +253,7 @@
};
//简易导入,importType来分辨是覆盖导入还是追加导入
$scope.importDataNew = function(importType){
$scope.importDataNew = function (importType) {
if (!$scope.file || !$scope.file.name) {
SweetAlert.warning($translate.instant('SelectImportFileRequired'));
......@@ -237,10 +280,10 @@
__RequestVerificationToken: token,
withCredentials: true
}, withCredentials: true
}).success(function(resp){
}).success(function (resp) {
$('#busy-indicator-container').hide();
if(resp.code == 1){
if (resp.code == 1) {
assetListService.getAssetGroupResultData(projectId).success(function (groupResultData) {
$scope.assetGroupResultDataSource = groupResultData.data;
});
......@@ -260,11 +303,11 @@
scope: $scope,
windowClass: "set-asset-list-modal"
});
}else{
} else {
SweetAlert.error("文件导入出现错误，请重试");
}
}).error(function(resp){
}).error(function (resp) {
SweetAlert.error("文件导入出现错误，请重试");
});
};
......@@ -312,7 +355,7 @@
function setErrorWrapCssDefault() {
$('#content-resizer').css('bottom', '10px');
$('#topIcon').css({ bottom: '-501px' });
$('#topIcon').css({bottom: '-501px'});
$('.error-info-wrapper').css('height', '0px');
};
......@@ -320,7 +363,7 @@
function showErrTab() {
$scope.ImportErrorTab = true;
$scope.ImportErrorTag = true;
$scope.errorMsg = $translate.instant('ImportAssetErrorMsg').formatObj({ "NumberOfError": $scope.errorList.length });
$scope.errorMsg = $translate.instant('ImportAssetErrorMsg').formatObj({"NumberOfError": $scope.errorList.length});
};
......@@ -333,20 +376,58 @@
//初始化dx控件
function initDxGrid() {
var dupColumns = [
{ caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50 },
{ caption: $translate.instant('AssetNumber'), dataField: "assetNumber" },
{ caption: $translate.instant('AssetGroupName'), dataField: "assetGroupName", },
{ caption: $translate.instant('AssetDescription'), dataField: "assetDescription", },
{ caption: $translate.instant('BuyDate'), dataField: "buyDate", dataType: "date", format: "yyyy-MM-dd", },
{ caption: $translate.instant('DepreciationDate'), dataField: "depreciationDate", dataType: "date", format: "yyyy-MM-dd", },
{ caption: $translate.instant('DepreciationPeriod'), dataField: "depreciationPeriod", format: { type: 'fixedPoint', precision: 0 } },
{ caption: $translate.instant('AcquisitionValue'), dataField: "acquisitionValue", format: { type: 'fixedPoint', precision: 2 } },
{ caption: $translate.instant('AdjustmentValue'), dataField: "adjustmentValue", format: { type: 'fixedPoint', precision: 2 } },
{ caption: $translate.instant('DisposedDate'), dataField: "disposedDate", dataType: "date", format: "yyyy-MM-dd", },
{ caption: $translate.instant('ResidualRate'), dataField: "residualRate", format: { type: 'fixedPoint', precision: 2 } },
{ caption: $translate.instant('YearDepreciationAmount'), dataField: "yearDepreciationAmount", format: { type: 'fixedPoint', precision: 2 } },
{ caption: $translate.instant('YearAdjustmentAmount'), dataField: "yearAdjustmentAmount", format: { type: 'fixedPoint', precision: 2 } },
{ caption: $translate.instant('YearEndValue'), dataField: "yearEndValue", format: { type: 'fixedPoint', precision: 2 } },
{caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50},
{caption: $translate.instant('AssetNumber'), dataField: "assetNumber"},
{caption: $translate.instant('AssetGroupName'), dataField: "assetGroupName",},
{caption: $translate.instant('AssetDescription'), dataField: "assetDescription",},
{caption: $translate.instant('BuyDate'), dataField: "buyDate", dataType: "date", format: "yyyy-MM-dd",},
{
caption: $translate.instant('DepreciationDate'),
dataField: "depreciationDate",
dataType: "date",
format: "yyyy-MM-dd",
},
{
caption: $translate.instant('DepreciationPeriod'),
dataField: "depreciationPeriod",
format: {type: 'fixedPoint', precision: 0}
},
{
caption: $translate.instant('AcquisitionValue'),
dataField: "acquisitionValue",
format: {type: 'fixedPoint', precision: 2}
},
{
caption: $translate.instant('AdjustmentValue'),
dataField: "adjustmentValue",
format: {type: 'fixedPoint', precision: 2}
},
{
caption: $translate.instant('DisposedDate'),
dataField: "disposedDate",
dataType: "date",
format: "yyyy-MM-dd",
},
{
caption: $translate.instant('ResidualRate'),
dataField: "residualRate",
format: {type: 'fixedPoint', precision: 2}
},
{
caption: $translate.instant('YearDepreciationAmount'),
dataField: "yearDepreciationAmount",
format: {type: 'fixedPoint', precision: 2}
},
{
caption: $translate.instant('YearAdjustmentAmount'),
dataField: "yearAdjustmentAmount",
format: {type: 'fixedPoint', precision: 2}
},
{
caption: $translate.instant('YearEndValue'),
dataField: "yearEndValue",
format: {type: 'fixedPoint', precision: 2}
},
];
$scope.gridInitDataOption = {
......@@ -358,7 +439,7 @@
$scope.assetImportGridInstance = e.component;
},
hoverStateEnabled: true,
scrolling: { mode: "virtual" },
scrolling: {mode: "virtual"},
noDataText: $translate.instant('AccountVoucher_DataGrid_NoDataText'),
height: '99%',
}
......@@ -403,11 +484,17 @@
},
columns: [
{
caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false,
caption: $translate.instant('ImportErrorPopUpNoCol'),
dataField: "index",
width: 50,
allowEditing: false,
},
{
caption: $translate.instant('AssetGroupName'), dataField: "assetName", width: 150, allowEditing: false,
caption: $translate.instant('AssetGroupName'),
dataField: "assetName",
width: 150,
allowEditing: false,
},
{
caption: $translate.instant('LevelOneGroup'), dataField: "assetGroupId",
......@@ -424,11 +511,11 @@
if (aseetDetailList.length == 0) {
rowData.assetDetailGroupId = null;
rowData.taxDepreciationPeriod = null;
}
else {
} else {
rowData.assetDetailGroupId = aseetDetailList[0].id;
rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear * 12;
};
}
;
},
lookup: {
dataSource: $scope.groupListDataSource,
......@@ -466,7 +553,9 @@
}
},
{
caption: $translate.instant('DepreciationPeriod'), dataField: "taxDepreciationPeriod", width: 100,
caption: $translate.instant('DepreciationPeriod'),
dataField: "taxDepreciationPeriod",
width: 100,
validationRules: [{
type: "required",
message: $translate.instant('DepreciationPeriodValidation')
......@@ -489,48 +578,199 @@
function initAssetResultDxGrid() {
var dupColumns = [
{ caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true },
{ caption: $translate.instant('AssetNumber'), dataField: "assetNumber", width: 120, allowEditing: false, fixed: true },
{ caption: $translate.instant('AssetGroupName'), dataField: "assetGroupName", width: 120, allowEditing: false, fixed: true },
{ caption: $translate.instant('AssetDescription'), dataField: "assetDescription", width: 200, allowEditing: false, fixed: true },
{
caption: $translate.instant('ImportErrorPopUpNoCol'),
dataField: "index",
width: 50,
allowEditing: false,
fixed: true
},
{
caption: $translate.instant('AssetNumber'),
dataField: "assetNumber",
width: 120,
allowEditing: false,
fixed: true
},
{
caption: $translate.instant('AssetGroupName'),
dataField: "assetGroupName",
width: 120,
allowEditing: false,
fixed: true
},
{
caption: $translate.instant('AssetDescription'),
dataField: "assetDescription",
width: 200,
allowEditing: false,
fixed: true
},
{
caption: $translate.instant('AccountData'), alignment: 'center',
columns: [
{ caption: $translate.instant('BuyDate'), dataField: "buyDate", dataType: "date", format: "yyyy-MM-dd", width: 100, allowEditing: false },
{ caption: $translate.instant('DepreciationDate'), dataField: "depreciationDate", dataType: "date", format: "yyyy-MM-dd", width: 100, allowEditing: false },
{ caption: $translate.instant('DepreciationPeriod'), dataField: "depreciationPeriod", format: { type: 'fixedPoint', precision: 0 }, width: 100, allowEditing: false },
{ caption: $translate.instant('AcquisitionValue'), dataField: "accountAcquisitionValue", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{
caption: $translate.instant('BuyDate'),
dataField: "buyDate",
dataType: "date",
format: "yyyy-MM-dd",
width: 100,
allowEditing: false
},
{
caption: $translate.instant('DepreciationDate'),
dataField: "depreciationDate",
dataType: "date",
format: "yyyy-MM-dd",
width: 100,
allowEditing: false
},
{
caption: $translate.instant('DepreciationPeriod'),
dataField: "depreciationPeriod",
format: {type: 'fixedPoint', precision: 0},
width: 100,
allowEditing: false
},
{
caption: $translate.instant('AcquisitionValue'),
dataField: "accountAcquisitionValue",
format: {type: 'fixedPoint', precision: 2},
width: 100,
allowEditing: false
},
//{ caption: $translate.instant('AdjustmentValue'), dataField: "adjustmentValue", format: { type: 'fixedPoint', precision: 2 } },
{ caption: $translate.instant('DisposedDate'), dataField: "disposedDate", dataType: "date", format: "yyyy-MM-dd", width: 100, allowEditing: false },
{ caption: $translate.instant('ResidualRate'), dataField: "residualRate", format: { type: 'percent', precision: 2 }, width: 80, allowEditing: false },
{ caption: $translate.instant('PerMonthDepreciationAmount'), dataField: "accountMonthDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{ caption: $translate.instant('YearDepreciationAmount'), dataField: "accountYearDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{ caption: $translate.instant('AccountTotalepreciationAmount'), dataField: "accountTotalDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{ caption: $translate.instant('YearEndValue'), dataField: "yearEndValue", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{
caption: $translate.instant('DisposedDate'),
dataField: "disposedDate",
dataType: "date",
format: "yyyy-MM-dd",
width: 100,
allowEditing: false
},
{
caption: $translate.instant('ResidualRate'),
dataField: "residualRate",
format: {type: 'percent', precision: 2},
width: 80,
allowEditing: false
},
{
caption: $translate.instant('PerMonthDepreciationAmount'),
dataField: "accountMonthDepreciationAmount",
format: {type: 'fixedPoint', precision: 2},
width: 100,
allowEditing: false
},
{
caption: $translate.instant('YearDepreciationAmount'),
dataField: "accountYearDepreciationAmount",
format: {type: 'fixedPoint', precision: 2},
width: 100,
allowEditing: false
},
{
caption: $translate.instant('AccountTotalepreciationAmount'),
dataField: "accountTotalDepreciationAmount",
format: {type: 'fixedPoint', precision: 2},
width: 100,
allowEditing: false
},
{
caption: $translate.instant('YearEndValue'),
dataField: "yearEndValue",
format: {type: 'fixedPoint', precision: 2},
width: 100,
allowEditing: false
},
]
},
{
caption: $translate.instant('TaxData'), alignment: 'center',
columns: [
{ caption: $translate.instant('TaxGroupType'), dataField: "taxGroupName", width: 200, allowEditing: false },
{ caption: $translate.instant('DepreciationPeriod'), dataField: "taxDepreciationPeriod", format: { type: 'fixedPoint', precision: 0 }, width: 100, allowEditing: true },
{ caption: $translate.instant('TaxToLastYearDepreciationPeriod'), dataField: "taxToLastYearDepreciationPeriod", format: { type: 'fixedPoint', precision: 0 }, width: 150, allowEditing: false },
{ caption: $translate.instant('TaxToCurrentYearDepreciationPeriod'), dataField: "taxToCurrentYearDepreciationPeriod", format: { type: 'fixedPoint', precision: 0 }, width: 150, allowEditing: false },
{ caption: $translate.instant('TaxYearDepreciationPeriod'), dataField: "taxYearDepreciationPeriod", format: { type: 'fixedPoint', precision: 0 }, width: 100, allowEditing: false },
{ caption: $translate.instant('PerMonthDepreciationAmount'), dataField: "taxMonthDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{ caption: $translate.instant('YearDepreciationAmount'), dataField: "taxCurrentYearDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{ caption: $translate.instant('AccountTotalepreciationAmount'), dataField: "taxToCurrentYearDepreciationAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{
caption: $translate.instant('TaxGroupType'),
dataField: "taxGroupName",
width: 200,
allowEditing: false
},
{
caption: $translate.instant('DepreciationPeriod'),
dataField: "taxDepreciationPeriod",
format: {type: 'fixedPoint', precision: 0},
width: 100,
allowEditing: true
},
{
caption: $translate.instant('TaxToLastYearDepreciationPeriod'),
dataField: "taxToLastYearDepreciationPeriod",
format: {type: 'fixedPoint', precision: 0},
width: 150,
allowEditing: false
},
{
caption: $translate.instant('TaxToCurrentYearDepreciationPeriod'),
dataField: "taxToCurrentYearDepreciationPeriod",
format: {type: 'fixedPoint', precision: 0},
width: 150,
allowEditing: false
},
{
caption: $translate.instant('TaxYearDepreciationPeriod'),
dataField: "taxYearDepreciationPeriod",
format: {type: 'fixedPoint', precision: 0},
width: 100,
allowEditing: false
},
{
caption: $translate.instant('PerMonthDepreciationAmount'),
dataField: "taxMonthDepreciationAmount",
format: {type: 'fixedPoint', precision: 2},
width: 100,
allowEditing: false
},
{
caption: $translate.instant('YearDepreciationAmount'),
dataField: "taxCurrentYearDepreciationAmount",
format: {type: 'fixedPoint', precision: 2},
width: 100,
allowEditing: false
},
{
caption: $translate.instant('AccountTotalepreciationAmount'),
dataField: "taxToCurrentYearDepreciationAmount",
format: {type: 'fixedPoint', precision: 2},
width: 100,
allowEditing: false
},
]
},
{
caption: $translate.instant('AssetDifferent'), alignment: 'center',
columns: [
{ caption: $translate.instant('TotalDifferenceAmount'), dataField: "totalDifferenceAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{ caption: $translate.instant('YearDifferenceAmount'), dataField: "yearDifferenceAmount", format: { type: 'fixedPoint', precision: 2 }, width: 100, allowEditing: false },
{
caption: $translate.instant('TotalDifferenceAmount'),
dataField: "totalDifferenceAmount",
format: {type: 'fixedPoint', precision: 2},
width: 100,
allowEditing: false
},
{
caption: $translate.instant('YearDifferenceAmount'),
dataField: "yearDifferenceAmount",
format: {type: 'fixedPoint', precision: 2},
width: 100,
allowEditing: false
},
]
},
{
caption: $translate.instant('IsRetain'), alignment: 'center', dataField: "isRetain", dataType: "boolean", width: 120, allowEditing: true
caption: $translate.instant('IsRetain'),
alignment: 'center',
dataField: "isRetain",
dataType: "boolean",
width: 120,
allowEditing: true
},
];
......@@ -541,7 +781,7 @@
},
editing: {
mode: "batch",
allowUpdating:true,
allowUpdating: true,
},
onInitialized: function (e) {
$scope.dataGridInstance = e.component;
......@@ -552,20 +792,17 @@
if (e.column.caption === $translate.instant('ImportErrorPopUpNoCol') ||
e.column.caption === $translate.instant('AssetNumber') ||
e.column.caption === $translate.instant('AssetGroupName') ||
e.column.caption === $translate.instant('AssetDescription'))
{
e.column.caption === $translate.instant('AssetDescription')) {
e.cellElement.addClass('herder-center');
e.cellElement.append($compile(inputElement)($scope));
}
if(e.column.caption === $translate.instant('IsRetain'))
{
if (e.column.caption === $translate.instant('IsRetain')) {
e.cellElement.empty();
var inputElement = $('<input type="checkbox" ng-model="SelectAll" ng-click="selectAllAsset()">{{\'isRetainDifference\' | translate}}</input>');
e.cellElement.addClass('herder-center');
e.cellElement.append($compile(inputElement)($scope));
}
if(e.column.caption === $translate.instant('IsRetain'))
{
if (e.column.caption === $translate.instant('IsRetain')) {
e.cellElement.empty();
var inputElement = $('<input type="checkbox" ng-model="SelectAll" ng-click="selectAllAsset()">{{\'isRetainDifference\' | translate}}</input>');
e.cellElement.addClass('herder-center');
......@@ -594,13 +831,10 @@
// },
onRowUpdating: function (e) {
var data = $.extend({}, e.oldData, e.newData);
if(data.isRetain == true)
{
data.isRetain =1;
}
else if(data.isRetain == false)
{
data.isRetain =0;
if (data.isRetain == true) {
data.isRetain = 1;
} else if (data.isRetain == false) {
data.isRetain = 0;
}
targetArray.push(data);
},
......@@ -610,18 +844,18 @@
template: "totalGroupCount"
});
var toolbarItems = e.toolbarOptions.items;
var savebutton = _.find(e.toolbarOptions.items, function (m) { return m.name === "saveButton" });
var savebutton = _.find(e.toolbarOptions.items, function (m) {
return m.name === "saveButton"
});
var defaultFun = savebutton.options.onClick;
var saveAsset = function () {
defaultFun();
assetListService.updateAssetResultList(targetArray,projectId).success(function (data) {
assetListService.updateAssetResultList(targetArray, projectId).success(function (data) {
if (data) {
getAssetResultList($scope.displayType - 1);
SweetAlert.success($translate.instant('SaveSuccess'));
targetArray = [];
}
else
{
} else {
SweetAlert.error(serviceErrorMsg);
targetArray = [];
}
......@@ -634,16 +868,17 @@
}
}
}
//税会差异选项内容
$scope.applyFilterTypes = [{
key: "2",
name: $translate.instant('AllTheItems')
}, {
key: "0",
name: $translate.instant('TaxDepreciation')+"<"+$translate.instant('AccountDepreciation')
name: $translate.instant('TaxDepreciation') + "<" + $translate.instant('AccountDepreciation')
}, {
key: "1",
name: $translate.instant('TaxDepreciation')+">="+$translate.instant('AccountDepreciation')
name: $translate.instant('TaxDepreciation') + ">=" + $translate.instant('AccountDepreciation')
}];
//初始化税会差异选项
$scope.taxAccountDifferenceOptions = {
......@@ -651,7 +886,7 @@
value: $scope.applyFilterTypes[0].key,
valueExpr: "key",
displayExpr: "name",
onValueChanged: function(data) {
onValueChanged: function (data) {
$scope.citAssetsListDto.taxAccountCompare = data.value;
getAssetResultList($scope.displayType - 1);
......@@ -714,14 +949,13 @@
$scope.assetsResultData.forEach(function (m) {
m.isRetain = 1;
});
}
else {
} else {
isRetain = 0;
$scope.assetsResultData.forEach(function (m) {
m.isRetain = 0;
});
}
assetListService.batchUpdateIsRetain($scope.displayType -1,projectId, isRetain);
assetListService.batchUpdateIsRetain($scope.displayType - 1, projectId, isRetain);
}
//验证信息
......@@ -738,16 +972,16 @@
$scope.gridPeriodOptions = {
columnAutoWidth: true,
columns: [
{ caption: $translate.instant('AssetNumber'), dataField: "AssetNumber", textalign: "center" },
{ caption: $translate.instant('LastYear'), dataField: "LastYear", textalign: "center" },
{caption: $translate.instant('AssetNumber'), dataField: "AssetNumber", textalign: "center"},
{caption: $translate.instant('LastYear'), dataField: "LastYear", textalign: "center"},
{
caption: $translate.instant('LastAcquisitionValue'), dataField: "LastAcquisitionValue",
textalign: "right", format: { type: 'fixedPoint', precision: 2 }
textalign: "right", format: {type: 'fixedPoint', precision: 2}
},
{ caption: $translate.instant('CurrentYear'), dataField: "CurrentYear", textalign: "center" },
{caption: $translate.instant('CurrentYear'), dataField: "CurrentYear", textalign: "center"},
{
caption: $translate.instant('CurrentAcquisitionValue'), dataField: "CurrentAcquisitionValue",
textalign: "right", format: { type: 'fixedPoint', precision: 2 }
textalign: "right", format: {type: 'fixedPoint', precision: 2}
}
],
dataSource: data,
......@@ -796,7 +1030,7 @@
if (parseInt($('#content-resizer').css('bottom')) < 100) {
$('#content-resizer').css('bottom', '150px');
$('#content-resizer').css('z-index', '2');
$('#topIcon').css({ bottom: '-200px' });
$('#topIcon').css({bottom: '-200px'});
$('.error-info-wrapper').css('height', '150px');
}
}
......@@ -804,10 +1038,9 @@
$scope.getGridHeight = function () {
if ($scope.isLoadComplete) {
return { height: ($('.balance-ouput-grid-wrapper').height() - 20) + "px" };
}
else {
return { height: 0 + "px" };
return {height: ($('.balance-ouput-grid-wrapper').height() - 20) + "px"};
} else {
return {height: 0 + "px"};
}
};
......@@ -817,10 +1050,10 @@
// Enough space
if (y > constant.UIGrid.gapHeight) {
y = y - constant.UIGrid.gapHeight;
return { height: y + "px" };
return {height: y + "px"};
} else {
return { height: '0px' };
return {height: '0px'};
}
}
return {};
......@@ -836,8 +1069,7 @@
}
if (errorLevel === 2) {
return '/app-resources/images/vat/tips.png';
}
else {
} else {
return '/app-resources/images/vat/tips.png';
}
}
......@@ -848,13 +1080,11 @@
$(this).removeClass('active');
});
$(event.target).addClass('active');
if ($scope.displayType !== type)
{
if ($scope.displayType !== type) {
$scope.displayType = type;
if (type > 1) {
getAssetResultList($scope.displayType - 1);
}
else {
} else {
$scope.assetImportGridInstance.refresh();
}
}
......@@ -898,8 +1128,7 @@
var dataGrid = $('#assetsGroupGrid').dxDataGrid("instance");
dataGrid.saveEditData();
if (validationAssetGroupList())
{
if (validationAssetGroupList()) {
assetListService.saveAssetGroupInfo($scope.assetGroupResultDataSource, $scope.saveGroupType, projectId).success(function (data) {
if (data.data) {
......@@ -907,7 +1136,7 @@
if ($scope.modalInstance) {
$scope.modalInstance.close();
}
}else {
} else {
SweetAlert.error("设置二级分类失败，请联系系统管理员");
if ($scope.modalInstance) {
$scope.modalInstance.close();
......@@ -916,9 +1145,7 @@
}).error(function () {
SweetAlert.error(serviceErrorMsg);
});
}
else
{
} else {
ackMessageBox.warning($translate.instant('PleaseSetAssetGroupInfo'));
}
};
......@@ -934,8 +1161,7 @@
$scope.isNeedMappingColumn = function (col) {
if ($scope.mustMappingTotalColumns.indexOf(col) > -1) {
return true;
}
else {
} else {
return false;
}
}
......@@ -950,22 +1176,32 @@
enableVerticalScrollbar: uiGridConstants.scrollbars.enableVerticalScrollbar,
columnDefs: [
{
name: $translate.instant('Icon'), width: '5%', cellTemplate: '<div class="ui-grid-cell-contents"><span><img data-ng-src="{{grid.appScope.errorLevelToString(row.entity.errorLevel)}}"><span></div>'
name: $translate.instant('Icon'),
width: '5%',
cellTemplate: '<div class="ui-grid-cell-contents"><span><img data-ng-src="{{grid.appScope.errorLevelToString(row.entity.errorLevel)}}"><span></div>'
},
{
name: $translate.instant('SequenceNo'), width: '5%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>'
name: $translate.instant('SequenceNo'),
width: '5%',
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>'
},
{
name: $translate.instant('ErrorResult'), width: '20%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.validationResult}}<span></div>'
name: $translate.instant('ErrorResult'),
width: '20%',
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.validationResult}}<span></div>'
},
{
name: $translate.instant('ErrorCount'), width: '10%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.number}}<span></div>'
name: $translate.instant('ErrorCount'),
width: '10%',
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.number}}<span></div>'
},
{
name: $translate.instant('ErrorDetail'), width: '35%', cellTemplate: dealDetail,
},
{
name: $translate.instant('ValidationTips'), width: '25%', cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.validationTips}}"><span>{{row.entity.validationTips}}<span></div>'
name: $translate.instant('ValidationTips'),
width: '25%',
cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.validationTips}}"><span>{{row.entity.validationTips}}<span></div>'
},
],
onRegisterApi: function (gridApi) {
......@@ -995,11 +1231,11 @@
});
};
var initParamFilter = function(){
$scope.citAssetsListDto.taxAccountCompare =2;
$scope.citAssetsListDto.assetGroupName =2;
$scope.citAssetsListDto.depreciationPeriod =2;
$scope.citAssetsListDto.taxGroupType =2;
var initParamFilter = function () {
$scope.citAssetsListDto.taxAccountCompare = 2;
$scope.citAssetsListDto.assetGroupName = 2;
$scope.citAssetsListDto.depreciationPeriod = 2;
$scope.citAssetsListDto.taxGroupType = 2;
};
var doDataFilter = function () {
......@@ -1012,7 +1248,7 @@
var doDataFilterReset = function () {
// initParamFilter();
$scope.citAssetsListDto.taxAccountCompare =2;
$scope.citAssetsListDto.taxAccountCompare = 2;
$scope.citAssetsListDto.assetGroupName = null;
$scope.citAssetsListDto.depreciationPeriod = null;
$scope.citAssetsListDto.taxGroupType = null;
......@@ -1022,7 +1258,7 @@
//开始
(function initialize() {
debugger;
/**************************************** function start*************************************************/
$scope.displayType = 2;
$scope.saveGroupType = 1;
......@@ -1034,7 +1270,7 @@
$scope.doDataFilter = doDataFilter;
$scope.doDataFilterReset = doDataFilterReset;
function init(){
function init() {
initColumns();
initDxGrid();
......@@ -1046,7 +1282,9 @@
getGroupDetailList();
getUserPermission();
}
init();
$scope.pagingService.populatePagingSelection();
// $scope.$watch('fileNameWrapper', function (newValue, oldValue) {
// if (newValue != null && newValue !== oldValue) {
// //设置上传文件名
......
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