Skip to content

T
traffic-front
Commit 525ff4e5 authored by chase's avatar chase
Browse files
Options

fix bug

parent 2aeee399
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 46 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/TaxDocumentController.java
View file @ 525ff4e5
......@@ -37,7 +37,6 @@ public class TaxDocumentController {
taxDocumentService.selectTaxDocumentList(taxDocumentDto);
PageInfo<TaxDocument> taxDocumentPageInfo = page.toPageInfo();
List<TaxDocument> list = taxDocumentPageInfo.getList();
return PageResultVo.getPageResultVo(taxDocumentPageInfo, list);
}
......@@ -49,8 +48,8 @@ public class TaxDocumentController {
@PostMapping("add")
@ResponseBody
public boolean addTaxDocument(@RequestBody TaxDocument taxDocument,
@RequestParam MultipartFile file) {
public boolean addTaxDocument(TaxDocument taxDocument,
@RequestParam("file") MultipartFile file) {
return taxDocumentService.addTaxDocumentList(file,taxDocument);
}
......@@ -72,7 +71,6 @@ public class TaxDocumentController {
return taxDocumentService.editFilesType(taxDocument);
}
@RequestMapping("exportExcel")
@ResponseBody
public void exportExcelFile(HttpServletResponse response, @RequestBody TaxDocumentDto taxDocumentDto) {
......@@ -120,12 +118,12 @@ public class TaxDocumentController {
/**
* 生成上传url
*
* @param picture
* @param file
* @param modual
* @return
*/
private String getUploadUrl(MultipartFile picture, String modual) {
String fileName = picture.getOriginalFilename();
private String getUploadUrl(MultipartFile file, String modual) {
String fileName = file.getOriginalFilename();
String pictureName = UUID.randomUUID().toString() + fileName.substring(fileName.lastIndexOf("."));
String dir = DateUtils.getStringDateShort();
String typePath = "";
......@@ -141,7 +139,7 @@ public class TaxDocumentController {
if (!basePath.exists()) {
basePath.mkdirs();
}
picture.transferTo(new File(fileSavePath + File.separator + typePath + File.separator + pictureName));
file.transferTo(new File(fileSavePath + File.separator + typePath + File.separator + pictureName));
} catch (Exception e) {
e.printStackTrace();
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java
View file @ 525ff4e5
......@@ -91,7 +91,7 @@ public class TaxDocumentServiceImpl {
}
//档案名称 fileName
if (StringUtils.isNotBlank(taxDocumentDto.getFileName())) {
criteria.andFileNameLike(taxDocumentDto.getFileName());
criteria.andFileNameLike("%"+taxDocumentDto.getFileName()+"%");
}
//业务线 businessLine
if (StringUtils.isNotBlank(taxDocumentDto.getBusinessLine())) {
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 525ff4e5
......@@ -231,7 +231,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
$scope.isCreatePop = false;
$scope.simpleUploadSubmit = editDocFileRecord;
$scope.localData.forEach(function (item) {
if (item.id === rowId) {
if (item.id == rowId) {
$scope.editFieldModel = angular.copy(item);
$scope.editFieldModel.ownTime = dateFormat(item.ownTime);
$scope.editFieldModel.fileTime = dateFormat(item.fileTime);
......@@ -285,7 +285,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
$scope.uploader.uploadItem(0);
$scope.isCoverOperation = false;
$('#busy-indicator-container').show();
// $('#busy-indicator-container').show();
// addLogicAfterUploadFile($scope.editFieldModel,'simple');
} else {
SweetAlert.swal({
......@@ -305,7 +305,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
$scope.uploader.uploadItem(0);
// editDocFileRecord($scope.editFieldModel, 'simple');
$('#busy-indicator-container').show();
// $('#busy-indicator-container').show();
$scope.isCoverOperation = true;
}
})
......@@ -530,27 +530,38 @@ taxDocumentManageModule.directive("multiDatePicker", function () {
$('#period-picker1').rangePicker(setModel)
.on('datePicker.done', function (e, result) {
// $scope.queryFieldModel.AvailabilityDate
$scope.queryFieldModel.fileBeginTime = result[0].reverse().join("-");
$scope.queryFieldModel.fileEndTTime = result[1].reverse().join("-");
$scope.queryFieldModel.fileBeginTime = dateFormat(result[0].reverse());
$scope.queryFieldModel.fileEndTTime = dateFormat(result[1].reverse());
});
$('#period-picker2').rangePicker(setModel)
.on('datePicker.done', function (e, result) {
// queryFieldModel.Duration
$scope.queryFieldModel.ownBeginTime = result[0].reverse().join("-");
$scope.queryFieldModel.ownEndTime = result[1].reverse().join("-");
$scope.queryFieldModel.ownBeginTime = dateFormat(result[0].reverse());
$scope.queryFieldModel.ownEndTime = dateFormat(result[1].reverse());
});
$('#period-picker3').rangePicker(setModel)
.on('datePicker.done', function (e, result) {
// queryFieldModel.DueDate
$scope.queryFieldModel.effectiveBeginTime = result[0].reverse().join("-");
$scope.queryFieldModel.effectiveEndTime = result[1].reverse().join("-");
$scope.queryFieldModel.effectiveBeginTime = dateFormat(result[0].reverse());
$scope.queryFieldModel.effectiveEndTime = dateFormat(result[1].reverse());
});
$('#period-picker4').rangePicker(setModel)
.on('datePicker.done', function (e, result) {
// queryFieldModel.UploadDate
$scope.queryFieldModel.uploadBeginTime = result[0].reverse().join("-");
$scope.queryFieldModel.uploadEndTime = result[1].reverse().join("-");
$scope.queryFieldModel.uploadBeginTime = dateFormat(result[0].reverse());
$scope.queryFieldModel.uploadEndTime = dateFormat(result[1].reverse());
});
function dateFormat(dateArr){
var result = [];
dateArr.forEach(function(dateItem){
dateItem = dateItem + "";
dateItem = dateItem.length < 2 ? "0" + dateItem : dateItem;
result.push(dateItem);
});
//默认填充每月的1号
result.push("01");
return result.join("-");
}
}]
}
......@@ -640,7 +651,11 @@ taxDocumentManageModule.directive('fileUploader',function () {
$scope.uploader = new FileUploader({
url: apiInterceptor.webApiHostUrl + "/taxDoc/add",
// autoUpload: true,//添加后，自动上传
headers:{"Authorization":apiInterceptor.tokenType + ' ' + apiInterceptor.apiToken()},
headers:{
'Access-Control-Allow-Origin': '*',
Authorization: apiInterceptor.tokenType + ' ' + apiInterceptor.apiToken(),
withCredentials: true
},
removeAfterUpload:true,
});
$scope.uploader.filters.push({//xls限制
......@@ -666,7 +681,7 @@ taxDocumentManageModule.directive('fileUploader',function () {
// $scope.uploader.clearQueue();
$scope.editFieldModel = {};
$('#busy-indicator-container').hide();
// $('#busy-indicator-container').hide();
};
// $scope.uploader.onCancelItem = function(fileItem, response, status, headers) {
// console.info('onCancelItem', fileItem, response, status, headers);
......@@ -1073,4 +1088,70 @@ taxDocumentManageModule.directive('pdfPreview',function(){
}]
}
});
taxDocumentManageModule.directive('helpPop',function(){
return{
restrict:'EA',
controller:['$scope','taxDocumentListService','$translate','$compile',
function($scope,taxDocumentListService,$translate,$compile){
$scope.openHelpPop = function(){
$scope.help_loadData();
};
$scope.help_cacheData = {};
$scope.help_loadData = function () {
taxDocumentListService.getDocumentsAttrAndType({params:{}}).then(function (data) {
$scope.help_dataGridUpdate(data);
var dataGrid = $('<div dx-data-grid="help_dataGridOptions">');
$("#helpPopContainer").html("").append(dataGrid);
$compile(dataGrid)($scope);
$("#helpPopDialog").modal("show");
})
};
$scope.help_dataGridUpdate = function (_data) {
$scope.help_cacheData = _data.items;
$scope.help_dataGridOptions = {
bindingOptions: {
dataSource: 'help_cacheData',
},
paging: {
enable: true,
pageIndex: 0,
pageSize: 10
},
pager: {
allowedPageSizes: 5,
infoText: "当前 {0}页 /共 {1}页 ({2} 项)",
showInfo: true,
showNavigationButtons: true,
showPageSizeSelector: true,
visible: true
},
showBorders: true,
showRowLines: true,
columnAutoWidth: true,
allowColumnReordering: true,
columns: [
{
dataField: "fileAttr",
caption: $translate.instant('DocumentAttr'),
},
{
dataField: "fileType",
caption: $translate.instant('DocumentType'),
},
{
dataField: "description",
caption: $translate.instant('Description'),
},
],
};
};
}]
}
});
\ No newline at end of file
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 525ff4e5
......@@ -272,6 +272,11 @@
.TDL-pdf-paging-btn-next{
right: 6rem;
}
/*HACK，主要为了解决rangPicker插件的布局问题*/
div.rangePicker.RTL > .wrap > .custom > div.calendar.from{
float: left;
}
</style>
<div class="menu-header TDL-header" multi-date-picker>
<div class="TDL-query-bar" ng-init="MoreFields = false">
......@@ -510,7 +515,7 @@
placeholder="{{'PleaseSelected' | translate}}"
readonly
ng-model="editFieldModel.fileNativePath"
required style="width:320px;" maxlength="50" />
required style="width:320px;" />
<input id="uploadFilePlugin" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">
</div>
<div class="DTL-special-external-btn">
......@@ -535,7 +540,7 @@
<input class="form-control" title="{{editFieldModel.fileName}}"
placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldModel.fileName"
required style="width:320px;" maxlength="50" />
required style="width:320px;" />
</div>
</div>
<div class="col-sm-6 form-group">
......@@ -547,7 +552,7 @@
<!--<input class="form-control"-->
<!--placeholder="{{'PleaseSelected' | translate}}"-->
<!--ng-model="editFieldModel.fileAttr"-->
<!--required style="width:320px;" maxlength="50" />-->
<!--required style="width:320px;" />-->
<select ng-model="editFieldModel.fileAttr" ng-init="editFieldModel.fileAttr = ''" class="form-control"
style="width:320px;" required placeholder="{{'PleaseSelected' | translate}}">
<option ng-repeat="fileAttr in fileAttrOptions track by $index"
......@@ -556,8 +561,10 @@
</select>
</div>
<div class="DTL-special-external-btn">
<a href="javascript:void(0)" ><i class="fa fake-question-circle" aria-hidden="true"></i></a>
<div class="DTL-special-external-btn" title="查看类型列表">
<a href="javascript:void(0)" ng-click="openHelpPop()">
<i class="fa fake-question-circle" aria-hidden="true"></i>
</a>
</div>
</div>
<div class="col-sm-6 form-group">
......@@ -569,7 +576,7 @@
<!--<input class="form-control" title="{{editFieldModel.companyName}}"-->
<!--placeholder="{{'PleaseSelected' | translate}}"-->
<!--ng-model="editFieldModel.companyName"-->
<!--required style="width:320px;" maxlength="50" />-->
<!--required style="width:320px;" />-->
<select ng-model="editFieldModel.companyName" class="form-control" ng-init="editFieldModel.companyName = ''"
title="{{editFieldModel.companyName}}" style="width:320px;" required placeholder="{{'PleaseSelected' | translate}}">
......@@ -588,7 +595,7 @@
<!--<input class="form-control"-->
<!--placeholder="{{'PleaseSelected' | translate}}"-->
<!--ng-model="editFieldModel.fileType"-->
<!--required style="width:320px;" maxlength="50" />-->
<!--required style="width:320px;" />-->
<select ng-model="editFieldModel.fileType" class="form-control" ng-init="editFieldModel.fileType = ''"
style="width:320px;" required placeholder="{{'PleaseSelected' | translate}}">
......@@ -606,7 +613,7 @@
<input class="form-control"
placeholder="{{'PleaseSelected' | translate}}"
ng-model="editFieldModel.taxType"
style="width:320px;" maxlength="50" />
style="width:320px;" />
</div>
</div>
<div class="col-sm-6 form-group">
......@@ -644,7 +651,7 @@
<input class="form-control"
placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldModel.storageArea"
style="width:320px;" maxlength="50" />
style="width:320px;" />
</div>
<div class="DTL-special-external-btn" title="{{'EntityStorageDescription' | translate}}">
<i class="fa fake-exclamatory-circle"></i>
......@@ -656,7 +663,7 @@
<input class="form-control"
placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldModel.keeper"
style="width:320px;" maxlength="50" />
style="width:320px;" />
</div>
</div>
<div class="col-sm-6 form-group">
......@@ -665,7 +672,7 @@
<input class="form-control" title="{{editFieldModel.storageArea}}"
placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldModel.physicalIndexNumber"
style="width:320px;" maxlength="50" />
style="width:320px;" />
</div>
</div>
<div class="form-group" style="width:100%;float:left;">
......@@ -673,7 +680,7 @@
<div class="col-sm-11" style="width:87.5%">
<textarea class="form-control"
placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldModel.remarks" maxlength="300">
ng-model="editFieldModel.remarks" >
</textarea>
</div>
</div>
......@@ -719,7 +726,7 @@
placeholder="{{'PleaseSelected' | translate}}"
readonly
ng-model="editFieldItem.fileNativePath"
required style="width:280px;" maxlength="50" />
required style="width:280px;" />
<!--<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">-->
</div>
</div>
......@@ -741,7 +748,7 @@
<input class="form-control" title="{{editFieldItem.fileName}}"
placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldItem.fileName"
required style="width:280px;" maxlength="50" />
required style="width:280px;" />
</div>
</div>
<div class="col-sm-6 form-group">
......@@ -753,7 +760,7 @@
<!--<input class="form-control"-->
<!--placeholder="{{'PleaseSelected' | translate}}"-->
<!--ng-model="editFieldModel.fileAttr"-->
<!--required style="width:280px;" maxlength="50" />-->
<!--required style="width:280px;" />-->
<select ng-model="editFieldItem.fileAttr" ng-init="editFieldItem.fileAttr = ''" class="form-control"
style="width:280px;" required placeholder="{{'PleaseSelected' | translate}}">
<option ng-repeat="fileAttr in fileAttrOptions track by $index"
......@@ -762,8 +769,8 @@
</select>
</div>
<div class="DTL-special-external-btn">
<a href="javascript:void(0)" ><i class="fa fake-question-circle" aria-hidden="true"></i></a>
<div class="DTL-special-external-btn" title="查看类型列表">
<a href="javascript:void(0)" ng-click="openHelpPop()"><i class="fa fake-question-circle" aria-hidden="true"></i></a>
</div>
</div>
<div class="col-sm-6 form-group">
......@@ -775,7 +782,7 @@
<!--<input class="form-control" title="{{editFieldModel.companyName}}"-->
<!--placeholder="{{'PleaseSelected' | translate}}"-->
<!--ng-model="editFieldModel.companyName"-->
<!--required style="width:280px;" maxlength="50" />-->
<!--required style="width:280px;" />-->
<select ng-model="editFieldItem.companyName" class="form-control"
title="{{editFieldItem.companyName}}" style="width:280px;" required placeholder="{{'PleaseSelected' | translate}}">
......@@ -795,7 +802,7 @@
<!--<input class="form-control"-->
<!--placeholder="{{'PleaseSelected' | translate}}"-->
<!--ng-model="editFieldModel.fileType"-->
<!--required style="width:280px;" maxlength="50" />-->
<!--required style="width:280px;" />-->
<select ng-model="editFieldItem.fileType" class="form-control" ng-init="editFieldItem.fileType = ''"
style="width:280px;" required placeholder="{{'PleaseSelected' | translate}}">
......@@ -813,7 +820,7 @@
<input class="form-control"
placeholder="{{'PleaseSelected' | translate}}"
ng-model="editFieldItem.taxType"
style="width:280px;" maxlength="50" />
style="width:280px;" />
</div>
</div>
<div class="col-sm-6 form-group">
......@@ -851,7 +858,7 @@
<input class="form-control"
placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldItem.storageArea"
style="width:280px;" maxlength="50" />
style="width:280px;" />
</div>
<div class="DTL-special-external-btn" title="{{'EntityStorageDescription'|translate}}">
<i class="fa fake-exclamatory-circle"></i>
......@@ -863,7 +870,7 @@
<input class="form-control"
placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldItem.keeper"
style="width:280px;" maxlength="50" />
style="width:280px;" />
</div>
</div>
<div class="col-sm-6 form-group">
......@@ -872,7 +879,7 @@
<input class="form-control" title="{{editFieldItem.storageArea}}"
placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldModel.physicalIndexNumber"
style="width:280px;" maxlength="50" />
style="width:280px;" />
</div>
</div>
<div class="form-group" style="width:100%;float:left;">
......@@ -880,7 +887,7 @@
<div class="col-sm-11" style="width:87.5%">
<textarea class="form-control"
placeholder="{{'PleaseType' | translate}}"
ng-model="editFieldItem.remarks" maxlength="300">
ng-model="editFieldItem.remarks" >
</textarea>
</div>
</div>
......@@ -946,6 +953,21 @@
</div>
</div>
<div class="modal fade" id="helpPopDialog" help-pop tabindex="-1" role="dialog" aria-labelledby="myModal" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog" style="width:80%;" role="document">
<div class="modal-content">
<div class="modal-header">
<span class="close" data-dismiss="modal" aria-hidden="true" ng-click="hideFilePreviewPop()">×</span>
<div class="modal-title">{{currentSheetName}}</div>
</div>
<div class="modal-body">
<div class="dx-viewport demo-container" id="helpPopContainer">
</div>
</div>
</div>
</div>
</div>
<div class="TDL-pdf-layout-dialog" id="pdfLayoutDialog" pdf-preview>
<div class="wrapper TDL-pdf-preview-pop" id="pdfContainer">
<canvas id="the-canvas"></canvas>
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.svc.js
View file @ 525ff4e5
......@@ -27,6 +27,9 @@ taxDocumentManageModule.factory('taxDocumentListService',
delFileRecordItems: function (params) {
return jqFetch.post(apiInterceptor.webApiHostUrl + '/taxDoc/batchDelete', params);
},
getDocumentsAttrAndType:function(params){
return jqFetch.post(apiInterceptor.webApiHostUrl + '/fileTypes/selectList', params);
},
getBinaryData: function (url) {
var defer = $q.defer();
var oReq = new XMLHttpRequest();
......
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