Merge remote-tracking branch 'origin/AIControl' into AIControl

src/components/qualityControl/AddQualityControlTemp.vue

@@ -10,8 +10,8 @@
                             <el-option v-for="item in hospitalList" :key="item.id" :label="item.name" :value="item.val"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="选择模块：" prop="moduleName" class="formItem">
-                        <el-select  v-model="form.moduleName" placeholder="请选择模块"  :disabled="isEdit" class="selectModule" @change="changeHsopital">
+                    <el-form-item label="所属模块：" prop="moduleName" class="formItem">
+                        <el-select  v-model="form.moduleName" placeholder="请选择所属模块"  :disabled="isEdit" class="selectModule" @change="changeHsopital">
                             <el-option v-for="item in moduleList" :key="item.id" :label="item.name" :value="item.val"></el-option>
                         </el-select>
                     </el-form-item>
@@ -39,7 +39,7 @@
                                 <ul v-if="searchIndex == index &&  item.searchResult.length > 0" class="searchResultBox">
                                     <li class="searchItem" 
                                         v-for="searchItem in item.searchResult" 
-                                        :title="searchItem.name"
+                                        :title="searchItem.tagName"
                                         @click="selectSearchFiled(searchItem,index)"
                                     >
                                         {{searchItem.tagName}}
@@ -95,7 +95,7 @@ export default {
             rules:{
                 tempName:{ required: true, message: '请输入模块名称', trigger: ['blur', 'change']},
                 hospital:{ required: true, message: '请选择医院', trigger: ['blur', 'change']},
-                moduleName:{ required: true, message: '请选择模块', trigger: ['blur', 'change']},
+                moduleName:{ required: true, message: '请选择所属模块', trigger: ['blur', 'change']},
                 moduleType:{ required: true, message: '请选择模块类型   ', trigger: ['blur', 'change']},
                 /*name:[{ required: true, message: '请输入显示名称',trigger: ['blur', 'change'] }],*/
             },
@@ -553,6 +553,8 @@ export default {
     border: 1px solid #dcdfe6;
     border-radius: 4px;
     padding: 5px 10px;
+    display: inline-block;
+    line-height: 20px;
 }
 .activeFiledName{
     border: 1px solid #48C5D7;

src/components/qualityControl/QualityControlTemp.vue

@@ -5,8 +5,8 @@
                  <el-form-item label="模板名称：">
                     <el-input size="mini" v-model.trim="filter.modeName" placeholder="模板名称" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="数据模块：">
-                     <el-select size="mini" v-model.trim="filter.modeId" @change="getValue"  placeholder="数据模块" clearable>
+                <el-form-item label="所属模块：">
+                     <el-select size="mini" v-model.trim="filter.modeId" @change="getValue"  placeholder="所属模块" clearable>
                         <el-option v-for="item in moduleList" :label="item.name" :value="item.val" :key="item.id" ></el-option>
                     </el-select>
                 </el-form-item>
@@ -42,7 +42,7 @@
                 <el-table-column
                         :resizable = "false"
                         prop="modeId"
-                        label="数据模块">
+                        label="所属模块">
                 </el-table-column>
                 
                 <el-table-column