From 58d1c1258fd54bf0ec1b592910df1a3af1bc6d6a Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Tue, 14 Jun 2022 15:18:25 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=8B=86=E5=88=86=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/search/index.vue                  | 3 ++-
 jero-web/src/components/searchalonesplit/index.vue        | 2 +-
 .../src/views/documentManage/ocr/modules/DocTable.vue     | 6 +++---
 .../documentManage/splitting/modules/ImportResult.vue     | 7 +++----
 .../documentManage/splitting/modules/SplitDetail.vue      | 1 -
 .../views/documentManage/splitting/modules/SplitText.vue  | 8 ++++----
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index 7c4ea6964..4efbbccf5 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -1,7 +1,7 @@
 <template>
   <a-form layout="inline" @keyup.enter.native="searchQuery">
     <a-row :gutter="24">
-      <a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
         <template v-if="index < 3">
           <div class="box-title-text" v-if="item.field_show_type == '0'">
             <div class="title-text" :title="item.db_field_txt">
@@ -241,6 +241,7 @@
   }
 
   .box-input {
+    min-width: 200px;
     display: inline-block;
     width: 70%;
     height: 38px;
diff --git a/jero-web/src/components/searchalonesplit/index.vue b/jero-web/src/components/searchalonesplit/index.vue
index 2d51da06b..cb5332960 100644
--- a/jero-web/src/components/searchalonesplit/index.vue
+++ b/jero-web/src/components/searchalonesplit/index.vue
@@ -1,7 +1,7 @@
 <template>
   <a-form layout="inline" @keyup.enter.native="searchQuery">
     <a-row :gutter="24">
-      <a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
         <template v-if="index < 3">
           <div class="box-title-text" v-if="item.field_show_type == '0'">
             <div class="title-text" :title="item.db_field_txt">
diff --git a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue
index af88dd4e1..bbf73d4f6 100644
--- a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue
+++ b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue
@@ -24,9 +24,9 @@
             @onSelectChange="onSelectChange"
           />
         </div>
-        <div class="doc-table-footer">
-          <a-button type="primary" class="btn-export" @click="tableExport"  v-has="'ocr:ocrRestful:addOcrRecord'">{{$t('import')}}</a-button>
-          <a-button type="primary" @click="onClose">{{$t('cancel')}}</a-button>
+        <div class="doc-table-footer" style='display: flex;justify-content: flex-end'>
+          <a-button type="primary" @click="onClose" style='background-color: #f5222d;margin-right: 15px;border: none'>{{$t('cancel')}}</a-button>
+          <a-button type="primary" class="btn-export" @click="tableExport"  v-has="'ocr:ocrRestful:addOcrRecord'">{{$t('submit')}}</a-button>
         </div>
       </a-drawer>
     </div>
diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
index c9c1a9aaf..971a0cf16 100644
--- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
@@ -36,11 +36,10 @@
         />
       </div>
 
-      <div class="imports-footer">
+      <div class="imports-footer" style='display: flex;justify-content: flex-end'>
         <div class="imports-footer-wrap">
-
-          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit" v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('preservation')}}</a-button>
-          <a-button class="imports-btn" type="primary" @click="cancleImports">{{$t('cancel')}}</a-button>
+          <a-button class="imports-btn" style='background-color: #f5222d;border: none;margin-right: 15px' type="primary" @click="cancleImports">{{$t('cancel')}}</a-button>
+          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit" v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('submit')}}</a-button>
         </div>
       </div>
       <a-modal
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index 0b2c7a811..23ba41bed 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -758,7 +758,6 @@
       //导出
       handleExportManage(){
         if(JSON.stringify(this.parameter)=='{}'){
-          console.log('pppp')
           this.parameter.info_id=this.infoId
           this.parameter.menu_id=this.menuId
         }
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
index e50971688..50c92214b 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
@@ -21,7 +21,7 @@
 
             <div  class="operator-select-type">
               <span class="operator-file-type"><i class="operator-i">*</i>{{$t('fileType')}}</span>
-              <a-select  v-model="fileGroup" :placeholder="$t('selectFileType')" class="file-type-select">
+              <a-select style='min-width: 295px;' v-model="fileGroup" :placeholder="$t('selectFileType')" class="file-type-select">
                 <a-select-option value="GSO" key="GSO" :title="$t('GSO')">
                   {{$t('GSO')}}
                 </a-select-option>
@@ -63,10 +63,10 @@
             @onSelectChange="onSelectChange"
           />
         </div>
-        <div class="split-footer">
+        <div class="split-footer" style='display: flex;justify-content: flex-end'>
           <div class="split-footer-wrap">
-            <a-button class="split-btn split-chai" type="primary" @click="submitSplit" v-has="'split:sarFileSplitInfo:add'">{{$t('split')}}</a-button>
-            <a-button class="split-btn" type="primary" @click="cancelSplit">{{$t('cancel')}}</a-button>
+            <a-button class="split-btn" type="primary" @click="cancelSplit" style='background-color: #f5222d;border: none;margin-right: 15px'>{{$t('cancel')}}</a-button>
+            <a-button class="split-btn split-chai" type="primary" @click="submitSplit" v-has="'split:sarFileSplitInfo:add'">{{$t('submit')}}</a-button>
           </div>
         </div>
       </a-drawer>