专利清单的检索及统计

src/utils/common.js

@@ -8,11 +8,11 @@ export default {
    * @param {Number} duration 
    * @returns 
    */
-  debounce(func , duration=500){
+  debounce(func, duration = 500) {
     let timer;
-    return ()=>{
+    return () => {
       clearTimeout(timer)
-      timer = setTimeout(func,duration)
+      timer = setTimeout(func, duration)
     }
   },
   /**
@@ -21,15 +21,15 @@ export default {
    * @param {Number} delay 
    * @returns 
    */
-  throttle(func,delay=2000){
+  throttle(func, delay = 2000) {
     let flag = true
-    return ()=>{
-      if(!flag) return;
+    return () => {
+      if (!flag) return;
       flag = false;
-      setTimeout(()=>{
+      setTimeout(() => {
         func()
         flag = true
-      },delay)
+      }, delay)
     }
   },
   //object转字符串
@@ -87,33 +87,33 @@ export default {
    * @param {Object} props 
    * @returns 
    */
-  getField(array,fun,props){
+  getField(array, fun, props) {
     var type = {
-      'Array':'3',
-      'DateTime':'2',
-      'String':'1'
+      'Array': '3',
+      'DateTime': '2',
+      'String': '1'
     }
 
     //获取规范数据
     var keys = []
     var arr = []
-    if(props){
+    if (props) {
       keys = Object.keys(props)
     }
     //获取所需要的数据
-    var newArray = array.filter(item=>{
-      return  fun(item)
+    var newArray = array.filter(item => {
+      return fun(item)
     })
-    if(keys.length>0){
-      newArray.forEach(item=>{
+    if (keys.length > 0) {
+      newArray.forEach(item => {
         var obj = {}
-        keys.forEach(key=>{
-          if(key == 'type'){
+        keys.forEach(key => {
+          if (key == 'type') {
             obj[key] = type[item[props[key]]] || item[props[key]]
-          }else{
+          } else {
             obj[key] = item[props[key]]
           }
-          
+
         })
         // 过滤不需要的数据
         if (['id'].includes(obj.value) == false) {
@@ -137,46 +137,46 @@ export default {
    * @example
    * getColumnData({value:1},{type:'String',value:'value'}) //返回字符串1 
    */
-  getColumnData(row,field,prop,data){
-    if(field.type == 'Array'){
-      if(row[field.value] && row[field.value].length>0){
-        if(prop){
-         return row[field.value].map(item=>{
+  getColumnData(row, field, prop, data) {
+    if (field.type == 'Array') {
+      if (row[field.value] && row[field.value].length > 0) {
+        if (prop) {
+          return row[field.value].map(item => {
             return item[prop]
           }).join('、')
         }
         return row[field.value].join('、')
-      }else{
+      } else {
         return '--'
       }
-    }else if(field.type == 'Object'){
-      if(!row[field.value]){
+    } else if (field.type == 'Object') {
+      if (!row[field.value]) {
         return '--'
       }
-      if(prop){
+      if (prop) {
         return row[field.value][prop]
       }
       return row[field.value].name
     }
-    else{
-      if(data){
-        if(data.data.constructor == Array){
+    else {
+      if (data) {
+        if (data.data.constructor == Array) {
           var dataProp = data.prop || {
-            label:'label',
-            value:'value'
+            label: 'label',
+            value: 'value'
           }
-          var obj = data.data.find(item=>{
+          var obj = data.data.find(item => {
             return item[dataProp.value] == row[field.value]
           })
-          if(obj){
+          if (obj) {
             return obj[dataProp.label]
-          }else{
+          } else {
             return '--'
           }
-        }else{
+        } else {
           return data.data[row[field.value]]
         }
-        
+
       }
       if (row[field.value] == '0') {
         return '0'
@@ -186,21 +186,23 @@ export default {
   },
 
   //查看图片
-  checkViewer(guid){
+  checkViewer(guid) {
     return `/fileManager/downloadFile?fileId=${guid}`
   },
 
   //查看显示栏位管理
-  async getCustomField(type){
+  async getCustomField(type, patentObj = {}) {
     var params = {
-      tableName:type
+      tableName: type,
+      ...patentObj,
     }
+    let apiItem = Object.keys(patentObj).length > 0 ? 'getTableColumns':'getCustomField'
     var a = []
-   await api.getCustomField(params).then((response) => {
+    await api[apiItem](params).then((response) => {
       if (response.code == 200) {
         a = response.data.data
       }
-    }).catch(error=>{
+    }).catch(error => {
       return []
     });
     return a
@@ -212,27 +214,27 @@ export default {
    * @param {Object} param0 {sort,column, prop, order,sortProp,defaultValue,multiple}
    * @returns 
    */
-  getSortData({sort,column, prop, order,sortProp,defaultValue,multiple}){
+  getSortData({ sort, column, prop, order, sortProp, defaultValue, multiple }) {
     var sortProp1 = sortProp || {
       "orderBy": "orderBy",
       "orderType": 'orderType'
     }
-    if(multiple){
+    if (multiple) {
       var sortData = sort
-    }else{
+    } else {
       var sortData = []
     }
     if (order == null) {
-      if(defaultValue){
+      if (defaultValue) {
         this.sort = [defaultValue]
       }
       this.sort = [
         {
           "orderBy": "createTime",
           "orderType": 1
-        } 
+        }
       ]
-    }else{
+    } else {
       var orderType = {
         ascending: 0,
         descending: 1
@@ -255,7 +257,7 @@ export default {
   //显示表头数据
   renderHeaderMethods(h, { column }, message) {
     var message = '点击升序'
-    switch(column.order){
+    switch (column.order) {
       case "":
         message = '点击升序'
         break;
@@ -278,7 +280,7 @@ export default {
         },
         [h('span', column.label)] // 图标
       )
-      ]
+    ]
   },
 
   /**
@@ -286,16 +288,16 @@ export default {
    * @param {Object} data 参数
    * @param {*} type 导入类型
    */
-  toImportParent(data,type){
-    var types={
-      1:'/import',
-      2:'/PatentNoImport',
-      4:'/conditionImport'
+  toImportParent(data, type) {
+    var types = {
+      1: '/import',
+      2: '/PatentNoImport',
+      4: '/conditionImport'
     }
     router.push(
       {
-        path:types[type],
-        query:{
+        path: types[type],
+        query: {
           ...data
         }
       }

src/views/components/dialog/fields.vue

@@ -1,37 +1,27 @@
 <template>
   <div>
-    <el-dialog
-      custom-class="myFields"
-      title="显示栏位管理"
-      :visible.sync="dialogVisible"
-      width="300px"
-      :before-close="handleClose"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-    >
+    <el-dialog custom-class="myFields" title="显示栏位管理" :visible.sync="dialogVisible" width="300px"
+      :before-close="handleClose" :close-on-click-modal="false" :append-to-body="true">
       <div>
-        <el-checkbox
-          :indeterminate="isIndeterminate"
-          v-model="checkAll"
-          @change="handleCheckAllChange"
-          >全选</el-checkbox
-        >
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
         <p></p>
         <el-checkbox-group v-model="checked" @change="handleCheckedChange">
           <template>
-            <div  v-for="(field,index) in filedList" :key="field.value" style="padding:5px 0;">
+            <div v-for="(field, index) in filedList" :key="field.value" style="padding:5px 0;">
               <el-checkbox :label="field.value">
                 <div>
                   <div>{{ field.name }}</div>
                   <div>
-                    <el-button type="text" :disabled="index == filedList.length-1" class="down"> <i class="el-icon-sort-down"  @click.stop.prevent="down(index,field)"></i></el-button>
-                    <el-button type="text" :disabled="index == 0" class="up"><i class="el-icon-sort-up" @click.stop.prevent="up(index,field)"></i></el-button>
+                    <el-button type="text" :disabled="index == filedList.length - 1" class="down"> <i
+                        class="el-icon-sort-down" @click.stop.prevent="down(index, field)"></i></el-button>
+                    <el-button type="text" :disabled="index == 0" class="up"><i class="el-icon-sort-up"
+                        @click.stop.prevent="up(index, field)"></i></el-button>
                   </div>
                 </div>
               </el-checkbox>
             </div>
           </template>
-          
+
         </el-checkbox-group>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -46,10 +36,20 @@
 export default {
   components: {},
   props: {
-    type:{
-      type:String,
-      default:''
-    }
+    type: {
+      type: String,
+      default: ''
+    },
+    projectId: {
+      default: null,
+    },
+    taskId: {
+      default: null,
+    },
+    filed: {
+      type:Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -62,36 +62,36 @@ export default {
       //选择
       checked: [],
       //显示栏位
-      filedList:[],
+      filedList: [],
       //按钮加载
-      loading:false
+      loading: false
     };
   },
   watch: {},
   computed: {},
-  created() {},
+  created() { },
   mounted() {
   },
   methods: {
 
     //打开栏位
     open(data) {
-      this.filedList  = JSON.parse(JSON.stringify(data))
-      this.checked = data.filter(item=>{
+      this.filedList = JSON.parse(JSON.stringify(data))
+      this.checked = data.filter(item => {
         return item.ifHidden == false
-      }).map(item=>{
+      }).map(item => {
         return item.value
       })
       this.handleCheckedChange(this.checked)
       this.dialogVisible = true;
     },
     //下移
-    down(index,file){
+    down(index, file) {
       var arr = this.filedList
       this.filedList.splice(index, 2, arr[index + 1], arr[index])
     },
     //上移
-    up(index,file){
+    up(index, file) {
       var arr = this.filedList
       this.filedList.splice(index - 1, 2, arr[index], arr[index - 1])
     },
@@ -101,31 +101,37 @@ export default {
     },
     //提交更改
     submit() {
-      for(var i = 0; i < this.filedList.length; i++ ){
-        if(this.checked.includes(this.filedList[i].value)){
+      for (var i = 0; i < this.filedList.length; i++) {
+        if (this.checked.includes(this.filedList[i].value)) {
           this.filedList[i].ifHidden = false
-        }else{
+        } else {
           this.filedList[i].ifHidden = true
         }
       }
       var params = {
-        tableName : this.type,
-        value:this.filedList
+        tableName: this.type,
+        value: this.filedList,
+        projectId: this.projectId,
+        taskId: this.taskId,
+      }
+      let apiItem = this.projectId ? 'setTableColumns' : 'setCustomField'
+      if (this.filed) {
+        apiItem='setShowCountColumns'
       }
       this.loading = true
-      this.$api.setCustomField(params).then((response)=>{
-        if(response.code == 200){
+      this.$api[apiItem](params).then((response) => {
+        if (response.code == 200) {
           this.loading = false
           this.handleClose()
-          this.$emit('getFieldList',this.filedList)
+          this.$emit('getFieldList', this.filedList)
         }
-      }).catch(error=>{
+      }).catch(error => {
         this.loading = false
       })
     },
     //全选
     handleCheckAllChange(val) {
-      this.checked = val ? this.filedList.map(item=>{
+      this.checked = val ? this.filedList.map(item => {
         return item.value
       }) : [];
       this.isIndeterminate = false;
@@ -140,23 +146,29 @@ export default {
 };
 </script>
 <style lang="scss">
-.myFields{
-  .el-checkbox{
+.myFields {
+  .el-checkbox {
     width: 100%;
-    .el-checkbox__label{
-      width:calc(100% - 10px);
-      div{
+
+    .el-checkbox__label {
+      width: calc(100% - 10px);
+
+      div {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        .down,.up{
+
+        .down,
+        .up {
           padding: 0;
           margin: 0;
         }
-        i{
+
+        i {
           color: #999;
         }
-        i:hover{
+
+        i:hover {
           color: #409EFF;
         }
       }

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

@@ -7,7 +7,7 @@
         </el-tabs>
       </el-header>
       <el-main>
-        <component :is="activeNameTabs" :projectId="projectId"></component>
+        <component :is="activeNameTabs" :projectId="projectId" :taskId="taskId"></component>
       </el-main>
     </el-container>
   </div>
@@ -21,6 +21,9 @@ export default {
     projectId: {
       default: null
     },
+    taskId: {
+      default: null
+    },
   },
   components: {
     queryPage,

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

@@ -57,11 +57,11 @@
         </el-container>
       </div>
       <div class="height_100 right" v-show="showRight">
-        <customFields :projectId="projectId" @customFields="handleCustomFields"></customFields>
+        <customFields :projectId="projectId" :taskId="taskId" @customFields="handleCustomFields"></customFields>
       </div>
     </div>
 
-    <field ref="field" type="patentProject" @getFieldList="getFieldList"></field>
+    <field ref="field" type="patentProject" :projectId="projectId" :taskId="taskId" @getFieldList="getFieldList"></field>
   </div>
 </template>
 
@@ -121,40 +121,42 @@ export default {
       // 获取显示自定义栏位
       fieldList: [],
       // 存放自定义栏位的筛选数据
-      customFields:[],
+      customFields: [],
     }
   },
   computed: {},
   async mounted() {
-    this.fieldList = await this.$commonJS.getCustomField('patent')
+    this.fieldList = await this.$commonJS.getCustomField('patent', { projectId: this.projectId, taskId: this.taskId })
     this.getList()
+    await this.getColumn()
   },
   methods: {
+    // 统计组件传的值
     handleCustomFields(val) {
-      this.customFields=val
+      this.customFields = val
       this.getList()
     },
     // 处理任务
-    handleClick(row,location) {
+    handleClick(row, location) {
       var search = {
-        searchOption:this.searchOption,
-        location:location
+        searchOption: this.searchOption,
+        location: location
       }
-      this.$s.setSession('search',search)
+      this.$s.setSession('search', search)
       // if (this.taskType) {//FTO标引任务
-        this.$router.push(
-          {
-            path: '/patentDetails/' + row.patentNo,
-            query: {
-              projectId: this.projectId,
-              taskId: this.taskId,
-              isResult:this.isResult,
-              taskType:this.taskType,
-              reportType: this.reportType,
-              handlerType:this.handlerType || '',
-            }
+      this.$router.push(
+        {
+          path: '/patentDetails/' + row.patentNo,
+          query: {
+            projectId: this.projectId,
+            taskId: this.taskId,
+            isResult: this.isResult,
+            taskType: this.taskType,
+            reportType: this.reportType,
+            handlerType: this.handlerType || '',
           }
-        )
+        }
+      )
       // } else {//FTO对比任务协同任务
       //   this.$router.push(
       //     {
@@ -172,6 +174,27 @@ export default {
       // }
 
     },
+    //获取table栏位及分组字段、检索字段
+    async getColumn() {
+      let params = [{
+        tableName: 'patent',
+        projectId:this.projectId,
+      }]
+      await this.$api.getQueryFields(params).then(res => {
+        if (res.code == 200) {
+          let conditionDTOList = JSON.parse(JSON.stringify(res.data.data[0].conditionDTOList))
+          // 搜索字段
+          let searchFiled = this.$commonJS.getField(conditionDTOList, (u) => u.ifSearch == true, {
+            label: 'name',
+            value: 'value',
+            type: 'type',
+          })
+          this.searchFiled= searchFiled.filter(item => {
+            return item.type != 'tree'
+          })
+        }
+      })
+    },
     // 搜索
     search(val) {
       let params = {}
@@ -253,13 +276,13 @@ export default {
       }
     },
     //专利导入
-    patentImport(type){
+    patentImport(type) {
       var form = {
-        importToId:this.projectId,
-        importToType:1,
-        type:type,
+        importToId: this.projectId,
+        importToType: 1,
+        type: type,
       }
-      this.$commonJS.toImportParent(form,type)
+      this.$commonJS.toImportParent(form, type)
     },
     // 跳转分配任务页面
     handleAllocation() {
@@ -269,7 +292,7 @@ export default {
           query: {
             projectId: this.projectId,
             searchOption: JSON.stringify(this.searchOption),//输入框检索条件
-            customFields:JSON.stringify(this.customFields),//右侧勾选自定义栏位的条件
+            customFields: JSON.stringify(this.customFields),//右侧勾选自定义栏位的条件
           }
         }
       )

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

@@ -16,7 +16,7 @@
                   <el-date-picker clear-icon size="small" type="year" v-model="valObj.valueTwo" value-format="yyyy"
                     placeholder="请选择时间"></el-date-picker>
                 </div>
-                <template v-if="![4,5].includes(item.type)">
+                <template v-if="![4, 5].includes(item.type)">
                   <el-input size="small" v-model="valObj.valueOne" placeholder="请输入查询内容"></el-input>
                   <el-button @click.stop="handleSearch(item)" size="small" type="primary" class="margin-left_10"
                     icon="el-icon-search" circle></el-button>
@@ -45,14 +45,15 @@
       </el-footer>
     </el-container>
 
-    <fieldsVue ref="fieldsVue" type="" @getFieldList="getFieldList"></fieldsVue>
+    <fieldsVue ref="fieldsVue" type="" :projectId="projectId" :taskId="taskId" :filed="true" @getFieldList="getFieldList">
+    </fieldsVue>
   </div>
 </template>
 
 <script>
 import fieldsVue from '@/views/components/dialog/fields.vue'
 export default {
-  props: ['projectId'],
+  props: ['projectId', 'taskId'],
   components: {
     fieldsVue
   },
@@ -77,21 +78,51 @@ export default {
       total: 0,
       // 总数据
       customFields: [],
-      // 
+      // 是否重新创建dom
       ifShow: true,
+      filedAll:[],
     }
   },
   mounted() {
+    // 获取自定义字段的栏位数据
     this.getList()
+    // 获取显示的统计栏位
+    this.getShowCountColumns()
+    // 获取所有统计栏位的数据
+    this.getAllCountColumns()
   },
   methods: {
+    // 获取所有的统计栏位
+    getAllCountColumns() {
+      let params = {
+        projectId:this.projectId,
+        taskId:this.taskId,
+      }
+      this.$api.getAllCountColumns(params).then(res => {
+        if (res.code == 200) {
+          
+        }
+      })
+    },
+    // 获取显示的统计栏位
+    getShowCountColumns() {
+      let params = {
+        projectId:this.projectId,
+        taskId:this.taskId,
+      }
+      this.$api.getShowCountColumns(params).then(res => {
+        if (res.code == 200) {
+          
+        }
+      })
+    },
     // 过滤组件传的值
     getFieldList(val) {
-      this.filed=this.filed.concat(data)
+      this.filed = this.filed.concat(data)
     },
     // 更多过滤项
-    handleMore() { 
-      this.$refs.handleMore.open([])
+    handleMore() {
+      this.$refs.handleMore.open(this.filedAll)
     },
     // 全选
     handleSelectAll(val) {

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

@@ -23,7 +23,7 @@
 
 <script>
 export default {
-  props: ['projectId'],
+  props: ['projectId','taskId'],
   data() {
     return {
       // 控制折叠面板