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

# Conflicts:
#	src/views/manage/materials/index.vue
This commit is contained in:
shidongli 2024-03-01 17:28:15 +08:00
commit f282bde78e
2 changed files with 18 additions and 0 deletions

View File

@ -290,6 +290,9 @@ export default {
}
selectAgencyList(query).then(res => {
this.campusAgencylist = res.data
this.queryParams.campusAgencyId = null
this.queryParams.departmentId = null
this.queryParams.wardId = null
})
},
//
@ -300,6 +303,8 @@ export default {
}
getDepartmentList(query).then(res => {
this.departmentlist = res.data
this.queryParams.departmentId = null
this.queryParams.wardId = null
})
},
//
@ -310,6 +315,7 @@ export default {
}
getDepartmentList(query).then(res => {
this.wardlist = res.data
this.queryParams.wardId = null
})
},
//

View File

@ -443,6 +443,9 @@ export default {
}
selectAgencyList(query).then(res => {
this.campusAgencylist = res.data
this.queryParams.campusAgencyId = null
this.queryParams.departmentId = null
this.queryParams.wardId = null
})
},
//
@ -453,6 +456,8 @@ export default {
}
getDepartmentList(query).then(res => {
this.departmentlist = res.data
this.queryParams.departmentId = null
this.queryParams.wardId = null
})
},
//
@ -463,6 +468,7 @@ export default {
}
getDepartmentList(query).then(res => {
this.wardlist = res.data
this.queryParams.wardId = null
})
},
//
@ -471,6 +477,12 @@ export default {
this.queryParams.departmentId = null
this.queryParams.wardId = null
},
//
clearhospitalAgency() {
this.queryParams.campusAgencyId = null
this.queryParams.departmentId = null
this.queryParams.wardId = null
},
//
clearcampusAgency() {
this.queryParams.departmentId = null