Skip to content

T
traffic-front
Commit 0a475162 authored by chase's avatar chase
Browse files
Options

merge档案管理代码

parent 31d0cfe1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 245 additions and 131 deletions
atms-api/src/main/java/pwc/taxtech/atms/constant/enums/FileUploadEnum.java 0 → 100644
View file @ 0a475162
package pwc.taxtech.atms.constant.enums;
import java.util.HashMap;
import java.util.Map;
public class FileUploadEnum {
/**
* 业务来源
*/
public enum BizSource {
REPORT_UPLOAD("REPORT_UPLOAD", "历史报表归档上传"),
RECORD_UPLOAD("RECORD_UPLOAD", "档案管理上传");
private String code;
private String name;
public static final Map<String, String> MAPPING = new HashMap<>();
BizSource(String code, String name) {
this.code = code;
this.name = name;
}
public String getCode() {
return code;
}
public String getName() {
return name;
}
static {
for (FileUploadEnum.BizSource bizSource : FileUploadEnum.BizSource.values()) {
MAPPING.put(bizSource.getCode(), bizSource.getName());
}
}
}
}
atms-api/src/main/java/pwc/taxtech/atms/controller/FileTypesController.java
View file @ 0a475162
......@@ -46,14 +46,8 @@ public class FileTypesController {
@PostMapping("/query4SelectionBox")
@ResponseBody
public Map<String,String> query4SelectionBox(){
// public Map<String,Map<Long,String>> query4SelectionBox(){
List<FileTypes> fileTypes = fileTypesService.query4SelectionBox();
// Map<Long,String> fileAttrList = fileTypes.stream().collect(Collectors.toMap(FileTypes::getId,FileTypes::getFileAttr));
// Map<Long,String> fileTypeList = fileTypes.stream().collect(Collectors.toMap(FileTypes::getId,FileTypes::getFileType));
Map<String,String> result = fileTypes.stream().collect(Collectors.toMap(FileTypes::getFileType,FileTypes::getFileAttr));
// Map<String,Map<Long,String>> result = new HashMap<>();
// result.put("fileAttrList",fileAttrList);
// result.put("fileTypeList",fileTypeList);
return result;
}
......
atms-api/src/main/java/pwc/taxtech/atms/controller/TaxDocumentController.java
View file @ 0a475162
......@@ -48,8 +48,10 @@ public class TaxDocumentController {
@PostMapping("add")
@ResponseBody
public boolean addTaxDocument(@RequestBody TaxDocument taxDocument) {
return taxDocumentService.addTaxDocumentList(taxDocument);
public boolean addTaxDocument(@RequestBody TaxDocument taxDocument,
@RequestPart("file") MultipartFile file,
@RequestParam(required = false) String modual) {
return taxDocumentService.addTaxDocumentList(file,taxDocument);
}
@PostMapping("delete")
......@@ -70,9 +72,10 @@ public class TaxDocumentController {
return taxDocumentService.editFilesType(taxDocument);
}
@RequestMapping("exportExcel")
@ResponseBody
public void exportExcelFile(HttpServletResponse response,@RequestBody TaxDocumentDto taxDocumentDto) {
public void exportExcelFile(HttpServletResponse response, @RequestBody TaxDocumentDto taxDocumentDto) {
try {
Map<String, String> headers = new HashMap<String, String>();
headers.put("id", "id");
......@@ -111,6 +114,17 @@ public class TaxDocumentController {
@RequestMapping("upload")
@ResponseBody
public String upload(@RequestPart("file") MultipartFile picture, @RequestParam(required = false) String modual) {
return getUploadUrl(picture, modual);
}
/**
* 生成上传url
*
* @param picture
* @param modual
* @return
*/
private String getUploadUrl(MultipartFile picture, String modual) {
String fileName = picture.getOriginalFilename();
String pictureName = UUID.randomUUID().toString() + fileName.substring(fileName.lastIndexOf("."));
String dir = DateUtils.getStringDateShort();
......@@ -133,4 +147,6 @@ public class TaxDocumentController {
}
return "images" + File.separator + typePath + File.separator + pictureName;
}
}
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DidiFileUploadService.java
View file @ 0a475162
......@@ -74,7 +74,7 @@ public class DidiFileUploadService extends BaseService {
private static final String PROXY_PORT = "11007";
public FileUpload uploadFile(MultipartFile file, String fileName,String bizSource) throws ServiceException {
public FileUpload uploadFile(MultipartFile file, String fileName, String bizSource) throws ServiceException {
CloseableHttpClient httpClient = null;
String requestKey = CommonUtils.getUUID();
String requestUrl = upload_post_url + "/" + requestKey;
......@@ -86,7 +86,7 @@ public class DidiFileUploadService extends BaseService {
httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(requestUrl);
String md5Str = getFileMD5String(file);
ByteArrayBody byteBody = new ByteArrayBody(file.getBytes(), ContentType.MULTIPART_FORM_DATA, StringUtils.isBlank(fileName)?file.getOriginalFilename():fileName);
ByteArrayBody byteBody = new ByteArrayBody(file.getBytes(), ContentType.MULTIPART_FORM_DATA, StringUtils.isBlank(fileName) ? file.getOriginalFilename() : fileName);
StringBody md5 = new StringBody(md5Str, ContentType.create("text/plain"));
HttpEntity httpEntity = MultipartEntityBuilder.create().addPart("filecontent", byteBody).addPart("md5", md5).build();
httpPost.setEntity(httpEntity);
......@@ -98,7 +98,7 @@ public class DidiFileUploadService extends BaseService {
fileUpload = new FileUpload();
fileUpload.setBizSource(bizSource);
fileUpload.setUid(CommonUtils.getUUID());
fileUpload.setFileName(StringUtils.isBlank(fileName)?file.getOriginalFilename():fileName);
fileUpload.setFileName(StringUtils.isBlank(fileName) ? file.getOriginalFilename() : fileName);
fileUpload.setResourceKey(requestKey);
assemblyModel(resultDto, fileUpload);
uploadLog.setFileUploadId(fileUpload.getUid());
......@@ -153,22 +153,22 @@ public class DidiFileUploadService extends BaseService {
}
FileUploadExample example = new FileUploadExample();
FileUploadExample.Criteria criteria = example.createCriteria();
if(CollectionUtils.isNotEmpty(param.getUuids())){
if (CollectionUtils.isNotEmpty(param.getUuids())) {
criteria.andUidIn(param.getUuids());
}
if(CollectionUtils.isNotEmpty(param.getBizSources())){
if (CollectionUtils.isNotEmpty(param.getBizSources())) {
criteria.andBizSourceIn(param.getBizSources());
}
if(CollectionUtils.isNotEmpty(param.getUploadMonths())){
if (CollectionUtils.isNotEmpty(param.getUploadMonths())) {
criteria.andUploadMonthIn(param.getUploadMonths());
}
if(CollectionUtils.isNotEmpty(param.getUploadDates())){
if (CollectionUtils.isNotEmpty(param.getUploadDates())) {
criteria.andUploadDateIn(param.getUploadDates());
}
if(CollectionUtils.isNotEmpty(param.getUploadWeeks())){
if (CollectionUtils.isNotEmpty(param.getUploadWeeks())) {
criteria.andUploadWeekIn(param.getUploadWeeks());
}
if(CollectionUtils.isNotEmpty(param.getUploadYears())){
if (CollectionUtils.isNotEmpty(param.getUploadYears())) {
criteria.andUploadYearIn(param.getUploadYears());
}
refreshViewUrl(param);
......@@ -214,22 +214,22 @@ public class DidiFileUploadService extends BaseService {
public void refreshViewUrl(DidiFileIUploadParam param) throws ServiceException {
FileUploadExample example = new FileUploadExample();
FileUploadExample.Criteria criteria = example.createCriteria();
if(CollectionUtils.isNotEmpty(param.getUuids())){
if (CollectionUtils.isNotEmpty(param.getUuids())) {
criteria.andUidIn(param.getUuids());
}
if(CollectionUtils.isNotEmpty(param.getBizSources())){
if (CollectionUtils.isNotEmpty(param.getBizSources())) {
criteria.andBizSourceIn(param.getBizSources());
}
if(CollectionUtils.isNotEmpty(param.getUploadMonths())){
if (CollectionUtils.isNotEmpty(param.getUploadMonths())) {
criteria.andUploadMonthIn(param.getUploadMonths());
}
if(CollectionUtils.isNotEmpty(param.getUploadDates())){
if (CollectionUtils.isNotEmpty(param.getUploadDates())) {
criteria.andUploadDateIn(param.getUploadDates());
}
if(CollectionUtils.isNotEmpty(param.getUploadWeeks())){
if (CollectionUtils.isNotEmpty(param.getUploadWeeks())) {
criteria.andUploadWeekIn(param.getUploadWeeks());
}
if(CollectionUtils.isNotEmpty(param.getUploadYears())){
if (CollectionUtils.isNotEmpty(param.getUploadYears())) {
criteria.andUploadYearIn(param.getUploadYears());
}
criteria.andUsefulEndTimeLessThan(new Date());
......@@ -261,12 +261,12 @@ public class DidiFileUploadService extends BaseService {
}
}
public Boolean delData(String uid){
public Boolean delData(String uid) {
boolean delFlag = false;
FileUploadExample example = new FileUploadExample();
example.createCriteria().andUidEqualTo(uid);
List<FileUpload> dataList = fileUploadMapper.selectByExample(example);
if(CollectionUtils.isNotEmpty(dataList)){
if (CollectionUtils.isNotEmpty(dataList)) {
CloseableHttpClient httpClient = null;
FileUploadLog uploadLog = new FileUploadLog();
uploadLog.setRequestId(dataList.get(0).getResourceKey());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/ReportFileUploadService.java
View file @ 0a475162
......@@ -8,6 +8,7 @@ import org.springframework.web.multipart.MultipartFile;
import pwc.taxtech.atms.common.AuthUserHelper;
import pwc.taxtech.atms.common.CommonUtils;
import pwc.taxtech.atms.common.message.ErrorMessage;
import pwc.taxtech.atms.constant.enums.FileUploadEnum;
import pwc.taxtech.atms.constant.enums.ReportFileUploadEnum;
import pwc.taxtech.atms.dao.ProjectMapper;
import pwc.taxtech.atms.dao.UserMapper;
......@@ -106,7 +107,7 @@ public class ReportFileUploadService extends BaseService {
data.setOrgId(project.getOrganizationId());
ReportFileUploadExample example = new ReportFileUploadExample();
example.createCriteria().andProjectIdEqualTo(data.getProjectId()).andPeriodEqualTo(data.getPeriod()).andReportTypeEqualTo(data.getReportType());
FileUpload fileUpload = didiFileUploadService.uploadFile(file, file.getOriginalFilename(), "ReportUpload");
FileUpload fileUpload = didiFileUploadService.uploadFile(file, file.getOriginalFilename(), FileUploadEnum.BizSource.REPORT_UPLOAD.name());
data.setFileUploadId(fileUpload.getUid());
data.setUid(CommonUtils.getUUID());
data.setCreateTime(new Date());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/ReportUploadService.java
View file @ 0a475162
......@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import pwc.taxtech.atms.common.AuthUserHelper;
import pwc.taxtech.atms.common.CommonUtils;
import pwc.taxtech.atms.constant.enums.FileUploadEnum;
import pwc.taxtech.atms.dao.ProjectMapper;
import pwc.taxtech.atms.dao.UserMapper;
import pwc.taxtech.atms.dto.didiFileUpload.DidiFileIUploadParam;
......@@ -96,7 +97,7 @@ public class ReportUploadService extends BaseService {
}
fileName += ".xlsx";
data.setReportName(fileName);
FileUpload fileUpload = didiFileUploadService.uploadFile(file, fileName, "ReportUpload");
FileUpload fileUpload = didiFileUploadService.uploadFile(file, fileName, FileUploadEnum.BizSource.REPORT_UPLOAD.name());
data.setFileUploadId(fileUpload.getUid());
data.setUid(CommonUtils.getUUID());
data.setCreateTime(new Date());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java
View file @ 0a475162
......@@ -5,12 +5,15 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import pwc.taxtech.atms.common.AuthUserHelper;
import pwc.taxtech.atms.constant.enums.FileUploadEnum;
import pwc.taxtech.atms.dao.TaxDocumentMapper;
import pwc.taxtech.atms.dto.TaxDocumentDto;
import pwc.taxtech.atms.entity.OperationLogTaxDocument;
import pwc.taxtech.atms.entity.TaxDocument;
import pwc.taxtech.atms.entity.TaxDocumentExample;
import pwc.taxtech.atms.vat.entity.FileUpload;
import javax.annotation.Resource;
import java.util.Calendar;
......@@ -34,6 +37,10 @@ public class TaxDocumentServiceImpl {
@Autowired
private OperationLogTaxDocServiceImpl operationLogTaxDocService;
@Autowired
DidiFileUploadService didiFileUploadService;
public List<TaxDocument> selectTaxDocumentList(TaxDocumentDto taxDocumentDto) {
return taxDocumentMapper.selectByExample(getExample(taxDocumentDto));
}
......@@ -111,8 +118,12 @@ public class TaxDocumentServiceImpl {
}
@Transactional
public synchronized boolean addTaxDocumentList(TaxDocument taxDocument) {
public synchronized boolean addTaxDocumentList(MultipartFile file, TaxDocument taxDocument) {
try {
//上传文件
FileUpload fileUpload = didiFileUploadService.uploadFile(file,file.getOriginalFilename(), FileUploadEnum.BizSource.RECORD_UPLOAD.name());
taxDocument.setFileUploadId(fileUpload.getUid());
taxDocument.setFilePositionUrl(fileUpload.getViewHttpUrl());
//设置创建人 创建时间信息 设置年份区分
taxDocument.setCreateTime(new Date());
taxDocument.setCreator(authUserHelper.getCurrentAuditor().get());
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/TaxDocument.java
View file @ 0a475162
......@@ -267,6 +267,17 @@ public class TaxDocument implements Serializable {
*/
private String filePositionUrl;
/**
* Database Column Remarks:
* 上传文件id
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column tax_document.file_upload_id
*
* @mbg.generated
*/
private String fileUploadId;
/**
* Database Column Remarks:
* 按年份分区的冗余字段
......@@ -313,6 +324,14 @@ public class TaxDocument implements Serializable {
return enable;
}
public String getFileUploadId() {
return fileUploadId;
}
public void setFileUploadId(String fileUploadId) {
this.fileUploadId = fileUploadId;
}
public void setEnable(String enable) {
this.enable = enable;
}
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/TaxDocumentMapper.xml
View file @ 0a475162
......@@ -28,6 +28,7 @@
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="file_original_name" jdbcType="VARCHAR" property="fileOriginalName"/>
<result column="file_position_url" jdbcType="VARCHAR" property="filePositionUrl"/>
<result column="file_upload_id" jdbcType="VARCHAR" property="fileUploadId"/>
<result column="year_redundancy" jdbcType="INTEGER" property="yearRedundancy"/>
<result column="audit_status" jdbcType="INTEGER" property="auditStatus"/>
<result column="physical_index_number" jdbcType="VARCHAR" property="physicalIndexNumber"/>
......@@ -110,7 +111,7 @@
-->
id, file_attr, file_type_id, file_type, file_name, business_line, company_id, company_name,
tax_type, file_time, effective_time, creator_id, creator, create_time, update_time,
upload_time, storage_area, keeper_id, keeper, remark, file_original_name, file_position_url,
upload_time, storage_area, keeper_id, keeper, remark, file_original_name, file_upload_id, file_position_url,
year_redundancy,audit_status,physical_index_number,own_time,enable
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.entity.TaxDocumentExample" resultMap="BaseResultMap">
......@@ -170,7 +171,7 @@
file_time, effective_time, creator_id,
creator, create_time, update_time,
upload_time, storage_area, keeper_id,
keeper, remark, file_original_name, file_position_url,
keeper, remark, file_original_name, file_upload_id, file_position_url,
year_redundancy,audit_status,physical_index_number,own_time)
values (#{id,jdbcType=BIGINT}, #{fileAttr,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=INTEGER},
#{fileType,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{businessLine,jdbcType=VARCHAR},
......@@ -178,7 +179,8 @@
#{fileTime,jdbcType=TIMESTAMP}, #{effectiveTime,jdbcType=TIMESTAMP}, #{creatorId,jdbcType=INTEGER},
#{creator,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{uploadTime,jdbcType=TIMESTAMP}, #{storageArea,jdbcType=VARCHAR}, #{keeperId,jdbcType=INTEGER},
#{keeper,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{fileOriginalName,jdbcType=VARCHAR}, #{filePositionUrl,jdbcType=VARCHAR},
#{keeper,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{fileOriginalName,jdbcType=VARCHAR},
#{fileUploadId,jdbcType=VARCHAR}, #{filePositionUrl,jdbcType=VARCHAR},
#{yearRedundancy,jdbcType=INTEGER},#{auditStatus,jdbcType=INTEGER},#{physicalIndexNumber,jdbcType=VARCHAR},
#{ownTime,jdbcType=TIMESTAMP})
</insert>
......@@ -576,6 +578,9 @@
<if test="null != remark and '' != remark">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="null != fileUploadId">
file_upload_id = #{fileUploadId,jdbcType=VARCHAR},
</if>
<if test="null != filePositionUrl">
file_position_url = #{filePositionUrl,jdbcType=VARCHAR},
</if>
......
atms-web/src/main/webapp/Gruntfile.js
View file @ 0a475162
......@@ -234,16 +234,19 @@ grunt.initConfig({
"Scripts/viewer/viewer.js",
"Scripts/xlsx/shim.min.js",
"Scripts/xlsx/xlsx.full.min.js",
"Scripts/position-calculator/position-calculator.min.js"],
"Scripts/position-calculator/position-calculator.min.js"
],
dest: '<%= pkg.bundleTemp %>/util.js'
},
angularFileUpload:{
src: ["Scripts/angular-file-upload.js"],
dest: '<%= pkg.bundleTemp %>/angular-file-upload.js'
},
PDFObject:{
src: ["Scripts/PDFObject.js"],
dest: '<%= pkg.bundleTemp %>/PDFObject.js'
pdfWorker:{
src: [
"Scripts/pdf/pdf.js",
"Scripts/pdf/pdf.worker.js"],
dest: '<%= pkg.bundleTemp %>/pdf.worker.js'
},
jqueryval: {
src: ["Scripts/jquery.validate*"],
......@@ -559,7 +562,7 @@ grunt.registerTask('build', '生产构建任务', function () {
});
grunt.registerTask('dev', '开发环境', function () {
grunt.task.run(['concat:adminHomePageJs', 'concat:adminHomePageLess','concat:basicDataJs','concat:angularFileUpload','concat:PDFObject',
grunt.task.run(['concat:adminHomePageJs', 'concat:adminHomePageLess','concat:basicDataJs','concat:angularFileUpload','concat:pdfWorker',
'concat:basicDataLess', 'concat:systemConfigurationJs','concat:systemConfigurationLess',
'concat:basicDataCss', 'concat:infrastructureJs','concat:infrastructureLess',
'concat:commonCss', 'concat:commonLess','concat:adminApp','concat:noPermissionPageJs','concat:noPermissionPageLess',
......
atms-web/src/main/webapp/Scripts/PDFObject.js deleted 100644 → 0
View file @ 31d0cfe1
This diff is collapsed.
atms-web/src/main/webapp/Scripts/pdf/pdf.js 0 → 100644
View file @ 0a475162
This diff is collapsed.
atms-web/src/main/webapp/Scripts/pdf/pdf.worker.js 0 → 100644
View file @ 0a475162
This diff is collapsed.
atms-web/src/main/webapp/WEB-INF/templates/index.html
View file @ 0a475162
......@@ -100,7 +100,7 @@
<script type="text/javascript" src="bundles/echarts.js"></script>
<script type="text/javascript" src="bundles/jsword.js"></script>
<script type="text/javascript" src="bundles/angular-file-upload.js"></script>
<script type="text/javascript" src="bundles/PDFObject.js"></script>
<script type="text/javascript" src="bundles/pdf.worker.js"></script>
<script type="text/javascript" src="bundles/app.js"></script>
<script type="text/javascript" src="bundles/common.js"></script>
......
atms-web/src/main/webapp/app-resources/css/customer.css
View file @ 0a475162
......@@ -3,9 +3,9 @@ a {
color: #404041;
}
a:hover, a:visited, a:active, a:checked {
a:hover, a:visited, a:active, a:checked {
color: #602320;
}
}
.badge {
background-color: #968c6d;
......@@ -176,8 +176,6 @@ span.form-control-customer {
/* LOGIN */
body.login-body {
background: #999999 url('/app-resources/images/login_pic.jpg') no-repeat;
height: calc(100% - 16px);
background-size: cover;
color: #333;
overflow-y: auto;
}
......@@ -203,9 +201,9 @@ body.login-body {
color: #A32020;
}
.tilte .text {
.tilte .text {
position: absolute;
}
}
.background-frame {
background-repeat: no-repeat;
......@@ -249,9 +247,9 @@ body.login-body {
margin-top: -45px;
}
.form-wrapper input, .form-wrapper button {
.form-wrapper input, .form-wrapper button {
opacity: 1;
}
}
.loginfull {
......@@ -277,17 +275,17 @@ body.login-body {
height: 100px;
}
.login-button:hover {
.login-button:hover {
color: #fff;
background-color: #dc6900;
}
}
.login-button:disabled {
.login-button:disabled {
background-color: #968c6d;
color: #fff;
width: 100px;
height: 100px;
}
}
.loginfull input::-webkit-input-placeholder {
font-weight: 400;
......@@ -331,11 +329,11 @@ body.login-body {
border-radius: 10px;
}
.loginfull .form-control-customer.has-error {
.loginfull .form-control-customer.has-error {
border-color: #a94442;
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
}
}
.loginfull .successMsg {
float: left;
......@@ -493,17 +491,17 @@ form.userchoose .form-group {
text-align: center;
}
.progress-table > tbody > tr > td:first-child {
.progress-table > tbody > tr > td:first-child {
text-align: left;
}
}
.progress-table > tbody > tr > td {
.progress-table > tbody > tr > td {
border-top: 0px;
}
}
.progress-table > tbody > tr > td:after {
.progress-table > tbody > tr > td:after {
border-top: 0px;
}
}
.progress-title {
text-shadow: none;
......@@ -583,9 +581,9 @@ form.userchoose .form-group {
background: #a32020;
}
.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary:hover, .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary:hover {
.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary:hover, .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary:hover {
background: #602320;
}
}
.bootstrap-switch.bootstrap-switch-focused {
border-color: #dc6900;
......@@ -765,28 +763,26 @@ form.userchoose .form-group {
}
}
width: 100%; @-webkit-keyframes uil-flickr-anim2 {
0%;
@-webkit-keyframes uil-flickr-anim2 {
{
0%{
left: 100px;
z-index: 1;
}
}
49% {
49% {
z-index: 1;
}
}
50% {
50% {
left: 0;
z-index: 10;
}
}
100% {
100% {
left: 100px;
z-index: 10;
}
}
}
@-webkit-keyframes uil-flickr-anim2 {
......@@ -943,15 +939,15 @@ width: 100%; @-webkit-keyframes uil-flickr-anim2 {
height: 200px;
}
.uil-flickr-css > div {
.uil-flickr-css > div {
width: 100px;
height: 100px;
border-radius: 50px;
position: absolute;
top: 50px;
}
}
.uil-flickr-css > div:nth-of-type(1) {
.uil-flickr-css > div:nth-of-type(1) {
left: 0;
background: #e35839;
z-index: 5;
......@@ -960,9 +956,9 @@ width: 100%; @-webkit-keyframes uil-flickr-anim2 {
-webkit-animation: uil-flickr-anim1 1s linear infinite;
-o-animation: uil-flickr-anim1 1s linear infinite;
animation: uil-flickr-anim1 1s linear infinite;
}
}
.uil-flickr-css > div:nth-of-type(2) {
.uil-flickr-css > div:nth-of-type(2) {
left: 100px;
background: #d28d4f;
-ms-animation: uil-flickr-anim2 1s linear infinite;
......@@ -970,7 +966,7 @@ width: 100%; @-webkit-keyframes uil-flickr-anim2 {
-webkit-animation: uil-flickr-anim2 1s linear infinite;
-o-animation: uil-flickr-anim2 1s linear infinite;
animation: uil-flickr-anim2 1s linear infinite;
}
}
/* datepicker */
......@@ -984,10 +980,10 @@ width: 100%; @-webkit-keyframes uil-flickr-anim2 {
background-color: #eb8c00;
}
.datepicker table tr td span.active.active.focus, .datepicker table tr td span.active.active:focus, .datepicker table tr td span.active.active:hover, .datepicker table tr td span.active.disabled.active.focus, .datepicker table tr td span.active.disabled.active:focus, .datepicker table tr td span.active.disabled.active:hover, .datepicker table tr td span.active.disabled:active.focus, .datepicker table tr td span.active.disabled:active:focus, .datepicker table tr td span.active.disabled:active:hover, .datepicker table tr td span.active.disabled:hover.active.focus, .datepicker table tr td span.active.disabled:hover.active:focus, .datepicker table tr td span.active.disabled:hover.active:hover, .datepicker table tr td span.active.disabled:hover:active.focus, .datepicker table tr td span.active.disabled:hover:active:focus, .datepicker table tr td span.active.disabled:hover:active:hover, .datepicker table tr td span.active:active.focus, .datepicker table tr td span.active:active:focus, .datepicker table tr td span.active:active:hover, .datepicker table tr td span.active:hover.active.focus, .datepicker table tr td span.active:hover.active:focus, .datepicker table tr td span.active:hover.active:hover, .datepicker table tr td span.active:hover:active.focus, .datepicker table tr td span.active:hover:active:focus, .datepicker table tr td span.active:hover:active:hover {
.datepicker table tr td span.active.active.focus, .datepicker table tr td span.active.active:focus, .datepicker table tr td span.active.active:hover, .datepicker table tr td span.active.disabled.active.focus, .datepicker table tr td span.active.disabled.active:focus, .datepicker table tr td span.active.disabled.active:hover, .datepicker table tr td span.active.disabled:active.focus, .datepicker table tr td span.active.disabled:active:focus, .datepicker table tr td span.active.disabled:active:hover, .datepicker table tr td span.active.disabled:hover.active.focus, .datepicker table tr td span.active.disabled:hover.active:focus, .datepicker table tr td span.active.disabled:hover.active:hover, .datepicker table tr td span.active.disabled:hover:active.focus, .datepicker table tr td span.active.disabled:hover:active:focus, .datepicker table tr td span.active.disabled:hover:active:hover, .datepicker table tr td span.active:active.focus, .datepicker table tr td span.active:active:focus, .datepicker table tr td span.active:active:hover, .datepicker table tr td span.active:hover.active.focus, .datepicker table tr td span.active:hover.active:focus, .datepicker table tr td span.active:hover.active:hover, .datepicker table tr td span.active:hover:active.focus, .datepicker table tr td span.active:hover:active:focus, .datepicker table tr td span.active:hover:active:hover {
color: #fff;
background-color: #dc6900;
}
}
.datepicker table tr td, .datepicker table tr th {
text-align: center;
......@@ -1044,9 +1040,9 @@ width: 100%; @-webkit-keyframes uil-flickr-anim2 {
background-image: none;
}
.ui-select-no-border .select2-container .select2-choice .select2-arrow b {
.ui-select-no-border .select2-container .select2-choice .select2-arrow b {
background: url(/app-resources/images/vat/down.png) no-repeat scroll right center transparent;
}
}
.ui-select-no-border .select2-container .select2-choice {
border: none;
......@@ -1085,18 +1081,18 @@ width: 100%; @-webkit-keyframes uil-flickr-anim2 {
outline: none;
}
.ui-select-has-border .select2-container .select2-choice .select2-arrow {
.ui-select-has-border .select2-container .select2-choice .select2-arrow {
border-left: none;
background: none;
background-image: none;
}
}
.ui-select-has-border .select2-container .select2-choice .select2-arrow b {
.ui-select-has-border .select2-container .select2-choice .select2-arrow b {
margin-top: 2px;
}
}
.ui-select-has-border .select2-container .select2-choice,
.ui-select-has-border .select2-container-active .select2-choice {
.ui-select-has-border .select2-container .select2-choice,
.ui-select-has-border .select2-container-active .select2-choice {
background-image: none;
background: none;
outline: none;
......@@ -1114,7 +1110,7 @@ width: 100%; @-webkit-keyframes uil-flickr-anim2 {
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
}
.dx-checkbox-checked .dx-checkbox-icon {
color: #e0301e;
......@@ -1142,17 +1138,17 @@ width: 100%; @-webkit-keyframes uil-flickr-anim2 {
background-color: #dc6900;
}
.dx-list:not(.dx-list-select-decorator-enabled) .dx-list-item.dx-state-focused.dx-list-item-selected {
.dx-list:not(.dx-list-select-decorator-enabled) .dx-list-item.dx-state-focused.dx-list-item-selected {
background-color: #dc6900;
}
}
.dx-list:not(.dx-list-select-decorator-enabled) .dx-list-item.dx-state-active {
background-color: #dc6900;
}
.dx-list:not(.dx-list-select-decorator-enabled) .dx-list-item.dx-state-active .dx-list-slide-item-content {
.dx-list:not(.dx-list-select-decorator-enabled) .dx-list-item.dx-state-active .dx-list-slide-item-content {
background-color: #dc6900;
}
}
.dx-list-item.dx-list-item-ghost-reordering.dx-state-focused.dx-state-hover {
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 0a475162
......@@ -201,6 +201,7 @@
line-height: 100%;
padding: 1.4rem;
/*color: #fff;*/
cursor: pointer;
border: 1px solid #e5e5e5;
}
.TDL-multi-upload-content{
......@@ -216,33 +217,61 @@
color:#4395ff;
}
.TDL-pdf-preview-pop{
position: fixed;top: 0;left: 0;z-index: 1051;
position: fixed;
top: 0;left: 0;z-index: 1051;
background: #333;
text-align: center;
overflow: auto;
}
.TDL-pdf-preview-pop-btn{
.TDL-pdf-preview-pop-close-btn{
position: fixed;
top: 6rem;
right: 6rem;
width: 4rem;
height: 4rem;
background: rgb(254,66,66);
background: rgba(254,66,66,0.5);
color: #333;
border-radius: 100%;
font-size: 2.4rem;
color: #666;
text-align: center;
line-height: 100%;
cursor: pointer;
padding: 0;
z-index: 1502;
border: 0;
opacity: 0.6;
}
.TDL-pdf-preview-pop-btn:hover{
opacity: 0.8;
.TDL-pdf-preview-pop-close-btn:hover{
background: rgba(254,66,66,0.8);
color:#fff;
}
.TDL-pdf-layout-dialog{
display:none;
}
.test{
position: absolute;
top:0;
left:0;
z-index: 1111;
}
.TDL-pdf-paging-btn{
position: fixed;
top: 49%;
z-index: 1052;
border: 0;
padding: 2rem;
font-size: 2rem;
background: rgba(33,33,33,0.5);
outline: none;
}
.TDL-pdf-paging-btn:hover{
background: rgba(255, 255, 198, 0.7);
color:#fff;
}
.TDL-pdf-paging-btn-prev{
left: 6rem;
}
.TDL-pdf-paging-btn-next{
right: 6rem;
}
</style>
<div class="menu-header TDL-header" multi-date-picker>
<div class="TDL-query-bar" ng-init="MoreFields = false">
......@@ -326,7 +355,6 @@
<div class="TDL-query-val">
<select ng-model="queryFieldModel.companyName" class="form-control radius3"
title="{{queryFieldModel.companyName}}" required placeholder="{{'PleaseSelected' | translate}}">
<option selected></option>
<option ng-repeat="(key,companyName) in companyNameOptionsMap"
ng-click="queryFieldModel.companyId = key"
value="{{companyName}}">{{companyName}}</option>
......@@ -488,11 +516,13 @@
<a href="javascript:void(0)" ng-click="uploadFile()"><i class="fa fa-upload"></i></a>
</div>
</div>
<div ng-if="isCreatePop && uploader.queue.length" class="col-sm-6 form-group">
<!--取消上传时的预览功能-->
<!--<div ng-if="isCreatePop && uploader.queue.length" class="col-sm-6 form-group">
<label class="col-sm-3 control-label" style="text-align: left;">
<a href="javascript:void(0)" class="DTL-special-external-preview" ng-click="viewNativeFile(uploader.queue[0])">{{'PreviewFile'|translate}}</a>
</label>
</div>
</div>-->
<div style="clear:both"></div>
<!--档案名称-->
<div class="col-sm-6 form-group">
......@@ -692,11 +722,13 @@
<!--<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">-->
</div>
</div>
<div class="col-sm-6 form-group">
<!--取消上传时的预览功能-->
<!-- <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label" style="text-align: left;margin-left: -34px;">
<a href="javascript:void(0)" class="DTL-special-external-preview" ng-click="viewNativeFile(multiUploader.queue[$index])">预览文件</a>
</label>
</div>
</div>-->
<div style="clear:both"></div>
<!--档案名称-->
<div class="col-sm-6 form-group">
......@@ -884,8 +916,11 @@
<div class="TDL-pdf-layout-dialog" id="pdfLayoutDialog" pdf-preview>
<div class="wrapper TDL-pdf-preview-pop" id="pdfContainer">
<canvas id="the-canvas"></canvas>
</div>
<button class="TDL-pdf-preview-pop-btn" ng-click="closePdfPop()">x</button>
</div>
<button class="TDL-pdf-preview-pop-close-btn" ng-click="closePdfPop()">x</button>
<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-prev" ng-click="prevPaging()" title="上一页">&lt;</button>
<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-next" ng-click="nextPaging()" title="下一页">&gt;</button>
</div>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.svc.js
View file @ 0a475162
......@@ -22,25 +22,23 @@ taxDocumentManageModule.factory('taxDocumentListService',
return jqFetch.post(apiInterceptor.webApiHostUrl + '/fileTypes/query4SelectionBox', params);
},
getCompanyNameOptions:function(params){
return jqFetch.post(apiInterceptor.webApiHostUrl + '/org/query4SelectionBox', params);
return jqFetch.get(apiInterceptor.webApiHostUrl + '/org/getMyOrgList', params);
},
delFileRecordItems:function(params){
return jqFetch.post(apiInterceptor.webApiHostUrl + '/taxDoc/batchDelete', params);
},
getBinaryData:function(url){
// var defer = $q.defer();
// var oReq = new XMLHttpRequest();
// oReq.onload = function(e) {
// var arraybuffer = oReq.response;
// console.info("arraybuffer:",arraybuffer);
// defer.resolve(arraybuffer);
// };
// oReq.open("GET", 'http://47.94.233.173:11007/static/erp_tax_system/3221D133-85B8-4E22-AE9B-DBEBD942D217?expire=1552361736&signiture=_Wz1_8Z6T8h5qnZAGpoRa8kNZeqmE7KoztKeehzYK4U=', true);
// oReq.responseType = "arraybuffer";
// oReq.send();
return jqFetch.get(apiInterceptor.webApiHostUrl + url,{},'arraybuffer');
// return defer.promise;
var defer = $q.defer();
var oReq = new XMLHttpRequest();
oReq.onload = function(e) {
var arraybuffer = oReq.response;
console.info("arraybuffer:",arraybuffer);
defer.resolve(arraybuffer);
};
oReq.open("GET", url, true);
oReq.responseType = "arraybuffer";
oReq.send();
return defer.promise;
}
......
atms-web/src/main/webapp/package-lock.json
View file @ 0a475162
......@@ -1011,16 +1011,6 @@
"dev": true,
"optional": true
},
"jquery": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
"integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
},
"jquery-viewer": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/jquery-viewer/-/jquery-viewer-1.0.0.tgz",
"integrity": "sha512-j1f7AKNU+wjywS8CwtHzDymyoroUznoXnrRp87WIRVuzZzMoFtJCrj54F/0BAi2DIEkDHx/1EZl9N725M6LiIA=="
},
"js-yaml": {
"version": "3.5.5",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz",
......@@ -1720,6 +1710,11 @@
}
}
},
"viewerjs": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.3.2.tgz",
"integrity": "sha512-P9Ac9H+GJ1jE9B5x8foRYm/xZvpWFR6L4GC9mr6181P9amOzQPDkplQrFj8l7mdnv8EyH2dO8XJJfoylir316A=="
},
"websocket-driver": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
......
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