Merge branch 'dev' into dev2/luolei

src/components/icss/MedicalName.vue

@@ -6,11 +6,7 @@
                     <el-input size="mini" v-model="filter.term" placeholder="输入术语"></el-input>
                 </el-form-item>
                 <el-form-item label="术语类型：">
-                  <el-select v-model="filter.type" 
-                  clearable 
-                  filterable 
-                  placeholder="请选择" 
-                  size="mini">
+                  <el-select v-model="filter.type" clearable filterable placeholder="请选择" size="mini">
                     <el-option
                       v-for="item in typeList"
                       :key="item.id"

src/components/icss/PubTagGroup.vue

@@ -142,6 +142,25 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item
+        v-if="form.region1 == 1 && form.region2 ==4"
+        label="是否为症状"
+        prop="region12"
+      >
+        <el-select
+          v-model="form.region12"
+          @change="sendData"
+        >
+          <el-option
+            label="是"
+            value="0"
+          ></el-option>
+          <el-option
+            label="不是"
+            value="1"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item
         label="年龄："
         prop="region8"

src/components/icss/PubTagPartDetail.vue

@@ -134,6 +134,10 @@ export default {
         type: Array
     }
   },
+
+  destroyed:function(){
+    this.searchVal = ''
+  },
   data() {
     return {
       poolDetailList: [[{questionDetailList:[]}],[{questionDetailList:[]}],[],[],[],[]],     //默认6个部分