Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/views/components/articles/index.vue

@@ -7,7 +7,7 @@
       </el-tooltip>
     </div>
     <div style="background:white;display:flex; justify-content:flex-end;align-items: center;height: 50px;" >
-      <el-button type="primary" size="small" @click="checkResult" style="margin-right:10px;height:32px;"> 查看结果 </el-button>
+      <el-button type="primary" size="small" v-if="type!=3" @click="checkResult" style="margin-right:10px;height:32px;"> 查看结果 </el-button>
       <!-- <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" >
         <patent-keywords-highlight :project-id="projectId" />
           <el-button :disabled="!$permission('/workspace/common/highlight')" slot="reference" size="small" type="primary" class="margin-right_10">
@@ -379,9 +379,16 @@ export default {
   methods: {
     // 返回
     goBack() {
-      this.$router.replace({
-        path: '/admin/task/MyHandle',
-      })
+      if(this.taskId){
+        this.$router.replace({
+          path: '/admin/task/MyHandle',
+        })
+      }else{
+        this.$router.replace({
+          path: '/admin/rManage',
+        })
+      }
+      
     },
     getIsTrue(val){
       // console.log(val)
@@ -505,6 +512,13 @@ if(index!=-1){
         // this.ruleForm.position = 
         // this.ruleForm.featureslist=[]
         this.visible = true
+      }else{
+        this.$alert('当前专利为标的专利', '提示', {
+          confirmButtonText: '确定',
+          type: 'warning',
+          callback: action => {
+          }
+        });
       }
       
     },

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/ContrasrProduct.vue

@@ -10,7 +10,7 @@
         <!-- <el-tag :type="patentStatus2=='0'?'info':'primary'" effect="dark" size="mini" class="margin-left_10"
           style="cursor: pointer" @click="changeStatus(patentStatus2)">{{ patentStatus[patentStatus2] }}</el-tag> -->
         <!-- <el-button type="primary" size="small" @click="checkResult" style="margin-top:20px;margin-right:10px;height:32px;"> 查看结果 </el-button> -->
-        <el-button v-if="reportType==4 && !taskId" @click="taskWork" type="primary" size="small" style="height: 32px;"> 协同办公 </el-button>
+        <el-button v-if="reportType==4 && !taskId" @click="taskWork" type="primary" size="small" style="height: 32px;margin-right:10px"> 协同办公 </el-button>
         <!-- <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" style="margin-left: 20px;">
           <patent-keywords-highlight :project-id="projectId" />
           <el-button slot="reference" size="small" type="primary"
@@ -342,9 +342,15 @@ export default {
     },
     // 返回
     goBack() {
-      this.$router.replace({
-        path: '/admin/task/MyHandle',
-      })
+      if(this.taskId){
+        this.$router.replace({
+          path: '/admin/task/MyHandle',
+        })
+      }else{
+        this.$router.replace({
+          path: '/admin/rManage',
+        })
+      }
     },
       // 侵权分析工作协同
       taskWork() { 

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

@@ -43,7 +43,7 @@
             </el-tab-pane>
           </el-tabs> -->
 
-          <IncompletePage :taskId="queryParams.taskId" :reportType="reportType" :reportName="queryParams.reportName" :signPatentNo="signPatentNo" :reportId="reportId" :type="queryParams.type" :activeName="activeName" :onChangesIn="onChangesIn" :formS="formS" :taskStatus="taskStatus" :coordination="coordination" :taskWorkRemak="taskWorkRemak"></IncompletePage>
+          <IncompletePage :params="params" :taskId="queryParams.taskId" :reportType="reportType" :reportName="queryParams.reportName" :signPatentNo="signPatentNo" :reportId="reportId" :type="queryParams.type" :activeName="activeName" :onChangesIn="onChangesIn" :formS="formS" :taskStatus="taskStatus" :coordination="coordination" :taskWorkRemak="taskWorkRemak"></IncompletePage>
         </el-main>
       </el-container>
     <!-- </el-container> -->
@@ -140,6 +140,11 @@ export default {
       taskWorkRemakShow:true,
     }
   },
+  computed:{
+    params(){
+      return this.$s.getSession('params')
+    }
+  },
   created() {
     this.queryParams.taskId = this.$route.query.taskId
     this.queryParams.reportName = this.$route.query.reportName

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

@@ -29,7 +29,7 @@
 import { Contrast } from './mixins';
 export default {
   mixins:[Contrast],
-  props:["activeName","taskId","reportId","onChangesIn","formS","taskStatus",'type','signPatentNo','reportType',"coordination","taskWorkRemak",'reportName'],
+  props:["activeName","taskId","reportId","onChangesIn","formS","taskStatus",'type','signPatentNo','reportType',"coordination","taskWorkRemak",'reportName' ,'params'],
   data() {
     return {
       tableData: [],
@@ -54,7 +54,8 @@ export default {
         size: 10,
         total: 0,
         type:this.type,
-        reportType:this.reportType
+        reportType:this.reportType,
+        taskName:this.params.taskName
       }
     }
   },