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

src/views/components/SearchForm.vue

@@ -32,7 +32,7 @@
         icon="el-icon-upload2"
         size="mini"
         @click="handleUpload"
-        v-if="this.$router.currentRoute.path == '/patient/Patientmanagement'"
+        v-if="this.$router.currentRoute.path == '/patient/Patientmanagement' || patientUploadButtonVisible=='true'"
         >导入</el-button
       >
 
@@ -447,6 +447,10 @@ export default {
       type: String,
       default: 'small',
     },
+    patientUploadButtonVisible:{
+      type:String,
+      default:'false'
+    }
   },
   data() {
     return {