ocr修改

jero-web/src/views/documentManage/ocr/index.vue

@@ -78,7 +78,7 @@
     </div>
 
     <doc-table v-if="drawVisible" :drawVisible="drawVisible" :drawTableSorce="drawTableSorce" @visible="docVisible" @exportVisible="exportVisible"></doc-table>
-    <ocr-upload  ref="uploadFile1" :disabled="disabled" :accept="accept" :title="title" :listType='listType' @uploadSuccess="uploadSuccess"></ocr-upload>
+    <ocr-upload  ref="uploadFile1" :disabled="disabled" :accept="accept"  :listType='listType' @uploadSuccess="uploadSuccess"></ocr-upload>
     </a-card>
   </div>
 
@@ -156,7 +156,7 @@
         accept:'application/pdf',
         today:'',
         timer:'',
-        title:this.$t('UploadFile'),
+        uploadTitle:this.$t('UploadFile'),
         listType:'text',
         token:Vue.ls.get(ACCESS_TOKEN),
         websock: null,
@@ -355,13 +355,18 @@
       },
       //上传文件
       uploadSuccess(data) {
+        console.log('data11',data)
         let attIdList = []
+        let attNameList = []
         if(data && data.length > 0){
           data.forEach(item => {
             attIdList.push(item.id || data.name)
+            attNameList.push(itme.fileName)
           })
           this.form.attId = attIdList.join(',')
+          this.form.fileName=attNameList.join(',')
         }
+        this.$refs.uploadFile1.visible=false
       },
       fileUpload(){
 
@@ -411,6 +416,7 @@
       addFormClick() {
         this.fileVisible = false
       },
+
     },
     beforeDestroy(){
     },

jero-web/src/views/documentManage/ocr/modules/DocTable.vue

@@ -182,7 +182,7 @@
       },
       //导入按钮
       tableExport(){
-        console.log('rows',this.rows)
+        // console.log('rows',this.rows)
         if(this.rows&&this.rows.length>1){
           this.$message.warning(this.$t('OnlyOneSelected'))
         }else if(this.rows==undefined||this.rows.length===0){
@@ -216,6 +216,8 @@
                 if (res.success) {
                   this.$message.success(this.$t('OperationSuccessful'))
                   eventBUs.$emit('searchReset')
+                  this.visible = false;
+                  this.$emit('visible',false)
                 } else {
                   this.$message.warning(this.$t('operationFailed'))
                 }

jero-web/src/views/documentManage/tags/dialog/DicList.vue

@@ -42,9 +42,9 @@
             <a-form-model-item :label="$t('name')" prop="name" v-if="dictVal=='tree'">
               <a-input v-model="form.name" :placeholder="$t('enterName')" />
             </a-form-model-item>
-            <a-form-model-item :label="$t('DataValue')" prop="itemValue">
-              <a-input v-model="form.itemValue" :placeholder="$t('enterDataValue')" />
-            </a-form-model-item>
+<!--            <a-form-model-item :label="$t('DataValue')" prop="itemValue">-->
+<!--              <a-input v-model="form.itemValue" :placeholder="$t('enterDataValue')" />-->
+<!--            </a-form-model-item>-->
             <a-form-model-item :label="$t('enName')" prop="enName">
               <a-input v-model="form.enName" :placeholder="$t('PleaseEnterYourEnglishName')" />
             </a-form-model-item>
@@ -103,10 +103,10 @@
               { required: true, message: this.$t('enterName'), trigger: 'blur' },
               { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' },
             ],
-          itemValue:[
-            { required: true, message: this.$t('enterDataValue'), trigger: 'blur' },
-            { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' },
-          ],
+          // itemValue:[
+          //   { required: true, message: this.$t('enterDataValue'), trigger: 'blur' },
+          //   { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' },
+          // ],
           enName:[
             { required: true, message: this.$t('PleaseEnterYourEnglishName'), trigger: 'blur' },
             { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' },