zhuliu 11 mesi fa
parent
commit
fdfdd2545b

+ 2 - 1
src/router/index.js

@@ -447,7 +447,8 @@ const routes = [
             meta: {
               title: '查新检索',
               sign: 'noveltySearch',
-              belong: 'AllReport'
+              belong: 'AllReport',
+              permission:'xiaoshi/noveltySearch'
             },
             component: () => import('@/views/noveltySearch/index.vue'),
           },

+ 8 - 5
src/views/layout/components/UserBar.vue

@@ -55,7 +55,7 @@
           <el-dropdown-item command="changePwd">修改密码</el-dropdown-item>
           <el-dropdown-item command="setStyle">文本样式设置</el-dropdown-item>
           <el-dropdown-item command="indicia">标注库</el-dropdown-item>
-          <el-dropdown-item command="noveltySearchDB">查新检索标注库</el-dropdown-item>
+          <!-- <el-dropdown-item command="noveltySearchDB">查新检索标注库</el-dropdown-item> -->
           <el-dropdown-item command="clientble" v-if="userinfo.tenantType == 1">客户管理</el-dropdown-item>
           <el-dropdown-item command="importAndExportHistory" >我的导入导出历史</el-dropdown-item>
           <el-dropdown-item divided command="doLogout">退出登录</el-dropdown-item>
@@ -278,6 +278,7 @@ export default {
     },
     //跳转页面
     changePage(path,item){
+      console.log(item)
       var query = {}
       if(item){
         // query.componentType = value
@@ -288,10 +289,12 @@ export default {
         // if(obj){
         //   item.current = obj.label
         // }
-      }
-      if(path == 1){
-        this.$refs.createNoveltySearch.open()
-        return 
+        if(path == '/conditionImport?noveltySearch=true'){
+          if(!(this.$permission.FunPermissions('xiaoshi/noveltySearch'))){
+            this.$showPermissionDialog()
+            return false
+          }
+        }
       }
       this.$router.push({
         path: path,

+ 1 - 1
src/views/noveltySearch/components/details/components/signMessage/signMessage.vue

@@ -5,7 +5,7 @@
         <el-button v-if="edit" type="primary" @click="isSave">保存</el-button>
         <el-button v-if="!edit" type="primary" @click="handleEdit">编辑</el-button>
       </div>
-      <div style="width: 500px;margin: auto;">
+      <div style="width: 600px;margin: auto;">
         <el-form v-if="edit" :model="form" status-icon :rules="rules" ref="form" label-width="120px" class="demo-form">
   
           <el-form-item label="IPC类号:" prop="ipc">

+ 1 - 1
src/views/noveltySearch/components/dialog/inventionPoint/inventionPoint.vue

@@ -69,7 +69,7 @@
                     </div>
                     <div>
                       <el-button type="text" size="mini" @click="clickItem(item,1)" v-if="clickType == 2">复用结果</el-button>
-                      <el-button type="text" size="mini" @click="clickItem(item,2)" v-if="!projectId">使用</el-button>
+                      <el-button type="text" size="mini" @click="clickItem(item,2)" v-if="!projectId">进入案件</el-button>
                     </div>
                   </div>
                   <el-form label-width="100px">