Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-operate-ui/src/views/detail/party-a/component/HeadFormNew.vue

@@ -26,8 +26,8 @@
                 <img src="@/assets/images/enterprise/enterprise-search-icon.svg" alt="">
                 <span v-show="!form.hover && !form.value">搜索</span>
                 <el-input v-model="form.value" :placeholder="form.placeholder ? form.placeholder : '输入关键词查询'"
-                  :style="form.width?'width:'+form.width+'px':'width:180px'" @focus="searchFocus($event,form)" @blur="searchBlur($event,form)"
-                  @input="value => searchInput(value,form)" v-show="form.hover || form.value">
+                  :style="form.width?'width:'+form.width+'px':'width:238px'" @focus="searchFocus($event,form)" @blur="searchBlur($event,form)"
+                  @input="value => searchInput(value,form)" v-show="form.hover || form.value" @keydown.native.enter="changeSelect">
                   <template slot="suffix">
                     <transition mode="out-in" appear name="fade">
                       <img src="@/assets/images/enterprise/search-input-clear-icon.svg" alt="" @click.stop="form.value = '';changeSelect()"

dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue

@@ -438,13 +438,15 @@ export default {
         margin-left: 25px;
         overflow: hidden;
         .swiper-slide{
+          min-width: 242px;
+          padding: 7px 4px 9px 0;
+          box-sizing: border-box;
           &.swiper-disn{
             display: none;
           }
           >div{
-            min-width: 242px;
+            width: 100%;
             height: 100%;
-            padding: 7px 4px 9px 0;
             cursor: pointer;
             align-items: normal;
             .swiper-item{

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -2776,12 +2776,10 @@ export default {
     },
 
     toEnterprise(id, html, type,name) {
-      // this.$tab.openPage(name, '/company/' + encodeStr(id) + '/' + (html ? '?html=' + html : '') + (type ? '&flag=true&type=' + type : ''))
-      this.$router.push({path:'/company/' + encodeStr(id) + '/' + (html ? html : '') + (type ? '?flag=true&type=' + type : '')} )
+      this.$tab.openPage(name, '/company/' + encodeStr(id) + '/' + (html ? html + '/' : '') + (type ? '?flag=true&type=' + type : ''))
     },
     toEnterpriseDetail(id,name) {
-      // this.$tab.openPage(name, '/company/' + encodeStr(id) + '/?index=true')
-      this.$router.push({path:'/company/' + encodeStr(id) + '/?index=true'} )
+      this.$tab.openPage(name, '/company/' + encodeStr(id) )
     },
 
     labelsWidth(e, t = 0) {