合并分支 'feature_dev_20221129_UI' 到 'master'

Feature dev 20221129 ui

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

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

@@ -375,15 +375,24 @@
   }
 
   .box-input {
-    width: calc(100% - 168px);
+    width: calc(100% - 183px);
     margin-right: 8px;
   }
 
   .button-text {
-    width: 73px;
+    width: 88px;
     overflow: hidden;
     padding: 0 8px;
-    box-sizing: border-box;
+    //box-sizing: border-box;
+    float: right;
+  }
+
+  ::v-deep .button-text span {
+    width: 64px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-top: 4px;
   }
 </style>
 <style>

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

@@ -21,6 +21,7 @@
                        v-model="queryParam.serial_number"></a-input>
             </div>
           </a-col>
+          <template v-if="toggleSearchStatus">
           <a-col :md="12" :sm="8">
             <div class="box-title-text">
               <div class="title-text" :title="$t('title')">
@@ -41,6 +42,7 @@
                                  :triggerChange="false" :dictCode="'state'"/>
             </div>
           </a-col>
+          </template>
           <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
@@ -48,6 +50,10 @@
                                        :fieldList="fieldList"/>
                   <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">
+                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
                </a-col>
       </span>
         </a-row>
@@ -96,6 +102,7 @@
     props: ['url'],
     data() {
       return {
+        toggleSearchStatus: false,
         visible: false,
         queryParam: {},
         confirmLoading: false,
@@ -164,6 +171,9 @@
 
     },
     methods: {
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
       addModel() {
         this.visible = true
         this.queryParam = {}
@@ -301,7 +311,7 @@
   }
 
   .title-text {
-    width: 33px;
+    width: 110px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;