合并分支 'feature_dev_20221129_UI' 到 'master'

Feature dev 20221129 ui

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

jero-web/src/App.vue

@@ -179,11 +179,16 @@
     height: 38px !important;
   }
 
-  .ant-table-column-title{
+  .ant-table-column-title {
     font-weight: bold!important;
   }
 
   .ant-table-thead > tr > th {
     background: #f3f6f6!important;
+    padding: 12px 8px!important;
+  }
+
+  .ant-table-tbody > tr > td {
+    padding: 12px 8px!important;
   }
 </style>

jero-web/src/assets/less/common.less

@@ -123,13 +123,19 @@
   border: 1px solid #0bd9d9!important;
 }
 
-.ant-table-column-title{
+.ant-table-column-title {
     font-weight: bold!important;
 }
 
 .ant-table-thead > tr > th {
     background: #f3f6f6!important;
+    padding: 12px 8px!important;
 }
+
+.ant-table-tbody > tr > td {
+  padding: 12px 8px!important;
+}
+
 .ant-tooltip-inner {
   color: #333;
   background-color: #fff!important;

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">

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

@@ -20,7 +20,7 @@
 
           <div class="operator-select-type">
             <span class="operator-file-type"><i class="operator-i">*</i>{{$t('fileType')}}</span>
-            <a-select v-model="fileGroup" style='min-width: 295px' :placeholder="$t('selectFileType')"
+            <a-select v-model="fileGroup" style='min-width: 250.5px' :placeholder="$t('selectFileType')"
                       class="file-type-select">
               <a-select-option value="GSO" key="GSO" :title="$t('GSO')">
                 {{$t('GSO')}}

jero-web/src/views/projectManagement/components/TaskList.vue

@@ -927,6 +927,15 @@
   ///deep/.taskTable .ant-table-thead > tr > th {
   //  font-weight: bolder;
   //}
+
+  /deep/ .ant-table-thead > tr > th {
+    background: #f3f6f6!important;
+    padding: 12px 16px!important;
+  }
+
+  /deep/ .ant-table-tbody > tr > td {
+    padding: 16px 16px!important;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {
@@ -941,4 +950,5 @@
     padding: 32px 0 !important;
     margin: 0 !important;
   }
+
 </style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue

@@ -53,7 +53,7 @@
         columns: [
           {
             title: this.$t('standardInformation'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'standardInfo',
             scopedSlots: { customRender: 'standardInformation' },
             ellipsis: true,
@@ -61,42 +61,42 @@
           },
           {
             title: this.$t('taskType'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'flowTypeShow',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('LastProcessor'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'lastAssigneeName',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('CurrentProcessor'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'assigneeName',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('TaskCutOffTime'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'endTime',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('taskStatus'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'statusShow',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('operation'),
-            align: 'center',
+            align: 'left',
             fixed: 'right',
             width: 120,
             scopedSlots: { customRender: 'operation' }