Browse Source

侵权分析对比结果不显示

zhuliu 1 năm trước cách đây
mục cha
commit
8f055a7a5c

+ 1 - 1
src/views/project/patentCollection/index.vue

@@ -666,7 +666,7 @@ export default {
     //PDF首页导出
     exportPDF(sign) {
       if (sign) {
-        if ( this.endNumber < 1 || this.queryParams.isAdd.length == 0) {
+        if ( this.endNumber < 1 && this.queryParams.isAdd.length == 0) {
           this.$message.error('请先选择专利')
           return false
         }

+ 11 - 7
src/views/report/components/productResult/productResult.vue

@@ -58,17 +58,17 @@
         <div class="height_100">
           <table class="PatentMessage">
             <tr>
-              <td>公告号</td>
+              <td><p style="min-width:120px">公告号</p> </td>
               <td> <span v-if="patent">{{ patent.grantNo }}</span></td>
-              <td>公告日</td>
+              <td><p style="min-width:120px">公告日</p> </td>
               <td><span v-if="patent">{{ patent.grantDate }}</span></td>
-              <td>专利权人</td>
+              <td><p style="min-width:120px">专利权人</p> </td>
               <td><span v-if="patent && patent.rightHolder">
                 <span v-for="item in patent.rightHolder.filter(a => a.type == 1)" :key="item.name">{{ item.name }}</span></span></td>
             </tr>
             <tr>
               <td>优先权</td>
-              <td><span v-if="patent">{{ patent.priorityNo }}</span></td>
+              <td><span v-if="patent && patent.priorities && patent.priorities.length>0">{{ patent.priorities[0].priorityno }}</span></td>
               <td>案件状态</td>
               <td> <span v-if="patent && patent.simpleStatusStr">{{ patent.simpleStatusStr }}</span></td>
               <td>同族专利</td>
@@ -269,8 +269,8 @@ export default {
   methods: {
     // 处理同族专利
     getPatentFamily(list) {
-      if (list.InpadocFamilyNos) {
-        return list.InpadocFamilyNos.join(',')
+      if (list.inpadocFamilyNos) {
+        return list.inpadocFamilyNos.join(',')
       } else {
         return ''
       }
@@ -341,7 +341,11 @@ export default {
         projectId: this.projectId,
         patentNo: patentNo,
       }
-      this.$api.getLastRecord(params).then(res => {
+      var api = 'getLastRecord'
+      if(this.reportType == 4){
+        api = 'getTortFinalResult'
+      }
+      this.$api[api](params).then(res => {
         if (res.code == 200) {
           // this.tableData = res.data
           this.getInterface(res)