Merge branch '' of E:\Software\rtpro\Foton\New_Pro\laws-system-front-FOTON with conflicts.
This commit is contained in:
@@ -1060,7 +1060,7 @@ export default {
|
||||
handleOnPreview(file) {
|
||||
let attId = file.id
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
// 相关附件 上传之前钩子
|
||||
|
||||
@@ -1038,7 +1038,7 @@ export default {
|
||||
*/
|
||||
downloadFile(attId) {
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
|
||||
} else {
|
||||
this.$message.error("请选择要下载的文件");
|
||||
}
|
||||
@@ -1049,7 +1049,7 @@ export default {
|
||||
this.$message.error("水印下载仅支持PDF,pdf格式文件");
|
||||
} else {
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
|
||||
} else {
|
||||
this.$message.error("请选择要下载的文件");
|
||||
}
|
||||
|
||||
@@ -2123,7 +2123,7 @@ export default {
|
||||
handleOnPreview(file) {
|
||||
let attId = file.id
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
+1
-1
@@ -2053,7 +2053,7 @@ export default {
|
||||
handleOnPreview(file) {
|
||||
let attId = file.id
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
@@ -162,7 +162,7 @@ export default {
|
||||
*/
|
||||
downloadFile(attId) {
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
|
||||
} else {
|
||||
this.$message.error("请选择要下载的文件");
|
||||
}
|
||||
@@ -173,7 +173,7 @@ export default {
|
||||
this.$message.error("水印下载仅支持PDF,pdf格式文件");
|
||||
} else {
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
|
||||
} else {
|
||||
this.$message.error("请选择要下载的文件");
|
||||
}
|
||||
|
||||
@@ -180,7 +180,7 @@
|
||||
>
|
||||
<el-upload
|
||||
class="upload-demo"
|
||||
action="/api/att/attFile/upload"
|
||||
action="/api/att/attFile/uploadNew"
|
||||
:on-preview="handlePreview"
|
||||
:on-remove="handleRemove"
|
||||
:before-remove="beforeRemove"
|
||||
|
||||
@@ -534,14 +534,14 @@ export default {
|
||||
handleOnPreview(file) {
|
||||
let attId = file.id
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
/** 点击对应附件进行下载*/
|
||||
previews(val) {
|
||||
let attId = val
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2872,7 +2872,7 @@ export default {
|
||||
downloadFile(attId) {
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href =
|
||||
"/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
"/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
|
||||
} else {
|
||||
this.$message.error("请选择要下载的文件");
|
||||
}
|
||||
|
||||
@@ -891,7 +891,7 @@ export default {
|
||||
},
|
||||
downloadFile (attId) {
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
@@ -901,7 +901,7 @@ export default {
|
||||
this.$message.error('水印下载仅支持PDF,pdf格式文件')
|
||||
} else {
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
|
||||
@@ -436,7 +436,7 @@ export default {
|
||||
this.$message.error('水印下载仅支持PDF,pdf格式文件')
|
||||
} else {
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
|
||||
@@ -327,7 +327,7 @@ export default {
|
||||
},
|
||||
downloadFile(attId) {
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
@@ -337,7 +337,7 @@ export default {
|
||||
this.$message.error('水印下载仅支持PDF,pdf格式文件')
|
||||
} else {
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
|
||||
@@ -397,7 +397,7 @@ export default {
|
||||
},
|
||||
downloadFile (attId) {
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
@@ -407,7 +407,7 @@ export default {
|
||||
this.$message.error('水印下载仅支持PDF,pdf格式文件')
|
||||
} else {
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
|
||||
@@ -426,7 +426,7 @@ export default {
|
||||
},
|
||||
downloadFile (attId) {
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
@@ -436,7 +436,7 @@ export default {
|
||||
this.$message.error('水印下载仅支持PDF,pdf格式文件')
|
||||
} else {
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
|
||||
@@ -346,7 +346,7 @@ export default {
|
||||
}
|
||||
},
|
||||
downloadFile (attId) {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview(item) {
|
||||
|
||||
@@ -1037,7 +1037,7 @@
|
||||
updateFile (item) {
|
||||
const attId = item.attId
|
||||
if (attId) {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.warning('文件不存在,下载失败')
|
||||
}
|
||||
@@ -1045,7 +1045,7 @@
|
||||
clickButtonToUpload (file) {
|
||||
const attId = file.attId
|
||||
if (attId) {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.warning('文件不存在,下载失败')
|
||||
}
|
||||
|
||||
@@ -915,7 +915,7 @@
|
||||
updateFile (item) {
|
||||
const attId = item.attId
|
||||
if (attId) {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.warning('文件不存在,下载失败')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user