1

public/reportTemplate/noveltyCommon/noveltyCommon.txt

@@ -86,7 +86,7 @@
                     <td>关键词</td>
                     <td>数量</td>
                 </tr>
-                <tr style="position: relative;" v-for="(item,index) in getColumnData('searchRecord',null,(dataObj.searchRecord && dataObj.searchRecord.length>0)?dataObj.searchRecord.map(item2=>{return {conditions:item2.conditions,totalNum:item2.totalNum}}): [{}])" :key="index">
+                <tr style="position: relative;" v-for="(item,index) in getColumnData('searchRecord',null,(dataObj.searchRecord && dataObj.searchRecord.length>0)?dataObj.searchRecord.map(item2=>{ var dB = {CN:'中国数据库','WD':'全球数据库'} return {conditions:item2.conditions,totalNum:item2.totalNum,area:dB(item.dbType)?dB(item.dbType):'',dbType:dB(item.dbType)?'小世系统':item.dbType}}): [{}])" :key="index">
                     
                     <td @click="edit('searchRecord','area',index)">
                         <div v-if="isEdit('searchRecord','area',index)">

public/reportTemplate/weixinnuo/weixinnuo.txt

@@ -74,7 +74,14 @@
                         </tr>
                         <tr>
                             <td>建立申请类型</td>
-                            <td colspan="3"> 发明 实用新型 外观设计 其他：结案，或补充资料后再评估</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)}">
+                                    <el-radio label="建议申请发明">发明</el-radio>
+                                    <el-radio label="建议申请实用新型">实用新型</el-radio>
+                                    <el-radio label="建议申请外观设计">外观设计</el-radio>
+                                    <el-radio label="建议结案处理，或者补充资料后再评估">其他：建议结案处理，或者补充资料后再评估</el-radio>
+                                </el-radio-group>
+                            </td>
                         </tr>
                     </table>
                 </div>
@@ -130,7 +137,7 @@
                             <td class="center">关键词</td>
                             <td class="center width_50">数量</td>
                         </tr>
-                        <tr style="position: relative;" v-for="(item,index) in getColumnData('searchRecord',null,(dataObj.searchRecord && dataObj.searchRecord.length>0)?dataObj.searchRecord.map(item2=>{return {conditions:item2.conditions,totalNum:item2.totalNum}}): [{}])" :key="index">
+                        <tr style="position: relative;" v-for="(item,index) in getColumnData('searchRecord',null,(dataObj.searchRecord && dataObj.searchRecord.length>0)?dataObj.searchRecord.map(item2=>{ var dB = {CN:'中国数据库','WD':'全球数据库'} return {conditions:item2.conditions,totalNum:item2.totalNum,area:dB(item.dbType)?dB(item.dbType):'',dbType:dB(item.dbType)?'小世系统':item.dbType}}): [{}])" :key="index">
                             <td @click="edit('searchRecord','area',index)">
                                 <div v-if="isEdit('searchRecord','area',index)">
                                     <myRichText v-model="item.area" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
@@ -240,11 +247,8 @@
                     <table>
                         <tr>
                             <td class="center width_150">建议</td>
-                            <td @click="edit('baseMessage','suggestion')">
-                                <div v-if="isEdit('searchRecord','suggestion')">
-                                    <myRichText v-model="reportData.baseMessage.suggestion" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
-                                </div>
-                                <div v-else v-html="getColumnData('baseMessage','suggestion')"></div>
+                            <td>
+                                <div v-else v-html="getColumnData('baseMessage','applicationAdvice')"></div>
                             </td>
                         </tr>
                         <tr>

src/views/noveltySearch/components/dialog/inventionPoint/inventionPoint.vue

@@ -332,7 +332,7 @@ export default {
       }
     },
     //确定
-    submit(type) {
+    submit(type,projectId) {
       
       if(type == 3){
         this.saveInventionPoint()
@@ -343,7 +343,7 @@ export default {
       else{
         var params = {
           content:this.technicalCase.inventionPoint,
-          projectId:this.projectId
+          projectId:projectId || this.projectId
         }
         this.loading = true
         this.$api.querySimilarInventionPoint(params).then(response=>{
@@ -362,7 +362,7 @@ export default {
       if(type == 2){
         //使用
         this.$emit('getProjectId',row.projectId)
-        this.submit(2)
+        this.submit(2,row.projectId)
         return
       }
       if(type == 1){

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

@@ -189,7 +189,11 @@ export default{
             data.splice(index,1)
         },
         addCompareRecord(data,index){
-            data.splice(index+1,0,{})
+            data.splice(index+1,0,{index:index+1})
+            for(var i = index+1;i++;i<data.length){
+                var item = data[i]
+                item.index = Number(item.index) + 1
+            }
         },
         async getPatentMessage(patentNo){
             var params = {