合并分支 'feature_dev_20221129_UI' 到 'master'

Feature dev 20221129 ui

查看合并请求 laws-nio/laws-weilai!283

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

@@ -549,7 +549,7 @@
     width: 90px;
     text-align: right;
     display: inline-block;
-    font-weight: bold;
+    /*font-weight: bold;*/
     font-size: 14px;
     margin-right: 16px;
     overflow: hidden;

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

@@ -1,7 +1,7 @@
 <template>
   <a-form layout="inline" @keyup.enter.native="searchQuery">
     <a-row :gutter="24">
-      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+      <a-col :md="9" :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">
@@ -137,7 +137,7 @@
 
       </a-col>
       <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
-         <a-col :md="6" :sm="24">
+         <a-col :md="9" :sm="24">
             <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
             <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
           <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">