FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!260
This commit is contained in:
王夏晖
2021-12-28 16:30:22 +08:00
parent cb28bb8199 2c96ffe5dc
commit 4f574624a9
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+5 -6
View File
@@ -382,14 +382,13 @@ export default {
} }
}, },
downloadFileByWater(attId, fileSuffix) { downloadFileByWater(attId, fileSuffix) {
let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
if (fileExtension !== "pdf" && fileExtension !== "PDF") { this.$message.error('水印下载仅支持PDF,pdf格式文件')
this.$message.error("水印下载仅支持PDF,pdf格式文件");
} else { } else {
if (attId != null && attId !== "") { if (attId != null && attId !== '') {
window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
} else { } else {
this.$message.error("请选择要下载的文件"); this.$message.error('请选择要下载的文件')
} }
} }
}, },
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+5 -6
View File
@@ -452,14 +452,13 @@ export default {
} }
}, },
downloadFileByWater(attId, fileSuffix) { downloadFileByWater(attId, fileSuffix) {
let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
if (fileExtension !== "pdf" && fileExtension !== "PDF") { this.$message.error('水印下载仅支持PDF,pdf格式文件')
this.$message.error("水印下载仅支持PDF,pdf格式文件");
} else { } else {
if (attId != null && attId !== "") { if (attId != null && attId !== '') {
window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
} else { } else {
this.$message.error("请选择要下载的文件"); this.$message.error('请选择要下载的文件')
} }
} }
}, },
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+1
View File
@@ -880,6 +880,7 @@ export default {
}else{ }else{
this.qdform = item.form this.qdform = item.form
this.dataList =item.form.dataList this.dataList =item.form.dataList
this.commentText = item.commentText
this.detailedId = item.form.detailedListId; this.detailedId = item.form.detailedListId;
} }
}); });
src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+1
View File
@@ -889,6 +889,7 @@ export default {
}else{ }else{
this.qdform = item.form this.qdform = item.form
this.dataList =item.form.dataList this.dataList =item.form.dataList
this.commentText = item.commentText
this.detailedId = item.form.detailedListId; this.detailedId = item.form.detailedListId;
} }
}); });
src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+1
View File
@@ -883,6 +883,7 @@ export default {
}else{ }else{
this.qdform = item.form this.qdform = item.form
this.dataList =item.form.dataList this.dataList =item.form.dataList
this.commentText = item.commentText
this.detailedId = item.form.detailedListId; this.detailedId = item.form.detailedListId;
} }
}); });