Skip to content

T
traffic-front
Commit 10e45fe6 authored by chase's avatar chase
Browse files
Options

merge 档案管理

parent a7d61f8b
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 29 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogFileTypeController.java
View file @ 10e45fe6
......@@ -94,13 +94,13 @@ public class OperationLogFileTypeController {
// public ReturnData selectListForLog(@RequestBody OperationLogFileType operationLogFileType){
try {
Map<String, String> headers = new LinkedHashMap<>();
headers.put("id", "id");
headers.put("id", "序号");
headers.put("create_time", "操作时间");
headers.put("operation_action", "操作");
headers.put("update_state", "操作内容");
headers.put("operation_user", "操作人员");
headers.put("ip", "操作ip");
headers.put("comment", "备注");
headers.put("create_time", "操作时间");
List<OperationLogFileType> fileTypes = operationLogFileTypeService.selectFileTypesList();
// List<OperationLogFileType> operationLogFileTypes = operationLogFileTypeService.selectListForLog(operationLogFileType.getFileTypeIds());
response.setContentType("multipart/form-data");
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 10e45fe6
......@@ -329,41 +329,65 @@ taxDocumentManageModule.controller('taxDocumentListController',
}
};
};
$scope.changeDateRangeError = function () {
var items = $scope.queryFieldModel;
$scope.changeDateRangeError=function(flag){
var items=$scope.queryFieldModel;
if (!PWC.isNullOrEmpty(items.fileBeginTime) && !PWC.isNullOrEmpty(items.fileEndTTime) &&
items.fileBeginTime > items.fileEndTTime) {
items.fileBeginTime > items.fileEndTTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
if(flag==1){
items.fileBeginTime="";
}else{
items.fileEndTTime="";
}
}
if (!PWC.isNullOrEmpty(items.ownBeginTime) && !PWC.isNullOrEmpty(items.ownEndTime) &&
items.ownBeginTime > items.ownEndTime) {
items.ownBeginTime > items.ownEndTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
if(flag==1){
items.ownBeginTime="";
}else{
items.ownEndTime="";
}
}
if (!PWC.isNullOrEmpty(items.effectiveBeginTime) && !PWC.isNullOrEmpty(items.effectiveEndTime) &&
items.effectiveBeginTime > items.effectiveEndTime) {
items.effectiveBeginTime > items.effectiveEndTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
if(flag==1){
items.effectiveBeginTime="";
}else{
items.effectiveEndTime="";
}
}
if (!PWC.isNullOrEmpty(items.uploadBeginTime) && !PWC.isNullOrEmpty(items.uploadEndTime) &&
items.uploadBeginTime > items.uploadEndTime) {
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
items.fileTime > items.effectiveTime) {
items.uploadBeginTime > items.uploadEndTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
if(flag==1){
items.uploadBeginTime="";
}else{
items.uploadEndTime="";
}
}
};
$scope.changeFieldModel=function(){
$scope.changeFieldModel=function(flag){
//新建记录
var items=$scope.editFieldModel;
if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
items.fileTime > items.effectiveTime)
{
SweetAlert.warning($translate.instant('FileTimeDateRangeError'));
if(flag==1){
items.fileTime="";
}else{
items.effectiveTime="";
}
}
};
$scope.changeFieldItem = function () {
$scope.changeFieldItem = function (flag) {
//批量上传
if($scope.multiUploadErrorItems){
for (var i = 0; i < $scope.multiUploadErrorItems.length; i++) {
......@@ -371,6 +395,11 @@ taxDocumentManageModule.controller('taxDocumentListController',
if (!PWC.isNullOrEmpty(modelItem.fileTime) && !PWC.isNullOrEmpty(modelItem.effectiveTime) &&
modelItem.fileTime > modelItem.effectiveTime) {
SweetAlert.warning($translate.instant("Document") + (i + 1) + "," +$translate.instant('FileTimeDateRangeError'));
if(flag==1){
modelItem.fileTime="";
}else{
modelItem.effectiveTime="";
}
break;
}
}
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 10e45fe6
......@@ -379,13 +379,18 @@
</div>
<div class="TDL-query-val">
<select ng-model="queryFieldModel.fileAttr"
class="form-control radius3"
class="form-control radius3" style="width:85%"
placeholder="{{'PleaseSelected' | translate}}">
<option value=""></option>
<option ng-repeat="fileAttr in fileAttrOptions track by $index"
value="{{fileAttr}}">{{fileAttr}}
</option>
</select>
<div class="DTL-special-external-btn" title="查看类型列表">
<a href="javascript:void(0)" ng-click="openHelpPop(queryFieldModel)">
<i class="fa fake-question-circle" aria-hidden="true"></i>
</a>
</div>
<!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.fileAttr"/>-->
</div>
......@@ -415,11 +420,11 @@
<!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.AvailabilityDate"/>-->
<!--<input type="text" class="form-control radius3" id="period-picker1"/>-->
<input type='text' placeholder="From" ng-change="changeDateRangeError()"
<input type='text' placeholder="From" ng-change="changeDateRangeError(1)"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.fileBeginTime"
data-min-view-mode="0" />
<input type='text' placeholder="To" ng-change="changeDateRangeError()"
<input type='text' placeholder="To" ng-change="changeDateRangeError(2)"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.fileEndTTime"
data-min-view-mode="0" />
......@@ -433,11 +438,11 @@
<div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.Duration"/>-->
<input type='text' placeholder="From" ng-change="changeDateRangeError()"
<input type='text' placeholder="From" ng-change="changeDateRangeError(1)"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyymm" ng-model="queryFieldModel.ownBeginTime"
data-min-view-mode="1"/>
<input type='text' placeholder="To" ng-change="changeDateRangeError()"
<input type='text' placeholder="To" ng-change="changeDateRangeError(2)"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyymm" ng-model="queryFieldModel.ownEndTime"
data-min-view-mode="1"/>
......@@ -478,7 +483,7 @@
<span translate="CorporationName"></span>
</div>
<div class="TDL-query-val">
<div dx-select-box="queryOrgOptions"></div>
<div dx-select-box="queryOrgOptions" style="height: 33px;position: relative;top: 9px"></div>
<!--<select ng-model="queryFieldModel.companyName" class="form-control radius3"-->
<!--title="{{queryFieldModel.companyName}}" required-->
......@@ -499,11 +504,11 @@
<div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.DueDate"/>-->
<input type='text' placeholder="From" ng-change="changeDateRangeError()"
<input type='text' placeholder="From" ng-change="changeDateRangeError(1)"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.effectiveBeginTime"
data-min-view-mode="0"/>
<input type='text' placeholder="To" ng-change="changeDateRangeError()"
<input type='text' placeholder="To" ng-change="changeDateRangeError(2)"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.effectiveEndTime"
data-min-view-mode="0"/>
......@@ -585,11 +590,11 @@
<!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.UploadDate"/>-->
<!--<input type="text" class="form-control radius3" id="period-picker4" />-->
<input type='text' placeholder="From" ng-change="changeDateRangeError()"
<input type='text' placeholder="From" ng-change="changeDateRangeError(1)"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.uploadBeginTime"
data-min-view-mode="0"/>
<input type='text' placeholder="To" ng-change="changeDateRangeError()"
<input type='text' placeholder="To" ng-change="changeDateRangeError(2)"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.uploadEndTime"
data-min-view-mode="0"/>
......@@ -821,7 +826,7 @@
</label>
<div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
data-date-format="yyyy/mm/dd" ng-change="changeFieldModel()"
data-date-format="yyyy/mm/dd" ng-change="changeFieldModel(1)"
ng-required="isRequired('AvailabilityDate')"
class="form-control" ng-model="editFieldModel.fileTime"/>
</div>
......@@ -834,7 +839,7 @@
<div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
data-date-format="yyyy/mm/dd"
ng-required="isRequired('DueDate')" ng-change="changeFieldModel()"
ng-required="isRequired('DueDate')" ng-change="changeFieldModel(2)"
class="form-control" ng-model="editFieldModel.effectiveTime"/>
</div>
</div>
......@@ -1063,7 +1068,7 @@
{{'AvailabilityDate' | translate}}
</label>
<div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem()"
<input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem(1)"
ng-class="{'upload-fail-mark':isRequired('AvailabilityDate') && !editFieldItem.fileTime}"
date-time-picker data-date-format="yyyy/mm/dd"
class="form-control" ng-model="editFieldItem.fileTime"/>
......@@ -1075,7 +1080,7 @@
{{'DueDate' | translate}}
</label>
<div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem()"
<input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem(2)"
ng-class="{'upload-fail-mark':isRequired('DueDate') && !editFieldItem.effectiveTime}"
date-time-picker data-date-format="yyyy/mm/dd"
class="form-control" ng-model="editFieldItem.effectiveTime"/>
......
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