专利数据库操作列表修改

src/utils/permissions.js

@@ -81,7 +81,7 @@ export default {
    * @param {String} str 
    */
   FunPermissions(str){
-    return true
+    // return true
     const user = Store.state.user.userinfo
     if(user.roleType){
       return true

src/views/components/import/components/importPatent.vue

@@ -108,14 +108,18 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="导入方式">
-                                    <el-switch
+                                    <!-- <el-switch
                                         v-model="form.type"
                                         active-color="#13ce66"
                                         active-value="2"
                                         inactive-value="3"
                                         active-text="专利号"
                                         inactive-text="文件">
-                                    </el-switch>
+                                    </el-switch> -->
+                                    <el-radio-group v-model="form.type">
+                                        <el-radio label="2">专利号</el-radio>
+                                        <el-radio label="3">文件</el-radio>
+                                    </el-radio-group>
                                 </el-form-item>
                                 <el-form-item label="专利号：" v-if="form.type == 2">
                                     <el-input type="textarea" v-model="form.searchCondition" placeholder="请输入专利号（多个专利号同时添加中间请用符号“，”隔开）"></el-input>

src/views/layout/components/UserBar.vue

@@ -2,15 +2,15 @@
   <div class="admin-user-bar">
     <div class="menu">
       <el-link :underline="true" v-for="item in menu" :key="item.path" @click="changePage(item.path)" :type="item.belong==belong?'primary':'default'">{{ item.label }}</el-link>
-      <el-dropdown @command="importPatent">
+      <!-- <el-dropdown @command="importPatent">
         <el-link :underline="true" :type="belong == 'conditionImport'?'primary':'default'" class="el-dropdown-link">
           专利检索<i class="el-icon-arrow-down el-icon--right"></i>
           </el-link>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item>接口检索</el-dropdown-item>
-          <!-- <el-dropdown-item>本地专利检索</el-dropdown-item> -->
+          <el-dropdown-item>本地专利检索</el-dropdown-item>
         </el-dropdown-menu>
-      </el-dropdown>
+      </el-dropdown> -->
     </div>
     <el-dropdown class="user panel-item" trigger="click" @command="handleCommand">
       <div class="user-avatar">
@@ -184,6 +184,12 @@ export default {
           path:'/myTask',
           belong:'myTask'
         },
+        {
+          value:'9',
+          label:'外部专利检索',
+          path:'/conditionImport',
+          belong:'conditionImport'
+        },
       ],
       clientTitle:'',
       clientVisible:false,

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

@@ -20,13 +20,15 @@
                       </el-dropdown-menu>
                     </el-dropdown>
                   </el-dropdown-item>
+                  <el-dropdown-item command="12">自定义栏位管理</el-dropdown-item>
+                <el-dropdown-item command="11">任务分配</el-dropdown-item>
                   <el-dropdown-item command="3">任务清单</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">项目分享</el-dropdown-item>
-                
+                <el-dropdown-item command="13">图表分析</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

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

@@ -36,12 +36,15 @@
                     </el-dropdown-menu>
                   </el-dropdown>
                 </el-dropdown-item>
+                <el-dropdown-item command="12">自定义栏位管理</el-dropdown-item>
+                <el-dropdown-item command="11">任务分配</el-dropdown-item>
                 <el-dropdown-item command="3">任务清单</el-dropdown-item>
                 <el-dropdown-item command="5">报告管理</el-dropdown-item>
                 <el-dropdown-item command="6">分类架构</el-dropdown-item>
                 <!-- <el-dropdown-item command="7">事件</el-dropdown-item> -->
                 <!-- <el-dropdown-item command="8">其他附件</el-dropdown-item> -->
                 <el-dropdown-item command="9">项目分享</el-dropdown-item>
+                <el-dropdown-item command="13">图表分析</el-dropdown-item>
                 <el-dropdown-item command="10" divided style="color:red">删 除</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>

src/views/project/index.vue

@@ -61,7 +61,8 @@
     <field ref="field" type="patentProject" @getFieldList="getFieldList"></field>
     <!-- 项目分享 -->
     <patentShare ref="patentShare"></patentShare>
-
+      <!-- 自定义栏位 -->
+      <Field-Drawer ref="FieldDrawer"></Field-Drawer>
   </div>
 </template>
 
@@ -76,6 +77,8 @@ import ProjectFormDrawer from './components/drawer/form.vue'
 import field from '@/views/components/dialog/fields.vue';
 import patentShare from '@/views/components/drawer/Share.vue';
 
+import FieldDrawer from '@/views/components/drawer/Field.vue'
+
 export default {
   components: {
     TotalChart,
@@ -85,6 +88,7 @@ export default {
     field,
     mergeTable,
     patentShare,
+    FieldDrawer
   },
   props: {
     isOperate: '',
@@ -436,12 +440,56 @@ export default {
         case '10'://删除
           this.deletes(row,isLast)
           break
+        case '11'://任务分配
+          this.handleAllocation(row)
+          break
+        case '12'://自定义栏位管理
+          this.handleField(row)
+          break
+        case '13'://图表分析
+          this.handleAnalyses(row)
+          break
         case 'e'://编辑
           this.handleEdit(row)
           break
       }
     },
-    
+    //自定义栏位管理
+    handleField(row) {
+      this.$refs.FieldDrawer.open(row.id)
+    },
+    // 跳转分配任务页面
+    handleAllocation(row) {
+      this.$router.push(
+        {
+          path: '/allocationTask',
+          query: {
+            projectId: row.id,
+            searchOption: '',//输入框检索条件
+            customFields: '',//右侧勾选自定义栏位的条件
+            projectType:1
+          }
+        }
+      )
+    },
+    //图表分析
+    async handleAnalyses(row) {
+      var params = {
+        searchQuery:  '',//检索条件
+        customFields: [],
+        orderDTOList: [],//排序信息
+        projectId:row.id
+      }
+      const router = this.$router.resolve({
+        path: '/customChart',
+        query: {
+          projectId: row.id,
+          search:JSON.stringify(params),
+          
+        }
+      })
+      window.open(router.href, '_blank');
+    },
     otherFiles(row){
 
     },

src/views/project/patentCollection/index.vue

@@ -48,6 +48,20 @@
                   件</el-dropdown-item> -->
                 <el-dropdown-item @click.native="handleField" v-disabled="false">自定义栏位管理</el-dropdown-item>
                 <!-- <el-dropdown-item @click.native="exportPDF">导出PDF首页</el-dropdown-item> -->
+
+                <el-dropdown-item>
+                  <el-dropdown @command="patentImport($event)" 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 command="1"> Excel导入 </el-dropdown-item>
+                      <el-dropdown-item command="2">专利号导入 </el-dropdown-item>
+                      <el-dropdown-item command="3">检索条件导入 </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </el-dropdown-item>
+
                 <el-dropdown-item>
                   <el-dropdown trigger="hover" placement="right-start">
                     <p>
@@ -107,6 +121,7 @@
                 </el-dropdown-item>
                 <el-dropdown-item @click.native="handleAnalyses">图表分析</el-dropdown-item>
                 <el-dropdown-item @click.native="handleAllocation">任务分配</el-dropdown-item>
+                <el-dropdown-item @click.native="taskList">任务清单</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -540,7 +555,7 @@ export default {
     handleField() {
       this.$refs.FieldDrawer.open(this.projectId)
     },
-    //获取自定义栏位
+    //获取显示栏位
     getFieldList(data) {
       this.customList = []
         this.$nextTick(()=>{
@@ -737,6 +752,26 @@ export default {
         }
       )
     },
+    //任务清单
+    taskList(){
+      this.$router.push(
+        {
+          path:'/myTask',
+          query:{
+            projectId:this.projectId
+          }
+        }
+      )
+    },
+     //专利导入
+     patentImport(type){
+      var form = {
+        importToId:this.projectId,
+        importToType:0,
+        type:type,
+      }
+      this.$commonJS.toImportParent(form,type)
+    },
     //合并发明人//合并申请人、权利人
     handleMerge(type) {
       let obj = {
@@ -774,6 +809,7 @@ export default {
     },
     submitIndex(){
       this.getList()
+      this.$refs.customFields.refreshNums()
     },
 
 

src/views/report/components/allocationTask/index.vue

@@ -21,10 +21,17 @@ export default {
       return this.$route.query.projectId
     },
     searchOption() {//检索条件
-      return JSON.parse(this.$route.query.searchOption)
+      if(this.$route.query.searchOption){
+        return JSON.parse(this.$route.query.searchOption)
+      }
+      return ''
+      
     },
     customFields() {//自定义字段检索条件
-      return JSON.parse(this.$route.query.customFields)
+      if(this.$route.query.customFields){
+        return JSON.parse(this.$route.query.customFields)
+      }
+      return []
     },
     projectType(){//项目类型
       return this.$route.query.projectType

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

@@ -653,6 +653,7 @@ export default {
 
     //打开弹窗
     async open(form) {
+      this.patentLoading = false
       var a = '编辑'
       this.form = JSON.parse(JSON.stringify(form))
       if (this.form.id) {

src/views/report/components/patentList/components/customFields/components/tab1.vue

@@ -31,9 +31,9 @@
                 <el-checkbox-group v-model="item.check" @change="onChange">
                   <div class="source-checkbox">
                     <el-checkbox v-for="source in item.options" :label="source.id || source.name" :key="source.id || source.name">
-                      <el-tooltip :content="source.name" placement="top" effect="light">
-                        <span class="source-checkbox-label text" :title="source.name">{{ source.name }}</span>
-                      </el-tooltip>
+                      <myTooltip :content="source.name" placement="top" effect="light">
+                        <span class="source-checkbox-label text noWrap" :title="source.name">{{ source.name }}</span>
+                      </myTooltip>
                       <!-- <span class="source-checkbox-label" :title="source.name">{{ source.name }}</span> -->
                       <span v-if="source.id" class="source-checkbox-count">({{ getCount(item, source.id) }})</span>
                       <span v-else class="source-checkbox-count">({{ source.number }})</span>
@@ -69,11 +69,11 @@
                   <div class="source-checkbox">
                     {{ item.value }}
                     <el-checkbox v-for="source in item.options" :label="source.name" :key="source.name">
-                      <el-tooltip :content="source.name" placement="top" effect="light">
-                        <span class="source-checkbox-label text" :title="source.name">
+                      <myTooltip :content="source.name" placement="top" effect="light">
+                        <span class="source-checkbox-label text noWrap" :title="source.name">
                         {{ ['LG','PT','SS'].includes(item.value) ? typeStatus[item.value][source.name] : source.name }}
                         </span>
-                      </el-tooltip>
+                      </myTooltip>
                       <span class="source-checkbox-count">({{ source.number }})</span>
                     </el-checkbox>
                   </div>