Merge remote-tracking branch 'origin/master'

src/views/service-management/hospitalization-management/components/handle-discharge.vue

@@ -73,6 +73,10 @@ export default {
     inHospitalInfo: {
       type: Object,
       default: false
+    },
+    flag: {
+      type: String,
+      default: '0'
     }
   },
   data() {
@@ -101,6 +105,9 @@ export default {
     },
     submitForm: function() {
       this.inHospitalInfo.status = '4'
+      if (this.flag === '1') {
+        this.inHospitalInfo.hospitalDetails = this.inHospitalInfo.hosDetailBos
+      }
       updateHospital(this.inHospitalInfo).then(res => {
         this.$message({
           showClose: true,

src/views/service-management/hospitalization-management/hospitalization-details.vue

@@ -364,7 +364,7 @@
       <!--      办理入院弹出框-->
       <handling-admissions :is-show="admissionShow" :in-hospital-info="detailInfo" @admissionModleClose="admissionModleClose" />
       <!--      出院办理弹出框-->
-      <handle-discharge :is-show="dischargeShow" :in-hospital-info="detailInfo" @disChargModleClose="disChargModleClose" />
+      <handle-discharge :is-show="dischargeShow" :flag="disChargeFlag" :in-hospital-info="detailInfo" @disChargModleClose="disChargModleClose" />
       <!--       更改病房弹出框-->
       <assign-wards ref="AssignWards" :is-show="changeWardShow" :in-hospital-info="detailInfo" @wardModleClose="wardModleClose" />
     </div>
@@ -384,6 +384,7 @@ export default {
   dicts: ['pet_sex', 'disease_level', 'vaccine_situation', 'exist_state', 'sterilization_status', 'pet_insure', 'cat_breed', 'dog_breed', 'other_breed', 'doctor_title', 'ward_type', 'hospital_status_in', 'in_hospital_detail'],
   data() {
     return {
+      disChargeFlag: '1',
       // 押金信息
       finTradeHis: [],
       // 住院信息
@@ -421,6 +422,7 @@ export default {
     },
     // 办理出院
     handDisCharge() {
+      console.log('详情', this.detailInfo)
       this.dischargeShow = true
     },
     // 办理入院

src/views/service-management/hospitalization-management/hospitalization-management.vue

@@ -241,7 +241,7 @@
     <!--      办理入院弹出框-->
     <handling-admissions :is-show="admissionsShow" :in-hospital-info="inHospitalInfo" @admissionModleClose="admissionModleClose" />
     <!--      出院办理弹出框-->
-    <handle-discharge :is-show="dischargeShow" :in-hospital-info="inHospitalInfo" @disChargModleClose="disChargModleClose" />
+    <handle-discharge :is-show="dischargeShow"  :flag="disChargeFlag" :in-hospital-info="inHospitalInfo" @disChargModleClose="disChargModleClose" />
 
   </div>
 </template>
@@ -258,6 +258,7 @@ export default {
   dicts: ['disease_level', 'pet_insure', 'ward_type', 'hospital_status_in'],
   data() {
     return {
+      disChargeFlag: '0',
       wardSelectList: [],
       dischargeId: '',
       // 出院办理弹窗口
@@ -345,6 +346,7 @@ export default {
     handleDischargeMe(row) {
       this.dischargeShow = true
       this.inHospitalInfo = row
+      console.log('详情', row)
     },
     // 入院办理
     handleadmission(row) {