1

public/reportTemplate/noveltyCommon/noveltyCommon.txt

@@ -25,7 +25,7 @@
                         <div v-if="isEdit('baseMessage','searchUnit')">
                             <myRichText :checkImage="false" :imgStyle="{width:'100%',height:'auto'}" v-model="reportData.baseMessage.searchUnit" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
                         </div>
-                        <div v-else v-html="getColumnData('baseMessage','searchUnit',dataObj.baseMessage.searchUnit)"></div>
+                        <div v-else v-html="getColumnData('baseMessage','searchUnit',dataObj.baseMessage.searchUnit || userinfo.tenantName)"></div>
                     </td>
                 </tr>
                 <tr>
@@ -34,7 +34,7 @@
                         <div v-if="isEdit('baseMessage','searchTime')">
                             <myRichText :checkImage="false" :imgStyle="{width:'100%',height:'auto'}" v-model="reportData.baseMessage.searchTime" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
                         </div>
-                        <div v-else v-html="getColumnData('baseMessage','searchTime',dataObj.baseMessage.searchTime)"></div>
+                        <div v-else v-html="getColumnData('baseMessage','searchTime',dataObj.baseMessage.searchTime || getSearchTime())"></div>
                     </td>
                 </tr>
                 <tr>
@@ -43,7 +43,7 @@
                         <div v-if="isEdit('baseMessage','searchUnitContact')">
                             <myRichText :checkImage="false" :imgStyle="{width:'100%',height:'auto'}" v-model="reportData.baseMessage.searchUnitContact" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
                         </div>
-                        <div v-else v-html="getColumnData('baseMessage','searchUnitContact',(dataObj.baseMessage.headName || '') + ' ' + (dataObj.baseMessage.searchUnitContact || ''))"></div>
+                        <div v-else v-html="getColumnData('baseMessage','searchUnitContact',(dataObj.baseMessage.headName || dataObj.baseMessage.createName || '') + ' ' + (dataObj.baseMessage.searchUnitContact || ''))"></div>
                     </td>
                 </tr>
                 <tr>

public/reportTemplate/visionox/visionox.txt

@@ -27,7 +27,7 @@
                                 <div v-if="isEdit('baseMessage','searchTime')">
                                     <myRichText  v-model="reportData.baseMessage.searchTime" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
                                 </div>
-                                <div v-else v-html="getColumnData('baseMessage','searchTime',dataObj.baseMessage.searchTime)"></div>
+                                <div v-else v-html="getColumnData('baseMessage','searchTime',dataObj.baseMessage.searchTime || getSearchTime())"></div>
                             </td>
                         </tr>
                         <tr>
@@ -52,14 +52,14 @@
                                 <div v-if="isEdit('baseMessage','searchName')">
                                     <myRichText :checkImage="false" :imgStyle="{width:'100%',height:'auto'}" v-model="reportData.baseMessage.searchName" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
                                 </div>
-                                <div v-else v-html="getColumnData('baseMessage','searchName',dataObj.baseMessage.headName)"></div>
+                                <div v-else v-html="getColumnData('baseMessage','searchName',dataObj.baseMessage.headName || dataObj.baseMessage.createName)"></div>
                             </td>
                             <td>代理机构</td>
                             <td @click="edit('baseMessage','searchUnit')">
                                 <div v-if="isEdit('baseMessage','searchUnit')">
                                     <myRichText :checkImage="false" :imgStyle="{width:'100%',height:'auto'}" v-model="reportData.baseMessage.searchUnit" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
                                 </div>
-                                <div v-else v-html="getColumnData('baseMessage','searchUnit',dataObj.baseMessage.searchUnit)"></div>
+                                <div v-else v-html="getColumnData('baseMessage','searchUnit',dataObj.baseMessage.searchUnit || userinfo.tenantName)"></div>
                             </td>
                         </tr>
                         <tr>

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

@@ -95,6 +95,18 @@ export default{
             // 测试字符是否匹配正则表达式  
             return punctuationRegex.test(char);  
         },
+        //获取最后一次检索记录的检索时间
+        getSearchTime(){
+            if(!this.dataObj.searchRecord || this.dataObj.searchRecord.length == 0){
+                return ''
+            }
+            var data = JSON.parse(JSON.stringify(this.dataObj.searchRecord))
+            var obj = data.sort((a, b) => (a.retrieveTime?new Date(a.retrieveTime):0) - (b.retrieveTime?new Date(b.retrieveTime):0))[data.length-1]
+            if(obj){
+                return obj.retrieveTime
+            }
+            return ''
+        },
         getColumnData(field,property,value){
             var key = field + '-' + property
             if(!this.editModel && !this.hasCopy[key]){

src/views/noveltySearch/components/exportReport/exportReport.vue

@@ -67,6 +67,9 @@ export default {
         },
     },
     computed: {
+        userinfo(){
+            return this.$s.getObj('userinfo')
+        },
     },
     created() {},
     async mounted() {