Commit 6cd4617b authored by zhkwei's avatar zhkwei

财务数据抽取以及CIT固定资产页面优化

parent 718af310
...@@ -35,6 +35,14 @@ ...@@ -35,6 +35,14 @@
Period: '', Period: '',
}; };
//分页的设置
$scope.pagingOptions = {
pageIndex: 1, //当前页码
totalItems: 1, //总数据
pageSize: 100, //每页多少条数据
pageSizeString: "100"
};
//导入方式 //导入方式
$scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 }; $scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 };
$scope.sheetData = { sheetNameList: [], dataList: [], selectedSheetIndex: 0 }; $scope.sheetData = { sheetNameList: [], dataList: [], selectedSheetIndex: 0 };
...@@ -1013,13 +1021,7 @@ ...@@ -1013,13 +1021,7 @@
//开始 //开始
(function initialize() { (function initialize() {
//分页的设置
$scope.pagingOptions = {
pageIndex: 1, //当前页码
totalItems: 1, //总数据
pageSize: 100, //每页多少条数据
pageSizeString: "100"
};
/**************************************** function start*************************************************/ /**************************************** function start*************************************************/
$scope.displayType = 2; $scope.displayType = 2;
$scope.saveGroupType = 1; $scope.saveGroupType = 1;
......
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
width: '10%', width: '10%',
caption: $translate.instant('LogOperationTime'), caption: $translate.instant('LogOperationTime'),
calculateCellValue: function(data) { calculateCellValue: function(data) {
return new Date(data).formatDateTime('yyyy-MM-dd hh:mm:ss'); return new Date(data.operateTime).formatDateTime('yyyy-MM-dd hh:mm:ss');
} }
} }
], ],
......
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