zhuliu 1 year ago
parent
commit
6fb7d9e60a

+ 2 - 1
src/utils/common.js

@@ -351,7 +351,8 @@ export default {
     if(url){
       apiItem = url
     }else{
-      apiItem = Object.keys(patentObj).length > 0 ? 'getTableColumns':'getCustomField'
+      // apiItem = Object.keys(patentObj).length > 0 ? 'getTableColumns':'getCustomField'
+      apiItem = 'getTableColumns'
     }
     
     var a = []

+ 0 - 1
src/views/project/patentCollection/components/dialog/PatentIndexSetting.vue

@@ -302,7 +302,6 @@ export default {
         })
       } else {
         let selected = []
-        console.log(this.fieldType)
         switch (this.fieldType) {
           case 0:
           case 1:

+ 6 - 6
src/views/report/InvalidResponse/components/reasonsAndEvidence/reasonsAndEvidence.vue

@@ -66,8 +66,8 @@
                             <!-- 证据组合 -->
                             <template v-if="item.value == 'proofGroup'">
                                 <div>
-                                    <div v-if="scope.row.proofGroupDescription">第一次证据组合:{{ scope.row.proofGroupDescription }}</div>
-                                    <div v-if="scope.row.proofGroupDescription2">第二次证据组合:{{ scope.row.proofGroupDescription2 }}</div>
+                                    <div v-if="scope.row.proofGroupDescription">第一次证据组合:<span v-html=" scope.row.proofGroupDescription "></span> </div>
+                                    <div v-if="scope.row.proofGroupDescription2">第二次证据组合:<span v-html=" scope.row.proofGroupDescription2 "></span></div>
                                 </div>
                             </template>
                             <!-- 原权要特征内容 -->
@@ -111,8 +111,8 @@
                             </template>
                             <!-- 修改后权要特征 -->
                             <template v-if="item.value == 'feature1'">
-                                <div>
-                                    {{ getFeatureCommon(scope.row,1) }}
+                                <div v-html=" getFeatureCommon(scope.row,1) ">
+                                    
                                 </div>
                             </template>
                             <!-- 第一次答辩意见 -->
@@ -152,8 +152,8 @@
                             </template>
                             <!-- 第二次修改后权要特征 -->
                             <template v-if="item.value == 'feature2'">
-                                <div>
-                                    {{ getFeatureCommon(scope.row,2) }}
+                                <div v-html=" getFeatureCommon(scope.row,2) ">
+                                    
                                 </div>
                             </template>
                             <!-- 第二次答辩意见 -->