权限控制

src/main.js

@@ -28,7 +28,7 @@ import permission from './utils/permissions'
 Vue.prototype.$permission = permission
 // Vue.prototype.$r = permission.hasRole
 // Vue.prototype.$permission = permission.hasPermission
-Vue.prototype.$reportPermission = permission.reportPermission
+// Vue.prototype.$reportPermission = permission.reportPermission
 
 import eventVisual from "@/views/event/components/details/showDialog";
 Vue.prototype.$eventVisual = eventVisual;

src/views/home/components/echarts/components/report.vue

@@ -46,35 +46,29 @@ export default {
           current:1,
           size:999,//分页信息
           searchQuery: '',//检索条件
-          // orderDTOList: [
-          //   {
-          //     "orderBy": "createTime",
-          //     "orderType": 1
-          //   }
-          // ],//排序
           groupBy: 'reportTypeName',//分组信息
         }
         var data = []
-       await this.$api.groupReportProject(params).then(res => {
-          if (res.code == 200) {
-            data = res.data.data.values
+        await this.$api.groupReportProject(params).then(res => {
+            if (res.code == 200) {
+              data = res.data.data.values
+            }
+          }).catch(error => {
+            data = []
+          })
+        
+        this.reportType.forEach((item,index) => {
+          var obj = data.find(i=>{
+            return i.value == item.value
+          })
+          this.reportData.type.push(item.label)
+          if(obj){
+            this.reportData.count.push(obj.count)
+          }else{
+            this.reportData.count.push(0)
           }
-        }).catch(error => {
-          data = []
-        })
-      
-      this.reportType.forEach((item,index) => {
-        var obj = data.find(i=>{
-          return i.value == item.value
-        })
-        this.reportData.type.push(item.label)
-        if(obj){
-          this.reportData.count.push(obj.count)
-        }else{
-          this.reportData.count.push(0)
-        }
-      });
-      this.initChart()
+        });
+        this.initChart()
       }
     },
     initChart() {

src/views/report/InvalidResponse/components/flowPath/flowPath.vue

@@ -167,7 +167,11 @@ export default {
       
     },
     // 添加
-    handleCommand(option) {
+    async handleCommand(option) {
+      if(!(await this.$permission.projectPermission(this.projectId))){
+        this.$showPermissionDialog()
+        return false
+      }
       var form = {
         systemFileList:[]
       }

src/views/report/analysisAndOpinion/components/comparisonPlan/comparisonPlan.vue

@@ -3,7 +3,7 @@
         <el-container>
             <el-header>
                 <div style="width:100%;display:flex; justify-content:flex-end;align-items: center;height: 50px;">
-                    <el-button type="danger" size="small" @click="delPlan(0)" v-if="checkList.length>0 && $reportPermission(projectId,[0,1])">删除</el-button>
+                    <el-button type="danger" size="small" @click="delPlan(0)" v-if="checkList.length>0">删除</el-button>
                 </div>
             </el-header>
             <el-main v-DivHeight="getDivHeight">
@@ -28,7 +28,7 @@
                             <div >
                                 <el-checkbox-group v-model="checkList">
                                     <el-checkbox :label="scope.row.groupId" >
-                                        <p ><span>{{ scope.row.groupName}} </span><span v-if="$reportPermission(projectId,[0,1])"><el-link style="color:red;margin-left:10px" @click.prevent="delPlan(scope.row.groupId)">删除</el-link></span></p>
+                                        <p ><span>{{ scope.row.groupName}} </span><span><el-link style="color:red;margin-left:10px" @click.prevent="delPlan(scope.row.groupId)">删除</el-link></span></p>
                                     </el-checkbox>
                                 </el-checkbox-group>
                             </div>
@@ -138,7 +138,11 @@ export default {
             //   return ''
             // }
         },
-        delPlan(id) {
+        async delPlan(id) {
+            if(!(await this.$permission.projectPermission(this.projectId))){
+                this.$showPermissionDialog()
+                return false
+            }
             if(id){
                 a = [id]
             } else {

src/views/report/analysisAndOpinion/components/comparisonResults/index.vue

@@ -5,7 +5,7 @@
             <div class="head">
                 <div>
                     <el-button @click="changeShow(1)" type="primary" :plain="!isSelect">对比结果查看</el-button>
-                    <el-button @click="changeShow(2)" type="primary" :plain="isSelect" v-if=" $reportPermission(projectId,[0,1])">对比方案选择</el-button>
+                    <el-button @click="changeShow(2)" type="primary" :plain="isSelect">对比方案选择</el-button>
                 </div>
                 <div>
                     <el-select placeholder="请选择显示类型" v-model="Type" style="margin-left: 10px;" @change="TypeSelect($event)" >
@@ -125,11 +125,15 @@ export default {
         this.rightList = Object.values(obj)
     },
     //切换查看结果和选择对比方案
-    changeShow(type){
+    async changeShow(type){
         if(type == 1){
             this.isSelect = false
         }
         else if(type == 2){
+            if(!(await this.$permission.projectPermission(this.projectId))){
+                this.$showPermissionDialog()
+                return false
+            }
             this.isSelect = true
         }
     },

src/views/report/components/dialog/addAndEditReport.vue

@@ -230,7 +230,7 @@
           <el-input type='textarea' v-model="form.description" autocomplete="off" placeholder="请输入备注"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" v-if="$reportPermission(form.id, [0, 1])">
+      <div slot="footer">
         <el-button @click="handleClose(false)">取 消</el-button>
         <!-- <el-button type="primary" @click="ifNext" v-if="form.reportType == 7 && !form.id">下一步</el-button> -->
         <el-button type="primary" :loading="patentLoading" @click="submit">确 定</el-button>
@@ -652,15 +652,10 @@ export default {
 
     //打开弹窗
     async open(form) {
-      var a = ''
+      var a = '编辑'
       this.form = JSON.parse(JSON.stringify(form))
       if (this.form.id) {
         this.$set(this.form,'signProjectIds',this.form.signPatentNo || this.form.signProjectId)
-        if (this.$reportPermission(this.form.id, [0, 1])) {
-          a = '编辑'
-        } else {
-          a = '查看'
-        }
       } else {
         this.$set(this.form, 'matterIds', form.matterId)
         this.form.scenarioIds = form.scenarioId

src/views/report/components/matter/addMatters.vue

@@ -23,7 +23,7 @@
         </el-form-item>
         <el-form-item>
           <div style="display:flex;justify-content:center"
-            v-if="formData[0].status != '已完成' && $reportPermission(projectId, [0, 1])">
+            v-if="formData[0].status != '已完成'">
             <el-button type="primary" @click="submitForm()" size="small" style="width:100px"
               :loading="btnLoading">保存</el-button>
             <el-button @click="resetForm()" size="small" style="width:100px">取消</el-button>
@@ -170,7 +170,11 @@ export default {
       }
     },
     //添加后续跟进事项
-    submitForm() {
+    async submitForm() {
+      if(!(await this.$permission.projectPermission(this.projectId))){
+        this.$showPermissionDialog()
+        return false
+      }
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.btnLoading = true

src/views/report/components/matter/remarryMatter.vue

@@ -3,7 +3,7 @@
   <div class="height_100">
     <el-container>
       <el-header style="display: flex;justify-content: flex-end;">
-        <div v-if="$reportPermission(projectId, [0, 1])">
+        <div>
           <el-dropdown trigger="click" split-button type="primary" size="small" @command="handleCommand($event)">
             <span @click="handleClick(1)">添加后续事项</span>
             <el-dropdown-menu slot="dropdown" class="text-align_center">
@@ -41,15 +41,14 @@
               <div>
                 <el-dropdown trigger="click" split-button type="primary" size="small"
                   @command="handleCommand1($event, scope.row)">
-                  <span @click="edit(scope.row)">{{ scope.row.statusStr == '进行中' && $reportPermission(projectId, [0, 1]) ?
+                  <span @click="edit(scope.row)">{{ scope.row.statusStr == '进行中' ?
                     '编辑' :
                     '查看' }}</span>
                   <el-dropdown-menu slot="dropdown" class="text-align_center">
                     <el-dropdown-item command="1"
-                      v-if="scope.row.statusStr == '进行中' && $reportPermission(projectId, [0, 1])">登记结果</el-dropdown-item>
+                      v-if="scope.row.statusStr == '进行中'">登记结果</el-dropdown-item>
                     <el-dropdown-item command="2" v-else>查看结果</el-dropdown-item>
-                    <el-dropdown-item command="3" divided class="color-red"
-                      v-if="$reportPermission(projectId, [0, 1])">删除</el-dropdown-item>
+                    <el-dropdown-item command="3" divided class="color-red">删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -279,7 +278,11 @@ export default {
       this.getList()
     },
     //新增后续跟进事项的选项
-    handleCommand(e) {
+    async handleCommand(e) {
+      if(!(await this.$permission.projectPermission(row.id))){
+        this.$showPermissionDialog()
+        return false
+      }
       switch (e) {
         case '1':
           this.handleClick(1)
@@ -346,7 +349,11 @@ export default {
       this.registerVisible = true
     },
     //获取需要删除的事项
-    deleteRegister(row) {
+    async deleteRegister(row) {
+      if(!(await this.$permission.projectPermission(this.projectId))){
+        this.$showPermissionDialog()
+        return false
+      }
       if (row) {
         var ids = [row.id]
       } 

src/views/report/components/view/card.vue

@@ -13,20 +13,20 @@
                   <i class="el-icon-more" style="font-size: 16px;"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="text-align_center">
-                  <el-dropdown-item command="0" v-if="$reportPermission(item.id,[0,1])">分享</el-dropdown-item>
-                  <el-dropdown-item command="1" v-if="[2,3].includes(item.status) && $reportPermission(item.id,[0,1])">导出报告</el-dropdown-item>
-                  <el-dropdown-item command="2" v-if="[2,3].includes(item.status) && $reportPermission(item.id,[0,1])">报告文档</el-dropdown-item>
-                  <el-dropdown-item command="3" v-if="[2].includes(item.status)&&[0,1,2,3].includes(item.reportType) && $reportPermission(item.id,[0,1])">自定义字段</el-dropdown-item>
-                  <el-dropdown-item command="5" v-if="[2].includes(item.status) && [0,1,2].includes(item.reportType) && $reportPermission(item.id,[0,1])">拆分特征</el-dropdown-item>
-                  <el-dropdown-item command="15" v-if="[2].includes(item.status) && [3,4].includes(item.reportType) && $reportPermission(item.id,[0,1])">产品信息录入</el-dropdown-item>
-                  <el-dropdown-item command="8" v-if="(item.reportType == 4 && [2].includes(item.status)) && $reportPermission(item.id,[0,1])">专利与产品关联比对</el-dropdown-item>
-                  <el-dropdown-item command="9" v-if="(item.reportType == 5 && [2].includes(item.status)) && $reportPermission(item.id,[0,1])"> 规避方案填写</el-dropdown-item>
-                  <el-dropdown-item command="10" v-if="[3].includes(item.reportType)&&[2].includes(item.status) && $reportPermission(item.id,[0,1])"> 相关对比文件</el-dropdown-item>
-                  <el-dropdown-item command="11" v-if="[2].includes(item.status) && $reportPermission(item.id,[0,1])"> 完成报告</el-dropdown-item>
-                  <el-dropdown-item command="12" v-if="[3].includes(item.status) && $reportPermission(item.id,[0,1])">添加追踪报告</el-dropdown-item>
-                  <!-- <el-dropdown-item command="13" v-if="(item.reportType == 7 && [2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">添加无效理由和证据</el-dropdown-item> -->
-                  <el-dropdown-item command="14" v-if="(item.reportType == 7 && [2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">证据文献</el-dropdown-item>
-                  <el-dropdown-item command="7" divided style="color: red;" v-if=" $reportPermission(item.id,[0,1])">删除 </el-dropdown-item>
+                  <el-dropdown-item command="0">分享</el-dropdown-item>
+                  <el-dropdown-item command="1" v-if="[2,3].includes(item.status)">导出报告</el-dropdown-item>
+                  <el-dropdown-item command="2" v-if="[2,3].includes(item.status)">报告文档</el-dropdown-item>
+                  <el-dropdown-item command="3" v-if="[2].includes(item.status)&&[0,1,2,3].includes(item.reportType)">自定义字段</el-dropdown-item>
+                  <el-dropdown-item command="5" v-if="[2].includes(item.status) && [0,1,2].includes(item.reportType)">拆分特征</el-dropdown-item>
+                  <el-dropdown-item command="15" v-if="[2].includes(item.status) && [3,4].includes(item.reportType)">产品信息录入</el-dropdown-item>
+                  <el-dropdown-item command="8" v-if="(item.reportType == 4 && [2].includes(item.status))">专利与产品关联比对</el-dropdown-item>
+                  <el-dropdown-item command="9" v-if="(item.reportType == 5 && [2].includes(item.status))"> 规避方案填写</el-dropdown-item>
+                  <el-dropdown-item command="10" v-if="[3].includes(item.reportType)&&[2].includes(item.status)"> 相关对比文件</el-dropdown-item>
+                  <el-dropdown-item command="11" v-if="[2].includes(item.status)"> 完成报告</el-dropdown-item>
+                  <el-dropdown-item command="12" v-if="[3].includes(item.status)">添加追踪报告</el-dropdown-item>
+                  <!-- <el-dropdown-item command="13" v-if="(item.reportType == 7 && [2,3].includes(item.status))">添加无效理由和证据</el-dropdown-item> -->
+                  <el-dropdown-item command="14" v-if="(item.reportType == 7 && [2,3].includes(item.status))">证据文献</el-dropdown-item>
+                  <el-dropdown-item command="7" divided style="color: red;">删除 </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

src/views/report/components/view/table.vue

@@ -31,23 +31,22 @@
         <el-table-column v-if="[1].indexOf(isOperate) == -1" label="操作" align="center" width="150px">
         <template slot-scope="scope">
           <el-dropdown @command="handleCommand($event, scope.row)" split-button type="primary" size="small"  @click="handleCommand('e',scope.row)">
-            <span v-if="$reportPermission(scope.row.id,[0,1])">编辑</span>
-            <span v-else>查看</span>
+            <span>编辑</span>
             <el-dropdown-menu slot="dropdown" class="text-align_center">
-              <el-dropdown-item command="0" v-if="$reportPermission(scope.row.id,[0,1])">分享</el-dropdown-item>
-              <el-dropdown-item command="1" v-if="[2,3].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])">导出报告</el-dropdown-item>
-              <el-dropdown-item command="2" v-if="[2,3].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])">报告文档</el-dropdown-item>
-              <el-dropdown-item command="3" v-if="[2].includes(scope.row.status)&&[0,1,2,3].includes(scope.row.reportType) && $reportPermission(scope.row.id,[0,1])">自定义字段</el-dropdown-item>
-              <el-dropdown-item command="5" v-if="[2].includes(scope.row.status) && [0,1,2].includes(scope.row.reportType) && $reportPermission(scope.row.id,[0,1])">拆分特征</el-dropdown-item>
-              <el-dropdown-item command="15" v-if="[2].includes(scope.row.status) && [3,4].includes(scope.row.reportType) && $reportPermission(scope.row.id,[0,1])">产品信息录入</el-dropdown-item>
-              <el-dropdown-item command="8" v-if="(scope.row.reportType == 4 && [2].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">专利与产品关联比对</el-dropdown-item>
-              <el-dropdown-item command="9" v-if="(scope.row.reportType == 5 && [2].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])"> 规避方案填写</el-dropdown-item>
-              <el-dropdown-item command="10" v-if="[3].includes(scope.row.reportType)&&[2,3].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])"> 相关对比文件</el-dropdown-item>
-              <el-dropdown-item command="11" v-if="[2].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])"> 完成报告</el-dropdown-item>
-              <el-dropdown-item command="12" v-if="[3].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])">添加追踪报告</el-dropdown-item>
-              <!-- <el-dropdown-item command="13" v-if="(scope.row.reportType == 7 && [2,3].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">添加无效理由和证据</el-dropdown-item> -->
-              <el-dropdown-item command="14" v-if="(scope.row.reportType == 7 && [2,3].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">证据文献</el-dropdown-item>
-              <el-dropdown-item command="7" divided style="color: red;" v-if=" $reportPermission(scope.row.id,[0,1])">删除 </el-dropdown-item>
+              <el-dropdown-item command="0">分享</el-dropdown-item>
+              <el-dropdown-item command="1" v-if="[2,3].includes(scope.row.status)">导出报告</el-dropdown-item>
+              <el-dropdown-item command="2" v-if="[2,3].includes(scope.row.status)">报告文档</el-dropdown-item>
+              <el-dropdown-item command="3" v-if="[2].includes(scope.row.status)&&[0,1,2,3].includes(scope.row.reportType)">自定义字段</el-dropdown-item>
+              <el-dropdown-item command="5" v-if="[2].includes(scope.row.status) && [0,1,2].includes(scope.row.reportType)">拆分特征</el-dropdown-item>
+              <el-dropdown-item command="15" v-if="[2].includes(scope.row.status) && [3,4].includes(scope.row.reportType)">产品信息录入</el-dropdown-item>
+              <el-dropdown-item command="8" v-if="(scope.row.reportType == 4 && [2].includes(scope.row.status))">专利与产品关联比对</el-dropdown-item>
+              <el-dropdown-item command="9" v-if="(scope.row.reportType == 5 && [2].includes(scope.row.status))"> 规避方案填写</el-dropdown-item>
+              <el-dropdown-item command="10" v-if="[3].includes(scope.row.reportType)&&[2,3].includes(scope.row.status)"> 相关对比文件</el-dropdown-item>
+              <el-dropdown-item command="11" v-if="[2].includes(scope.row.status)"> 完成报告</el-dropdown-item>
+              <el-dropdown-item command="12" v-if="[3].includes(scope.row.status)">添加追踪报告</el-dropdown-item>
+              <!-- <el-dropdown-item command="13" v-if="(scope.row.reportType == 7 && [2,3].includes(scope.row.status))">添加无效理由和证据</el-dropdown-item> -->
+              <el-dropdown-item command="14" v-if="(scope.row.reportType == 7 && [2,3].includes(scope.row.status))">证据文献</el-dropdown-item>
+              <el-dropdown-item command="7" divided style="color: red;">删除 </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>