修改产品相关专利导入

RMS-FrontEnd/src/router/index.js

@@ -252,7 +252,7 @@ const routes = [
         meta: {
           title: '任务清单',
           aside: true,
-          showHeader:true,
+          showHeader:false,
         },
         component: () => import('@/views/components/task/taskIndex.vue'),
       },

RMS-FrontEnd/src/views/components/import/PatentNoImport/download.vue

@@ -68,7 +68,7 @@
       </div>
       
       <div>
-         <SystemTask :form="9" :reportId="reportId" ></SystemTask> 
+         <SystemTask :form="9" :reportId="reportId" :productId="productId"></SystemTask> 
       </div>
     </div>
 </template>
@@ -80,7 +80,7 @@ import timeChoose from "@/views/components/common/components/timeChoose.vue";
 
 export default {
   mixins:[cron],
-  props:['reportId','downloadId','asCompare'],
+  props:['reportId','downloadId','asCompare','productId'],
   components: {
     SystemTask,
     timeChoose,
@@ -169,6 +169,7 @@ export default {
       queryParams: {
         database:[],
         reportId: this.reportId,
+        productId: this.productId,
         crons:'',
         conditions:'',//搜索条件
         configId: '',//网站

RMS-FrontEnd/src/views/components/import/PatentNoImport/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <download :reportId="id" :downloadId="option" :asCompare="asCompare"></download>
+    <download :reportId="id" :downloadId="option" :asCompare="asCompare" :productId="productId"></download>
   </div>
 </template>
 
@@ -19,6 +19,9 @@ export default {
     id() {
       return this.$route.query.id
     },
+    productId() {
+      return this.$route.query.productId
+    },
     option() {
       return this.$route.query.option
     },

RMS-FrontEnd/src/views/components/import/excelImport/importPatent.vue

@@ -26,7 +26,7 @@
         
       </el-aside>
       <el-main>
-        <systemTask ref="systemTask" :form="1" :reportId="reportId"></systemTask>
+        <systemTask ref="systemTask" :form="1" :reportId="reportId" :productId="productId"></systemTask>
       </el-main>
     </el-container>
   </div>
@@ -36,7 +36,7 @@
 // import systemTask from './systemTask.vue'
 import systemTask from '@/views/components/task/index.vue'
 export default {
-  props:['reportId','asCompare'],
+  props:['reportId','asCompare','productId'],
   components: {
     systemTask
   },
@@ -71,6 +71,7 @@ export default {
      
       let data = {
         reportId: this.reportId,
+        productId: this.productId,
         sourceId:this.sourceId,
         fieldList: [],
         folderIds: refs.folderTree ? refs.folderTree.getCheckedKeys() : [],

RMS-FrontEnd/src/views/components/import/excelImport/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <importPatent :reportId="id" :asCompare="asCompare"></importPatent>
+    <importPatent :reportId="id" :asCompare="asCompare" :productId="productId"></importPatent>
   </div>
 </template>
 
@@ -19,6 +19,9 @@ export default {
     id() {
       return this.$route.query.id
     },
+    productId() {
+      return this.$route.query.productId
+    },
     asCompare() {
       return this.$route.query.asCompare
     }

RMS-FrontEnd/src/views/components/task/components/mixins.js

@@ -3,7 +3,7 @@ import { cron } from "@/views/components/common/components/mixins";
 import { mapGetters } from "vuex";
 export const common = {
     mixins:[cron],
-    props: ['form','reportId','tableHeight','review','webSockets'],
+    props: ['form','reportId','tableHeight','review','webSockets','productId'],
     data() {
         return {
             // statusObj: {

RMS-FrontEnd/src/views/components/task/components/realTime.vue

@@ -112,7 +112,8 @@ export default {
       ],
       queryParams:{
         taskStatus:[0,1,4],
-        reportId:this.reportId?this.reportId:0
+        reportId:this.reportId,
+        productId:this.productId,
       }
     };
   },
@@ -151,7 +152,7 @@ export default {
           const index = this.taskData.findIndex(item=>{return item.id == data.taskId})
           // const index = this.taskData.findIndex(item=>{return item.id == data.id})
           if (index === -1) {
-            if(data.reportId == this.reportId){
+            if(data.reportId == this.reportId || data.productId == this.productId){
               this.getList()
             }
             

RMS-FrontEnd/src/views/components/task/components/todoList.vue

@@ -181,7 +181,8 @@ export default {
             size:10,
             createName:'',
             taskStatus:[0,1,2,4,5],
-            reportId:this.reportId?this.reportId:0,
+            reportId:this.reportId,
+            productId:this.productId,
             orderBy:'createTime',
             orderType:'desc',
         },

RMS-FrontEnd/src/views/layout/components/UserBar.vue

@@ -202,6 +202,9 @@ export default {
      toTaskList(){
       const router = this.$router.resolve({
         path: '/taskList',
+        query:{
+          reportId:0
+        }
       })
       window.open(router.href,'_blank')
     },

RMS-FrontEnd/src/views/product/components/relatedPatents/components/table.vue

@@ -7,20 +7,29 @@
       <div :style="{ visibility: selectedTotal > 0 ? 'visible' : 'hidden' }">
         已勾选 <b>{{ selectedTotal }}</b> 条
       </div>
-      <div style="display: flex;margin-bottom: 20px;" >
+      <!-- <div style="display: flex;margin-bottom: 20px;" >
              <el-input v-model="paramsRuleForm.patentNo" size="small" style="width: 450px;" placeholder="请输入专利号进行添加（多个专利号同时添加中间请用符号“|”隔开）"></el-input>
         <el-tooltip class="item" effect="dark" content="将搜索的专利添加至该产品的相关专利中" placement="top">
           <el-button type="primary" size="small" @click="getListAdd" style="margin-left: 10px;"> 添 加 </el-button>
         </el-tooltip>
-      </div>
+      </div> -->
       <div style="display:flex;justify-content: flex-end;padding-bottom:20px">
         <div style="margin-right: 10px;">
           <!-- <el-button type="primary" size="small" @click="addRelevantPatents">新增</el-button> -->
           <!-- <el-button type="primary" size="small" @click="savePatentList" :loading="btnLoading">保存</el-button> -->
         </div>
         <el-button size="small" type="warning" @click="handleFieldManage">显示栏位管理</el-button>
-        <el-button type="primary" size="small" style="margin-right:10px;width:70px"
-          @click="importPatent(productId)">导入</el-button>
+        <!-- <el-button type="primary" size="small" style="margin-right:10px;width:70px" @click="importPatent(productId)">导入</el-button> -->
+        <el-dropdown @command="importPatent($event,productId)" type="primary" size="small" style="margin-right:10px;">
+                <el-button type="primary" size="small" >
+                  导入专利<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu  class="children_item">
+                <el-dropdown-item command="1">专利号导入</el-dropdown-item>
+                <el-dropdown-item command="2">Excel导入</el-dropdown-item>
+                <!-- <el-dropdown-item command="3">检索导入</el-dropdown-item> -->
+                </el-dropdown-menu>
+              </el-dropdown>
         <div class="btn1" @click="sift"
           style="width:80px;height:32px;display:flex;justify-content:space-around;border-radius:5px; cursor: pointer;">
           <img src="@/assets/img/filtrationSearch.png" alt=""
@@ -324,20 +333,21 @@ export default {
 
     },
     // 导入
-    importPatent(val) {
-      this.$router.push({
-        path: '/relatedPatentsImport',
-        query: {
-          id: val,
-        }
-      })
+    importPatent(type,productId,asCompare) {
+      var typeList = {
+        '1':'/PatentNoImport',
+        '2':'/import',
+        '3':'/conditionImport'
+      }
+        this.$router.push({
+          path: typeList[type],
+          query: {
+            productId: productId,
+            asCompare:asCompare,
+            option:8,
+          }
+        })
     },
-    // async getListAdd() {
-    //   this.getListAdd2()
-    // //   return false
-    // //   const [data] = await Promise.allSettled([this.getListAdd2])
-    // //  console.log(data)
-    // },
     // 查询并添加到相关专利
     getListAdd() {
       // console.log(1)