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

This commit is contained in:
闫晓茹 2024-04-29 16:31:49 +08:00
commit 2e51001c54
12 changed files with 29 additions and 29 deletions

View File

@ -470,7 +470,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id, type)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
if (type) {

View File

@ -190,7 +190,7 @@ export default {
//
usergetListinfo() {
usergetList({
agencyId: this.queryParams.hospitalAgencyId,
hospitalAgencyId: this.queryParams.hospitalAgencyId,
postName: 'DOCTOR'
}).then(res => {
this.attendingPhysicianlist = res.data
@ -312,7 +312,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
// this.departmentlist = res.data

View File

@ -223,7 +223,7 @@ export default {
//
usergetListinfo() {
usergetList({
agencyId: this.queryParams.hospitalAgencyId,
hospitalAgencyId: this.queryParams.hospitalAgencyId,
postName: 'DOCTOR'
}).then(res => {
this.attendingPhysicianlist = res.data
@ -345,7 +345,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
// this.departmentlist = res.data

View File

@ -713,7 +713,7 @@ export default {
//
usergetListinfo(id, type) {
usergetList({
agencyId: id,
hospitalAgencyId: id,
postName: 'DOCTOR'
}).then(res => {
if (type) {
@ -785,7 +785,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id, type)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
if (type) {

View File

@ -1090,7 +1090,7 @@ export default {
this.form.diseaseTypeId = '';
let query = {
nodeType: 'DEPARTMENT',
agencyId: e,
hospitalAgencyId: e,
}
getDepartmentList(query).then(res => {
this.Departmentdata = res.data

View File

@ -600,7 +600,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
this.queryParams.departmentId = null

View File

@ -805,7 +805,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id, type)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
if (type) {
@ -893,7 +893,7 @@ export default {
//
usergetListinfo(id, type) {
usergetList({
agencyId: id,
hospitalAgencyId: id,
postName: 'DOCTOR'
}).then(res => {
if (type) {

View File

@ -638,7 +638,7 @@ export default {
//
usergetListinfotwo(id) {
usergetList({
agencyId: id,
hospitalAgencyId: id,
postName: 'DOCTOR'
}).then(res => {
this.addsignattendingPhysicianlist = res.data
@ -873,7 +873,7 @@ export default {
//
usergetListinfo(id, type) {
usergetList({
agencyId: id,
hospitalAgencyId: id,
postName: 'DOCTOR'
}).then(res => {
if (type) {
@ -945,7 +945,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id, type)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
if (type) {

View File

@ -138,7 +138,7 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<!-- <el-table-column label="上级科室id" align="center" prop="parentDepartmentId" />
<el-table-column label="所属机构id" align="center" prop="agencyId" /> -->
<el-table-column label="所属机构id" align="center" prop="hospitalAgencyId" /> -->
<!-- <el-table-column label="所属机构名称" align="center" prop="agencyName" /> -->
<el-table-column
label="科室名称"
@ -330,8 +330,8 @@
placeholder="请输入上级科室id"
/>
</el-form-item>
<el-form-item label="所属机构id" prop="agencyId">
<el-input v-model="form.agencyId" placeholder="请输入所属机构id" />
<el-form-item label="所属机构id" prop="hospitalAgencyId">
<el-input v-model="form.hospitalAgencyId" placeholder="请输入所属机构id" />
</el-form-item>
<el-form-item label="所属机构名称" prop="agencyName">
<el-input
@ -415,7 +415,7 @@
:options="treeOptions"
@change="change($event)"
style="width: 205px; color: black"
v-model="form.agencyId"
v-model="form.hospitalAgencyId"
:show-all-levels="false"
:placeholder="
form.agencyName ? form.agencyName : '请选择所属机构'
@ -682,7 +682,7 @@ export default {
pageNum: 1,
pageSize: 10,
parentDepartmentId: null,
agencyId: null,
hospitalAgencyId: null,
agencyName: null,
departmentName: null,
departmentCode: null,
@ -834,8 +834,8 @@ export default {
change(e) {
console.log(e, "78");
if (e) {
this.form.agencyId = e[e.length - 1];
if (this.form.agencyId) {
this.form.hospitalAgencyId = e[e.length - 1];
if (this.form.hospitalAgencyId) {
const arr = this.$refs["cascader"].getCheckedNodes()[0].pathLabels;
// console.log(arr, "5555555");
this.form.agencyName = arr.slice(-1).join(",");
@ -912,7 +912,7 @@ export default {
//
handleNodeClick(data) {
console.log(data, "5");
this.queryParams.agencyId = data.id;
this.queryParams.hospitalAgencyId = data.id;
this.getList();
},
/** 查询科室信息列表 */
@ -934,7 +934,7 @@ export default {
this.form = {
id: null,
parentDepartmentId: null,
agencyId: null,
hospitalAgencyId: null,
agencyName: null,
departmentName: null,
departmentCode: null,

View File

@ -313,7 +313,7 @@ export default {
//
usergetListinfo() {
usergetList({
agencyId: this.queryParams.hospitalAgencyId,
hospitalAgencyId: this.queryParams.hospitalAgencyId,
postName: 'DOCTOR'
}).then(res => {
this.attendingPhysicianlist = res.data

View File

@ -1001,7 +1001,7 @@ export default {
},
formlist: {
userId: "",
agencyId: "",
hospitalAgencyId: "",
userName: "",
},
formlistdep: {
@ -1016,7 +1016,7 @@ export default {
},
formlists: {
userId: "",
agencyId: "",
hospitalAgencyId: "",
userName: "",
},
//
@ -1142,7 +1142,7 @@ export default {
});
this.nowSelectData = selection;
if (selection.length > 0) {
this.formlist.agencyId = selection[0].agencyId;
this.formlist.hospitalAgencyId = selection[0].hospitalAgencyId;
}
},

View File

@ -227,7 +227,7 @@ export default {
//
usergetListinfo() {
usergetList({
agencyId: this.$route.query.hospitalAgencyId,
hospitalAgencyId: this.$route.query.hospitalAgencyId,
postName: 'DOCTOR'
}).then(res => {
this.attendingPhysicianlist = res.data
@ -237,7 +237,7 @@ export default {
changecampusAgency() {
let query = {
nodeType: 'DEPARTMENT',
agencyId: this.$route.query.hospitalAgencyId,
hospitalAgencyId: this.$route.query.hospitalAgencyId,
}
getDepartmentList(query).then(res => {
this.departmentlist = res.data