zhuliu 1 vuosi sitten
vanhempi
commit
1ce2edc89b

+ 8 - 8
public/reportTemplate/noveltyCommon/noveltyCommon.txt

@@ -157,8 +157,8 @@
             <div class="mainContent1" style="position: relative;" v-for="(item,index) in getCompareRecordData([
             {
                 field:'patentMessage.applicant',
-                function:(data)=>{
-                    if(data.patentMessage.applicant && data.patentMessage.applicant.length>0){
+                useFunction:(data)=>{
+                    if(data.patentMessage && data.patentMessage.applicant && data.patentMessage.applicant.length>0){
                         return data.patentMessage.applicant.join('、')
                     }
                     return ''
@@ -173,19 +173,19 @@
             },
             {
                 field:'content',
-                function:(data)=>{
+                useFunction:(data)=>{
                     var str = ''
-                    var const = 1
+                    var num = 1
                     if(data.noveltyCompareRecordVOS){
                         data.noveltyCompareRecordVOS.forEach((item,index) => {
-                            str = `${str}${const}、${item.markNoteText}<br>`
-                            const += 1
+                            str = `${str}${num}、${item.markNoteText}<br>`
+                            num += 1
                         });
                     }
                     if(data.data && data.data.length>0){
                         data.data.forEach((item,index) => {
-                            str = `${str}${const}、${item.markSelectField}“${item.markSelectText}”揭示了“${item.technicalFeature}”${item.markNoteText}<br>`
-                            const += 1
+                            str = `${str}${num}、${item.markSelectField}“${item.markSelectText}”揭示了“${item.technicalFeature}”${item.markNoteText}<br>`
+                            num += 1
                         });
                     }
                     return str

+ 1 - 1
src/utils/common.js

@@ -305,7 +305,7 @@ treeToArray(data,prop={children:children}){
    */
   getColumnData(row, field, prop, data) {
     if(field.type == 'function'){
-      return field.function(row)
+      return field.useFunction(row)
     }
     var text = this.getDataByField(row,field.value || field.field)
     

+ 1 - 0
src/views/noveltySearch/components/details/components/basicMessage/basicMessage.vue

@@ -234,6 +234,7 @@ export default {
                     this.$set(this.editField,field,false)
                 }else{
                    this.editReport.edit = false 
+                   this.getReportMessage()
                 }
                 
             }

+ 4 - 4
src/views/noveltySearch/components/details/components/contrastFile/contrastFile.vue

@@ -89,7 +89,7 @@
     },
     {
         field:'grantNo',
-        function:(data)=>{
+        useFunction:(data)=>{
             return data.grantNo || data.publicNo || ''
         },
         type:'function',
@@ -98,7 +98,7 @@
     },
     {
         field:'grantDate',
-        function:(data)=>{
+        useFunction:(data)=>{
             return data.grantDate || data.publicDate || ''
         },
         type:'function',
@@ -113,7 +113,7 @@
     },
     {
         field:'applicant',
-        function:(data)=>{
+        useFunction:(data)=>{
             if(data.applicant && data.applicant.length>0){
                 return data.applicant.map(item=>item.name).join('、')
             }
@@ -125,7 +125,7 @@
     },
     {
         field:'noveltyCompareRecordVOS',
-        function:(data)=>{
+        useFunction:(data)=>{
             if(data.noveltyCompareRecordVOS && data.noveltyCompareRecordVOS.length>0){
                 return data.noveltyCompareRecordVOS[0].markNoteText
             }

+ 2 - 2
src/views/noveltySearch/components/exportReport/components/common.vue

@@ -158,7 +158,7 @@
             <div class="mainContent1" style="position: relative;" v-for="(item,index) in getCompareRecordData([
             {
                 field:'patentMessage.applicant',
-                function:(data)=>{
+                useFunction:(data)=>{
                     if(data.patentMessage.applicant && data.patentMessage.applicant.length>0){
                         return data.patentMessage.applicant.join('、')
                     }
@@ -174,7 +174,7 @@
             },
             {
                 field:'content',
-                function:(data)=>{
+                useFunction:(data)=>{
                     var str = ''
                     if(data.data && data.data.length>0){
                         data.data.forEach((item,index) => {