zhuhao 1 ano atrás
pai
commit
bfea2d95e0

+ 82 - 33
src/api/newApi/common.js

@@ -6,7 +6,7 @@ export default {
    * @returns 
    */
   getOsSystemDict(data) {
-    return axios.post("/xiaoshi/common/getOsSystemDict",  data );
+    return axios.post("/xiaoshi/common/getOsSystemDict", data);
   },
   /**
    * 查询应用场景
@@ -118,46 +118,95 @@ export default {
   deleteCustomOption(data) {
     return axios.post("/xiaoshi/customOption/deleteCustomOption", data);
   },
-  
 
-   /**
-   * 查询所有标引栏位
-   * @param {*} params 
-   * @returns 
-   */
-   getAllPatentCustomField(params) {
-    return axios.get("/xiaoshi/customField/getAllPatentCustomField", {params});
+
+  /**
+  * 查询所有标引栏位
+  * @param {*} params 
+  * @returns 
+  */
+  getAllPatentCustomField(params) {
+    return axios.get("/xiaoshi/customField/getAllPatentCustomField", { params });
   },
-   /**
-   * 查询所有标引栏位值
-   * @param {*} data 
-   * @returns 
-   */
-   getCustomFieldValues(data) {
+  /**
+  * 查询所有标引栏位值
+  * @param {*} data 
+  * @returns 
+  */
+  getCustomFieldValues(data) {
     return axios.post("/xiaoshi/customField/getCustomFieldValues", data);
   },
-   /**
-   * 保存自定义栏位顺序
-   * @param {*} data 
-   * @returns 
-   */
-   addAllPatentCustomFieldOrder(data) {
+  /**
+  * 保存自定义栏位顺序
+  * @param {*} data 
+  * @returns 
+  */
+  addAllPatentCustomFieldOrder(data) {
     return axios.post("/xiaoshi/customField/addAllPatentCustomFieldOrder", data);
   },
-   /**
-   * 添加标引
-   * @param {*} data 
-   * @returns 
-   */
-   addCustomFieldValue(data) {
+  /**
+  * 添加标引
+  * @param {*} data 
+  * @returns 
+  */
+  addCustomFieldValue(data) {
     return axios.post("/xiaoshi/customField/addCustomFieldValue", data);
   },
-   /**
-   * 自定义栏位统计
-   * @param {*} data 
-   * @returns 
-   */
-   esCountSearch(data) {
+  /**
+  * 自定义栏位统计
+  * @param {*} data 
+  * @returns 
+  */
+  esCountSearch(data) {
     return axios.post("/xiaoshi/patent/esCountSearch", data);
   },
+  /**
+  * 获取检索栏位
+  * @param {*} data 
+  * @returns 
+  */
+  getQueryFields(data) {
+    return axios.post("/xiaoshi/personField/getQueryFields", data);
+  },
+  /**
+  * 获取表格显示栏位
+  * @param {*} data 
+  * @returns 
+  */
+  getTableColumns(data) {
+    return axios.post("/xiaoshi/personField/getTableColumns", data);
+  },
+  /**
+  * 设置表格显示栏位
+  * @param {*} data 
+  * @returns 
+  */
+  setTableColumns(data) {
+    return axios.post("/xiaoshi/personField/setTableColumns", data);
+  },
+  /**
+  * 获取所有统计栏位
+  * @param {*} data 
+  * @returns 
+  */
+  getAllCountColumns(data) {
+    return axios.post("/xiaoshi/personField/getAllCountColumns", data);
+  },
+  /**
+  * 获取显示的统计栏位
+  * @param {*} data 
+  * @returns 
+  */
+  getShowCountColumns(data) {
+    return axios.post("/xiaoshi/personField/getShowCountColumns", data);
+  },
+  /**
+  * 设置显示的统计栏位
+  * @param {*} data 
+  * @returns 
+  */
+  setShowCountColumns(data) {
+    return axios.post("/xiaoshi/personField/setShowCountColumns", data);
+  },
+
 };

+ 6 - 4
src/views/report/components/patentList/components/tab1.vue

@@ -5,7 +5,7 @@
         <template>
           <el-collapse v-model="activeNames" style="margin: 0px 5px 0px 5px;">
             <el-collapse-item v-for="item in field" :title="item.name" :name="item.id" :key="item.id" :loading="loading"
-              @click.native.prevent="handleChange(item)">
+              @click.native="handleChange(item)">
 
 
               <div style="display:flex;margin-bottom: 10px;">
@@ -16,9 +16,11 @@
                   <el-date-picker clear-icon size="small" type="year" v-model="valObj.valueTwo" value-format="yyyy"
                     placeholder="请选择时间"></el-date-picker>
                 </div>
-                <el-input v-else 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>
+                <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>
+                </template>
               </div>
               <el-checkbox-group v-model="valObj[item.id]" @change.stop="onChange($event, item.id)">
                 <div class="source-checkbox" v-if="ifShow">