组合字段筛选接口对接

src/components/qualityControl/AddCombineFeild.vue

@@ -4,29 +4,27 @@
         <div class="contents">
             <div class="content">
                 <el-form ref="form" :label-position="labelPosition" label-width="118px" :model="form" :rules="rules">
-                    <el-form-item label="所属医院：" prop="hisName">
-                        <el-select v-model="form.hisName"
+                    <el-form-item label="所属医院：" prop="hospitalId">
+                        <el-select v-model="form.hospitalId"
                                    placeholder="请选择"
-                                   size="small"
-                                   :disabled="id && !copy?true:false">
+                                   size="small">
                             <el-option
                                     v-for="item in hisTypes"
                                     :key="item.val"
                                     :label="item.name"
-                                    :value="item.val">
+                                    :value="Number(item.val)">
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="所属模块：" prop="moduleName">
-                        <el-select v-model="form.moduleName"
+                    <el-form-item label="所属模块：" prop="modeId">
+                        <el-select v-model="form.modeId"
                                    placeholder="请选择"
-                                   size="small"
-                                   :disabled="id && !copy?true:false">
+                                   size="small">
                             <el-option
                                     v-for="item in fieldTypes"
                                     :key="item.val"
                                     :label="item.name"
-                                    :value="item.val">
+                                    :value="Number(item.val)">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -71,15 +69,15 @@
         isFirst:true,
         title:'组合字段维护-添加组合字段',
         form:{
-          moduleName:"",
-          hisName:"",
+          modeId:"",
+          hospitalId:"",
           name:'',
           remark:'',
         },
         id:null,
         rules:{
-          hisName:{ required: true, message: '请选择所属医院', trigger: ['blur', 'change']},
-          moduleName:{ required: true, message: '请选择所属模块', trigger: ['blur', 'change']},
+          hospitalId:{ required: true, message: '请选择所属医院', trigger: ['blur', 'change']},
+          modeId:{ required: true, message: '请选择所属模块', trigger: ['blur', 'change']},
           tagName:{ required: true, message: '请输入备注', trigger: ['blur', 'change']},
           /*name:[{ required: true, message: '请输入显示名称',trigger: ['blur', 'change'] }],*/
         },

src/components/qualityControl/CombineFeildList.vue

@@ -3,12 +3,12 @@
         <crumbs title="组合字段维护">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="所属医院：">
-                    <el-select size="mini" v-model="filter.hisType" placeholder="所属医院" clearable>
+                    <el-select size="mini" v-model="filter.hospitalId" placeholder="所属医院" clearable>
                         <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-select size="mini" v-model="filter.modeId" placeholder="所属模块" clearable>
                         <el-option v-for="item in fieldTypes" :label="item.name" :value="item.val" :key="item.val"></el-option>
                     </el-select>
                 </el-form-item>
@@ -34,13 +34,15 @@
                         width="60">
                 </el-table-column>-->
                 <el-table-column
-                        prop="hisName"
+                        prop="hospitalId"
                         label="所属医院"
                         width="150"
+                        :formatter="hisFormatter"
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
                         prop="moduleName"
+                        :formatter="moduleFormatter"
                         label="所属模块">
                 </el-table-column>
                 <el-table-column
@@ -93,8 +95,8 @@
         fieldTypes:[],
         hisTypes:[],
         filter: {
-          hisType:'',
-          moduleType:'',
+          hospitalId:'',
+          modeId:'',
           tagName: ''
         }
       }
@@ -104,6 +106,14 @@
       this.getDataList();
     },
     methods: {
+      moduleFormatter(item){
+        const field = this.fieldTypes.filter((it)=>it.val==item.modeId);
+        return field[0]?field[0].name:'';
+      },
+      hisFormatter(item){
+        const field = this.hisTypes.filter((it)=>it.val==item.hospitalId);
+        return field[0]?field[0].name:'';
+      },
       getAllTypes(){
         if(localStorage.getItem("qcModuleTypes")){
           this.hisTypes = JSON.parse(localStorage.getItem("qcHospitalTypes"));