From d4e5e908c5a60cfe9002424a2b7e22e025e38643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 4 Jul 2024 11:23:13 +0800
Subject: [PATCH] xg

---
 src/views/manage/visitout/index.vue           | 35 +++++++++++--------
 .../operationInfo/operationInfo/index.vue     | 28 ++++-----------
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index 284d368..92179b4 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -202,8 +202,8 @@
     <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
       :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
     <!-- 添加或修改患者信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :before-close="handleClose">
+      <el-form ref="openform" :model="form" :rules="rules" label-width="100px" :inline="true">
         <div class="title">基本信息</div>
         <el-form-item label="患者姓名" prop="patientName">
           <el-input v-model="form.patientName" placeholder="请输入患者姓名" style="width:200px" />
@@ -251,58 +251,58 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="form.hospitalAgencyId">
+        <el-form-item label="院区" prop="campusAgencyId" v-show="form.hospitalAgencyId">
           <el-select v-model="form.campusAgencyId" filterable placeholder="请选择院区" style="width:200px" clearable
             @clear="clearcampusAgency(1)" @change="changecampusAgency($event, 1)">
             <el-option v-for="item in form_campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="科室名称" prop="departmentId" v-if="form.hospitalAgencyId">
+        <el-form-item label="科室名称" prop="departmentId" v-show="form.hospitalAgencyId">
           <el-select v-model="form.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable
             @clear="cleardepartment(1)" @change="changedepartment($event, 1)">
             <el-option v-for="item in form_departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="预约病区" prop="wardId" v-if="form.hospitalAgencyId">
+        <el-form-item label="预约病区" prop="wardId" v-show="form.hospitalAgencyId">
           <el-select v-model="form.wardId" filterable placeholder="请选择病区" style="width:200px" clearable>
             <el-option v-for="item in form_wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="主治医生" prop="attendingPhysician" v-if="form.hospitalAgencyId">
+        <el-form-item label="主治医生" prop="attendingPhysician" v-show="form.hospitalAgencyId">
           <el-select v-model="form.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px" clearable>
             <el-option v-for="item in form_attendingPhysicianlist" :key="item.userId" :label="item.nickName"
               :value="item.userId">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="门诊号" prop="inHospitalNumber" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
+        <el-form-item label="门诊号" prop="inHospitalNumber" v-show="form.visitMethod == 'OUTPATIENT_SERVICE'">
           <el-input v-model="form.inHospitalNumber" placeholder="请输入门诊号" style="width:200px"
             onKeyUp="value=value.replace(/[\W]/g,'')" />
         </el-form-item>
-        <el-form-item label="住院号" prop="inHospitalNumber" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+        <el-form-item label="住院号" prop="inHospitalNumber" v-show="form.visitMethod == 'BE_IN_HOSPITAL'">
           <el-input v-model="form.inHospitalNumber" placeholder="请输入住院号" style="width:200px"
             onKeyUp="value=value.replace(/[\W]/g,'')" />
         </el-form-item>
-        <el-form-item label="责任护士" prop="responsibleNurse" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+        <el-form-item label="责任护士" prop="responsibleNurse" v-show="form.visitMethod == 'BE_IN_HOSPITAL'">
           <el-input v-model="form.responsibleNurse" placeholder="请输入责任护士" style="width:200px" />
         </el-form-item>
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
         </el-form-item>
-        <el-form-item label="门诊时间" prop="dischargeTime" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
+        <el-form-item label="门诊时间" prop="dischargeTime" v-show="form.visitMethod == 'OUTPATIENT_SERVICE'">
           <el-date-picker clearable v-model="form.dischargeTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
             format='yyyy-MM-dd HH:mm' placeholder="请选择门诊时间" style="width:200px">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="入院时间" prop="admissionTime" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+        <el-form-item label="入院时间" prop="admissionTime" v-show="form.visitMethod == 'BE_IN_HOSPITAL'">
           <el-date-picker clearable v-model="form.admissionTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
             format='yyyy-MM-dd HH:mm' style="width:200px" placeholder="请选择入院时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="出院时间" prop="dischargeTime" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+        <el-form-item label="出院时间" prop="dischargeTime" v-show="form.visitMethod == 'BE_IN_HOSPITAL'">
           <el-date-picker clearable v-model="form.dischargeTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
             format='yyyy-MM-dd HH:mm' :picker-options="pickerOptions" style="width:200px" placeholder="请选择出院时间">
           </el-date-picker>
@@ -310,13 +310,13 @@
         <el-form-item label="手术名称" prop="surgicalName">
           <el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
         </el-form-item>
-        <el-form-item label="手术记录" prop="surgicalRecord" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+        <el-form-item label="手术记录" prop="surgicalRecord" v-show="form.visitMethod == 'BE_IN_HOSPITAL'">
           <editor v-model="form.surgicalRecord" :min-height="192" style="width:838px" />
         </el-form-item>
         <el-form-item label="入院病历">
           <editor v-model="form.inHospitalInfo" :min-height="192" style="width:838px" />
         </el-form-item>
-        <el-form-item label="出院病历" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
+        <el-form-item label="出院病历" v-show="form.visitMethod == 'BE_IN_HOSPITAL'">
           <editor v-model="form.outHospitalInfo" :min-height="192" style="width:838px" />
         </el-form-item>
         <!-- <el-form-item label="患者来源" prop="patientSource">
@@ -743,7 +743,7 @@ export default {
         patientSource: null,
         delFlag: null,
       };
-      this.resetForm("form");
+      this.resetForm("openform");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -782,6 +782,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.patientVisitRecordId || this.patientVisitRecordIds
+      console.log(id)
       getPatientInfo(id).then(response => {
         this.form = response.data;
         this.form = response.data;
@@ -798,6 +799,10 @@ export default {
         this.title = "修改患者信息";
       });
     },
+    handleClose() {
+      this.form = {}
+      this.open = false
+    },
     /** 提交按钮 */
     submitForm() {
       if (this.form.visitMethod == 'BE_IN_HOSPITAL') {
diff --git a/src/views/operationInfo/operationInfo/index.vue b/src/views/operationInfo/operationInfo/index.vue
index 8f50ab4..514975c 100644
--- a/src/views/operationInfo/operationInfo/index.vue
+++ b/src/views/operationInfo/operationInfo/index.vue
@@ -2,24 +2,7 @@
   <div class="app-container" ref="layout">
     <el-row :gutter="20">
       <el-col :span="5" :xs="24">
-        <div class="left" ref="box">
-          <div class="name">科室名称</div>
-          <div>
-            <el-input v-model="name" placeholder="请输入科室名称" clearable @keyup.enter.native="handleQuery" />
-          </div>
-          <div class="listitem">
-            <div :class="itemname == null ? 'allactive' : 'all'" @click="itemdata()">
-              全部
-            </div>
-            <span class="count">{{ count }}</span>
-          </div>
-          <div class="listitem" v-for="(item, index) in DepartmentoList" :key="index" @click="itemdata(item)">
-            <div :class="itemname == item.id ? 'allactive' : 'all'">
-              {{ item.departmentName }}
-            </div>
-            <span class="count">{{ item.countNum }}</span>
-          </div>
-        </div>
+        <DepartmentList ref="DepartmentList"></DepartmentList>
       </el-col>
       <el-col :span="19" :xs="24">
         <div ref="topform" class="form">
@@ -145,7 +128,11 @@
 <script>
 import { listOperationInfo, getOperationInfo, delOperationInfo, addOperationInfo, updateOperationInfo, listOperationNum } from "@/api/operationInfo/operationInfo";
 import { department, listDisease } from "@/api/manage/script";
+import DepartmentList from '../../components/DepartmentList.vue'
 export default {
+  components: {
+    DepartmentList,
+  },
   name: "OperationInfo",
   data() {
     return {
@@ -157,8 +144,6 @@ export default {
       name: '',
       departmentId: null,
       count: '',
-
-
       innerVisibleshow: false, //科室弹框
       // 科室
       informationqueryParams: {
@@ -168,7 +153,6 @@ export default {
       },
       infolist: [],
       totaldepartment: 0,
-
       // 遮罩层
       loading: true,
       // 选中数组
@@ -266,7 +250,7 @@ export default {
   mounted() {
     this.getMaxTableHeight()
     this.screenChange()
-    // this.$refs.box.addEventListener('scroll', this.lazyLoading) // 滚动到底部，再加载的处理事件
+    // this.$refs.DepartmentList.addEventListener('scroll', this.lazyLoading) // 滚动到底部，再加载的处理事件
   },
   methods: {
     // 点击科室