1

public/reportTemplate/weixinnuo/weixinnuo.css

@@ -38,7 +38,8 @@
     min-height: 150px;
 }
 .weixinnuo .text-indent {
-    text-indent: 2em;
+    /* text-indent: 2em; */
+    margin-left:2em;
 }
 .weixinnuo .red-text {
     color: red;

public/reportTemplate/weixinnuo/weixinnuo.txt

@@ -22,7 +22,7 @@
                                 </div>
                                 <div v-else v-html="getColumnData('baseMessage','customCaseNumber',dataObj.baseMessage.customCaseNumber)"></div>
                             </td>
-                            <td>检索日期</td>
+                            <td class="width_98">检索日期</td>
                             <td @click="edit('baseMessage','searchTime')">
                                 <div v-if="isEdit('baseMessage','searchTime')">
                                     <myRichText v-model="reportData.baseMessage.searchTime" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
@@ -74,8 +74,8 @@
                         </tr>
                         <tr>
                             <td>建立申请类型</td>
-                            <td colspan="3"> 发明 实用新型 外观设计 其他：结案，或补充资料后再评估
-                                 <el-radio-group :value="getColumnData('baseMessage','analysisAndConclusion',()=>{if(this.dataObj.baseMessage.analysisAndConclusion == '建议补充资料，然后再进行评估' || this.dataObj.baseMessage.analysisAndConclusion == '建议结案处理'){this.dataObj.baseMessage.analysisAndConclusion = '建议结案处理，或者补充资料后再评估'}})" @input="(value)=>{this.$set(this.reportData.baseMessage,'analysisAndConclusion',value)}">
+                            <td colspan="3">
+                                 <el-radio-group :value="getColumnData('baseMessage','applicationAdvice',(this.dataObj.baseMessage.applicationAdvice == '建议补充资料，然后再进行评估' || this.dataObj.baseMessage.applicationAdvice == '建议结案处理')?'建议结案处理，或者补充资料后再评估':this.dataObj.baseMessage.applicationAdvice)" @input="(value)=>{this.$set(this.reportData.baseMessage,'applicationAdvice',value)}">
                                     <el-radio label="建议申请发明">发明</el-radio>
                                     <el-radio label="建议申请实用新型">实用新型</el-radio>
                                     <el-radio label="建议申请外观设计">外观设计</el-radio>
@@ -217,6 +217,7 @@
                         </div>  
                     </div>
                     <div class="patentContent" style="position: relative;" v-for="(item,index) in getCompareRecordData([
+                        
                         {
                             field:'patentMessage.rightHolder',
                             useFunction:(data)=>{
@@ -229,14 +230,12 @@
                             key:'rightHolder'
                         },
                         {
-                             {
-                                field:'publicNo',
-                                useFunction:(data)=>{
-                                    return data.grantNo || data.publicNo || ''
-                                },
-                                type:'function',
-                                key:'publicNo'
+                            field:'patentMessage.publicNo',
+                            useFunction:(data)=>{
+                                return data.patentMessage.grantNo || data.patentMessage.publicNo || ''
                             },
+                            type:'function',
+                            key:'publicNo'
                         },
                         {
                             field:'compareLiterature.technicalPoints',
@@ -318,7 +317,7 @@
                         <tr>
                             <td class="center width_150">建议</td>
                             <td>
-                                <div v-else v-html="getColumnData('baseMessage','applicationAdvice')"></div>
+                                <div v-html="getColumnData('baseMessage','applicationAdvice')"></div>
                             </td>
                         </tr>
                         <tr>

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

@@ -585,7 +585,7 @@ export default {
     },
     //刷新网页参数
     reLoadQuery(){
-      this.$router.push({
+      this.$router.replace({
         path: '/searchResult',
         query: {
           data: JSON.stringify(this.condition),

src/views/components/import/task/components/index.vue

@@ -460,47 +460,67 @@ export default {
       downLoad2(row.fileGuid)
     },
     toProject(row){
-      var projectType = row.importToType//0:专题库；1：报告；2：产品;3:查新检索
+      // var projectType = row.importToType//0:专题库；1：报告；2：产品;3:查新检索
+      
+      var projectType = row.projectType//1:专题库；2：报告；3：专利挖掘;4:查新检索
       var projectName = row.importToName
-      var projectId = row.importToId
-      var path = {
-        '0':'/project/patentCollection',
-        '1':'/reportDetails',
-        '2':'/commodity',
-        '3':'/noveltySearchDetails'
-      }
-      if(path[projectType]){
-        var params = {}
-        switch(Number(projectType)){
-          case 0:
-            params = {
-              id: projectId,
-              projectName:projectName,
-              projectType:1
-            }
-            break;
-          case 1:
-            params = {
-              projectId: projectId,
-              projectName:projectName,
-              projectType:2
-            }
-            break;
-          case 2:
-            params = {
-              productId:projectId,
-              productName:projectName,
-              projectType:3
-            }
-            break;
-          case 3:
-            params = {
-              projectId:projectId,
-            }
-            break;
+      var projectId = row.projectId
+      var href = ''
+      var params = {}
+      if(projectType){
+        var path = {
+          '1':'/project/patentCollection',
+          '2':'/reportDetails',
+          '3':'/details',
+          '4':'/noveltySearchDetails'
         }
+        if(path[projectType]){
+          href = path[projectType]
+          
+          switch(Number(projectType)){
+            case 1:
+              params = {
+                id: projectId,
+                projectName:projectName,
+                projectType:1
+              }
+              break;
+            case 2:
+              params = {
+                projectId: projectId,
+                projectName:projectName,
+                projectType:2
+              }
+              break;
+            case 3:
+              params = {
+                id:projectId,
+                // productName:projectName,
+                // projectType:3
+              }
+              break;
+            case 4:
+              params = {
+                projectId:projectId,
+              }
+              break;
+          }
+        }
+      }else{
+        var importToType = row.importToType
+        if(importToType == 2){//产品
+          var productId = row.importToId
+          href = '/commodity'
+          params = {
+            productId:productId,
+            productName:projectName,
+            projectType:3
+          }
+        }
+      }
+      if(href){
         let router = this.$router.resolve({
-          path: path[projectType],
+          path: href,
           query:params
         })
         window.open(router.href,'_blank')

src/views/noveltySearch/components/exportReport/components/mixins.js

@@ -99,10 +99,14 @@ export default{
             var key = field + '-' + property
             if(!this.editModel && !this.hasCopy[key]){
                 if(value){
+                    var value1 = value
+                    if(typeof value == 'string'){
+                        value1 = value.replace('\n','<br>')
+                    }
                     if(property){
-                        this.$set(this.reportData[field],property,value)
+                        this.$set(this.reportData[field],property,value1)
                     }else{
-                        this.$set(this.reportData,field,value)
+                        this.$set(this.reportData,field,value1)
                     }
                 }
                 
@@ -222,9 +226,9 @@ export default{
         },
         delCompareRecord(data,index){
             data.splice(index,1)
-            for(var i = index;i++;i<data.length){
+            for(var i = index;i<data.length;i++){
                 var item = data[i]
-                if(item.index == 0 || item.index){
+                if(item.index || item.index == 0){
                     item.index = Number(item.index) - 1
                 }else{
                     item.index = i + 1
@@ -234,9 +238,9 @@ export default{
         },
         addCompareRecord(data,index){
             data.splice(index+1,0,{index:index+1})
-            for(var i = index+1;i++;i<data.length){
+            for(var i = index+1;i<data.length;i++){
                 var item = data[i]
-                if(item.index == 0 || item.index){
+                if(item.index || item.index == 0){
                     item.index = Number(item.index) + 1
                 }else{
                     item.index = i + 1

src/views/project/patentCollection/components/views/Abstract.vue

@@ -1,228 +1,229 @@
 <template>
+  <div class="height_100">
   <!-- 摘要视图 -->
-  <div class="patent-abstract-list-view">
-    <div class="patent-abstract-card" v-for="(patent, index) in tableData" :key="index">
-      <div class="patent-abstract-card-wrapper">
-        <table class="patent-abstract-card-table">
-          <tbody>
-            <tr>
-              <!-- <td v-if="refresh"><el-checkbox :label="patent.id" @change="changeSelect(patent)"
-                  :checked="selected.indexOf(patent.id) !== -1 || patentNoList.indexOf(patent.patentNo) !== -1"></el-checkbox>
-              </td> -->
-              <td v-if="refresh">
-                <!-- <el-checkbox :label="patent.patentNo" @change="changeSelect(patent)"></el-checkbox> -->
-                <el-checkbox-group :value="patentNoList" >
-                  <el-checkbox :label="patent.patentNo" @change="changeSelect(patent)">
-                  </el-checkbox>
-                </el-checkbox-group>
-              </td>
-              <td>
-                <div class="patent-abstract-index-container">
-                  <span>{{ (index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
-                  <!-- 已读未读 -->
-                  <span v-if="projectId">
-                    <!-- patent.read判断已读未读 -->
-                    <!-- <el-tag :type="patent.read === 0 ? 'danger' : 'success'"
-                      v-if="$permission('/workspace/folder/isRead')" effect="dark" size="small"
-                      @click="handleChangeRead(patent)">{{ readType[patent.read] }}</el-tag>
-                    <el-tag type="info" v-else effect="dark" size="small">{{ readType[patent.read] }}</el-tag> -->
-                  </span>
+    <div class="patent-abstract-list-view">
+      <div class="patent-abstract-card" v-for="(patent, index) in tableData" :key="index">
+        <div class="patent-abstract-card-wrapper">
+          <table class="patent-abstract-card-table">
+            <tbody>
+              <tr>
+                <!-- <td v-if="refresh"><el-checkbox :label="patent.id" @change="changeSelect(patent)"
+                    :checked="selected.indexOf(patent.id) !== -1 || patentNoList.indexOf(patent.patentNo) !== -1"></el-checkbox>
+                </td> -->
+                <td v-if="refresh">
+                  <!-- <el-checkbox :label="patent.patentNo" @change="changeSelect(patent)"></el-checkbox> -->
+                  <el-checkbox-group :value="patentNoList" >
+                    <el-checkbox :label="patent.patentNo" @change="changeSelect(patent)">
+                    </el-checkbox>
+                  </el-checkbox-group>
+                </td>
+                <td>
+                  <div class="patent-abstract-index-container">
+                    <span>{{ (index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
+                    <!-- 已读未读 -->
+                    <span v-if="projectId">
+                      <!-- patent.read判断已读未读 -->
+                      <!-- <el-tag :type="patent.read === 0 ? 'danger' : 'success'"
+                        v-if="$permission('/workspace/folder/isRead')" effect="dark" size="small"
+                        @click="handleChangeRead(patent)">{{ readType[patent.read] }}</el-tag>
+                      <el-tag type="info" v-else effect="dark" size="small">{{ readType[patent.read] }}</el-tag> -->
+                    </span>
 
-                </div>
-                <div class="picture text-align_center patent-abstract-image-container">
-                  <el-image fit="contain" :src="outside?patent.pictureGuid:$commonJS.checkViewer(patent.pictureGuid)"
-                    :preview-src-list="[outside?patent.pictureGuid:$commonJS.checkViewer(patent.pictureGuid)]"
-                    style="margin:0 auto;vertical-align:middle;"
-                    :style="{ width: patent.imgWidth ? patent.imgWidth : '100%', height: patent.imgHeight ? patent.imgHeight : '100%' }">
-                    <div slot="error" class="image-slot">
-                      <img src="https://www.patentstar.com.cn/img/Common/nopic.jpg" alt="" style="">
-                    </div>
-                  </el-image>
-                </div>
-                <div class="patent-abstract-pdf-button-container">
-                  <el-button class="width_100" size="small"
-                    type="primary" :loading="patent.downLoadPDF" @click="handleDownload(patent)">PDF 下载</el-button>
-                </div>
-              </td>
-              <!-- 专利号 -->
-              <td width="850px">
-                <div class="patent-abstract-title">
-                  <el-link v-if="patent.ifSearch" type="success"
-                    @click.native="handleClick(patent, index)">
-                    <span v-html="getView(patent, 'patentNo')"></span>
-                  </el-link>
-                  <template v-else>
+                  </div>
+                  <div class="picture text-align_center patent-abstract-image-container">
+                    <el-image fit="contain" :src="outside?patent.pictureGuid:$commonJS.checkViewer(patent.pictureGuid)"
+                      :preview-src-list="[outside?patent.pictureGuid:$commonJS.checkViewer(patent.pictureGuid)]"
+                      style="margin:0 auto;vertical-align:middle;"
+                      :style="{ width: patent.imgWidth ? patent.imgWidth : '100%', height: patent.imgHeight ? patent.imgHeight : '100%' }">
+                      <div slot="error" class="image-slot">
+                        <img src="https://www.patentstar.com.cn/img/Common/nopic.jpg" alt="" style="">
+                      </div>
+                    </el-image>
+                  </div>
+                  <div class="patent-abstract-pdf-button-container">
+                    <el-button class="width_100" size="small"
+                      type="primary" :loading="patent.downLoadPDF" @click="handleDownload(patent)">PDF 下载</el-button>
+                  </div>
+                </td>
+                <!-- 专利号 -->
+                <td width="850px">
+                  <div class="patent-abstract-title">
+                    <el-link v-if="patent.ifSearch" type="success"
+                      @click.native="handleClick(patent, index)">
                       <span v-html="getView(patent, 'patentNo')"></span>
-                      <span>（未匹配到专利）</span>
-                  </template>
-                  <el-tag class="margin-left_10" type="primary" effect="dark" size="small" v-if="patent.simpleStatus">{{
-                    simpleStatus[patent.simpleStatus] }}</el-tag>
-                  <el-tag class="margin-left_10" style="cursor: pointer;" type="primary" effect="plain" size="small" @click="openAddRemark(patent)" v-if="noveltySearch && !noveltyIsRemark(patent)">添加查新标注</el-tag>
-                  <el-tag class="margin-left_10" style="cursor: pointer;" type="primary" effect="plain" size="small"  v-if="noveltySearch && noveltyIsRemark(patent)" @click="openAddRemark(patent)">已标注</el-tag>
-                </div>
-                <div style="font-size: 13px;">
-                  <el-row>
-                    <el-col :span="24" v-if="t()">
-                      <span class="patent-abstract_label">标题:</span>
-                      <span class="patent-abstract_text">
-                        <span v-html="getView(patent, 'title')"></span>
-                        <el-link v-if="haveTranslatedText(patent, 'title')" type="primary" @click.native="handleChange(patent, 'title')"
-                          style="margin-left: 10px;">
-                          <span v-if="!patent.change">切换译文</span>
-                          <span v-else>切换原文</span>
-                        </el-link>
-                      </span>
-                    </el-col>
-                  </el-row>
-                  <el-row>
-                    <el-col :span="8" v-if="t()">
-                      <span class="patent-abstract_label">申请日:</span>
-                      <span class="patent-abstract_text">
-                        <span v-html="getView(patent, 'appDate')"></span>
-                      </span>
-                    </el-col>
-                    <el-col :span="8" v-if="t()">
-                      <span class="patent-abstract_label">公开/公告日:</span>
-                      <span class="patent-abstract_text">
-                        <span v-if="patent.publicDate" v-html="getView(patent, 'publicDate')"></span>
-                        <span v-else v-html="getView(patent, 'grantDate')"></span>
-                      </span>
-                    </el-col>
-                    <el-col :span="8" v-if="t()">
-                      <span class="patent-abstract_label">申请号:</span>
-                      <span class="patent-abstract_text">
-                        <span v-html="getView(patent, 'appNo')"></span>
-                      </span>
-                    </el-col>
-                  </el-row>
-                  <el-row v-if="t()">
-                    <el-col :span="24">
-                      <span class="patent-abstract_label">权利人:</span>
-                      <span class="patent-abstract_text" v-if="patent.rightHolder">
-                        <!-- <span v-for="(item) in patent.rightHolder.filter(a => a.dataType === 1)" :key="item.name"> -->
-                          <el-link type="primary">
-                            <!-- <span v-html="getView(patent,'rightHolder')"></span> -->
-                            <span v-html="getViewDom(getPersonNames({row:patent,key:'rightHolder',join:'；'}))"></span>
+                    </el-link>
+                    <template v-else>
+                        <span v-html="getView(patent, 'patentNo')"></span>
+                        <span>（未匹配到专利）</span>
+                    </template>
+                    <el-tag class="margin-left_10" type="primary" effect="dark" size="small" v-if="patent.simpleStatus">{{
+                      simpleStatus[patent.simpleStatus] }}</el-tag>
+                    <el-tag class="margin-left_10" style="cursor: pointer;" type="primary" effect="plain" size="small" @click="openAddRemark(patent)" v-if="noveltySearch && !noveltyIsRemark(patent)">添加查新标注</el-tag>
+                    <el-tag class="margin-left_10" style="cursor: pointer;" type="primary" effect="plain" size="small"  v-if="noveltySearch && noveltyIsRemark(patent)" @click="openAddRemark(patent)">已标注</el-tag>
+                  </div>
+                  <div style="font-size: 13px;">
+                    <el-row>
+                      <el-col :span="24" v-if="t()">
+                        <span class="patent-abstract_label">标题:</span>
+                        <span class="patent-abstract_text">
+                          <span v-html="getView(patent, 'title')"></span>
+                          <el-link v-if="haveTranslatedText(patent, 'title')" type="primary" @click.native="handleChange(patent, 'title')"
+                            style="margin-left: 10px;">
+                            <span v-if="!patent.change">切换译文</span>
+                            <span v-else>切换原文</span>
                           </el-link>
-                          <!-- <span class="patent-abstract_semicolon">;</span> -->
-                        <!-- </span> -->
-                      </span>
-                    </el-col>
-                  </el-row>
-                  <el-row v-if="t()">
-                    <el-col :span="24">
-                      <span class="patent-abstract_label">申请人:</span>
-                      <span class="patent-abstract_text" v-if="patent.applicant">
-                        <!-- <span v-for="(item) in patent.applicant.filter(a => a.dataType === 2)" :key="item.name"> -->
+                        </span>
+                      </el-col>
+                    </el-row>
+                    <el-row>
+                      <el-col :span="8" v-if="t()">
+                        <span class="patent-abstract_label">申请日:</span>
+                        <span class="patent-abstract_text">
+                          <span v-html="getView(patent, 'appDate')"></span>
+                        </span>
+                      </el-col>
+                      <el-col :span="8" v-if="t()">
+                        <span class="patent-abstract_label">公开/公告日:</span>
+                        <span class="patent-abstract_text">
+                          <span v-if="patent.publicDate" v-html="getView(patent, 'publicDate')"></span>
+                          <span v-else v-html="getView(patent, 'grantDate')"></span>
+                        </span>
+                      </el-col>
+                      <el-col :span="8" v-if="t()">
+                        <span class="patent-abstract_label">申请号:</span>
+                        <span class="patent-abstract_text">
+                          <span v-html="getView(patent, 'appNo')"></span>
+                        </span>
+                      </el-col>
+                    </el-row>
+                    <el-row v-if="t()">
+                      <el-col :span="24">
+                        <span class="patent-abstract_label">权利人:</span>
+                        <span class="patent-abstract_text" v-if="patent.rightHolder">
+                          <!-- <span v-for="(item) in patent.rightHolder.filter(a => a.dataType === 1)" :key="item.name"> -->
+                            <el-link type="primary">
+                              <!-- <span v-html="getView(patent,'rightHolder')"></span> -->
+                              <span v-html="getViewDom(getPersonNames({row:patent,key:'rightHolder',join:'；'}))"></span>
+                            </el-link>
+                            <!-- <span class="patent-abstract_semicolon">;</span> -->
+                          <!-- </span> -->
+                        </span>
+                      </el-col>
+                    </el-row>
+                    <el-row v-if="t()">
+                      <el-col :span="24">
+                        <span class="patent-abstract_label">申请人:</span>
+                        <span class="patent-abstract_text" v-if="patent.applicant">
+                          <!-- <span v-for="(item) in patent.applicant.filter(a => a.dataType === 2)" :key="item.name"> -->
+                            <el-link type="primary">
+                              <!-- <span v-html="getView(patent,'applicant')"></span> -->
+                              <span v-html="getViewDom(getPersonNames({row:patent,key:'applicant',join:'；'}))"></span>
+                            </el-link>
+                            <!-- <span class="patent-abstract_semicolon">;</span> -->
+                          <!-- </span> -->
+                        </span>
+                      </el-col>
+                    </el-row>
+                    <el-row v-if="t()">
+                      <el-col :span="24">
+                        <span class="patent-abstract_label">发明人:</span>
+                        <span class="patent-abstract_text">
+                          <!-- <span v-for="(item) in patent.inventor" :key="item.name">-->
+                            <el-link type="primary">
+                              <!-- <span v-html="getView(patent, 'inventor')"></span> -->
+                              <span v-html="getViewDom(getPersonNames({row:patent,key:'inventor',join:'；'}))"></span>
+                            </el-link>
+                            <!-- <span class="patent-abstract_semicolon">;</span> -->
+                          <!-- </span>  -->
+                        </span>
+                      </el-col>
+                    </el-row>
+                    <el-row v-if="t()">
+                      <el-col :span="24">
+                        <span class="patent-abstract_label">分类号:</span>
+                        <span class="patent-abstract_text">
                           <el-link type="primary">
-                            <!-- <span v-html="getView(patent,'applicant')"></span> -->
-                            <span v-html="getViewDom(getPersonNames({row:patent,key:'applicant',join:'；'}))"></span>
+                            <span v-if="patent.patentType == 3 &&  patent.patentNo.substring(0,2) == 'CN'" v-html="getView(patent, 'mloc')"></span>
+                            <span v-else v-html="getView(patent, 'mipc')"></span>
                           </el-link>
-                          <!-- <span class="patent-abstract_semicolon">;</span> -->
-                        <!-- </span> -->
-                      </span>
-                    </el-col>
-                  </el-row>
-                  <el-row v-if="t()">
-                    <el-col :span="24">
-                      <span class="patent-abstract_label">发明人:</span>
-                      <span class="patent-abstract_text">
-                        <!-- <span v-for="(item) in patent.inventor" :key="item.name">-->
+                        </span>
+                      </el-col>
+                    </el-row>
+                    <!-- <el-row v-if="t()">
+                      <el-col :span="24">
+                        <span class="patent-abstract_label">IPC分类号:</span>
+                        <span class="patent-abstract_text">
                           <el-link type="primary">
-                            <!-- <span v-html="getView(patent, 'inventor')"></span> -->
-                            <span v-html="getViewDom(getPersonNames({row:patent,key:'inventor',join:'；'}))"></span>
-                          </el-link>
-                          <!-- <span class="patent-abstract_semicolon">;</span> -->
-                        <!-- </span>  -->
-                      </span>
-                    </el-col>
-                  </el-row>
-                  <el-row v-if="t()">
-                    <el-col :span="24">
-                      <span class="patent-abstract_label">分类号:</span>
-                      <span class="patent-abstract_text">
-                        <el-link type="primary">
-                          <span v-if="patent.patentType == 3 &&  patent.patentNo.substring(0,2) == 'CN'" v-html="getView(patent, 'mloc')"></span>
-                          <span v-else v-html="getView(patent, 'mipc')"></span>
-                        </el-link>
-                      </span>
-                    </el-col>
-                  </el-row>
-                  <!-- <el-row v-if="t()">
-                    <el-col :span="24">
-                      <span class="patent-abstract_label">IPC分类号:</span>
-                      <span class="patent-abstract_text">
-                        <el-link type="primary">
-                          <span v-html="getView(patent, 'mipc')"></span>
-                        </el-link>
-                      </span>
-                    </el-col>
-                  </el-row> -->
-                  <!-- 三种同族，若要显示需要后台返回同族专利数组（目前未返回） -->
-                  <!-- <el-row v-if="t('simpleFamily')">
-                    <el-col :span="24">
-                      <span class="patent-abstract_label">简单同族:</span>
-                      <span class="patent-abstract_text">
-                        <span v-for="(item) in patent.simpleFamilyNum" :key="item">
-                          <el-link type="primary" @click.native="handleFamily(item)">
-                            <span v-html="getView(item)"></span>
+                            <span v-html="getView(patent, 'mipc')"></span>
                           </el-link>
-                          <span class="patent-abstract_semicolon">;</span>
                         </span>
-                      </span>
-                    </el-col>
-                  </el-row>
-                  <el-row v-if="t('inpadocFamily')">
-                    <el-col :span="24">
-                      <span class="patent-abstract_label">INPADOC同族:</span>
-                      <span class="patent-abstract_text">
-                        <span v-for="(item) in patent.simpleFamilyNum" :key="item">
-                          <el-link type="primary" @click.native="handleFamily(item)">
-                            <span v-html="getView(item)"></span>
-                          </el-link>
-                          <span class="patent-abstract_semicolon">;</span>
+                      </el-col>
+                    </el-row> -->
+                    <!-- 三种同族，若要显示需要后台返回同族专利数组（目前未返回） -->
+                    <!-- <el-row v-if="t('simpleFamily')">
+                      <el-col :span="24">
+                        <span class="patent-abstract_label">简单同族:</span>
+                        <span class="patent-abstract_text">
+                          <span v-for="(item) in patent.simpleFamilyNum" :key="item">
+                            <el-link type="primary" @click.native="handleFamily(item)">
+                              <span v-html="getView(item)"></span>
+                            </el-link>
+                            <span class="patent-abstract_semicolon">;</span>
+                          </span>
                         </span>
-                      </span>
-                    </el-col>
-                  </el-row>
-                  <el-row v-if="t('patSnapFamily')">
-                    <el-col :span="24">
-                      <span class="patent-abstract_label">PatSnap同族:</span>
-                      <span class="patent-abstract_text">
-                        <span v-for="(item) in patent.simpleFamilyNum" :key="item">
-                          <el-link type="primary" @click.native="handleFamily(item)">
-                            <span v-html="getView(item)"></span>
-                          </el-link>
-                          <span class="patent-abstract_semicolon">;</span>
+                      </el-col>
+                    </el-row>
+                    <el-row v-if="t('inpadocFamily')">
+                      <el-col :span="24">
+                        <span class="patent-abstract_label">INPADOC同族:</span>
+                        <span class="patent-abstract_text">
+                          <span v-for="(item) in patent.simpleFamilyNum" :key="item">
+                            <el-link type="primary" @click.native="handleFamily(item)">
+                              <span v-html="getView(item)"></span>
+                            </el-link>
+                            <span class="patent-abstract_semicolon">;</span>
+                          </span>
                         </span>
-                      </span>
-                    </el-col>
-                  </el-row> -->
-                  <el-row v-if="t()">
-                    <el-col :span="24">
-                      <span class="patent-abstract_label">摘要:</span>
-                      <div>
-                        <span v-html="getView(patent, 'abstractStr')"></span>
-                        <el-link v-if="haveTranslatedText(patent, 'abstractStr')" type="primary" @click.native="handleChange(patent, 'abstractStr')">
-                          <span v-if="!patent.change2">切换译文</span>
-                          <span v-else>切换原文</span>
-                        </el-link>
-                      </div>
-                    </el-col>
-                  </el-row>
+                      </el-col>
+                    </el-row>
+                    <el-row v-if="t('patSnapFamily')">
+                      <el-col :span="24">
+                        <span class="patent-abstract_label">PatSnap同族:</span>
+                        <span class="patent-abstract_text">
+                          <span v-for="(item) in patent.simpleFamilyNum" :key="item">
+                            <el-link type="primary" @click.native="handleFamily(item)">
+                              <span v-html="getView(item)"></span>
+                            </el-link>
+                            <span class="patent-abstract_semicolon">;</span>
+                          </span>
+                        </span>
+                      </el-col>
+                    </el-row> -->
+                    <el-row v-if="t()">
+                      <el-col :span="24">
+                        <span class="patent-abstract_label">摘要:</span>
+                        <div>
+                          <span v-html="getView(patent, 'abstractStr')"></span>
+                          <el-link v-if="haveTranslatedText(patent, 'abstractStr')" type="primary" @click.native="handleChange(patent, 'abstractStr')">
+                            <span v-if="!patent.change2">切换译文</span>
+                            <span v-else>切换原文</span>
+                          </el-link>
+                        </div>
+                      </el-col>
+                    </el-row>
 
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
-    </div>
-
-
 
+    </div>
     <addRemark ref="addRemark" :projectId="projectId" v-on="$listeners"></addRemark>
   </div>
+  
 </template>
 
 <script>

src/views/project/patentDetails/components/patentMessage/mixins/index.js

@@ -80,7 +80,8 @@ export const patentDetails = {
               this.initData(true)
             }
             else{
-              this.getPatent(value)
+              // this.getPatent(value)
+              this.$emit('refresh')
             }
             
           }

src/views/report/components/dialog/addAndEditReport.vue

@@ -1117,6 +1117,7 @@ export default {
             }
             
           }
+          this.$set(this.form,'signPatentNo',this.form.signPatentNo.trim())
           let formData = this.form
           if (!this.form.id) {//新增报告
             this.$confirm('是否需要进行审核?', '提示', {