Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
83774c064c
@ -32,7 +32,7 @@
|
|||||||
icon="el-icon-upload2"
|
icon="el-icon-upload2"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="handleUpload"
|
@click="handleUpload"
|
||||||
v-if="this.$router.currentRoute.path == '/patient/Patientmanagement'"
|
v-if="this.$router.currentRoute.path == '/patient/Patientmanagement' || patientUploadButtonVisible=='true'"
|
||||||
>导入</el-button
|
>导入</el-button
|
||||||
>
|
>
|
||||||
|
|
||||||
@ -447,6 +447,10 @@ export default {
|
|||||||
type: String,
|
type: String,
|
||||||
default: 'small',
|
default: 'small',
|
||||||
},
|
},
|
||||||
|
patientUploadButtonVisible:{
|
||||||
|
type:String,
|
||||||
|
default:'false'
|
||||||
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user