无效应对添加权限和修改无效记录为被无效历史

RMS-FrontEnd/src/App.vue

@@ -17,19 +17,19 @@
                 
                 <template  v-if="[0,1,2].includes(Number(mark.reportType)) && mark.taskId">
                   &NonBreakingSpace;&NonBreakingSpace;
-                  <a onclick="addDuiBi()" v-if="!mark.id" style="font-size: 14px;font-weight: 500;">对比</a>
+                  <a onclick="addDuiBi()" v-if="!mark.id && $reportPermission(mark.rangeId,[0,1])" style="font-size: 14px;font-weight: 500;">对比</a>
                 </template>
 
-                <template v-if="mark.reportType==7">
+                <template v-if="mark.reportType==7 && $reportPermission(mark.rangeId,[0,1])">
                   &NonBreakingSpace;&NonBreakingSpace;
                   <a v-if="mark.scratchField && mark.scratchField.includes('权利要求') && (mark.signPatentNo == mark.pno)" @click="addStateOpinion()" style="font-size: 14px;font-weight: 500;" >添加特征</a>
-                  <a v-else-if="mark.signPatentNo != mark.patentNo" @click="addStateOpinion()" style="font-size: 14px;font-weight: 500;" >陈述意见</a>
+                  <a v-else-if="mark.signPatentNo != mark.patentNo " @click="addStateOpinion()" style="font-size: 14px;font-weight: 500;" >陈述意见</a>
                  </template>
 
              <!-- &NonBreakingSpace;&NonBreakingSpace; -->
                 <!-- <a onclick="hiddenPizhu()"></a> -->
                 &NonBreakingSpace;&NonBreakingSpace;
-                <a v-if="mark.id" @click="hiddenPiZhuDelete" style="font-size: 14px;font-weight: 500;">删除</a>
+                <a v-if="mark.id && $reportPermission(mark.rangeId,[0,1])" @click="hiddenPiZhuDelete" style="font-size: 14px;font-weight: 500;">删除</a>
                 &NonBreakingSpace;&NonBreakingSpace;
           </div>
     </div>

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

@@ -226,7 +226,7 @@ export default {
         // },
         {
           value: 'Invalid',
-          label: '无效记录'
+          label: '被无效历史'
         },
         {
           value: 'Litigation',

RMS-FrontEnd/src/views/components/articles/components/mixins.js

@@ -845,6 +845,9 @@ export const addContrast = {
     },
     //点击图标回显数据
     selectMark(id, selectType) {
+      if(!this.$reportPermission(this.reportId,[0,1])){
+        return false
+      }
       var Id = id.substring(1,id.length)
       if (selectType=='p') {
         var index = this.piZhuContrastList.findIndex(item => {
@@ -992,10 +995,18 @@ export const addContrast = {
         if (node.getAttribute("data-type") != null) {
           temNode = node
         } else {
-          NotIncludeDataType(node.parentElement);
+          if(node.parentElement){
+            NotIncludeDataType(node.parentElement);
+          }else{
+            temNode = temNode.parentElement
+          }
+          
         }
       }
       var rightSort = null
+      if(temNode.getAttribute("data-type") == null){
+        return false
+      }
       if (this.reportType == 7 && temNode.getAttribute("data-type").includes('权利要求')) {
         var node1 = null
         getRightSort(a)

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

@@ -366,7 +366,7 @@ export default {
         // },
         {
           value: 'Invalid',
-          label: '无效记录'
+          label: '被无效历史'
         },
         {
           value: 'Litigation',

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/ContrasrProduct.vue

@@ -328,7 +328,7 @@ export default {
         // },
         {
           value: 'Invalid',
-          label: '无效记录'
+          label: '被无效历史'
         },
         {
           value: 'Litigation',

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/patentMessage.vue

@@ -226,7 +226,7 @@ import { splitScreen1 } from '@/views/components/common/SplitScreen'
         // },
         {
           value: 'Invalid',
-          label: '无效记录'
+          label: '被无效历史'
         },
         {
           value: 'Litigation',

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

@@ -3,7 +3,7 @@
         
         <div style="background:white;display:flex; justify-content:flex-end;align-items: center;">
             <!-- <el-button type="primary" size="small" @click="checkInvalid" style="margin-right:10px;height:32px;"> 查看无效请求书/标的专利 </el-button> -->
-            <el-button type="primary" size="small" @click="addOpinion" style="margin-right:10px;height:32px;"> 陈述意见 </el-button>
+            <el-button type="primary" size="small" @click="addOpinion" style="margin-right:10px;height:32px;" v-if=" $reportPermission(params.reportId,[0,1])"> 陈述意见 </el-button>
             <el-switch
                 v-model="value"
                 :disabled="!$permission('/workspace/details/comparison')"
@@ -119,7 +119,10 @@ export default {
     this.getQueryProofList()//获取证据列表
     this.$nextTick(()=>{
         this.$set(this,'height',document.getElementsByClassName('el-main')[0].offsetHeight-60  + 'px')
-        this.addOpinion()
+        if(this.$reportPermission(this.params.reportId,[0,1])){
+          this.addOpinion()
+        }
+        
      })
   },
   methods: {

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

@@ -10,12 +10,13 @@
               </span>
             </p>
             <div v-if="!item.show" style="margin-bottom:10px">
-              <Table :tableData="item.proofDetails" @submit="submitInvalid"  v-bind="$attrs" v-on="$listeners" :proofs="item.proofs" :proofGroup="item"></Table>
+              <Table :tableData="item.proofDetails" @submit="submitInvalid" :reportId="reportId"  v-bind="$attrs" v-on="$listeners" :proofs="item.proofs" :proofGroup="item"></Table>
             </div>
             <div style="display:flex;align-items:center;" v-if="!item.show">
               <p style="min-width:80px !important">陈述意见：</p>
                 <div  v-if="!item.editArgumentStr" style="display:flex;align-items:center">
-                  <div v-html="item.argumentStr" class="div_MAX_Height" style="border:1px solid #DCDFE6"></div><span @click="editArgumentStr(item)"><el-link type="primary"><i class="iconfont icon-bianji" style="font-size:28px"></i></el-link></span>
+                  <div v-html="item.argumentStr" class="div_MAX_Height" style="border:1px solid #DCDFE6"></div>
+                  <span @click="editArgumentStr(item)" v-if=" $reportPermission(reportId,[0,1])"><el-link type="primary"><i class="iconfont icon-bianji" style="font-size:28px"></i></el-link></span>
                 </div>
                 <div v-else style="width:100%;display:flex;align-items:center">
                   <myRich-Text style="width:100%" v-model="item.argumentStr" placeholder="请输入陈述意见"></myRich-Text>
@@ -36,7 +37,7 @@ export default {
   components: {
     Table
   },
-  props: ['invalidReasonId','proofGroupId'],
+  props: ['invalidReasonId','proofGroupId','reportId'],
   data() {
     return {
       InvalidDetails:[],

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

@@ -2,7 +2,7 @@
   <div>
     <div style="margin-top: 20px; display: flex; justify-content: space-between">
             <!-- <el-button @click="addInvalid" type="primary" size="small">添加/更新无效证据</el-button> -->
-            <el-dropdown @command="getProof">
+            <el-dropdown @command="getProof" v-if=" $reportPermission(reportId,[0,1])">
                 <span class="el-dropdown-link">
                     <el-button type="primary" size="small">
                         添加/更新无效证据<i class="el-icon-arrow-down el-icon--right"></i>
@@ -53,7 +53,7 @@
 
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="操作">
+                    <el-table-column align="center" label="操作" v-if=" $reportPermission(reportId,[0,1])">
                         <template slot-scope="scope">
                             <div v-if="!scope.row.edit">
                                 <span class="margin-left_10"><el-link type="primary" @click="editInvalid(scope.row,scope.$index)">编辑</el-link></span>

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

@@ -1,14 +1,17 @@
 <template>
   <!-- 无效理由和证据 -->
   <div>
-    <div style="display:flex;justify-content: flex-end;margin-bottom:10px">
+    <div style="display:flex;justify-content: flex-end;margin-bottom:10px" v-if=" $reportPermission(reportId,[0,1])">
       <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>
       <el-button type="primary" size="small" @click="exportInvalid" :loading="btnLoading">导出无效理由</el-button>
     </div>
-    
+    <div style="display:flex;justify-content: flex-end;margin-bottom:10px" v-else>
+      <el-button type="primary" size="small" @click="openField">显示栏位管理</el-button>
+      <el-button type="primary" size="small" @click="exportInvalid" :loading="btnLoading">导出无效理由</el-button>
+    </div>
     <el-table border ref="table" v-if="refreshData" :data="tableData" v-loading="tableLoading" row-key="pId" :expand-row-keys="expands" :span-method="objectSpanMethod" :maxHeight="tableHeight">
       <el-table-column prop="id" label="序号" align="center" width="80px">
         <template slot-scope="scope">
@@ -112,7 +115,7 @@
           <div v-else v-html="getData1(scope.row,item.fieldKey)" class="div_MAX_Height"></div>
         </template>
       </el-table-column>
-      <el-table-column  label="操作" align="center" width="180px" type prop="id">
+      <el-table-column  label="操作" align="center" width="180px" type prop="id" v-if=" $reportPermission(reportId,[0,1])">
         <template slot-scope="scope">
           <div>
             <el-button @click.native.prevent="editRow(scope.row)" type="text" size="small"> 编辑 </el-button>
@@ -532,9 +535,8 @@ export default {
         var index1 = this.expands.findIndex(item=>{
             return item == row.pId
         })
-        var scrollTop = 0
+        var scrollTop = document.querySelector('.el-table__body-wrapper').scrollTop
       if (index1 == -1) {
-        scrollTop = document.querySelector('.el-table__body-wrapper').scrollTop
           var a = []
           a[0] = this.tableData.slice(0,index+1)
           a[1]= this.tableData.slice(index+1,this.tableData.length)

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div style="margin-bottom: 10px;float: right;">
+    <div style="margin-bottom: 10px;float: right;" v-if=" $reportPermission(reportId,[0,1])">
       <el-button type="primary" size="small" v-if="examine" @click="andClick('1')">上传无效请求书</el-button>
       <el-dropdown trigger="click" @command="andClick($event)" :hide-on-click="false" type="primary" size="small">
       <el-button type="primary" size="small">
@@ -70,7 +70,7 @@
           <div>{{ scope.row.remark?scope.row.remark:'——' }}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作" width="100">
+      <el-table-column align="center" label="操作" width="100" v-if=" $reportPermission(reportId,[0,1])">
         <template slot-scope="scope">
           <div>
             <el-button type="text" size="small" @click="handleDelete(scope.row)" style="color:red"> 删 除 </el-button>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 无效流程 -->
-    <div style="display: flex;justify-content: end;margin-bottom: 10px;">
+    <div style="display: flex;justify-content: end;margin-bottom: 10px;" v-if=" $reportPermission(reportId,[0,1])">
       <el-button type="primary" size="small" @click="addOption">添加陈述意见</el-button>
       <el-dropdown @command="handleCommand">
         <el-button type="primary" size="small">
@@ -22,7 +22,7 @@
           <el-card>
             <div>
               <span>{{ timeType[item.processType] }}：</span><span>{{ item.occuredTime.slice(0,10) }}</span>
-              <div style="float: right;">
+              <div style="float: right;" v-if=" $reportPermission(reportId,[0,1])">
                   <span style="margin-right: 10px;"  @click="edit(item)"><el-link>编辑</el-link></span>
                   <span  @click="dele(item)"><el-link>删除</el-link></span>
               </div>
@@ -35,7 +35,7 @@
               <div v-if="item.reportFile" class="upload-file">
                 <div  style="margin:0;display:flex;justify-content:space-around;">
                   <p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis;cursor: pointer;">{{item.reportFile.name?item.reportFile.name+'.'+item.reportFile.suffix:item.reportFile.fileName}}</p> 
-                  <Menu :data="item.reportFile" @delFile="delFile(item)" :isDelete="true"></Menu>
+                  <Menu :data="item.reportFile" @delFile="delFile(item)" :isDelete="true" ></Menu>
                 </div>
               </div>
             </div>