1

src/views/components/import/conditionImport/search.vue

@@ -2,16 +2,18 @@
     <div style="background:white" class="height_100">
         <div class="head">
             <div class="search-menu">
-                <span class="type">
+                <div class="type">
                     <el-radio-group v-model="DBType">
                         <el-radio label="CN">中国专利检索</el-radio>
                         <el-radio label="WD">世界专利检索</el-radio>
                     </el-radio-group>
-                </span>
-                  <el-link :type="isComponent === 'FormSearch' ? 'primary' : undefined" @click="changeComponent('FormSearch')" >表格检索</el-link>
+                </div>
+                <div>
+                    <el-link :type="isComponent === 'FormSearch' ? 'primary' : undefined" @click="changeComponent('FormSearch')" >表格检索</el-link>
                   <el-link :type="isComponent === 'patentNoSearch' ? 'primary' : undefined" @click="changeComponent('patentNoSearch')" >号码检索</el-link>
                   <el-link :type="isComponent === 'customSearch' ? 'primary' : undefined" @click="changeComponent('customSearch')">高级检索</el-link>
                   <el-link :type="isComponent === 'AdvancedSearch' ? 'primary' : undefined" @click="changeComponent('AdvancedSearch')">专家检索</el-link>  
+                </div>
                 <span class="icon">
                     <i class="iconfont icon-shouye" @click="openHistory"></i>
                 </span>
@@ -214,20 +216,16 @@ export default {
 .search-menu{
     width:70%;
     margin:0 auto;
-    position: relative;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     .el-link{
         margin-right: 20px; 
     } 
     .type{
-        position: absolute;
-        left:0;
-        top:0;
     }
     .icon{
         
-        position: absolute;
-        right:0;
-        top:0;
         i{
             font-size:24px;
         }

src/views/components/import/conditionImport/searchResult.vue

@@ -29,7 +29,7 @@
       </el-header>
       <el-main id="patent-list-container" v-loading="loading">
         <div class="height_100">
-          <component ref="patentViewList" :is="viewSelected" :outside="true" :noveltySearch="noveltySearch" :column="columnList" :tableData="tableData"  @clickPatentNo="handleClick" :canSort="condition.component != 'patentNoSearch'?true:false"
+          <component ref="patentViewList" :is="viewSelected" :outside="outside" :noveltySearch="noveltySearch" :column="columnList" :tableData="tableData"  @clickPatentNo="handleClick" :canSort="condition.component != 'patentNoSearch'?true:false"
             @select-change="handleSelect" :selected.sync="queryParams.selected" :queryParams="queryParams" :patentNoList.sync="patentNoList" :refresh='true'
             :view-field="patentViewField" @on-sort="handleSort" @addSelect="getChoosePatentNo" :projectId="projectId" :contrastFileList="saveRemarkList" @saveRemark="saveRemark"></component>
         </div>
@@ -120,7 +120,11 @@ export default {
     searchData: {},
     noveltySearch:{},
     retrieveRecordId:{},
-    projectId:{}
+    projectId:{},
+    outside:{
+      type:Boolean,
+      default:true
+    }
   },
   data() {
     return {
@@ -247,7 +251,7 @@ export default {
         {
           path: '/patentDetails/' + row.patentNo,
           query: {
-            outside:true,
+            outside:this.outside,
             noveltySearch:this.noveltySearch,
             projectId:this.projectId,
             retrieveRecordId:this.queryParams.retrieveRecordId

src/views/components/import/conditionImport/searchResultIndex.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <search-Result :searchData="searchData" :noveltySearch="noveltySearch" :projectId="projectId" :retrieveRecordId="retrieveRecordId"></search-Result> 
+    <search-Result :searchData="searchData" :noveltySearch="noveltySearch" :projectId="projectId" :retrieveRecordId="retrieveRecordId" :outside="outside"></search-Result> 
   </div>
 </template>
 
@@ -31,6 +31,9 @@ export default {
     retrieveRecordId(){
       return this.$route.query.retrieveRecordId
     },
+    outside(){
+      return this.$route.query.outside
+    },
   },
   methods: {},
   created() {},