筛选接口对接

src/components/qualityControl/BaseFieldList.vue

@@ -13,12 +13,12 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注：">
-                    <el-input size="mini" v-model="filter.proName" placeholder="备注"></el-input>
+                    <el-input size="mini" v-model="filter.tagName" placeholder="备注"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
                     <router-link to="/admin/LT-ZKYMSJWH-TJZDYSWH" style="margin:0 10px">
-                        <el-button size="mini" type="warning">添加映射</el-button>
+                        <el-button size="mini" type="warning">添加字段映射</el-button>
                     </router-link>
                 </el-form-item>
             </el-form>
@@ -115,7 +115,7 @@
         filter: {
           hisType:'',
           moduleType:'',
-          proName: ''
+          tagName: ''
         }
       }
     },
@@ -166,12 +166,11 @@
         });
       },
       getFilterItems() {
-        const param = {
+        const param = Object.assign({
           tagTypeList:this.tagType,
-          name: this.filter.proName,
           current: this.currentPage,
           size: this.pageSize
-        };
+        },this.filter);
         return param;
       },
       indexMethod(index) {

src/components/qualityControl/CombineFeildList.vue

@@ -4,16 +4,16 @@
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="所属医院：">
                     <el-select size="mini" v-model="filter.hisType" placeholder="所属医院" clearable>
-                        <el-option v-for="item in hisTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
+                        <el-option v-for="item in hisTypes" :label="item.name" :value="item.val" :key="item.val"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="所属模块：">
                     <el-select size="mini" v-model="filter.moduleType" placeholder="所属模块" clearable>
-                        <el-option v-for="item in fieldTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
+                        <el-option v-for="item in fieldTypes" :label="item.name" :value="item.val" :key="item.val"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注：">
-                    <el-input size="mini" v-model="filter.proName" placeholder="备注"></el-input>
+                    <el-input size="mini" v-model="filter.tagName" placeholder="备注"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
@@ -34,13 +34,13 @@
                         width="60">
                 </el-table-column>-->
                 <el-table-column
-                        prop="gmtModified"
+                        prop="hisName"
                         label="所属医院"
                         width="150"
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
-                        prop="name"
+                        prop="moduleName"
                         label="所属模块">
                 </el-table-column>
                 <el-table-column
@@ -95,7 +95,7 @@
         filter: {
           hisType:'',
           moduleType:'',
-          proName: ''
+          tagName: ''
         }
       }
     },
@@ -146,12 +146,11 @@
         });
       },
       getFilterItems() {
-        const param = {
+        const param =  Object.assign({
           tagTypeList:this.tagType,
-          name: this.filter.proName,
           current: this.currentPage,
           size: this.pageSize
-        };
+        },this.filter);
         return param;
       },
       indexMethod(index) {