zhuliu 2 роки тому
батько
коміт
f0db4ab01d

+ 30 - 3
RMS-FrontEnd/src/views/report/InvalidResponse/components/FileDetails/fileDetails.vue

@@ -7,7 +7,7 @@
       </div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="标的专利" name="patent">
-                <ContrastIndex v-bind="$attrs" v-on="$listeners" :reportId="reportId" :evidenceFlieId="evidence.id" :evidence="evidence" @on-change='changefix' :publicNo="signPatentNo"  :signPatentNo="signPatentNo" :reportType="reportType" :showEvidence="!showEvidence" @openOpinioncontrast="openOpinioncontrast"></ContrastIndex>
+                <ContrastIndex v-bind="$attrs" v-on="$listeners" :reportId="reportId" :evidenceFlieId="getEvidenceId()" :evidence="evidence1" @on-change='changefix' :publicNo="signPatentNo"  :signPatentNo="signPatentNo" :reportType="reportType" :showEvidence="!showEvidence" @openOpinioncontrast="openOpinioncontrast"></ContrastIndex>
             </el-tab-pane>
             <el-tab-pane label="无效请求书" name="InvalidRequest">
                 <check-File ref="checkFile"></check-File>
@@ -19,7 +19,7 @@
         <img src="@/assets/visual/fixed.png" width="20px" height="20px" @click="qx" v-if="fix===true" />
           <img src="@/assets/visual/unfixed.png" width="20px" height="20px" @click="gd" v-if="fix===false"  />
       </div>
-       <ContrastIndex v-if="type == 1" v-bind="$attrs" v-on="$listeners" :reportId="reportId" :evidenceFlieId="evidence.id" :evidence="evidence" @on-change='changefix' :publicNo="evidence.proofConditions" :signPatentNo="signPatentNo" :reportType="reportType" :showEvidence="showEvidence" @openOpinioncontrast="openOpinioncontrast"></ContrastIndex> 
+       <ContrastIndex v-if="type == 1" v-bind="$attrs" v-on="$listeners" :reportId="reportId" :evidenceFlieId="getEvidenceId()" :evidence="evidence1" @on-change='changefix' :publicNo="evidence1.proofConditions" :signPatentNo="signPatentNo" :reportType="reportType" :showEvidence="showEvidence" @openOpinioncontrast="openOpinioncontrast"></ContrastIndex> 
        <check-File v-else ref="checkFile1"></check-File>
     </div>
     <Add-Opinion ref="addOpinion"></Add-Opinion>
@@ -36,7 +36,7 @@ export default {
     checkFile,
     AddOpinion
   },
-  props: ['isEvidence','evidence','reportId','signPatentNo','reportType'],
+  props: ['isEvidence','evidence','reportId','signPatentNo','reportType','EvidenceList'],
   data() {
     return {
         activeName:'patent',
@@ -44,6 +44,7 @@ export default {
         showEvidence:this.isEvidence,
         type:1,
         url:'',
+        evidence1:{},
     };
   },
   watch: {
@@ -54,6 +55,7 @@ export default {
     },
     'evidence'(val){
         if(!this.fix){
+          this.evidence1 = JSON.parse(JSON.stringify(val))
             this.type = val.type
             this.showEvidence = true
             this.getDetails(val)
@@ -72,6 +74,31 @@ export default {
     // })
   },
   methods: {
+    //获取证据文献id
+    getEvidenceId(){
+      // var row = this.EvidenceList.find(item=>{
+      //   if(!this.fix){
+      //     console.log(12)
+      //      return item.proofConditions == this.evidence1.proofConditions
+      //   }else{
+      //     console.log(1)
+      //     return item.proofConditions == this.evidence.proofConditions
+      //   }
+       
+      // })
+      if(!this.fix){
+        var row = this.EvidenceList.find(item=>{
+           return item.proofConditions == this.evidence1.proofConditions
+        })
+      }else{
+        var row = this.EvidenceList.find(item=>{
+           return item.proofConditions == this.evidence1.proofConditions
+        })
+      }
+      if(row){
+        return row.id
+      }
+    },
     // 划词陈述意见
     openOpinioncontrast(val) {
       var form = {}

+ 6 - 2
RMS-FrontEnd/src/views/report/InvalidResponse/components/FileDetails/index.vue

@@ -29,11 +29,11 @@
           <div class="left1 fileDetails" style="width:100%;padding-bottom:10px" :style="{height:height}">
             <div class="box" ref="box" v-dragControllerDiv :style="{height:'100%'}">
               <div class="left" :style="{width:width}" v-loading="loading" style="height:100%"><!--左侧div内容-->
-                <FileDetails :isEvidence="isEvidence" style="overflow-y:auto;overflow-x: hidden;" :style="{height:'100%'}" :evidence="evidence" :reportId="params.reportId" :height="height" :signPatentNo="params.signPatentNo" :reportType="params.reportType" :type="params.reportType"></FileDetails>
+                <FileDetails :isEvidence="isEvidence" style="overflow-y:auto;overflow-x: hidden;" :style="{height:'100%'}" :evidence="evidence" :EvidenceList="EvidenceList1" :reportId="params.reportId" :height="height" :signPatentNo="params.signPatentNo" :reportType="params.reportType" :type="params.reportType"></FileDetails>
               </div>
               <div class="resize" title="收缩侧边栏"   v-show="width!='100%'" style="height:100%">⋮</div>
               <div class="mid" v-show="width!='100%'" :style="{width:width}" style="height:100%"><!--右侧div内容-->
-                <FileDetails :isEvidence="isEvidence" style="overflow-y:auto;overflow-x: hidden;" :style="{height:'100%'}" :evidence="evidence" :reportId="params.reportId" :height="height" :signPatentNo="params.signPatentNo" :reportType="params.reportType" :type="params.reportType"></FileDetails>
+                <FileDetails :isEvidence="isEvidence" style="overflow-y:auto;overflow-x: hidden;" :style="{height:'100%'}" :evidence="evidence" :EvidenceList="EvidenceList1" :reportId="params.reportId" :height="height" :signPatentNo="params.signPatentNo" :reportType="params.reportType" :type="params.reportType"></FileDetails>
               </div>
             </div> 
           </div>
@@ -54,6 +54,7 @@
 import PatentDetail from './patentDetail.vue';
 import FileDetails from './fileDetails.vue';
 import addOpinion from './addOpinions.vue'
+import jsCookie from 'js-cookie';
 export default {
   components: {
     PatentDetail,
@@ -71,6 +72,7 @@ export default {
         patentNo:this.$route.query.patentNo || null,
         FileVisible: false,
         EvidenceList:[],
+        EvidenceList1:[],
         params:{},
         evidence:{},//证据文献
         // literatureType:1,//文献类型1是专利文献
@@ -164,6 +166,7 @@ export default {
       this.loading = false
       // 1是文献2是非文献
      if (val.type == 1) {
+      this.queryScratchs()
         // this.getPatent(val.proofConditions)
         // this.getPiZhuContrastList(val.proofConditions)
       } else {
@@ -187,6 +190,7 @@ export default {
       this.$api.queryProof(params).then((res) => {
         if (res.code==200) {
           this.EvidenceList = res.data
+          this.EvidenceList1 = JSON.parse(JSON.stringify(res.data))
           var index = this.EvidenceList.findIndex(item => {
             return item.id == this.evidence.id
           })

+ 1 - 1
RMS-FrontEnd/src/views/report/InvalidResponse/components/InvalidIndex.vue

@@ -2,7 +2,7 @@
   <!-- 无效理由和证据 -->
   <div>
     <div style="display:flex;justify-content: flex-end;margin-bottom:10px">
-      <el-button type="primary" size="small" @click="addInvalid">添加无效证据</el-button>
+      <el-button type="primary" size="small" @click="addInvalid">添加无效理由</el-button>
       <!-- <el-button type="primary" size="small" @click="addCourtOpinion">添加法院意见</el-button> -->
       <el-button type="primary" size="small" @click="addCourtOpinion" v-if="this.tableField2.findIndex(item=>{return item.fieldKey.slice(-1) == 2})==-1">添加法院二审</el-button>
       <el-button type="primary" size="small" @click="openField">显示栏位管理</el-button>