diff --git a/src/views/components/DepartmentList.vue b/src/views/components/DepartmentList.vue new file mode 100644 index 0000000..d45938d --- /dev/null +++ b/src/views/components/DepartmentList.vue @@ -0,0 +1,121 @@ + + + + \ No newline at end of file diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue index ed7616e..6a59f3a 100644 --- a/src/views/manage/patientInfo/index.vue +++ b/src/views/manage/patientInfo/index.vue @@ -412,6 +412,9 @@ export default { this.queryParams.departmentId = null this.queryParams.wardId = null this.queryParams.attendingPhysicianId = null + setTimeout(() => { + this.attendingPhysicianlist = [] + }, 1000); }, //清空院区 clearcampusAgency() { diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue index 6277382..7b0c8dc 100644 --- a/src/views/manage/preHospitalized/index.vue +++ b/src/views/manage/preHospitalized/index.vue @@ -83,8 +83,8 @@ - - + @@ -262,8 +262,8 @@ - - + @@ -523,6 +523,7 @@ export default { // 查询参数 appointmentDate: [], queryParams: { + certificateIssuingDoctorId: undefined, pageNum: 1, pageSize: 10, appointmentDateStart: '', @@ -708,7 +709,7 @@ export default { sex: null, address: null, patientType: 'PRE_HOSPITALIZED_PATIENT', - certificateIssuingDoctor: null, + certificateIssuingDoctorId: null, mainDiagnosis: null, hospitalAgencyId: null, campusAgencyId: null, @@ -725,6 +726,7 @@ export default { }, resetHospital() { this.formHospital = { + attendingPhysicianId: undefined, patientName: null, patientPhone: null, familyMemberPhone: null, @@ -737,7 +739,6 @@ export default { certificateIssuingDoctor: null, visitMethod: 'BE_IN_HOSPITAL', mainDiagnosis: null, - attendingPhysicianId: null, hospitalAgencyId: null, campusAgencyId: null, departmentId: null, @@ -1013,8 +1014,6 @@ export default { // } // getDepartmentList(query).then(res => { if (type) { - - if (!typetwo) { this.formHospital.departmentId = null this.formHospital.wardId = null @@ -1036,8 +1035,6 @@ export default { // } // getDepartmentList(query).then(res => { if (type) { - - if (!typetwo) { this.formHospital.wardId = null this.form.wardId = null @@ -1053,13 +1050,19 @@ export default { this.form.campusAgencyId = null this.form.departmentId = null this.form.wardId = null + this.form.attendingPhysicianId = null this.formHospital.campusAgencyId = null this.formHospital.departmentId = null this.formHospital.wardId = null + this.formHospital.attendingPhysicianId = null } else { this.queryParams.campusAgencyId = null this.queryParams.departmentId = null this.queryParams.wardId = null + this.queryParams.attendingPhysicianId = null + setTimeout(() => { + this.attendingPhysicianlist = [] + }, 1000); } }, //清空院区 @@ -1137,6 +1140,10 @@ export default { window.removeEventListener('resize', this.getMaxTableHeight, true) }) }, + changecertificateIssuingDoctor(e) { + console.log(e) + console.log(this.queryParams) + }, } }; diff --git a/src/views/manage/template/index.vue b/src/views/manage/template/index.vue index 52c9f38..c8cfe4a 100644 --- a/src/views/manage/template/index.vue +++ b/src/views/manage/template/index.vue @@ -149,6 +149,7 @@ prop="templateContent" label="模板内容" align="center" + :show-overflow-tooltip="true" > diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue index 0c2800f..8de6a95 100644 --- a/src/views/manage/visitin/index.vue +++ b/src/views/manage/visitin/index.vue @@ -92,7 +92,7 @@ - + { + this.attendingPhysicianlist = [] + }, 1000); } }, //清空院区 diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue index 3ac6145..92179b4 100644 --- a/src/views/manage/visitout/index.vue +++ b/src/views/manage/visitout/index.vue @@ -69,7 +69,7 @@ - + - - + +
基本信息
@@ -251,58 +251,58 @@
- + - + - + - + - + - + - + - + - + - + @@ -310,13 +310,13 @@ - + - + -
-
-
{{ formview.propagandaTitle }}
- -
- -
知识卡片
-
- +
+
文章模板:{{ formview.propagandaTitle }}
+
+
{{ formview.propagandaTitle }}
+
+ +
知识卡片
+
+ +
-
+ + 关闭 + + -
-
+ + 关闭 + +
-
+
+
+
话术模板: + + 预览 +
+ + 预览 +
-
-
+ + 关闭 + + -
-
+ + 关闭 + +
@@ -851,18 +910,10 @@ import indexjs from "./indexjs.js"; export default indexjs;