From 809dab9bd53b0b34ed0397e9e176adf633437b72 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Wed, 6 Apr 2022 10:05:15 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/OcrAddForm/index.vue  | 16 +++++++---
 jero-web/src/components/OcrUpload/index.vue   |  2 +-
 .../splitting/modules/ImportResult.vue        | 31 ++++++++++---------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue
index 33d44df6b..3e7de8c1b 100644
--- a/jero-web/src/components/OcrAddForm/index.vue
+++ b/jero-web/src/components/OcrAddForm/index.vue
@@ -89,10 +89,18 @@
                 <span class="title-text-text">{{item.db_field_txt}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                   :disabled="disabled"
-                                   :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
-                                   :triggerChange="false" :dictCode="item.dict_field"/>
+<!--                <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"-->
+<!--                                   :disabled="disabled"-->
+<!--                                   :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"-->
+<!--                                   :triggerChange="false" :dictCode="item.dict_field"/>-->
+                <a-select class="box-input" v-model="formInline[item.db_field_name]"
+                          :disabled="disabled"
+                          :placeholder="$t('PleaseSelect')+item.db_field_txt" @change="handleChange">
+
+                  <a-select-option v-for="(element) in item.value_list" :value="element">
+                    {{element}}
+                  </a-select-option>
+                </a-select>
               </a-form-model-item>
             </div>
           </a-col>
diff --git a/jero-web/src/components/OcrUpload/index.vue b/jero-web/src/components/OcrUpload/index.vue
index 5a4a2ad38..228a93a1d 100644
--- a/jero-web/src/components/OcrUpload/index.vue
+++ b/jero-web/src/components/OcrUpload/index.vue
@@ -49,7 +49,7 @@
     },
     methods:{
       beforeUpload(file,fileList) {
-        console.log('file',this.accept)
+        // console.log('file',this.accept)
         this.fileTypeSatus=false
         if(this.myfileList&&this.myfileList.length>=1){
           this.$message.warning('只能上传一个文件')
diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
index 121e0dc4c..3b8f4ebfe 100644
--- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
@@ -170,7 +170,7 @@
         })
       },
       afterVisibleChange(val) {
-        console.log('visible', val);
+        // console.log('visible', val);
       },
       onClose() {
         this.visible = false;
@@ -242,22 +242,23 @@
             title:this.rows[0].title,
 
           }
-          if(this.rows[0].text_info=='发布稿(必读)'){
-            params.fileType='1'
-          }else if(this.rows[0].text_info=='增补件(必读)'){
-            params.fileType='2'
-          }else if(this.rows[0].text_info=='报批稿'){
-            params.fileType='3'
-          }else if(this.rows[0].text_info=='征求意见稿'){
-            params.fileType='4'
-          }else if(this.rows[0].text_info=='测试程序'){
-            params.fileType='5'
-          }else if(this.rows[0].text_info=='相关资料'){
-            params.fileType='6'
-          }
+          params.fileType=this.rows[0].text_info
+          // if(this.rows[0].text_info=='发布稿(必读)'){
+          //   params.fileType='1'
+          // }else if(this.rows[0].text_info=='增补件(必读)'){
+          //   params.fileType='2'
+          // }else if(this.rows[0].text_info=='报批稿'){
+          //   params.fileType='3'
+          // }else if(this.rows[0].text_info=='征求意见稿'){
+          //   params.fileType='4'
+          // }else if(this.rows[0].text_info=='测试程序'){
+          //   params.fileType='5'
+          // }else if(this.rows[0].text_info=='相关资料'){
+          //   params.fileType='6'
+          // }
           let formData = new FormData()
           Object.keys(params).forEach((key) => {
-            console.log('key',key,params[key])
+            // console.log('key',key,params[key])
             formData.append(key, params[key]);
           });
           // console.log('formData',params,formData.getAll)