Przeglądaj źródła

去掉权限控制

zhuliu 1 rok temu
rodzic
commit
1e6e8d1c41

+ 58 - 1
src/utils/permissions.js

@@ -1,5 +1,5 @@
 import Store from '@/store'
-
+import Api from '@/api'
 export default {
   //专利数据库权限
   hasRole(projectId, roles){
@@ -39,5 +39,62 @@ export default {
             }
         }
     return result
+  },
+
+  /**
+   * 产品权限
+   * @param {number} id //产品id或者产品类别id
+   * @param {number} type //类型,1是产品,2是产品类别
+   */
+  async producePermission(id,type){
+    const user = Store.state.user.userinfo
+    var data = {}
+    if(type == 1){
+      var str = sessionStorage.getItem('product')
+      if(str){
+        data = JSON.parse(str)
+      }
+    }else if(type == 2){
+      var str = sessionStorage.getItem('productCategory')
+      if(str){
+        data = JSON.parse(str)
+      }
+    }
+    var obj = data[id]
+    if(!obj){
+      var params = {
+        searchQuery:`id=${id}`
+      }
+      var api = ''
+      if(type == 1){
+        api = 'queryProduct'
+      }else if(type == 2){
+        api = 'queryProductCategory'
+      }
+      Api[api](params).then(response=>{
+        if(response.code == 200){
+          var d = response.data.data
+          if(d && d.length>0){
+            data[d[0].id] = d[0]
+            if(type == 1){
+              sessionStorage.setItem('product',JSON.stringify(data))
+            }else if(type == 2){
+              sessionStorage.setItem('productCategory',JSON.stringify(data))
+            }
+            obj = d[0]
+          }
+        }
+      })
+    }
+    if(!obj){
+      return false
+    }
+    if(obj.createdId == user.id){
+      return true
+    }
+    if(obj.adminIds && obj.adminIds.includes(user.id)){
+      return true
+    }
+    return false
   }
 }

+ 10 - 14
src/views/components/drawer/Field.vue

@@ -8,11 +8,11 @@
               <el-input v-model="searchOption.name" size="small" placeholder="请输入字段名称"></el-input>
             </el-form-item>
             <el-form-item>
-              <el-button type="" :disabled="!$permission('/workspace/common/customField/check')" size="small" @click="getList">查询</el-button>
-              <el-button type="primary" size="small" @click="handleAdd" :disabled="!$permission('/workspace/common/customField/add')">新增</el-button>
+              <el-button type="" size="small" @click="getList">查询</el-button>
+              <el-button type="primary" size="small" @click="handleAdd">新增</el-button>
             </el-form-item>
           </el-form>
-          <el-button class="margin-right_20" type="success" size="small" @click="handleImport" :disabled="!$permission('/workspace/common/customField/import')">导入</el-button>
+          <el-button class="margin-right_20" type="success" size="small" @click="handleImport">导入</el-button>
         </el-header>
         <el-main class="project-field-main">
           <el-table v-loading="loading" :data="tableData" border header-row-class-name="custom-table-header">
@@ -38,13 +38,12 @@
             <el-table-column label="操作" align="center" width="150">
               <template slot-scope="scope">
                 <el-dropdown  split-button type="primary" size="small">
-                 <span @click="handleEdit(scope.row)" v-if="$permission('/workspace/common/customField/modify')">编辑</span>
-                 <span v-else :disabled="true">编辑</span>
+                 <span @click="handleEdit(scope.row)">编辑</span>
                   <el-dropdown-menu slot="dropdown" class="text-align_center">
-                    <el-dropdown-item @click.native="handleEditOption(scope.row)" v-if="[3, 4, 5, 6].indexOf(scope.row.type) !== -1 && $permission('/workspace/common/customField/managementOptions')">选项管理</el-dropdown-item>
+                    <el-dropdown-item @click.native="handleEditOption(scope.row)" v-if="[3, 4, 5, 6].indexOf(scope.row.type) !== -1">选项管理</el-dropdown-item>
                     <el-dropdown-item v-else-if="[3, 4, 5, 6].indexOf(scope.row.type) !== -1" type="primary" size="small" @click.native="handleEditOption(scope.row)">选项查看</el-dropdown-item>
-                    <el-dropdown-item :disabled="!$permission('/workspace/common/customField/copy')" @click.native="handleCopy(scope.row)">复制</el-dropdown-item>
-                    <el-dropdown-item class="color-red" @click.native="handleDelete(scope.row)" :disabled="!$permission('/workspace/common/customField/delete')" divided>删除</el-dropdown-item>
+                    <el-dropdown-item @click.native="handleCopy(scope.row)">复制</el-dropdown-item>
+                    <el-dropdown-item class="color-red" @click.native="handleDelete(scope.row)" divided>删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
                 <!-- <el-button v-else-if="[3, 4, 5, 6].indexOf(scope.row.type) !== -1" type="primary" size="small" @click.native="handleEditOption(scope.row)">选项查看</el-button> -->
@@ -102,7 +101,7 @@
             >
               <div class="custom-tree-node" slot-scope="{ node, data }">
                 <el-input v-model="data.name" :style="{'--backgroundColor':getBackground(node,data)}" placeholder="请输入内容" size="small" class="r" @focus="lockOption = true" @input="valueChange = true" @blur="submitOption(data)"></el-input>
-                <div class="o" v-if="$permission('/workspace/common/customField/managementOptions')">
+                <div class="o">
                   <span class="el-icon-circle-plus" @click="handleAddTreeNode(data)" title="添加"></span>
                   <span class="el-icon-delete" style="color: black;font-weight: bold;" @click="handleDeleteTreeNode(node, data)" title="删除"></span>
                 </div>
@@ -112,13 +111,13 @@
           <template v-else>
             <div v-for="(item, index) in ruleForm.option" class="option">
               <el-input v-model="item.name" placeholder="请输入内容" size="small" class="t" @focus="lockOption = true" @input="valueChange = true" @blur="submitOption(item)"></el-input>
-              <div class="o" v-if="$permission('/workspace/common/customField/managementOptions')">
+              <div class="o">
                 <span class="el-icon-delete" @click="handleDeleteOption(item, index)" title="删除"></span>
               </div>
             </div>
           </template>
         </el-main>
-        <el-footer v-if="$permission('/workspace/common/customField/managementOptions')">
+        <el-footer>
           <el-button type="primary" size="small" @click="handleAddOption()" :disabled="lockOption">添加</el-button>
         </el-footer>
       </el-container>
@@ -352,9 +351,6 @@ export default {
       this.$forceUpdate()
     },
     submitOption(item) {
-      if (!this.$permission('/workspace/common/customField/managementOptions')) {
-        return false
-      }
       if (!item.name) {
         this.$message.error('请输入内容')
         return false

+ 0 - 1
src/views/components/import/conditionImport/patentDetails/patentIndex.vue

@@ -4,7 +4,6 @@
             <el-button type="primary" class="margin-right_10" @click="importToProject">导入到报告</el-button>
             <el-switch
                 v-model="value"
-                :disabled="!$permission('/workspace/details/comparison')"
                 inactive-text="对比"
                 active-color="#00BFFF"
                 inactive-color="#D3D3D3">

+ 1 - 1
src/views/components/import/task/components/index.vue

@@ -45,7 +45,7 @@
                         </el-tooltip>  
                     </el-link> -->
                 <el-link type="primary" @click.native="handleDownload(scope.row)"
-                  v-if="$permission('/workspace/common/taskDownload') && (scope.row.fileGuid && (scope.row.state !== 0 || scope.row.state !== 1))">
+                  v-if="(scope.row.fileGuid && (scope.row.state !== 0 || scope.row.state !== 1))">
                   <el-tooltip class="item" effect="dark" content="下载" placement="top">
                     <i class="iconfont icon-xiazai"></i>
                   </el-tooltip>

+ 3 - 3
src/views/layout/components/UserBar.vue

@@ -40,10 +40,10 @@
             </el-dropdown>
           </el-dropdown-item>
           <el-dropdown-item command="userinfo">个人信息</el-dropdown-item>
-          <el-dropdown-item command="changePwd" v-if="$permission('/admin/updatePassword')" >修改密码</el-dropdown-item>
+          <el-dropdown-item command="changePwd">修改密码</el-dropdown-item>
           <el-dropdown-item command="setStyle">文本样式设置</el-dropdown-item>
-          <el-dropdown-item command="indicia" v-if="$permission('/workspace/scratchWords')">标注库</el-dropdown-item>
-          <el-dropdown-item command="clientble" v-if="$permission('/workspace/clientManage')">客户管理</el-dropdown-item>
+          <el-dropdown-item command="indicia">标注库</el-dropdown-item>
+          <el-dropdown-item command="clientble">客户管理</el-dropdown-item>
           <el-dropdown-item divided command="doLogout">退出登录</el-dropdown-item>
         </el-dropdown-menu>
       </template>

+ 2 - 3
src/views/patentMining/components/viewIndex.vue

@@ -3,13 +3,12 @@
     <el-container v-if="showView">
       <el-header>
         <div id="step1">
-          <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption"
-            :disabled="!$permission('/workspace/project/check')"></mySearch>
+          <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption"></mySearch>
         </div>
         <div style="display:flex;margin-right:10px">
           <div id="step2"  v-if="[2].indexOf(isOperate) == -1">
             <span>分组查询:</span>
-            <el-select v-model="group" :disabled="!$permission('/workspace/project/check')" clearable size="small"
+            <el-select v-model="group" clearable size="small"
               @change="onChange" style="width:200px">
               <el-option v-for="item in groupingOption" :key="item.value" :label="item.name" :value="item.value">
               </el-option>

+ 1 - 5
src/views/product/components/index.vue

@@ -185,6 +185,7 @@ export default {
     },
     // 子组件编辑等事件
     handleOption({ val, row }) {
+      
       switch (val) {
         case '0'://编辑
           this.$refs.addEditCategory.open(row)
@@ -365,11 +366,6 @@ export default {
       this.$api.queryProductCategory(params).then(response=>{
         if(response.code == 200){
           this.tableData = response.data.data
-          // var data = {}
-          // for(var i = 0;i<this.tableData.length;i++){
-          //   data[this.tableData[i].id] = this.tableData[i]
-          // }
-          // this.$s.setSession('productCategory',data)
           this.total = response.data.total
           this.loading = false
         }

+ 2 - 2
src/views/project/components/drawer/form.vue

@@ -70,7 +70,7 @@
             
             <template>
               <div>
-                <el-form-item label="产品类别/产品" prop="productId" v-if="$permission('/workspace/product')">
+                <el-form-item label="产品类别/产品" prop="productId">
                   <div>
                     <div v-if="ruleForm.products">
                       {{ ruleForm.products.name }}
@@ -82,7 +82,7 @@
                     <el-button size="small" v-else @click="choseProduct">+ 选择</el-button>
                   </div>
                 </el-form-item>
-                <el-form-item label="分类架构" prop="structureId" v-if="ruleForm.products && ruleForm.products.fieldId && $permission('/workspace/product')">
+                <el-form-item label="分类架构" prop="structureId" v-if="ruleForm.products && ruleForm.products.fieldId">
                   <my-select-Tree style="width:100%" :options="structureList" :props="StructureProp" v-model="ruleForm.structureId"></my-select-Tree>
                 </el-form-item>
               </div>

+ 6 - 6
src/views/project/components/view/card.vue

@@ -10,22 +10,22 @@
                   <i class="el-icon-more el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="text-align_center">
-                  <el-dropdown-item command="0" :disabled="!($permission('/workspace/project/patent_import')&& $r(item.id,[1,2]))">
+                  <el-dropdown-item command="0">
                     <el-dropdown @command="handleCommand($event, item)" placement="right-start">
                       <span class="el-dropdown-link"> 专利导入 </span>
                       <el-dropdown-menu  class="children_item">
                           <el-dropdown-item command="0"> Excel导入 </el-dropdown-item>
                           <el-dropdown-item command="1">专利号导入 </el-dropdown-item>
-                          <el-dropdown-item command="2" v-if="$permission('/workspace/common/retrieval')"> 检索条件导入 </el-dropdown-item>
+                          <el-dropdown-item command="2"> 检索条件导入 </el-dropdown-item>
                       </el-dropdown-menu>
                     </el-dropdown>
                   </el-dropdown-item>
                   <el-dropdown-item command="3">任务清单</el-dropdown-item>
-                <el-dropdown-item command="5" :disabled="!$permission('/workspace/project/report_manage')">报告管理</el-dropdown-item>
-                <el-dropdown-item command="6" v-if="item.isCategory == 1&& $permission('/workspace/product')">产品架构</el-dropdown-item>
+                <el-dropdown-item command="5">报告管理</el-dropdown-item>
+                <el-dropdown-item command="6" v-if="item.isCategory == 1">产品架构</el-dropdown-item>
                 <!-- <el-dropdown-item command="7" v-if="$permission('/workspace/event')">事 件</el-dropdown-item> -->
                 <!-- <el-dropdown-item command="8" :disabled="!$permission('/workspace/project/other_accessories')">其它附件</el-dropdown-item> -->
-                <el-dropdown-item command="9" :disabled="!($permission('/workspace/project/project_share')&&$r(item.id,[2]))">项目分享</el-dropdown-item>
+                <el-dropdown-item command="9">项目分享</el-dropdown-item>
                 
                 </el-dropdown-menu>
               </el-dropdown>
@@ -33,7 +33,7 @@
             <el-form>
               <el-form-item label="名称">
                 <div>
-                  <el-link :disabled="!$permission('/workspace/folder')" :class="$permission('/workspace/folder')?'':'jinzhi'" type="primary" @click.native="handleClick(item)" :title="item.name">
+                  <el-link type="primary" @click.native="handleClick(item)" :title="item.name">
                     <span v-if="item.volumeNumber">{{ item.volumeNumber }} - </span>
                     <span>{{ item.name }}</span>
                   </el-link>

+ 3 - 5
src/views/project/index.vue

@@ -13,13 +13,12 @@
         <el-container v-if="showView">
           <el-header>
             <div id="step1">
-              <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption"
-                :disabled="!$permission('/workspace/project/check')"></mySearch>
+              <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption"></mySearch>
             </div>
             <div style="display:flex;margin-right:10px">
               <div id="step2"  v-if="[2].indexOf(isOperate) == -1">
                 <span>分组查询:</span>
-                <el-select v-model="group" :disabled="!$permission('/workspace/project/check')" clearable size="small"
+                <el-select v-model="group" clearable size="small"
                   @change="onChange" style="width:200px">
                   <el-option v-for="item in groupingOption" :key="item.value" :label="item.name" :value="item.value">
                   </el-option>
@@ -37,8 +36,7 @@
                 <span @click="handleAdd" v-disabled="false">新增专利数据库</span>
                 <el-dropdown-menu slot="dropdown" class="text-align_center">
                   <el-dropdown-item @click.native="handleExport"  v-if="[2].indexOf(isOperate) == -1">导出列表</el-dropdown-item>
-                  <el-dropdown-item @click.native="handleImport"
-                    :disabled="!$permission('/workspace/project/import')"  v-if="[2].indexOf(isOperate) == -1">导入数据包</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleImport" v-if="[2].indexOf(isOperate) == -1">导入数据包</el-dropdown-item>
                   <el-dropdown-item @click.native="handleField">显示栏位管理</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>

+ 2 - 5
src/views/project/patentCollection/components/drawer/MergeInventor.vue

@@ -35,12 +35,9 @@
             <el-table-column label="操作" align="center" width="150">
               <template slot-scope="scope">
                 <el-dropdown split-button type="primary" size="small">
-                  <span @click="handleEdit(scope.row)"
-                    v-if="$permission('/workspace/folder/merge/inventorMerge/modify')">编辑</span>
-                  <span v-else :disabled="true">编辑</span>
+                  <span @click="handleEdit(scope.row)">编辑</span>
                   <el-dropdown-menu slot="dropdown" class="text-align_center">
-                    <el-dropdown-item class="color-red" @click.native="handleDelete(scope.row)"
-                      :disabled="!$permission('/workspace/folder/merge/inventorMerge/delete')">删除</el-dropdown-item>
+                    <el-dropdown-item class="color-red" @click.native="handleDelete(scope.row)">删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </template>

+ 2 - 3
src/views/project/patentCollection/components/views/Abstract.vue

@@ -35,15 +35,14 @@
                   </el-image>
                 </div>
                 <div class="patent-abstract-pdf-button-container">
-                  <el-button :disabled="!$permission('/workspace/folder/PDFdownload')" class="width_100" size="small"
+                  <el-button class="width_100" size="small"
                     type="primary" @click="handleDownload(patent)">PDF 下载</el-button>
                 </div>
               </td>
               <!-- 专利号 -->
               <td width="850px">
                 <div class="patent-abstract-title">
-                  <el-link :disabled="!$permission('/workspace/details')"
-                    :class="$permission('/workspace/details') ? '' : 'jinzhi'" type="success"
+                  <el-link type="success"
                     @click.native="handleClick(patent, index)">
                     <span v-html="getView(patent, 'patentNo')"></span>
                   </el-link>

+ 1 - 2
src/views/project/patentCollection/components/views/Picture.vue

@@ -9,8 +9,7 @@
           <el-divider></el-divider>
           <span v-if="refresh"> <el-checkbox :label="item.id" @change="changeSelect(item)">
 
-              <el-link :disabled="!$permission('/workspace/details')"
-                :class="$permission('/workspace/details') ? '' : 'jinzhi'" :type="item.read === 1 ? 'success' : 'danger'"
+              <el-link :type="item.read === 1 ? 'success' : 'danger'"
                 @click.native.prevent="handleClick(item, index)">
                 <span v-html="getView(item, 'patentNo')"></span>
               </el-link>

+ 6 - 15
src/views/project/patentCollection/index.vue

@@ -25,8 +25,7 @@
             <!-- <mySearch :SearchFields="searchFiled" @search="search" :searchValue="searchOption"></mySearch> -->
             <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click">
               <patent-keywords-highlight :project-id="projectId" />
-              <el-button slot="reference" size="small" type="primary" class="margin-right_10 margin-left_10"
-                :disabled="!$permission('/workspace/common/highlight')">
+              <el-button slot="reference" size="small" type="primary" class="margin-right_10 margin-left_10">
                 高亮<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
             </el-popover>
@@ -72,30 +71,25 @@
                     </el-dropdown-menu>
                   </el-dropdown>
                 </el-dropdown-item>
-                <el-dropdown-item :disabled="!$permission('/workspace/folder/merge')">
+                <el-dropdown-item>
                   <el-dropdown trigger="hover" placement="right-start">
                     <p>
                       合并<i class="el-icon-arrow-right el-icon--right"></i>
                     </p>
                     <el-dropdown-menu slot="dropdown">
-                      <!-- <el-dropdown-item @click.native="handleMerge2"
-                        :disabled="!($permission('/workspace/folder/merge/inventorMerge') && $r(projectId, [1, 2]))">发明人</el-dropdown-item>
-                      <el-dropdown-item @click.native="handleMerge"
-                        :disabled="!($permission('/workspace/folder/merge/applicationMerge') && $r(projectId, [1, 2]))">申请人/权利人</el-dropdown-item> -->
                       <el-dropdown-item @click.native="handleMerge(2)">发明人</el-dropdown-item>
                       <el-dropdown-item @click.native="handleMerge(0)">申请人/权利人</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="$permission('/workspace/createReport')">
+                <el-dropdown-item>
                   <el-dropdown trigger="hover" placement="right-start">
                     <p>
                       创建报告<i class="el-icon-arrow-right el-icon--right"></i>
                     </p>
                     <el-dropdown-menu slot="dropdown" style="margin-top:0px">
                       <!-- 遍历按钮 -->
-                      <el-dropdown-item @click.native="handleAnalysesFto"
-                        v-if="$permission('/workspace/createReport/FTO')">FTO调查</el-dropdown-item>
+                      <el-dropdown-item @click.native="handleAnalysesFto">FTO调查</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </el-dropdown-item>
@@ -138,7 +132,7 @@
 
             <div v-show="patentNoList.length" class="margin-left_10">
               <el-dropdown size="medium">
-                <el-button type="primary" size="small" :disabled="!$permission('/workspace/folder/batchOperation')">
+                <el-button type="primary" size="small">
                   批量操作<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
@@ -146,11 +140,8 @@
                     :disabled="!$permission('/workspace/folder/isRead')">已读</el-dropdown-item>
                   <el-dropdown-item @click.native="handleRead(0)"
                     :disabled="!$permission('/workspace/folder/isRead')">未读</el-dropdown-item> -->
-                  <!-- <el-dropdown-item @click.native="handleIndex"
-                    :disabled="!($permission('/workspace/folder/batchOperation/batchIndexing') && $r(projectId, [1, 2]))">批量标引</el-dropdown-item> -->
                   <el-dropdown-item @click.native="handleIndex">批量标引</el-dropdown-item>
-                  <el-dropdown-item @click.native="checkPatentWorth"
-                    v-if="patentNoList.length && $permission('/workspace/patent/worth')">价值曲线</el-dropdown-item>
+                  <el-dropdown-item @click.native="checkPatentWorth" v-if="patentNoList.length">价值曲线</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

+ 5 - 9
src/views/project/patentDetails/components/patentDetails.vue

@@ -34,20 +34,16 @@
               <el-button type="primary" size="small" @click="importToProject">导入专利</el-button>
             </div>
             <div style="display: flex;justify-content: space-between;margin-right: 10px;align-items: center;" v-else>
-              <el-dropdown size="medium" style="margin-right:10px" v-if="$permission('/workspace/createReport')">
+              <el-dropdown size="medium" style="margin-right:10px">
                 <el-button type="primary" size="small">
                   创建报告<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown" style="margin-top:0px">
                   <!-- 遍历按钮 -->
-                  <el-dropdown-item @click.native="handleAnalyse(1)"
-                    v-if="$permission('/workspace/createReport/invalid')">第三方意见</el-dropdown-item>
-                  <el-dropdown-item @click.native="handleAnalyse(2)"
-                    v-if="$permission('/workspace/createReport/invalid')">稳定性分析</el-dropdown-item>
-                  <el-dropdown-item @click.native="handleAnalyse(4)"
-                    v-if="$permission('/workspace/createReport/tort')">侵权分析</el-dropdown-item>
-                  <el-dropdown-item @click.native="handleAnalyse(5)"
-                    v-if="$permission('/workspace/createReport/avoidDesign')">回避设计</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleAnalyse(1)">第三方意见</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleAnalyse(2)">稳定性分析</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleAnalyse(4)">侵权分析</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleAnalyse(5)">回避设计</el-dropdown-item>
                   <el-dropdown-item @click.native="handleAnalyse(7)">官方无效</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>

+ 5 - 5
src/views/project/patentDetails/components/patentMessage/PatentBasic.vue

@@ -15,7 +15,7 @@
                 </el-link>
               </span>
         <table class="patent-basic-table">
-          <tr v-if="$permission('/workspace/details/links')">
+          <tr>
             <td width="80"><span class="patent-basic-label">外部链接:</span></td>
             <td>
               <el-link type="primary" :href="`https://worldwide.espacenet.com/patent/search?q=${patent.publicNo}`" target="_blank"  style="margin-right: 15px;">
@@ -31,12 +31,12 @@
             <td>
               <div class="patent-label">
                 <template >
-                  <span v-if="$permission('/workspace/details/deleteLabel') && $r(projectId,[1,2])">
+                  <span >
                     <el-tag  v-for="(label, index) in patent.label" :key="label.name" effect="dark" type="primary" size="small" closable :disable-transitions="false" @close="handleCloseLabel(index)">{{ label.name }}</el-tag>
                   </span>
-                 <span  v-else>
+                 <!-- <span  v-else>
                   <el-tag v-for="(label) in patent.label" :key="label.name" effect="dark" type="primary" size="small">{{ label.name }}</el-tag>
-                 </span>
+                 </span> -->
                  
                   <el-input
                       class="input-new-tag"
@@ -48,7 +48,7 @@
                       @blur="handleInputLabelConfirm"
                   >
                   </el-input>
-                  <el-button :disabled="!($permission('/workspace/details/addLabel') && $r(projectId,[1,2]))" v-else type="primary" size="mini" @click="showInputLabel" circle icon="el-icon-plus"></el-button>
+                  <el-button  v-else type="primary" size="mini" @click="showInputLabel" circle icon="el-icon-plus"></el-button>
                 </template>
               </div>
             </td>

+ 3 - 6
src/views/project/patentDetails/components/patentMessage/PatentImage.vue

@@ -8,10 +8,8 @@
       <el-card class="preview" v-for="(item, index) in patent.image" :key="index" shadow="hover" :style="{ width: width }">
         <div slot="header" class="card-header" v-if="projectId">
           <span></span>
-          <el-button :disabled="!$permission('/workspace/details/figureDelete')" class="delete" type="text"
-            @click="handleDelete(item)">删除</el-button>
-          <el-button :disabled="!$permission('/workspace/details/figuremodify')" class="edit" type="text"
-            @click="handleEdit(item)">编辑</el-button>
+          <el-button class="delete" type="text" @click="handleDelete(item)">删除</el-button>
+          <el-button class="edit" type="text" @click="handleEdit(item)">编辑</el-button>
         </div>
         <div class="text-align_center">
           <el-image :src="outside ? item : $commonJS.checkViewer(item)" :preview-src-list="srcList"
@@ -20,8 +18,7 @@
       </el-card>
     </div>
 
-    <div type="primary" class="up"
-      v-if="$permission('/workspace/details/figureUpdata') && projectId && $r(projectId, [1, 2])" @click="handleAdd">上传图片
+    <div type="primary" class="up" @click="handleAdd">上传图片
     </div>
 
     <el-dialog :title="title" :visible.sync="visible" width="500px" append-to-body destroy-on-close :before-close="close"

+ 1 - 1
src/views/report/components/dialog/addAndEditReport.vue

@@ -94,7 +94,7 @@
             <el-form-item label="结论论述" prop="cronDescription">
               <el-input v-model="form.cronDescription" type="textarea" placeholder="请输入结论论述"></el-input>
             </el-form-item>
-            <el-form-item label="后续跟进事项" v-if="$permission('/rms/matter')" prop="followUps">
+            <el-form-item label="后续跟进事项" prop="followUps">
               <span v-if="form.followUps"><span v-for="item in form.followUps" :key="item.name"
                   style="margin-right:10px">{{ item.name }}</span></span>
               <span>

+ 1 - 1
src/views/report/components/dialog/cronConclusion.vue

@@ -10,7 +10,7 @@
                 <el-form-item label="结论论述" >
                 <el-input v-model="form.cronDescription" type="textarea" placeholder="请输入结论论述"></el-input>
                 </el-form-item>
-                <el-form-item label="后续跟进事项" v-if="$permission('/rms/matter')">
+                <el-form-item label="后续跟进事项">
                 <span v-if="form.followUps"><span v-for="item in form.followUps" :key="item.name" style="margin-right:10px">{{ item.name}}</span></span> 
                 <span>
                     <el-popover

+ 1 - 1
src/views/report/components/index.vue

@@ -20,7 +20,7 @@
               }}</el-button>
           </el-button-group>
           <div id="step4" class="margin-left_10">
-            <el-dropdown size="small" v-if="$permission('/pcs/report/add')">
+            <el-dropdown size="small">
               <el-button type="primary" size="small">
                 创建报告<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>