1

src/views/components/dialog/menuDialog/noveltySearchContrast.vue

@@ -222,8 +222,16 @@
       handleRemove(index) {
         this.form.pictureUrl.splice(index,1)
       },
-      handlePictureCardPreview() {
-          this.$refs.image.showViewer = true
+      handlePictureCardPreview(index) {
+        var dom = this.$refs.image
+        if(dom){
+          if(dom[0]){
+            dom[0].showViewer = true
+          }else{
+            dom.showViewer = true
+          }
+        }
+          
       },
       delContrast(){
         //   if(!this.$permission.FunPermissions('xiaoshi/annotationLibrary')){

src/views/components/import/conditionImport/searchResult.vue

@@ -346,7 +346,7 @@ export default {
       })
     },
     searchBth() {
-      this.queryParams.retrieveRecordId = null
+      // this.queryParams.retrieveRecordId = null
       this.queryParams.current = 1
       this.getList()
       if(this.outside){

src/views/noveltySearch/components/details/components/contrastRecords/contrastRecords.vue

@@ -14,7 +14,7 @@
                             <div v-html="`[${scope.row.markSelectField}]${scope.row[item.field]}`"></div>
                         </div>
                         <div v-else-if="item.field == 'technicalFeature'">
-                            <div style="width:100px;height:100px">
+                            <div style="width:100px;height:100px" v-if="scope.row.systemFileList && scope.row.systemFileList.length>0">
                                 <el-image v-for="picture in scope.row.systemFileList" :key="picture.guid" fit="contain" ref="image" style="width:100%;height:100%"  :src="$commonJS.checkViewer(picture.guid)" :preview-src-list="scope.row.systemFileList.map(item=>$commonJS.checkViewer(item.guid))"></el-image>
                             </div>
                             <div v-html="scope.row[item.field]"></div>

src/views/project/patentCollection/components/views/Picture.vue

@@ -5,7 +5,11 @@
       <el-card shadow="hover" v-for="(item, index) in tableData" style="width:200px;margin:5px" :key="index">
         <div slot="header"
           style="width: 100%; white-space: nowrap;overflow-x: hidden;text-overflow: ellipsis;font-size:12px;">
-          <div>序号：{{ (index + 1) + ((queryParams.current - 1) * queryParams.size) }}</div>
+          <div>
+            序号：{{ (index + 1) + ((queryParams.current - 1) * queryParams.size) }}
+            <el-tag class="margin-left_10" style="cursor: pointer;" type="primary" effect="plain" size="small" @click.native="openAddRemark(item)" v-if="noveltySearch && !noveltyIsRemark(item)">添加查新标注</el-tag>
+            <el-tag class="margin-left_10" style="cursor: pointer;" type="primary" effect="plain" size="small"  v-if="noveltySearch && noveltyIsRemark(item)" @click.native="openAddRemark(item)">已标注</el-tag>
+          </div>
           <el-divider></el-divider>
           <span v-if="refresh"> 
             <el-checkbox-group :value="patentNoList" >
@@ -52,6 +56,7 @@
       </el-col>
     </el-row> -->
     </div>
+    <addRemark ref="addRemark" :projectId="projectId" v-on="$listeners"></addRemark>
   </div>
 </template>
 

src/views/project/patentCollection/components/views/Table.vue

@@ -60,6 +60,8 @@
               </template>
               
             </el-popover>
+            <el-tag class="margin-left_10" style="cursor: pointer;" type="primary" effect="plain" size="small" @click.native="openAddRemark(scope.row)" v-if="noveltySearch && !noveltyIsRemark(scope.row)">添加查新标注</el-tag>
+            <el-tag class="margin-left_10" style="cursor: pointer;" type="primary" effect="plain" size="small"  v-if="noveltySearch && noveltyIsRemark(scope.row)" @click.native="openAddRemark(scope.row)">已标注</el-tag>
           </div>
           <template v-else-if="item.ifPersonal">
             <div>
@@ -98,6 +100,7 @@
         </template>
       </el-table-column>
     </el-table>
+    <addRemark ref="addRemark" :projectId="projectId" v-on="$listeners"></addRemark>
   </div>
 </template>
 

src/views/report/InvalidResponse/components/reasonsAndEvidence/details_1.vue

@@ -16,12 +16,12 @@
                     <template slot-scope="scope">
                         <div>
                             <div v-if="editMessage.field && editMessage.field.field == item.field && editMessage.data.proofGroupId == scope.row.proofGroupId">
-                                <el-select clearable v-if="item.field == 'courtOpinions1' || item.field == 'courtOpinions2'" :value="getColumnData(scope.row,item)" @change="(value)=>changeMessage(item,scope.row,value)" placeholder="请选择">
+                                <!-- <el-select clearable v-if="item.field == 'courtOpinions1' || item.field == 'courtOpinions2'" :value="getColumnData(scope.row,item)" @change="(value)=>changeMessage(item,scope.row,value)" placeholder="请选择">
                                     <el-option label="基于原权要维持有效"  value="基于原权要维持有效"></el-option>
                                     <el-option label="基于修改后权要维持有效"  value="基于修改后权要维持有效"></el-option>
                                     <el-option label="全部无效"  value="全部无效"></el-option>
-                                </el-select>
-                                <my-RichText v-else :autoFocus="true" :value="getColumnData(scope.row,item)" @blur="(value)=>changeMessage(item,scope.row,value)"></my-RichText>
+                                </el-select> -->
+                                <my-RichText :autoFocus="true" :value="getColumnData(scope.row,item)" @blur="(value)=>changeMessage(item,scope.row,value)"></my-RichText>
                             </div>
                             
                             <div class="text" v-else v-html="getColumnData(scope.row,item)"></div>

src/views/report/InvalidResponse/components/reasonsAndEvidence/details_2.vue

@@ -15,12 +15,12 @@
                     <template slot-scope="scope">
                         <div>
                             <div v-if="editMessage.field && editMessage.field.field == item.field && editMessage.data.proofGroupId == scope.row.proofGroupId">
-                                <el-select clearable v-if="item.field == 'courtOpinions1' || item.field == 'courtOpinions2'" :value="getColumnData(scope.row,item)" @change="(value)=>changeMessage(item,scope.row,value)" placeholder="请选择">
+                                <!-- <el-select clearable v-if="item.field == 'courtOpinions1' || item.field == 'courtOpinions2'" :value="getColumnData(scope.row,item)" @change="(value)=>changeMessage(item,scope.row,value)" placeholder="请选择">
                                     <el-option label="基于原权要维持有效"  value="基于原权要维持有效"></el-option>
                                     <el-option label="基于修改后权要维持有效"  value="基于修改后权要维持有效"></el-option>
                                     <el-option label="全部无效"  value="全部无效"></el-option>
-                                </el-select>
-                                <my-RichText v-else :ref="item.field + scope.row.proofGroupId" :autoFocus="true" :value="getColumnData(scope.row,item)" @blur="(value)=>changeMessage(item,scope.row,value)"></my-RichText>
+                                </el-select> -->
+                                <my-RichText :ref="item.field + scope.row.proofGroupId" :autoFocus="true" :value="getColumnData(scope.row,item)" @blur="(value)=>changeMessage(item,scope.row,value)"></my-RichText>
                             </div>
                             
                             <div class="text" v-else >