Merge remote-tracking branch 'origin/master'

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

@@ -102,18 +102,18 @@ export default {
     },
     // 返回按钮
     goBack() {
-      this.$confirm('是否确认立即返回，返回后系统不再保存已填写内容', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        customClass: 'box-logout',
-        cancelButtonClass: 'resetBtn',
-        confirmButtonClass: 'queryBtn',
-        closeOnClickModal: false
-      }).then(() => {
-        // this.isShow = false
-        this.$emit('disChargModleClose', false)
-      })
+      // this.$confirm('是否确认立即返回，返回后系统不再保存已填写内容', '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning',
+      //   customClass: 'box-logout',
+      //   cancelButtonClass: 'resetBtn',
+      //   confirmButtonClass: 'queryBtn',
+      //   closeOnClickModal: false
+      // }).then(() => {
+      // this.isShow = false
+      this.$emit('disChargModleClose', false)
+      // })
     },
     closeModle() {
       this.inHospitalInfo = {