From 04f3fbc15846e77add4c99d221b7a7b7577f067f Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Thu, 14 Apr 2022 13:57:04 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E6=A0=A1=E6=A0=B8=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/documentManage/ocr/OcrSplit.vue |   3 +-
 .../src/views/documentManage/ocr/index.vue    | 185 ++++++++++--------
 2 files changed, 106 insertions(+), 82 deletions(-)

diff --git a/jero-web/src/views/documentManage/ocr/OcrSplit.vue b/jero-web/src/views/documentManage/ocr/OcrSplit.vue
index 3d7e1cfd6..deb72d979 100644
--- a/jero-web/src/views/documentManage/ocr/OcrSplit.vue
+++ b/jero-web/src/views/documentManage/ocr/OcrSplit.vue
@@ -54,8 +54,9 @@
       populateIframe(iframe, headers) {
         var xhr = new XMLHttpRequest();
         let fileName= this.$route.query.fileName
+        let id=this.$route.query.id
         // xhr.open("GET", 'http://10.0.1.31:8080/jero-boot/ocr/pageOffice/word');
-        xhr.open("GET", '/jero-boot/ocr/ocrCheck/editorFile?fileName='+fileName);
+        xhr.open("GET", '/jero-boot/ocr/ocrCheck/editorFile?fileName='+fileName+'&id='+id);
         xhr.responseType = "blob";
         headers.forEach((header) => {
           xhr.setRequestHeader(header[0], header[1]);
diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index d1bf6e9cf..a92a13881 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -1,83 +1,85 @@
 <template>
   <div class="ocr">
     <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <search :flag="'2'" :url="url"/>
-    </div>
-    <div class="table-operator">
-      <div class="operator-text" @click="handleUpload" v-has="'ocr:ocrRestful:addOcrRecord'">
-        <a-icon type="plus" />
-        {{ $t('upload1') }}
+      <a-spin :spinning="loading">
+      <div class="table-page-search-wrapper">
+        <search :flag="'2'" :url="url"/>
       </div>
-      <div class="operator-text" @click="handleFileExport" v-has="'document:ocrPageInfo'">
-        <a-icon type="export" />
-        {{ $t('RetrieveFiles') }}
+      <div class="table-operator">
+        <div class="operator-text" @click="handleUpload" v-has="'ocr:ocrRestful:addOcrRecord'">
+          <a-icon type="plus" />
+          {{ $t('upload1') }}
+        </div>
+        <div class="operator-text" @click="handleFileExport" v-has="'document:ocrPageInfo'">
+          <a-icon type="export" />
+          {{ $t('RetrieveFiles') }}
+        </div>
+        <div class="operator-text" @click="handleDel" v-has="'ocr:ocrRecord:deleteBatch'">
+          <a-icon type="delete" />
+          {{ $t('BatchDelete') }}
+        </div>
       </div>
-      <div class="operator-text" @click="handleDel" v-has="'ocr:ocrRecord:deleteBatch'">
-        <a-icon type="delete" />
-        {{ $t('BatchDelete') }}
+
+      <!--        上传弹框-->
+      <a-modal
+        class="show-content"
+        :title="$t('UploadFile')"
+        :visible="fileVisible"
+        :confirm-loading="confirmLoading"
+        @ok="modalOk"
+        @cancel="handleCancel"
+      >
+        <addForm
+          ref="fileForm"
+          @addFormClick="addFormClick"
+          :flag="'2'"
+          v-if="fileVisible"
+          :url="url">
+        </addForm>
+      </a-modal>
+
+      <!--        同步弹框-->
+      <a-modal
+        class="show-content"
+        :title="$t('SyncLibrary')"
+        v-if="toVisible"
+        :visible="toVisible"
+        :confirm-loading="confirmLoading"
+        @ok="handleOkTo"
+        @cancel="handleCancelTo"
+      >
+        <p style="text-align: center">{{$t('sureSynchronize')}}</p>
+      </a-modal>
+      <!--      校核弹框-->
+      <a-modal
+        class="show-content"
+        :title="$t('check')"
+        v-if="checkVisible"
+        :visible="checkVisible"
+        :confirm-loading="confirmLoading"
+        @ok="handleOkCheck"
+        @cancel="handleCancelCheck"
+      >
+        <p style="text-align: center">{{$t('sureVerified')}}</p>
+      </a-modal>
+      <div class="table-detail">
+        <tableData
+          :flag="'2'"
+          :OperationList="OperationList"
+          @actionSynchron="actionSynchron"
+          :url="url"
+          showAction
+          @actionCheck="actionCheck"
+          @actionDown="actionDown"
+          @onSelectChange="onSelectChange"
+          @actionDelete="actionDelete"
+          @detailClick="detailClick"
+        />
       </div>
-    </div>
 
-    <!--        上传弹框-->
-    <a-modal
-      class="show-content"
-      :title="$t('UploadFile')"
-      :visible="fileVisible"
-      :confirm-loading="confirmLoading"
-      @ok="modalOk"
-      @cancel="handleCancel"
-    >
-      <addForm
-        ref="fileForm"
-        @addFormClick="addFormClick"
-        :flag="'2'"
-        v-if="fileVisible"
-        :url="url">
-      </addForm>
-    </a-modal>
-
-    <!--        同步弹框-->
-    <a-modal
-      class="show-content"
-      :title="$t('SyncLibrary')"
-      v-if="toVisible"
-      :visible="toVisible"
-      :confirm-loading="confirmLoading"
-      @ok="handleOkTo"
-      @cancel="handleCancelTo"
-    >
-      <p style="text-align: center">{{$t('sureSynchronize')}}</p>
-    </a-modal>
-    <!--      校核弹框-->
-    <a-modal
-      class="show-content"
-      :title="$t('check')"
-      v-if="checkVisible"
-      :visible="checkVisible"
-      :confirm-loading="confirmLoading"
-      @ok="handleOkCheck"
-      @cancel="handleCancelCheck"
-    >
-      <p style="text-align: center">{{$t('sureVerified')}}</p>
-    </a-modal>
-    <div class="table-detail">
-      <tableData
-        :flag="'2'"
-        :OperationList="OperationList"
-        @actionSynchron="actionSynchron"
-        :url="url"
-        showAction
-        @actionCheck="actionCheck"
-        @actionDown="actionDown"
-        @onSelectChange="onSelectChange"
-        @actionDelete="actionDelete"
-        @detailClick="detailClick"
-      />
-    </div>
-
-    <doc-table v-if="drawVisible" :drawVisible="drawVisible" :drawTableSorce="drawTableSorce" @visible="docVisible" @exportVisible="exportVisible"></doc-table>
-<!--    <ocr-upload  ref="uploadFile1" :disabled="disabled" :accept="accept"  :listType='listType' @uploadSuccess="uploadSuccess"></ocr-upload>-->
+      <doc-table v-if="drawVisible" :drawVisible="drawVisible" :drawTableSorce="drawTableSorce" @visible="docVisible" @exportVisible="exportVisible"></doc-table>
+  <!--    <ocr-upload  ref="uploadFile1" :disabled="disabled" :accept="accept"  :listType='listType' @uploadSuccess="uploadSuccess"></ocr-upload>-->
+      </a-spin>
     </a-card>
   </div>
 
@@ -159,6 +161,7 @@
         listType:'text',
         token:Vue.ls.get(ACCESS_TOKEN),
         websock: null,
+        loading:false
       }
     },
     props:{
@@ -308,16 +311,36 @@
       //校核
       actionCheck(val){
         // this.checkVisible=true
-        let newUrl = this.$router.resolve({
-          path: '/ocr/ocrSplit',
-          query:{
-            fileName: val.docRealName
+        this.loading=true
+        axios({
+          url: '/jero-boot/ocr/ocrCheck/verifyCheckFlag',
+          method: 'get',
+          params: {
+            id:val.id
+          },
+          headers: {
+            'X-Access-Token':this.token
           }
         })
-        // this.$router.push({
-        //     path:'/ocr/ocrSplit'
-        // })
-        window.open(newUrl.href, '_blank')
+          .then( (res) => {
+            if (res.data.success) {
+              let newUrl = this.$router.resolve({
+                path: '/ocr/ocrSplit',
+                query:{
+                  fileName: val.docRealName,
+                  id:val.id
+                }
+              })
+              window.open(newUrl.href, '_blank')
+            }else{
+              this.$message.error(res.data.message)
+            }
+          }).finally(()=>{
+            this.loading=false
+        })
+
+
+
       },
       //下载
       actionDown(val){