zhuliu hace 2 años
padre
commit
e538653788

+ 1 - 1
RMS-FrontEnd/src/views/components/common/mixins.js

@@ -281,7 +281,7 @@ export const patentKeywordsHighlight = {
       var row = this[key]
       if (row.length > 0) {
         for (let i = 0; i < row.length; i++) {
-          if (row[i].patentNo == this.patent.publicNo) {
+          if (row[i].patentNo == this.patent.publicNo || row[i].patentNo == this.patent.patentNo ) {
             if (row[i][obj[key][3]].indexOf(field) != -1) { 
               var a = {}
               a.Type=1

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

@@ -136,6 +136,7 @@ export default {
   },
   watch: {
     reportId(){
+      this.getFeatureRights(this.signPatentNo)
         this.getInvalidReason()  
     },
   },

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

@@ -78,7 +78,7 @@
             </el-dialog> -->
             <!-- <addInvalidDialog ref="addInvalidDialog" :featureList="featureList" v-bind="$attrs" v-on="$listeners"></addInvalidDialog> -->
             <el-dialog title="添加证据" :visible.sync="EvidenceVisible" width="1000px" :before-close="closeEvidence" custom-class="addInvalid" append-to-body>
-                <Invalid-Evidence ref="invalid" :reportId="reportId" :patentNo="patentNo" ></Invalid-Evidence>
+                <Invalid-Evidence ref="invalid" :reportId="reportId" :patentNo="patentNo" @edit="getEdit"></Invalid-Evidence>
                 <div slot="footer" class="dialog-footer">
                     <el-button @click="closeEvidence">取 消</el-button>
                     <el-button type="primary" @click="submitEvidence">确 定</el-button>
@@ -120,6 +120,9 @@ export default {
     this.getFeature()
   },
   methods: {
+    getEdit(){
+      this.$emit('submit',true)
+    },
     //编辑无效证据
     editInvalid(row,index){
       if(row.arguments && row.arguments.length==0){

+ 4 - 0
RMS-FrontEnd/src/views/report/InvalidResponse/components/InvalidEvidence.vue

@@ -175,6 +175,7 @@ export default {
           this.$message.success('更新成功')
           row.oldData = null
           this.$set(row,'edit',false)
+          this.$emit('edit',false)
           this.tableData[index] = JSON.parse(JSON.stringify(row))
           
           this.refreshData = false
@@ -191,6 +192,8 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          
+          this.evidence.proofStrIds.splice(this.evidence.proofStrIds.indexOf(id), 1)
           this.deletes([id])
         }).catch(() => {          
         });
@@ -201,6 +204,7 @@ export default {
       this.$api.deleteProofStr(ids).then(response=>{
         if(response.code == 200){
           this.$message.success('删除成功')
+          this.$emit('edit',false)
           this.getPoofArguments(this.evidence,this.right)
         }
       })

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

@@ -219,6 +219,7 @@ export default {
         this.$message.error('请选择特征')
         return false
       }
+      this.form.scratchId = this.form.id
       this.form.rightSort = this.form.rightId
       // if (!this.form.id) {
         this.$api.addArguments(this.form).then((res) => {
@@ -426,7 +427,8 @@ export default {
       }
       this.$api.queryProofStr(params).then((res) => {
         if (res.code == 200) {
-          if (res.data.proofStr) {
+          console.log(res.data.proofStrId)
+          if (res.data.proofStrId) {
             this.$set(this.form,'proofStr',res.data.proofStr)
             this.$set(this.form,'proofStrId',res.data.proofStrId)
             if(res.data.arguments && res.data.arguments.length>0){