diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index d3afd036e..9533d09d6 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -569,5 +569,6 @@ module.exports = {
searchContent:'Search content',
viewFile:'view file',
fileFormatIncorrect:'the file format is incorrect',
+ pleaseUploadFile:'please upload the file',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index bae2b8d6a..211b3d30b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -573,6 +573,7 @@ module.exports = {
searchContent:'搜索内容',
viewFile:'查看文件',
fileFormatIncorrect:'文件格式不正确',
+ pleaseUploadFile:'请上传文件',
}
\ No newline at end of file
diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue
index c713eca92..97f240046 100644
--- a/jero-web/src/components/OcrAddForm/index.vue
+++ b/jero-web/src/components/OcrAddForm/index.vue
@@ -169,7 +169,7 @@
{{item.db_field_txt}}
-
+
diff --git a/jero-web/src/components/OcrUpload/index.vue b/jero-web/src/components/OcrUpload/index.vue
index 215445ffe..296ebc680 100644
--- a/jero-web/src/components/OcrUpload/index.vue
+++ b/jero-web/src/components/OcrUpload/index.vue
@@ -15,7 +15,8 @@
:remove='remove'
@change="handleChange">
- {{$t('clickUpload')}}
+ {{$t('clickUpload')}}
+ {{$t('clickUpload')}}
@@ -26,7 +27,7 @@
import { ACCESS_TOKEN } from "@/store/mutation-types"
export default {
name: 'ocrUpload',
- props:['disableds','disabled','thisFileUploadUrl','readonly','thisFileType','accept','title','listType'],
+ props:['disableds','disabled','thisFileUploadUrl','readonly','thisFileType','accept','title','listType','module'],
data(){
return{
visible:false,
@@ -48,6 +49,7 @@
},
methods:{
beforeUpload(file,fileList) {
+ console.log('file',this.accept)
if(this.myfileList&&this.myfileList.length>=1){
this.$message.warning('只能上传一个文件')
return false
@@ -67,7 +69,7 @@
},
handleChange(info) {
// console.log('info',info)
- let { file } = info;
+ let { file,fileList } = info;
const status = info.file.status;
info.fileList.forEach((val,index)=>{
if(val.response && !val.response.result){
diff --git a/jero-web/src/components/SplitUpload/index.vue b/jero-web/src/components/SplitUpload/index.vue
index a10aa88ad..41d39919d 100644
--- a/jero-web/src/components/SplitUpload/index.vue
+++ b/jero-web/src/components/SplitUpload/index.vue
@@ -71,21 +71,14 @@
beforeUpload(file) {
let fileFlag=false
console.log('accept',this.accept,file)
- // if(this.accept.indexOf(',')!=-1){
- // let fileTypes=this.accept.split(',')
- // fileTypes.forEach(item=>{
- // if(item==file.type){
- // fileFlag=true
- // }
- // })
- // }else{
- // let fileTypes=this.accept.split('/')
- // let fileNowTypes=file.type.split('/')
- // fileFlag=fileTypes[0]==fileTypes[0]?true:false
- // }
+
+ let fileTypes=this.accept.split('/')
+ let fileNowTypes=file.type.split('/')
+ fileFlag=fileTypes[0]==fileTypes[0]?true:false
+
// console.log('filetype',fileFlag)
- if(fileFlag){
+ if(!fileFlag){
this.$message.warning(this.$t('fileFormatIncorrect'))
this.fileTypeSatus = false
}else{
diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
index 0bbea9361..2fa24904a 100644
--- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
@@ -34,33 +34,33 @@
:wrapper-col="wrapperCol"
>
- {{form.file}}
-
+
+
+
- {{ (form.file === 'null' || form.file === '' ||
- form.file == null) ? $t('upload1') : $t('viewUploadedFiles')
- }}
-
+
+
+
+
{{$t('templateDownload')}}
-
+