zhuliu před 1 rokem
rodič
revize
e9c5b66217

+ 3 - 2
src/views/project/patentCollection/components/views/Abstract.vue

@@ -80,9 +80,10 @@
                       </span>
                     </el-col>
                     <el-col :span="8" v-if="t()">
-                      <span class="patent-abstract_label">公开日:</span>
+                      <span class="patent-abstract_label">公开/公告日:</span>
                       <span class="patent-abstract_text">
-                        <span v-html="getView(patent, 'publicDate')"></span>
+                        <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()">

+ 2 - 2
src/views/project/patentDetails/components/patentMessage/PatentBasic.vue

@@ -81,8 +81,8 @@
                 <el-descriptions :column=2>
                   <el-descriptions-item label="申请号"><div class="patent-basic-value"  v-html="getViewDom(patent.appNo,'申请号')"></div></el-descriptions-item>
                   <el-descriptions-item label="申请日"><div class="patent-basic-value"  v-html="getViewDom(patent.appDate,'申请日')"></div></el-descriptions-item>
-                  <el-descriptions-item label="公开号"><div class="patent-basic-value" v-html="getViewDom(patent.publicNo,'公开号')"></div></el-descriptions-item>
-                  <el-descriptions-item label="公开日"><div class="patent-basic-value"  v-html="getViewDom(patent.publicDate,'公开日')"></div></el-descriptions-item>
+                  <el-descriptions-item label="公开号" v-if="patent.publicNo"><div class="patent-basic-value" v-html="getViewDom(patent.publicNo,'公开号')"></div></el-descriptions-item>
+                  <el-descriptions-item label="公开日" v-if="patent.publicDate"><div class="patent-basic-value"  v-html="getViewDom(patent.publicDate,'公开日')"></div></el-descriptions-item>
                   <el-descriptions-item label="授权号" v-if="patent.grantNo"><div class="patent-basic-value"  v-html="getViewDom(patent.grantNo,'授权号')"></div></el-descriptions-item>
                   <el-descriptions-item label="授权日" v-if="patent.grantDate"><div class="patent-basic-value"  v-html="getViewDom(patent.grantDate,'授权日')"></div></el-descriptions-item>
                   <el-descriptions-item label="优先权" v-if="patent.priorityNo"><div class="patent-basic-value"  v-html="getViewDom(patent.priorityNo,'优先权')+ '&nbsp;&nbsp;&nbsp;&nbsp;' +getViewDom(patent.priorityDate)"></div></el-descriptions-item>

+ 1 - 1
src/views/report/components/patentList/components/customFields/components/tab2.vue

@@ -59,7 +59,7 @@ export default {
     return {
       ifShow: true,
       // 是否关联子分类false不关联,true关联
-      ifHaveChild: false,
+      ifHaveChild: true,
     }
   },
   watch: {

+ 1 - 1
src/views/report/components/patentList/components/customFields/index.vue

@@ -96,7 +96,7 @@ export default {
       //正在打开的折叠面板
       activeName2: [],
       // 树不关联模式
-      ifHaveChild: false,
+      ifHaveChild: true,
     }
   },
   watch: {