解决测试bug

RMS-FrontEnd/src/api/InvalidResponse.js

@@ -133,10 +133,11 @@ export default {
     return axios.post('/report/api/proof/addOrUpdateProofStr', params)
   },
    /**
- * 删除无效证据
+ * 删除无效证据arguments/deleteProofStr
  */
    deleteProofStr(params) {
-    return axios.post('/report/api/proof/deleteProofStr', params)
+    // return axios.post('/report/api/proof/deleteProofStr', params)
+    return axios.post('/report/api/arguments/deleteProofStr', params)
   },
   /**
  * 查询陈述意见列表

RMS-FrontEnd/src/views/components/articles/ContrastIndex.vue

@@ -63,12 +63,12 @@
           <div class="patent-articles-content-left1" :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }">
             <div class="dom1 box1" v-dragControllerDiv1 style="display:flex;width:100%">
               <div class="component left1" style="width:100%;overflow-y:auto;overflow-x: hidden;padding-bottom:10px" :style="{height:height}">
-                <component :is="componentName" v-bind="$attrs" :type1='type' :isTrue="isTrue" @openContrast='openContrast'  :project-id="projectId" :patent="patent" :patent-id="patentId" :signPatentNo="signPatentNo" :patentNo="this.activeMenu == 'patentWorth'?[patentNo?patentNo:productPublicNo]:patentNo" :publicNo="publicNo" :domId="patentNo + '2'" :reportId="reportId" @refresh="getPatent(patent.patentNo)"></component>
+                <component :is="componentName" v-on="$listeners" v-bind="$attrs" :type1='type' :isTrue="isTrue" @openContrast='openContrast'  :project-id="projectId" :patent="patent" :patent-id="patentId" :signPatentNo="signPatentNo" :patentNo="this.activeMenu == 'patentWorth'?[patentNo?patentNo:productPublicNo]:patentNo" :publicNo="publicNo" :domId="patentNo + '2'" :reportId="reportId" @refresh="getPatent(patent.patentNo)"></component>
               </div>
               <div class="resize2" title="收缩侧边栏" v-show="(radio == 2 || radio == 3) && activeMenu != activeMenu2"><p><span>˙</span><span>˙</span><span>˙</span></p></div>
               <div class="resize1" title="收缩侧边栏" v-show="(radio == 4 || radio == 5) && activeMenu != activeMenu2"><span>⋮</span></div>
             <div v-show="radio != 1 && activeMenu != activeMenu2" class="mid1" :style="{height:(radio == 4 || radio == 5)?height:'280px'}"  style="width:450px;height:280px;border:1px solid #E4E7ED;margin:10px;overflow-y:auto;overflow-x: hidden;">
-              <component :is="activeMenu2" v-bind="$attrs" :project-id="projectId" :patent="patent" :patent-id="patentId" :pdfType1="(patent.pdf && patent.pdf.length>0)?patent.pdf[0].type:2" :sign="true"></component>
+              <component :is="activeMenu2"  v-bind="$attrs" :project-id="projectId" :patent="patent" :patent-id="patentId" :pdfType1="(patent.pdf && patent.pdf.length>0)?patent.pdf[0].type:2" :sign="true"></component>
             </div>
             </div>
           
@@ -323,7 +323,7 @@ export default {
   methods: {
      //获取需要跳转的批注
      getBiaoZhu(val) {
-      if (val.scratchField == '摘要') {
+      if (val.scratchField.indexOf('摘要')!=-1) {
         this.activeMenu = 'PatentBasic'
       } else { 
         this.activeMenu = this.menuList.find(item => {

RMS-FrontEnd/src/views/components/articles/index.vue

@@ -592,7 +592,7 @@ export default {
 
     //获取需要跳转的批注
     getBiaoZhu(val) {
-      if (val.scratchField == '摘要') {
+      if (val.scratchField.indexOf('摘要')!=-1) {
         this.activeMenu = 'PatentBasic'
       } else { 
         this.activeMenu = this.menuList.find(item => {

RMS-FrontEnd/src/views/components/gaoliang/components/pizhu.vue

@@ -135,7 +135,7 @@ export default {
     },
     // 确定增加批注
     submitPizhu() {
-      this.mark.rangeType=false
+     
       if (this.mark.id) {
         this.$api.scratchWordsUpdate(this.mark).then(response => {
           if (response.code == 200) {
@@ -161,6 +161,7 @@ export default {
     },
     // 关闭批注
     cancelPizhu() {
+      
       if (this.mark.id|| this.mark.Id) {
         let index={
           color:this.mark.color,

RMS-FrontEnd/src/views/report/InvalidResponse/components/FileDetails/addOpinions.vue

@@ -63,7 +63,7 @@
         </el-form>
     </div>
     <div v-if="show">
-      <InvalidDetails :invalidReasonId="form.content" :reportId="reportId" :rightSort="rightSort"></InvalidDetails>
+      <InvalidDetails :invalidReasonId="form.content" :reportId="reportId" :rightSort="rightSort" :right="rights.find(item => item.sort == rightSort)"></InvalidDetails>
     </div>
     <div style="margin-left:20px">
       <div style="display:flex;justify-content:space-between;align-items:center">
@@ -128,6 +128,7 @@ export default {
         },
       ],
       rightList:[],
+      rights:[],
       proofGroups:[],
       proofs:[],
       features:[]
@@ -140,13 +141,24 @@ export default {
   },
   computed: {},
   created() {},
-  mounted() {
+  async mounted() {
     if(this.reportId){
+     await this.getFeatureRights(this.signPatentNo)
        this.getInvalidReason() 
+       
     }
     
   },
   methods: {
+      // 请求权要特征
+      async getFeatureRights(val) {
+      let params = { patentNo: val}
+      await this.$api.getFeatureRights(params).then((res) => {
+        if (res.code == 200) {
+          this.rights = res.data
+        }
+      })
+    },
     //更新陈述意见
     submit(){
       var params={

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"></ContrastIndex>
+                <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>
             </el-tab-pane>
             <el-tab-pane label="无效请求书" name="InvalidRequest">
                 <check-File ref="checkFile"></check-File>
@@ -19,20 +19,22 @@
         <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"></ContrastIndex> 
+       <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> 
        <check-File v-else ref="checkFile1"></check-File>
     </div>
-    
+    <Add-Opinion ref="addOpinion"></Add-Opinion>
   </div>
 </template>
 
 <script>
 import ContrastIndex from '@/views/components/articles/ContrastIndex.vue';
-import checkFile from '@/views/report/InvalidResponse/components/checkFile.vue'
+import checkFile from '@/views/report/InvalidResponse/components/checkFile.vue';
+import AddOpinion from '@/views/report/InvalidResponse/components/addOpinion.vue'
 export default {
   components: {
     ContrastIndex,
-    checkFile
+    checkFile,
+    AddOpinion
   },
   props: ['isEvidence','evidence','reportId','signPatentNo','reportType'],
   data() {
@@ -70,6 +72,14 @@ export default {
     // })
   },
   methods: {
+    // 划词陈述意见
+    openOpinioncontrast(val) {
+      var form = {}
+      form=val
+      form.reportId=this.reportId
+      form.signPatentNo = this.signPatentNo
+      this.$refs.addOpinion.open(form,false)
+    },
     qx() {
       this.fix = false
 

RMS-FrontEnd/src/views/report/InvalidResponse/components/InvalidDetails/table.vue

@@ -246,9 +246,9 @@ export default {
         this.evidence = this.proofs.find(item=>{return item.id == val})
         this.evidence.sortStr = 'D'+this.evidence.sort
         this.$set(this.evidence,'proofStrIds',this.tableData.map(item=>{
-            if(item.sort == this.evidence.sort){
+            // if(item.sort == this.evidence.sort){
                 return item.proofStrId
-            }
+            // }
         }))
         this.EvidenceVisible = true
         this.$nextTick(() => {

RMS-FrontEnd/src/views/report/InvalidResponse/components/addOpinion.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog  :title="title"  :visible.sync="dialogVisible" :before-close="closeDialog">
+    <el-dialog  :title="title"  :visible.sync="dialogVisible" :before-close="closeDialog" append-to-body>
           <div class="opinion" id="opinion">
             <el-form :model="form" label-width="100px" label-position="left">
               <template v-if="form.content">
@@ -264,6 +264,9 @@ export default {
       //   form.proofId = null
       // }
       this.form = JSON.parse(JSON.stringify(form))
+      if(this.form.rightSort == 0 || this.form.rightSort){
+        this.form.rightId = this.form.rightSort
+      }
       if(this.form.proofId == -1){
         this.form.proofId = null
       }
@@ -278,8 +281,10 @@ export default {
         } else {
           this.title='添加陈述意见'
         }
+        this.$nextTick(()=>{
+          this.dialogVisible = true
+        })
         
-        this.dialogVisible = true
       } else {
         this.featureForm=this.form
         this.featureVisible = true
@@ -430,6 +435,11 @@ export default {
             }
             
             // this.form.proofStr = res.data.proofStr
+          }else{
+            this.$set(this.form,'proofStr','')
+            this.$set(this.form,'proofStrId','')
+              this.$set(this.form,'argumentStr','')
+              this.$set(this.form,'argumentId','')
           }
         }
       })