Merge branch 'fix_foton_20240408' into 'master'

Fix foton 20240408

See merge request laws-foton-slrs/foton-laws-system-front!180
This commit is contained in:
王晓勇
2024-04-22 09:47:53 +00:00
2 changed files with 5 additions and 1 deletions
+3 -1
View File
@@ -54,7 +54,9 @@ async function preview (attId, type) {
this.$message.error('文档未转换成功或本地读取不到该文档')
return
}
} else {
} else if (file.previewAttId) {
url = viewer + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.previewAttId)
}else {
url = kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(file.downLoadUrl)) + '&watermarkTxt=' + encodeURIComponent(store.getters.userInfo.userName)
}
}
@@ -568,6 +568,8 @@ export default {
if (this.form.standStatus === '2') {
form.putTime = undefined
form.issueTime = undefined
form.XGD = undefined
form.XGDName = undefined
}
this.form = Object.assign(initForm, pick(form, keys), { standStatus: this.form.standStatus })
// 对象空值转为空字符串