Merge remote-tracking branch 'origin/master'

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

@@ -713,7 +713,8 @@ export default {
   min-width: 150px;
 }
 .add-width{
-  width: 30%;
+  width: 33%;
+  margin-right: 5px;
 }
 .add--number{
   width: 101%;

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

@@ -18,9 +18,9 @@
               <span v-if="ol.text==$t('SyncLibrary')" v-has="'ocr:ocrRecord:syncToDocument'">
                      {{record.resultContent=='转换成功'&&record.syncState=='未同步'&&record.fileSource=='1'?ol.text:''}}
               </span>
-             <span v-if="ol.text==$t('check')">
+<!--             <span v-if="ol.text==$t('check')">-->
-                     {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}}
+<!--                     {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}}-->
-              </span>
+<!--              </span>-->
              <span v-if="ol.text==$t('download') && record.createBy == userData.username"
                    v-has="'ocr:ocrRestful:downFile'">
                      {{record.resultContent=='转换成功'?ol.text:''}}

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

@@ -69,7 +69,6 @@
           @actionSynchron="actionSynchron"
           :url="url"
           showAction
-          @actionCheck="actionCheck"
           @actionDown="actionDown"
           @onSelectChange="onSelectChange"
           @actionDelete="actionDelete"
@@ -114,10 +113,10 @@
             text: this.$t('SyncLibrary'),
             ClickEvent: 'actionSynchron'
           },   //同步至文档库
-          {
+          // {
-            text: this.$t('check'),
+          //   text: this.$t('check'),
-            ClickEvent: 'actionCheck'
+          //   ClickEvent: 'actionCheck'
-          },   //校核
+          // },   //校核
           {
             text: this.$t('download'),
             ClickEvent: 'actionDown'
@@ -309,39 +308,36 @@
         }
       },
       //校核
-      actionCheck(val){
+      // actionCheck(val){
-        // this.checkVisible=true
+      //   // this.checkVisible=true
-        this.loading=true
+      //   this.loading=true
-        axios({
+      //   axios({
-          url: '/jero-boot/ocr/ocrCheck/verifyCheckFlag',
+      //     url: '/jero-boot/ocr/ocrCheck/verifyCheckFlag',
-          method: 'get',
+      //     method: 'get',
-          params: {
+      //     params: {
-            id:val.id
+      //       id:val.id
-          },
+      //     },
-          headers: {
+      //     headers: {
-            'X-Access-Token':this.token
+      //       'X-Access-Token':this.token
-          }
+      //     }
-        })
+      //   })
-          .then( (res) => {
+      //     .then( (res) => {
-            if (res.data.success) {
+      //       if (res.data.success) {
-              let newUrl = this.$router.resolve({
+      //         let newUrl = this.$router.resolve({
-                path: '/ocr/ocrSplit',
+      //           path: '/ocr/ocrSplit',
-                query:{
+      //           query:{
-                  fileName: val.docRealName,
+      //             fileName: val.docRealName,
-                  id:val.id
+      //             id:val.id
-                }
+      //           }
-              })
+      //         })
-              window.open(newUrl.href, '_blank')
+      //         window.open(newUrl.href, '_blank')
-            }else{
+      //       }else{
-              this.$message.error(res.data.message)
+      //         this.$message.error(res.data.message)
-            }
+      //       }
-          }).finally(()=>{
+      //     }).finally(()=>{
-            this.loading=false
+      //       this.loading=false
-        })
+      //   })
-
+      // },
-
-
-      },
       //下载
       actionDown(val){
         let fileNames=val.docRealName.split('_')

jero-web/src/views/documentManage/splitting/modules/SplitText.vue

@@ -259,10 +259,11 @@
                   attId: file.id,
                   title: file.title,
                   fileName:file.file_name,
+                  titleEn:file.title_en,
                   serialNumber: file.serial_number,
                   connectId: file.connect_id,
                   fileGroup: this.fileGroup,
-                  fileType:file.text_info
+                  fileType:file.text_info_id
                 }
 
                 if(!this.submitFlag){