导入拆分结果

jero-web/src/components/OcrAddForm/index.vue

@@ -169,7 +169,7 @@
                 <span class="title-text-text">{{item.db_field_txt}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <uploadFile ref="uploadFile" :accept="accept" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+                <uploadFile ref="uploadFile" :accept="accept" :disabled="disabled" :module="'ocr'" @uploadSuccess="uploadSuccess"></uploadFile>
 <!--                <a-button type="primary" class="button-text"-->
 <!--                          @click="clickButtonToUpload(item.db_field_name)">-->
 <!--                  {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||-->

jero-web/src/components/OcrUpload/index.vue

@@ -15,7 +15,8 @@
         :remove='remove'
         @change="handleChange">
 <!--        <p><a-icon style="font-size: 67px;color: #c0c4cc;" type="cloud-upload" /></p>-->
-        <a-button  type="primary" ghost class="ant-upload-text" style="font-size: 14px;line-height: 30px">{{$t('clickUpload')}}</a-button>
+        <a-button  type="primary" v-if="module=='ocr'" ghost class="ant-upload-text" style="font-size: 14px;line-height: 30px">{{$t('clickUpload')}}</a-button>
+        <a-button  type="primary" v-if="module=='split'" class="ant-upload-text" style="font-size: 14px;line-height: 30px">{{$t('clickUpload')}}</a-button>
       </a-upload>
 <!--    </a-modal>-->
   </div>
@@ -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){

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{