优化界面及修改权限

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

@@ -18,7 +18,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.patentNo}`" target="_blank" v-html="getViewDom('Espacenet')" style="margin-right: 15px;"></el-link>

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

@@ -263,9 +263,9 @@ watch: {
     },
     //标引事件
     onChange(val, input) {
-      if (!this.$permission('/workspace/details/indexing')) {
-        return false
-      }
+      // if (!this.$permission('/workspace/details/indexing')) {
+      //   return false
+      // }
       if (this.look) {
         return false
       }

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

@@ -22,8 +22,8 @@
           <el-card class="preview" v-for="(item, index) in patent.image" shadow="hover" :style="{width:width}">
             <div slot="header" class="card-header" >
               <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  l-image :src="getImagePath(item.url)" :preview-src-list="srcList" style="height: 100%; min-height:125px;"></el-image>
@@ -36,7 +36,7 @@
         
       </el-col> -->
     <!-- </el-row> -->
-    <div type="primary" class="up" v-if="$permission('/workspace/details/figureUpdata') && $r(projectId,[1,2])" @click="handleAdd">上传图片</div>
+    <div type="primary" class="up" v-if="$r(projectId,[1,2])" @click="handleAdd">上传图片</div>
           <!-- <i class="el-icon-circle-plus-outline" style="font-size:40px"  @click="handleAdd"></i> -->
      <!-- <div type="primary" class="up" v-else :disabled="true">上传图片</div> -->
     

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

@@ -1,6 +1,6 @@
 <template>
   <div class="patent-pdf">
-    <div>
+    <div v-if="!sign">
       <el-button-group class="float_left margin-bottom_10">
         <el-button size="small" :type="pdfType === 2 ? 'primary' : ''" @click="handleSelect(2)">授权文档</el-button>
         <el-button size="small" :type="pdfType === 1 ? 'primary' : ''" @click="handleSelect(1)">公开文档</el-button>
@@ -13,7 +13,7 @@
           :on-change="handleChange"
           :multiple="false"
       >
-        <el-button type="success" size="small" :loading="btnLoading" :disabled="!($permission('/workspace/details/updataInstruction') && $r(projectId,[1,2]))">上传文档</el-button>
+        <el-button type="success" size="small" :loading="btnLoading">上传文档</el-button>
         <div slot="tip" class="el-upload__tip"></div>
       </el-upload>
     </div>
@@ -28,7 +28,7 @@
 import Config from '@/config'
 
 export default {
-  props: ['patent', 'projectId'],
+  props: ['patent', 'projectId','sign'],
   components: {},
   data() {
     return {

RMS-FrontEnd/src/views/components/articles/components/history/examination.vue

@@ -96,6 +96,12 @@ export default {
       Already:[]
     }
   },
+  watch:{
+      patent(val){
+            this.queryParams.patentNo = val.patentNo
+            this.getList()
+        }
+   },
   mounted() {
     this.getList()
   },
@@ -148,7 +154,8 @@ export default {
       }else{
         this.row.reportFiles.push({
           id:file.raw.uid,
-          name:file.raw.name
+          name:file.raw.name,
+          key:1
         })
         this.row.fileList.push(file.raw) 
       }
@@ -166,7 +173,8 @@ export default {
         if(index!=-1){
           row.reportFiles.splice(index,1)
         }
-      }else{
+      }
+      if(row.key){
         var index = row.fileList.findIndex(item=>{
           return item.uid == id
         })

RMS-FrontEnd/src/views/components/articles/components/history/invalid.vue

@@ -108,6 +108,12 @@ export default {
       Already:[]
     }
   },
+  watch:{
+        patent(val){
+            this.queryParams.patentNo = val.patentNo
+            this.getList()
+        }
+   },
   mounted() {
     this.getList()
   },
@@ -163,7 +169,8 @@ export default {
       }else{
         this.row.reportFiles.push({
           id:file.raw.uid,
-          name:file.raw.name
+          name:file.raw.name,
+          key:1
         })
         this.row.fileList.push(file.raw) 
       }
@@ -180,7 +187,8 @@ export default {
         if(index!=-1){
           row.reportFiles.splice(index,1)
         }
-      }else{
+      }
+      if(row.key){
         var index = row.fileList.findIndex(item=>{
           return item.uid == id
         })

RMS-FrontEnd/src/views/components/articles/components/history/litigation.vue

@@ -126,6 +126,12 @@ export default {
       Already:[]
     }
   },
+  watch:{
+        patent(val){
+            this.queryParams.patentNo = val.patentNo
+            this.getList()
+        }
+   },
   mounted() {
     this.getList()
   },
@@ -178,7 +184,8 @@ export default {
       }else{
         this.row.reportFiles.push({
           id:file.raw.uid,
-          name:file.raw.name
+          name:file.raw.name,
+          key:1
         })
         this.row.fileList.push(file.raw) 
       }
@@ -196,7 +203,8 @@ export default {
         if(index!=-1){
           row.reportFiles.splice(index,1)
         }
-      }else{
+      }
+      if(row.key){
         var index = row.fileList.findIndex(item=>{
           return item.uid == id
         })

RMS-FrontEnd/src/views/components/articles/components/history/other.vue

@@ -93,6 +93,12 @@ export default {
       Already:[]
     }
   },
+  watch:{
+        patent(val){
+            this.queryParams.patentNo = val.patentNo
+            this.getList()
+        }
+   },
   mounted() {
     this.getList()
   },
@@ -145,7 +151,8 @@ export default {
       }else{
         this.row.reportFiles.push({
           id:file.raw.uid,
-          name:file.raw.name
+          name:file.raw.name,
+          key:1
         })
         this.row.fileList.push(file.raw) 
       }
@@ -164,7 +171,8 @@ export default {
         if(index!=-1){
           row.reportFiles.splice(index,1)
         }
-      }else{
+      }
+      if(row.key){
         var index = row.fileList.findIndex(item=>{
           return item.uid == id
         })

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

@@ -16,7 +16,6 @@
       </el-popover> -->
       <el-switch
         v-model="value"
-        :disabled="!$permission('/workspace/details/comparison')"
         inactive-text="对比"
         active-color="#00BFFF"
         inactive-color="#D3D3D3">
@@ -99,7 +98,7 @@
                   </div>
                 </div>
               </div>
-              <div class="patent-articles-content-right" v-if="showRight">
+              <div class="patent-articles-content-right" v-if="showRight" :style="{height:height2}">
                 <el-container>
                   <el-header>
                     <div class="patent-articles-option">

RMS-FrontEnd/src/views/components/common/SplitScreen.js

@@ -3,6 +3,7 @@ export const splitScreen = {
         return {
             radio:1,
             height:null,
+            height2:null,
             positionList:[
                 {
                     label:'tab展示',
@@ -37,7 +38,7 @@ export const splitScreen = {
     mounted() {
         this.$nextTick(()=>{
             this.$set(this,'height',document.getElementsByClassName('patent-articles-content-left')[0].offsetHeight +20 + 'px')
-            
+            this.height2 = this.height
          })
     },
     methods: {
@@ -93,6 +94,7 @@ export const splitScreen1 = {
         return {
             radio:1,
             height:null,
+            height2:null,
             positionList:[
                 {
                     label:'tab展示',
@@ -129,6 +131,7 @@ export const splitScreen1 = {
             this.$set(this,'height',document.getElementsByClassName('patent-articles-content-left')[0].offsetHeight+20  + 'px')
             if(this.height == '20px'){
                 this.$set(this,'height',document.getElementsByClassName('patent-articles-content-left1')[0].offsetHeight+20  + 'px')
+                this.height2 = this.height
             }
          })
     },

RMS-FrontEnd/src/views/components/common/menu/index.vue

@@ -10,14 +10,14 @@
         <ul class="menu-list" >
             <li @click="downLoad(data)"><i class="fa el-icon-download"></i><span>下载</span></li>
             <li @click="preview(data)"><i class="fa el-icon-view"></i><span>预览</span></li>
-            <li @click="delFile(data)" v-if="!isDelete"><i class="fa el-icon-delete"></i><span>删除</span></li>
+            <li @click="delFile(data)" v-if="!isDelete && ((reportId && $reportPermission(reportId,[0,1])) || !reportId)"><i class="fa el-icon-delete"></i><span>删除</span></li>
         </ul>
     </div>
 </template>
 <script>
 import {File} from './mixins'
 export default {
-    props:['data','isDelete'],
+    props:['data','isDelete','reportId'],
     mixins:[File],
     data() {
         return {

RMS-FrontEnd/src/views/components/export/data.vue

@@ -34,8 +34,8 @@
               <template slot-scope="scope">
                 <span v-if="!scope.row.url">等待中</span>
                 <div v-else>
-                  <el-link type="primary" @click.native="handleDownload(scope.row)" v-if="$permission('/workspace/folder/topicLibraryExport/download')">下载</el-link>
-                  <el-link class="margin-left_10" type="danger" @click.native="handleDelete(scope.row)" v-if="$permission('/workspace/folder/topicLibraryExport/delete')">删除</el-link>
+                  <el-link type="primary" @click.native="handleDownload(scope.row)">下载</el-link>
+                  <el-link class="margin-left_10" type="danger" @click.native="handleDelete(scope.row)">删除</el-link>
                 </div>
               </template>
             </el-table-column>

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

@@ -58,7 +58,7 @@
             <el-table-column prop="createUserName" label="创建人" align="center" width="120" show-overflow-tooltip></el-table-column>
             <el-table-column label="操作" align="center" width="120" show-overflow-tooltip>
               <template slot-scope="scope" v-if="scope.row.status !== 0">
-                <el-link type="primary" @click.native="handleDownload(scope.row)" v-if="$permission('/workspace/common/taskDownload')">下载</el-link>
+                <el-link type="primary" @click.native="handleDownload(scope.row)">下载</el-link>
                 <el-link class="margin-left_10" type="danger" @click.native="handleDelete(scope.row)" >删除</el-link>
               </template>
             </el-table-column>

RMS-FrontEnd/src/views/layout/components/UserBar.vue

@@ -11,8 +11,8 @@
           <!-- <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="AnalysisSystem" v-if="$permission('/pcs/analysisSystem')">分析系统</el-dropdown-item>
-          <el-dropdown-item command="clientble" v-if="$permission('/workspace/clientManage')">客户管理</el-dropdown-item>
-          <el-dropdown-item command="product" v-if="$permission('/workspace/product')">产品管理</el-dropdown-item>
+          <el-dropdown-item command="clientble" v-if="$permission('/rms/clientManage')">客户管理</el-dropdown-item>
+          <el-dropdown-item command="product" v-if="$permission('/rms/product')">产品管理</el-dropdown-item>
           <el-dropdown-item command="set">设置</el-dropdown-item>
           <el-dropdown-item divided command="doLogout">退出登录</el-dropdown-item>
         </el-dropdown-menu>

RMS-FrontEnd/src/views/layout/components/field.vue

@@ -8,8 +8,8 @@
                 <el-input v-model="queryParams.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> -->
@@ -38,13 +38,13 @@
               <el-table-column label="操作" align="center" width="150">
                 <template slot-scope="scope">
                   <el-dropdown  split-button type="primary" size="small">
-                   <p @click="handleEdit(scope.row)" v-if="$permission('/workspace/common/customField/modify')">编辑</p>
-                   <p v-else :disabled="true">编辑</p>
+                   <p @click="handleEdit(scope.row)">编辑</p>
+                   <!-- <p v-else :disabled="true">编辑</p> -->
                     <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 ">选项管理</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 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> -->

RMS-FrontEnd/src/views/product/components/product.vue

@@ -6,7 +6,7 @@
         <el-input v-model="queryParams.productName" size="small" placeholder="请输入产品名称" style="width: 200px;margin-right: 10px;"></el-input>
         <el-input v-model="queryParams.companyName" size="small" placeholder="请输入产品所属公司名称" style="width: 200px;margin-right: 10px;"></el-input>
           <el-button type="primary" size="small" @click="getList2">查询</el-button>
-          <el-button type="primary" size="small" @click="handleAdd" v-if="(!patentNo||sign==2) && $permission('/workspace/product/addCategory')">新增类别</el-button>
+          <el-button type="primary" size="small" @click="handleAdd" v-if="(!patentNo||sign==2)">新增类别</el-button>
           <el-button type="primary" size="small" @click="addProduct" v-if="patentNo&&sign!=2">添加</el-button>
           <el-dropdown @command="handleCommandAdd" v-if="!patentNo||sign==2">
             <el-button type="primary" size="small">

RMS-FrontEnd/src/views/product/components/relatedPatents/components/import/SystemTask.vue

@@ -58,7 +58,7 @@
             <el-table-column prop="createName" label="创建人" align="center" width="120" show-overflow-tooltip></el-table-column>
             <el-table-column label="操作" align="center" width="120" show-overflow-tooltip>
               <template slot-scope="scope" v-if="scope.row.status !== 0">
-                <el-link type="primary" @click.native="handleDownload(scope.row)" v-if="$permission('/workspace/common/taskDownload')">下载</el-link>
+                <el-link type="primary" @click.native="handleDownload(scope.row)">下载</el-link>
                 <el-link class="margin-left_10" type="danger" @click.native="handleDelete(scope.row)" >删除</el-link>
               </template>
             </el-table-column>

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

@@ -1,5 +1,5 @@
 <template>
-  <div style="height:100%">
+  <div style="height:calc(100% - 50px)">
     <div style="display:flex;justify-content: space-between;align-items: center;">
       <div :style="{visibility: !coordinationA&&!isShow1?'visible':'hidden'}" >
         <el-tooltip class="item" effect="dark" content="返回任务页面" placement="top-start">
@@ -100,7 +100,7 @@
               <div class="patent-articles-content-left"
                 :style="{ width: showRight ? 'calc(100% - 321px)' : 'calc(100% - 21px)' }">
                 <div class="dom 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}">
+                  <div class="component left1" style="width:100%;overflow-y:auto;overflow-x: hidden;" :style="{height:height}">
                     <component :is="componentName" :project-id="projectId" :isTrue="isTrue" :type1="type" :patent="patent"
                 :patentNo="[patent.patentNo]" :domId="patent.patentNo + '1'" :reportId="reportId" :patent-id="patentId" @refresh="getPatent(patent.patentNo)"></component>
                   </div>

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

@@ -57,7 +57,7 @@
             </div>
                 
               </div>
-              <div class="patent-articles-content-right" v-if="showRight">
+              <div class="patent-articles-content-right" v-if="showRight" :style="{height:height2}">
                 <el-container>
                   <el-header v-if="showcard==true">
                     <div class="patent-articles-option">
@@ -394,7 +394,7 @@ import { splitScreen1 } from '@/views/components/common/SplitScreen'
         padding: 0;
         height: 100%;
         overflow: hidden;
-        .patent-articles-content-left {
+        .patent-articles-content-left1 {
           float: left;
           height: 100%;
           overflow-y: auto;

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/AssignTasks.vue

@@ -371,6 +371,13 @@ export default {
         this.checkList = JSON.parse(JSON.stringify(this.checkList))
     },
     save(row){//保存
+      if(isNaN(row.assignCount)){
+        this.$message.error('请输入数字')
+        return false
+      }else if(Number(row.assignCount)<0 || Number(row.assignCount) + this.leaveNumber>this.totalNumber){
+        this.$message.error('请输入正确数量')
+        return false
+      }
       row.vVisible = !row.vVisible
       var a= row.assignCount
       row.isEdit = false

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/Result.vue

@@ -112,7 +112,7 @@
               ref="table"
               :data="recordData"
               border
-              :height="tableHeight"
+              :height="tableHeight2"
               style="min-width: 100%; overflow:auto">
               <el-table-column
                   prop="patentNo"
@@ -139,7 +139,7 @@
                           :allow-drop="allowDrop"
                           draggable
                           @check-change="handleCheckChange">
-                          <span class="custom-tree-node" slot-scope="{ node, data }"><el-radio v-model="val" @input="changeRadio(item,data)" :label="node.label">D{{tableHeader.findIndex(item=>item.patentNo == data.patentNo)+1}}</el-radio></span>
+                          <span class="custom-tree-node" slot-scope="{ node, data }"><el-radio v-model="val" @input="changeRadio(scope.row,data)" :label="node.label">D{{tableHeader.findIndex(item=>item.patentNo == data.patentNo)+1}}</el-radio></span>
                         </el-tree>
                         <p style="color:red">备注：选择其中一个文件与其交换位置</p>
                         <i class="el-icon-arrow-down el-icon--right" @click="getVal(scope.row)" slot="reference"></i>
@@ -314,6 +314,7 @@ export default {
       CompareRecord:[],
       recordData:[],
       tableHeight: null,
+      tableHeight2: null,
       val:null,
       num:null,
       checked:[],
@@ -503,6 +504,9 @@ export default {
         this.tableHeight = offsetTop
       }
       this.tableHeight = this.tableHeight>300?this.tableHeight:300
+      if(!this.tableHeight2){
+        this.tableHeight2 = this.tableHeight
+      }
       // console.log(this.tableHeight)
     },
     getVal(val){

RMS-FrontEnd/src/views/report/index.vue

@@ -8,7 +8,7 @@
                   </el-button>
                    <el-dropdown-menu slot="dropdown" style="margin-top:0px" v-if="dictMessage.REPORT_TYPE">
                     <!-- 遍历按钮 -->
-                      <el-dropdown-item v-for="item in dictMessage.REPORT_TYPE.filter(item=>!['6'].includes(item.dictChildValue))" :key="item.dictChildLabel"  @click.native="handleAnalyse(item.dictChildValue)" v-if="$permission('/pcs/report/add/'+item.permission)">{{item.dictChildLabel}}</el-dropdown-item>
+                      <el-dropdown-item v-for="item in dictMessage.REPORT_TYPE.filter(item=>!['6'].includes(item.dictChildValue))" :key="item.dictChildLabel"  @click.native="handleAnalyse(item.dictChildValue)" v-if="$permission('/pcs/report/add/' + item.permission)">{{item.dictChildLabel}}</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
                 <div style="margin-left:20px;height:50px">

RMS-FrontEnd/src/views/report/reportDetails/components/basicMessage.vue

@@ -47,7 +47,7 @@
                 <div v-if="form.reportFiles" class="upload-file">
                     <div v-for="item in form.reportFiles" style="margin:0;display:flex;justify-content:space-around;align-items:center;">
                       <p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis;cursor: pointer" @click="checkFile(item)">{{item.name?item.name+'.'+item.suffix:item.fileName}}</p> 
-                      <Menu :data="item" @delFile="delFile"></Menu>
+                      <Menu :data="item" :reportId="reportId" @delFile="delFile"></Menu>
                     </div>
                 </div>
                 <el-upload v-if="!noEdit1 && Object.keys(form).length>1 && $reportPermission(reportId,[0,1])" ref="upload" class="upload-file" drag action="#" :auto-upload="false" :show-file-list="true" :on-change="onChange" multiple   :on-preview="handlePreview" :on-remove="handleRemove">