修改专利清单

src/api/newApi/common.js

@@ -118,6 +118,38 @@ export default {
   deleteCustomOption(data) {
     return axios.post("/xiaoshi/customOption/deleteCustomOption", data);
   },
-
   
+
+   /**
+   * 查询所有标引栏位
+   * @param {*} data 
+   * @returns 
+   */
+   getAllPatentCustomField(data) {
+    return axios.post("/xiaoshi/customField/getAllPatentCustomField", data);
+  },
+   /**
+   * 查询所有标引栏位值
+   * @param {*} data 
+   * @returns 
+   */
+   getCustomFieldValues(data) {
+    return axios.post("/xiaoshi/customField/getCustomFieldValues", data);
+  },
+   /**
+   * 保存自定义栏位顺序
+   * @param {*} data 
+   * @returns 
+   */
+   addAllPatentCustomFieldOrder(data) {
+    return axios.post("/xiaoshi/customField/addAllPatentCustomFieldOrder", data);
+  },
+   /**
+   * 添加标引
+   * @param {*} data 
+   * @returns 
+   */
+   addCustomFieldValue(data) {
+    return axios.post("/xiaoshi/customField/addCustomFieldValue", data);
+  },
 };

src/router/index.js

@@ -311,18 +311,7 @@ const routes = [
             },
             component:() => import('@/views/report/components/allocationTask/index.vue'),
           },
-          //报告处理分配（标引）任务专利清单
-          {
-            path: '/patentListTask',
-            name:"patentListTask",
-            meta:{
-              aside: true,
-              showHeader: true,
-              sign:'patentListTask',
-              belong:'AllReport'
-            },
-            component:() => import('@/views/report/components/patentListTask/index.vue'),
-          },
+
           //侵权分析
           {
             path: '/tortIndex',

src/views/project/patentDetails/components/PatentField.vue

@@ -1,246 +1,325 @@
 <template>
-  <div class="PatentField height_100">
-    <el-container class="height_100" style="width: 300px;float: right;">
-      <el-main>
-        <template>
-          <el-form label-position="top" class="custom-field-form">
-            <el-form-item v-for="item in field" :key="item.id">
-              <template slot="label">
-                <span :title="item.name" class="name">{{ item.name }}</span>
-              </template>
-              <!-- 已选择 -->
-              <template v-if="[4, 5, 6].includes(item.type)">
-                <div style="display: flex;align-items: center;">
-                  <!-- <el-popover placement="top-start" title="标题" width="200" trigger="hover"
-                    >
-                    <div v-for="checks in dataShow.filter(showItem =>{ return  showItem.type == item.type})" :key="checks.id">
-                      <span>{{ checks.name }}</span>
-                    </div>
-                    <div slot="reference">已选择的栏位</div>
-                  </el-popover> -->
-
-                  <div @click="hover(item)" class="check" style="min-width: 120px;min-height: 30px;background: rgb(235, 235, 168);position: relative;" >
-                    <div style="text-align: center;">已选择的栏位 <i class="el-icon-arrow-down"></i></div>
-                    <div class="checkSon">
-                      <div v-for="checks in dataShow.filter(showItem => { return showItem.type == item.type })"
-                        :key="checks.id">
-                        <span>{{ checks.name }}</span>
-                      </div>
-                    </div>
-                  </div>
-                  <el-tooltip class="item" effect="dark" content="显示栏位的值" placement="top">
-                    <el-button @click="showClick(item)" type="primary" size="small" style="margin-left: 10px;">{{ '显示'
-                    }}</el-button>
-                  </el-tooltip>
-                </div>
-              </template>
-              <!-- 数字、日期、文字 -->
-              <template v-if="item.type === 0 || item.type === 2 || item.type === 1">
-                <div class="custom-input">
-                  <el-date-picker v-if="item.type === 1" value-format="yyyy-MM-dd" type="date" size="small"
-                    placeholder="选择日期" class="width_100" @change="onChange(item, val)"></el-date-picker>
-                  <el-input v-else type="textarea" placeholder="请输入内容" size="small"
-                    @blur="onChange(item, val)"></el-input>
-                </div>
-              </template>
-
-              <!-- 单选 -->
-              <div v-if="item.type == 4 && show.field1">
-                <el-radio v-for="radio in item.options" :key="radio.id" :label="radio.id" style="width: 100%;">
-                  <span>{{ radio.name }}</span>
-                </el-radio>
+  <div class="patent-articles-patent-field" style="width:300px">
+    <el-form label-position="top" class="custom-field-form">
+      <template v-for="(item, index) in customField">
+        <el-form-item :key="index">
+          <template slot="label">
+            <span :title="item.name" class="name">{{ item.name }}</span>
+          </template>
+          <div class="option">
+            <el-dropdown size="small">
+              <span class="el-dropdown-link">
+                <i class="el-icon-more el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item @click.native="handleOption(0, item.id, index)">上移</el-dropdown-item>
+                <el-dropdown-item @click.native="handleOption(1, item.id, index)">下移</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+          <template v-if="item.type === 0 || item.type === 2 || item.type === 1">
+            <div v-for="(val, i) in selected[item.id]"  class="custom-input">
+              <el-date-picker v-if="item.type === 1"  v-model="val.label" value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择日期" class="width_100" @change="onChange($event, item, val)"></el-date-picker>
+              <el-input v-else type="textarea"  v-model="val.label" placeholder="请输入内容" size="small" @blur="onChange($event, item, val)"></el-input>
+            </div>
+          </template>
+          <template v-if="item.type === 4">
+            <div class="showValue">
+              <div>
+                <div v-for="fieldValue in item.selected" :key="fieldValue" class="value">{{ fieldValue.name }}</div>
+              </div>
+                <el-button size="small" @click="$set(item,'show',!item.show)">{{ item.show?'收起':'修改' }}</el-button>
+            </div>
+            <el-radio-group v-model="item.selectedId" @change="onChange($event, item)" v-show="item.show">
+              <div v-for="option in item.option">
+                <el-radio class="custom-radio" :label="option.id" @click.native.prevent="getSelect(item,option.id)">{{ option.name }}</el-radio>
+              </div>
+            </el-radio-group>
+          </template>
+          <template v-if="item.type === 5">
+            <div class="showValue">
+              <div>
+                <div v-for="fieldValue in item.selected" :key="fieldValue" class="value">{{ fieldValue }}</div>
               </div>
-              <!-- 多选 -->
-              <el-checkbox-group v-if="item.type == 5 && show.field2">
-                <div class="source-checkbox">
-                  <el-checkbox v-for="source in item.options" :label="source.id" :key="source.id">
-                    <span class="source-checkbox-label">{{ source.name }}</span>
-                  </el-checkbox>
-                </div>
-              </el-checkbox-group>
-              <!-- 树类型 -->
-              <el-tree v-if="item.type == 6 && show.field3" @check-change="onChangeTree($event, item.id)" :ref="item.id"
-                :data="item.child" show-checkbox node-key="id" check-strictly :default-expand-all="false"
-                :props="{ children: 'child', label: 'name' }">
-                <div class="custom-filter-tree-node" slot-scope="{ node, data }">
-                  <span class="name">{{ data.name }}</span>
-                </div>
-              </el-tree>
-            </el-form-item>
-          </el-form>
-        </template>
-      </el-main>
-    </el-container>
+                <el-button size="small" @click="$set(item,'show',!item.show)">{{ item.show?'收起':'修改' }}</el-button>
+            </div>
+            <el-checkbox-group v-model="selected[item.id]"  @change="onChange($event, item)" v-show="item.show">
+              <el-checkbox class="custom-checkbox" v-for="option in item.option" :label="option.id">{{ option.name }}</el-checkbox>
+            </el-checkbox-group>
+          </template>
+          <template v-if="item.type === 6" >
+            <div class="showValue">
+              <div>
+                <div v-for="fieldValue in item.selected" :key="fieldValue" class="value">{{ fieldValue }}</div>
+              </div>
+                <el-button size="small" @click="$set(item,'show',!item.show)">{{ item.show?'收起':'修改' }}</el-button>
+            </div>
+          <div v-show="item.show">
+             <el-tree
+                @check-change="onChange($event, item)"
+                :ref="item.id"
+                :data="item.option"
+                check-strictly
+                :default-checked-keys="selected[item.id]"
+                show-checkbox
+                node-key="id"
+                default-expand-all
+                :props="defaultProps"
+            ></el-tree>
+          </div>
+           
+          </template>
+          
+        </el-form-item>
+      </template>
+
+    </el-form>
   </div>
 </template>
 
 <script>
 export default {
+  props: {
+    projectId:{
+      default:0
+    },
+    taskId:{
+      default:0
+    },
+    patentNo:''
+  },
   data() {
     return {
-      field: [],
-      // 控制栏位值的显示
-      show: {
-        field1: false,
-        field2: false,
-        field3: false,
-      },
-      // 显示已选择的数据
-      dataShow: []
+      customField:[],
+      selected:[],
+      defaultProps:{
+        children:'child'
+      }
+    }
+  },
+  watch: {
+    patentNo(){
+      this.getOptionsAndSelected()
     }
   },
   mounted() {
-    this.getList()
+    this.getCustomField()
   },
-  methods: {
-    hover(row) {
-      let divCheckSon = document.querySelector('.checkSon')
-      divCheckSon.classList.add('Checked')
-    },
-    // 显示自定义栏位
-    showClick(row) {
-      switch (row.type) {
-        case 4:
-          this.show.field1 = !this.show.field1
-          break;
-        case 5:
-          this.show.field2 = !this.show.field2
-          break;
-        case 6:
-          this.show.field3 = !this.show.field3
-          break;
+  methods:{
+    //上移下移
+    handleOption(type,id,index){
 
-        default:
-          break;
-      }
     },
-    onChangeTree(val) {
-      console.log(val);
-      let obj = {
-        name: val.name,
-        id: val.id,
-        type: val.type
-      }
-      if (this.dataShow.length>0) {
-        let index = this.dataShow.forEach(item => {
-          return item.id == val.id
-        })
-        if (index!=-1) {
-          
-        } else {
-          this.dataShow.push(obj)
-        }
-      } else {
-        this.dataShow.push(obj)
-      }
-      
+    //切换选择
+    onChange(){
+
     },
-    // 查询自定义栏位数据
-    getList() {
+    getCustomField(){
       var params = {
-        current: 1,
-        size: 10,
-        searchQuery: `projectId=${101}`,
-        orderDTOList: [],
+        projectId:this.projectId,
+        taskId:this.taskId
       }
-      this.$api.queryCustomField(params).then(response => {
-        if (response.code == 200) {
-          let data = response.data.data
-          this.handleFiled(data)
+      this.$api.getAllPatentCustomField(params).then(response=>{
+        if(response.code == 200){
+          this.customField = response.data
+          // this.getOptionsAndSelected()
         }
-      }).catch(error => {
-        this.loading = false
+      }).catch(error=>{
+        this.customField = [
+            {
+                "id": 10,
+                "name": "相似度",
+                "projectId": 101,
+                "type": 6,
+                "description": "",
+                "status": true,
+                "createId": "328",
+                "createName": "朱豪",
+                "createTime": "2023-12-15 14:52:42"
+            },
+            {
+                "id": 11,
+                "name": "多选",
+                "projectId": 101,
+                "type": 5,
+                "description": "",
+                "status": true,
+                "createId": "328",
+                "createName": "朱豪",
+                "createTime": "2023-12-15 14:54:03"
+            },
+            {
+                "id": 12,
+                "name": "单选",
+                "projectId": 101,
+                "type": 4,
+                "description": "",
+                "status": true,
+                "createId": "328",
+                "createName": "朱豪",
+                "createTime": "2023-12-15 14:54:29",
+                selected:[
+                  {
+                    id:1,
+                    name:'选项'
+                  }
+                ],
+                selectedId:1,
+                option:[
+                  {
+                    id:1,
+                    name:'选项'
+                  }
+                ]
+            },
+            {
+                "id": 13,
+                "name": "文本",
+                "projectId": 101,
+                "type": 2,
+                "description": "",
+                "status": true,
+                "createId": "328",
+                "createName": "朱豪",
+                "createTime": "2023-12-15 14:54:51"
+            },
+            {
+                "id": 14,
+                "name": "日期",
+                "projectId": 101,
+                "type": 1,
+                "description": "",
+                "status": true,
+                "createId": "328",
+                "createName": "朱豪",
+                "createTime": "2023-12-15 14:54:57"
+            },
+            {
+                "id": 15,
+                "name": "数字",
+                "projectId": 101,
+                "type": 0,
+                "description": "",
+                "status": true,
+                "createId": "328",
+                "createName": "朱豪",
+                "createTime": "2023-12-15 14:55:03"
+            }
+        ]
       })
     },
-    handleFiled(data) {
-      data.forEach(item => {
-        this.queryCustomOption(item)
+    //获取栏位的选项和选项值（0数字，1日期，2文本，4单选，5多选，6树，7产品8产品类别9技术分类）
+    getOptionsAndSelected(){
+      this.customField.forEach(item => {
+            this.getSelected(item)
+            switch(item.type){
+              case 4:
+              case 5:
+              case 6:
+                this.getCustomOption(item)
+                break;
+              case 7:
+                break;
+              case 8:
+                break;
+            }
+      });
+    },
+    //获取选项值
+    getSelected(item){
+      this.$api.getCustomFieldValues().then(response=>{
+        if(response.code == 200){
+          item.selected = response.data
+        }
+      }).catch(error=>{
+        item.selected = []
       })
     },
-    // 查询自定义栏位选项数据
-    queryCustomOption(row) {
-
-      let params = {
-        customFieldId: row.id,
+    //查询自定义栏位选项
+    getCustomOption(item){
+      var params = {
+        customFieldId:item.id
       }
-      this.$api.queryCustomOption(params).then(response => {
-        if (response.code == 200) {
-          if (row.type == 6) {//树类型
-            row.child = response.data.data
-          } else if (row.type == 5) {
-            row.options = response.data.data
-          } else if (row.type == 4) {
-            row.options = response.data.data
-          }
-          this.field.push(row)
+      this.$api.queryCustomOption(params).then(response=>{
+        if(response.code == 200){
+          this.$set(item, 'option', response.data.data)
         }
-      }).catch(error => {
-
+      }).catch(error=>{
+        this.$set(item, 'option', [])
       })
     },
-  },
-}
-</script>
+    //获取产品或产品类别架构
+    getProductCategory(){
 
-<style lang="scss" scoped>
-.PatentField {
-  .Checked{
-    min-width: 120px;
-    min-height: 30px;
-    background: rgb(235, 235, 168);
-    position: absolute;
-    top: 45px;
-    left: 0px;
-    z-index: 10;
-  }
-  .name {
-    display: block;
-    width: 170px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .option {
-    position: absolute;
-    right: 0;
-    top: -50px;
-    color: #1e9fff;
-
-    i {
-      cursor: pointer;
     }
   }
+}
+</script>
 
-  .el-form-item {
-    margin-bottom: 0 !important;
-
-    .el-form-item__label {
-      font-size: 16px;
-      border-bottom: 1px solid #d2d2d2;
+<style lang="scss">
+.patent-articles-patent-field {
+  .custom-field-form {
+    .name {
+      display: block;
+      width: 170px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .option {
+      position: absolute;
+      right: 0;
+      top: -50px;
+      color: #1e9fff;
+      i {
+        cursor: pointer;
+      }
+    }
+    .el-form-item {
+      margin-bottom: 0 !important;
+      .el-form-item__label {
+        font-size: 16px;
+        border-bottom: 1px solid #d2d2d2;
+        margin-bottom: 10px;
+        color: #EE6666;
+      }
+    }
+    .custom-input {
       margin-bottom: 10px;
-      color: #EE6666;
+      .el-input {
+      }
+      .el-button {
+        float: right;
+        margin-top: 5px;
+      }
     }
-  }
-
-  .custom-input {
-    margin-bottom: 10px;
-
-    .el-button {
-      float: right;
-      margin-top: 5px;
+    .custom-checkbox, .custom-radio {
+      width: 100%;
+      margin-right: 0 !important;
+      line-height: 30px;
+    }
+    .el-form-item__label {
+      width: 100%;
+      padding: 0 !important;
     }
   }
-
-  .custom-checkbox,
-  .custom-radio {
-    width: 100%;
-    margin-right: 0 !important;
-    line-height: 30px;
-  }
-
-  .el-form-item__label {
-    width: 100%;
-    padding: 0 !important;
+}
+</style>
+<style lang="scss" scoped>
+  .showValue{
+    width:100%;
+    display: flex;
+    align-items: center;
+    &>div{
+      width:100%;
+      min-height: 30px;
+      border:1px solid var(--color1);
+    }
+    
+    .value{
+      
+      padding:5px;
+      line-height: 20px;
+    }
   }
-}</style>
+</style>

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

@@ -1,15 +1,17 @@
 <template>
+  <!-- 任务专利列表页面 -->
   <div class="height_100">
-    <div class="height_100" style="display:flex">
-      <div class="height_100" :style="{width:showRight?'calc( 100% - 300px )':'100%'}">
+    <div class="height_100 content" :style="{'flex-direction':(taskId?'row-reverse':'row')}">
+      <div class="height_100  left" :style="{width:showRight?`calc(100% - 300px)`:'100%'}">
         <el-container>
           <el-header style="padding:0 10px !important;">
-            <div id="step1">
+            <div style="display: flex;align-items: center;">
               <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption">
               </mySearch>
             </div>
             <div style="display:flex;align-items:center">
-              <el-dropdown id="step4" trigger="click" split-button type="primary" size="small" @click="handleFieldManage"
+              <el-button v-if="taskId" type="primary" size="small" @click="handleFieldManage">显示栏位管理</el-button>
+              <el-dropdown v-else id="step4" trigger="click" split-button type="primary" size="small" @click="handleFieldManage"
                 @command="handleCommand($event)">
                 <span v-disabled="false">显示栏位管理</span>
                 <el-dropdown-menu slot="dropdown" class="text-align_center">
@@ -35,9 +37,9 @@
               </div>
             </div>
           </el-header>
-          <el-main class="height_100" style="width: 100%;">
+          <el-main class="height_100">
             <component :is='components' :tableData="tableData" :column="fieldList" :projectId="projectId"
-              @on-sort="handleSort" :queryParams="queryParams"></component>
+              @on-sort="handleSort" :queryParams="queryParams" @clickPatentNo="handleClick"></component>
           </el-main>
           <el-footer class="pagination">
             <el-pagination background layout="total, sizes, prev, pager, next, jumper"
@@ -47,12 +49,11 @@
           </el-footer>
         </el-container>
       </div>
-      <div class="height_100 right" v-if="showRight" :style="{'min-width':showRight?'300px':'0px'}">
+      <div class="height_100 right" v-show="showRight">
         <customFields :projectId="projectId"></customFields>
       </div>
     </div>
 
-
     <field ref="field" type="patentProject" @getFieldList="getFieldList"></field>
   </div>
 </template>
@@ -60,23 +61,26 @@
 <script>
 import field from '@/views/components/dialog/fields.vue';
 import PatentTableListView from '@/views/project/patentCollection/components/views/Table.vue'
-import customFields from '../patentListTask/components/customFields.vue';
+import customFields from './customFields.vue';
 export default {
+  props: {
+    taskId: {
+      default:0
+    },
+    projectId:{
+      default:0
+    },
+  },
   components: {
-    field,
     PatentTableListView,
+    field,
     customFields,
   },
-  props: {
-    projectId: {
-      default: 0
-    }
-  },
   data() {
     return {
       //显示组件
       components: 'PatentTableListView',
-      //显示右侧
+      //显示左側
       showRight: false,
       //检索字段
       searchFiled: [],
@@ -100,18 +104,26 @@ export default {
       ],
       //专利列表
       tableData: [],
-      //显示栏位
-      fieldList: []
-    };
+      // 获取显示自定义栏位
+      fieldList:[],
+    }
   },
-  watch: {},
   computed: {},
-  created() { },
   async mounted() {
     this.fieldList = await this.$commonJS.getCustomField('patent')
     this.getList()
   },
   methods: {
+    handleClick(row){
+      this.$router.push(
+        {
+          path:'/patentDetails/'+row.patentNo,
+          query:{
+            projectId:this.projectId
+          }
+        }
+      )
+    },
     // 搜索
     search() {
       let params = {}
@@ -130,13 +142,14 @@ export default {
       this.queryParams.current = 1
       this.getList()
     },
-    //获取专利列表
-    getList() {
+   //获取专利列表
+   getList() {
       let params = {
         ...this.queryParams,//分页信息
         projectId: this.projectId,
-        searchQuery: this.$commonJS.objectToString(this.searchOption),//检索条件
-        orderDTOList: this.sort,//排序信息
+        taskId: this.taskId,
+        searchQuery: '',//检索条件
+        orderDTOList: [],//排序信息
       }
       this.$api.QueryPatent(params).then(res => {
         if (res.code == 200) {
@@ -166,58 +179,28 @@ export default {
       this.queryParams.current = val;
       this.getList();
     },
-    //下拉按钮
-    handleCommand(option) {
-      switch (option) {
-        case '1'://分配任务
-          this.toAllocationTask()
-          break;
-        case '2'://专利号导入
-          this.patentImport(2)
-          break;
-        case '3'://excel导入
-          this.patentImport(1)
-          break;
-        case '4'://检索导入
-          this.patentImport(4)
-          break;
-      }
-    },
-    // 去分配任务页面
-    toAllocationTask() {
-      this.$router.push({
-        path: '/allocationTask',
-        query: {
-          projectId: this.projectId,
-        }
-      })
-    },
-    //专利导入
-    patentImport(type) {
-      var form = {
-        importToId: this.projectId,
-        importToType: 1,
-        type: type,
-      }
-      this.$commonJS.toImportParent(form, type)
-    },
     //显示栏位管理
     handleFieldManage() {
       this.$refs.field.open(this.fieldList)
     },
-    //获取自定义栏位
-    getFieldList(data) {
+     //获取显示自定义栏位
+     getFieldList(data) {
       this.fieldList = data
     },
   },
-};
+}
 </script>
+
 <style lang="scss" scoped>
-.left {
-  width: 100%
+.content{
+  display: flex;
+  max-width:100%;
+  .right{
+    min-width:300px;
+  }
+  .left{
+    width: 100%;
+  }
 }
 
-.right {
-  width: 100%
-}
 </style>

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

@@ -1,30 +1,36 @@
 <template>
+  <!--  -->
   <div>
-    <patentList :projectId="projectId"></patentList>
+    <patentList :projectId="projectId" :taskId="taskId"></patentList>
   </div>
 </template>
 
 <script>
-import patentList from './patentList.vue';
+import patentList from './components/index.vue'
 export default {
   components: {
     patentList
   },
-  props: {},
   data() {
     return {
-    };
+
+    }
   },
-  watch: {},
   computed: {
-    projectId(){
-        return this.$route.query.projectId || 0
-    }
+    projectId() {
+      return this.$route.query.projectId || 0
+    },
+    taskId() {
+      return this.$route.query.taskId || 0
+    },
+  },
+  mounted() {
+
+  },
+  methods: {
+
   },
-  created() {},
-  mounted() {},
-  methods: {},
-};
+}
 </script>
-<style lang="scss" scoped>
-</style>
+
+<style lang="scss" scoped></style>

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

@@ -1,164 +0,0 @@
-<template>
-  <!-- 任务专利列表页面 -->
-  <div class="height_100">
-    <div class="height_100" style="display:flex">
-      <div class="height_100" v-if="showRight" :style="{ 'min-width': showRight ? '300px' : '0px' }">
-        <customFields :projectId="projectId"></customFields>
-      </div>
-      <div class="height_100" :style="{ width: showRight ? 'calc( 100% - 300px )' : '100%' }">
-        <el-container>
-          <el-header style="padding:0 10px !important;">
-            <div style="display: flex;align-items: center;">
-              <div>
-                <el-tooltip class="item" effect="dark" :content="(showRight ? '隐藏' : '显示') + '右侧自定义栏位'" placement="top">
-                  <i :class="showRight ? 'el-icon-s-fold' : 'el-icon-s-unfold'"
-                    style="font-size: 25px; margin-left: 10px;color: #2f2f2f; cursor: pointer"
-                    @click="showRight = !showRight"></i>
-                </el-tooltip>
-              </div>
-              <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption">
-              </mySearch>
-            </div>
-            <div>
-              <el-button type="primary" size="small" @click="handleFieldManage">显示栏位管理</el-button>
-            </div>
-          </el-header>
-          <el-main class="height_100" style="width: 100%;">
-            <component :is='components' :tableData="tableData" :column="fieldList" :projectId="projectId"
-              @on-sort="handleSort" :queryParams="queryParams"></component>
-          </el-main>
-          <el-footer class="pagination">
-            <el-pagination background layout="total, sizes, prev, pager, next, jumper"
-              :current-page.sync="queryParams.current" :page-sizes="sizeArr" :page-size.sync="queryParams.size"
-              @current-change="handleCurrentChange" @size-change="getList" :total="total">
-            </el-pagination>
-          </el-footer>
-        </el-container>
-      </div>
-
-    </div>
-
-    <field ref="field" type="patentProject" @getFieldList="getFieldList"></field>
-  </div>
-</template>
-
-<script>
-import field from '@/views/components/dialog/fields.vue';
-import PatentTableListView from '@/views/project/patentCollection/components/views/Table.vue'
-import customFields from './customFields.vue';
-export default {
-  props: {
-    taskId: '',
-    projectId: '',
-  },
-  components: {
-    PatentTableListView,
-    field,
-    customFields,
-  },
-  data() {
-    return {
-      //显示组件
-      components: 'PatentTableListView',
-      //显示左側
-      showRight: false,
-      //检索字段
-      searchFiled: [],
-      //检索条件
-      searchOption: {},
-      //专利数据库数据总数
-      total: 0,
-      //分页信息
-      queryParams: {
-        size: 10,
-        current: 1,
-      },
-      //页大小
-      sizeArr: [10, 20, 30, 40, 50, 100],
-      //排序
-      sort: [
-        {
-          "orderBy": "createTime",
-          "orderType": 1
-        }
-      ],
-      //专利列表
-      tableData: [],
-      // 获取显示自定义栏位
-      fieldList:[],
-    }
-  },
-  computed: {},
-  async mounted() {
-    this.fieldList = await this.$commonJS.getCustomField('patent')
-    this.getList()
-  },
-  methods: {
-    // 搜索
-    search() {
-      let params = {}
-      val.forEach(item => {
-        if (item.type == 3) {
-          params[item.value] = item.searchValue.map(itemValue => {
-            return itemValue.value
-          })
-        } else {
-          params[item.value] = item.searchValue.label
-        }
-      })
-      // 返回字符串
-      this.searchOption = params
-      // 调用查询接口
-      this.queryParams.current = 1
-      this.getList()
-    },
-   //获取专利列表
-   getList() {
-      let params = {
-        ...this.queryParams,//分页信息
-        projectId: this.projectId,
-        taskId: this.taskId,
-        searchQuery: '',//检索条件
-        orderDTOList: [],//排序信息
-      }
-      this.$api.QueryPatent(params).then(res => {
-        if (res.code == 200) {
-          this.tableData = res.data.data
-          this.total = res.data.total
-        }
-      }).catch(error => {
-        this.tableData = []
-        this.total = 0
-      })
-    },
-    //排序
-    handleSort({ column, prop, order }) {
-      //如需要多个字段排序，则不需要清空
-      var params = {
-        sort: this.sort,
-        column,
-        prop,
-        order,
-      }
-      this.sort = this.$commonJS.getSortData(params)
-      this.queryParams.current = 1
-      this.getList()
-    },
-    //分页
-    handleCurrentChange(val) {
-      this.queryParams.current = val;
-      this.getList();
-    },
-    //显示栏位管理
-    handleFieldManage() {
-      this.$refs.field.open(this.fieldList)
-    },
-     //获取显示自定义栏位
-     getFieldList(data) {
-      this.fieldList = data
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped></style>

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

@@ -1,36 +0,0 @@
-<template>
-  <!--  -->
-  <div>
-    <patentTaskList :projectId="projectId" :taskId="taskId"></patentTaskList>
-  </div>
-</template>
-
-<script>
-import patentTaskList from './components/index.vue'
-export default {
-  components: {
-    patentTaskList
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    projectId() {
-      return this.$route.query.projectId
-    },
-    taskId() {
-      return this.$route.query.taskId
-    },
-  },
-  mounted() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped></style>

src/views/task/components/index.vue

@@ -326,7 +326,7 @@ export default {
     //报告分配（标引）任务
     handleAllocation(row, str) {
       let router = this.$router.resolve({
-        path: '/patentListTask',
+        path: '/reportPatentList',
         query: {
           taskId: row.id,
           projectId: row.projectId,