Merge branch 'feature/zjx' into 'release'

Feature/zjx

See merge request !193

src/views/appoint-demo/index.vue

@@ -76,6 +76,7 @@
             right-icon="arrow"
             placeholder="请选择检测机构"
             :rules="[{ required: true, message: '请选择检测机构' }]"
+            @click="showPicker=true"
           >
             <template #input>
               <div
@@ -136,6 +137,19 @@
       @change="selectTimes"
       @close="closePopup"
     />
+    <van-popup
+      v-model="showPicker"
+      round
+      position="bottom"
+    >
+      <van-picker
+        show-toolbar
+        :columns="hospitalNameList"
+        value-key="hospitalName"
+        @cancel="showPicker = false"
+        @confirm="onConfirm"
+      />
+    </van-popup>
   </div>
 </template>
 
@@ -163,6 +177,7 @@ export default {
         style: 'backgroundColor:#ffffff;zIndex:100;',
         background: '',
       },
+      showPicker:false,
       dectionData:{},
       dectionForm: {
         detectName: '',
@@ -173,6 +188,17 @@ export default {
         hospitalName:'人民医院和平社区健康服务中心',
         location: '深圳市坪山区',
       },
+      hospitalNameList: [
+        {
+          hospitalName: '人民医院和平社区健康服务中心',
+          value:1139136
+        },
+        {
+          hospitalName: '深圳市罗湖区新围社区健康服务中心',
+          value:539629
+        },
+
+      ],
       showAreaLabel:'',
       showArea:false,
       reportShow: false,
@@ -226,6 +252,12 @@ export default {
         this.$loading.hide();
       });
     },
+    onConfirm(item) {
+      console.log(item);
+      this.dectionForm.hospitalName = item.hospitalName;
+      this.hospitalId = item.value;
+      this.showPicker = false;
+    },
     selectTimes(times) {
       console.log(times);
       const {value, currentItemChoosed} = times;