入出院审核结果的对话框区分cancel和close

src/views/medical-insurance/inpatient/AdmRegistration.vue

@@ -465,10 +465,6 @@ export default {
       })
     }
 
-    const searchMethod = computed(() => {
-      return store.state.ptnt.searchMethod
-    })
-
     const searchPhysician = () => {
       searchParams.title = '管床医生'
       searchParams.target = 'physician'
@@ -542,17 +538,20 @@ export default {
                 getPsnInsuinfo()
                 break
               case 2:
-                ElMessageBox.alert('医保科驳回了此患者的医保入院申请，驳回意见为【' + res.handleComment + '】', '提示', {
+                ElMessageBox.confirm('医保科驳回了此患者的医保入院申请，驳回意见为【' + res.handleComment + '】', '提示', {
                   type: 'error',
+                  distinguishCancelAndClose: true,
                   confirmButtonText: '我知道了',
                   cancelButtonText: '重新提交',
                   showCancelButton: true,
-                }).catch(() => {
-                  admissApply.value.patNo = patient.value.inpatientNo
-                  admissApply.value.times = patient.value.admissTimes
-                  admissApply.value.ledgerSn = patient.value.ledgerSn
-                  admissApply.value.admissDatetime = patient.value.ybRegisterDate
-                  showAdmissApplyForm.value = true
+                }).catch((action) => {
+                  if (action === 'cancel') {
+                    admissApply.value.patNo = patient.value.inpatientNo
+                    admissApply.value.times = patient.value.admissTimes
+                    admissApply.value.ledgerSn = patient.value.ledgerSn
+                    admissApply.value.admissDatetime = patient.value.ybRegisterDate
+                    showAdmissApplyForm.value = true
+                  }
                 })
                 break
             }

src/views/medical-insurance/inpatient/DiscSettlement.vue

@@ -420,33 +420,36 @@ export default {
               }
               break
             case 2:
-              ElMessageBox.alert('医保科驳回了此患者的' + dismissBtnText.value + '申请，驳回意见为【' + res.handleComment + '】', '提示', {
+              ElMessageBox.confirm('医保科驳回了此患者的' + dismissBtnText.value + '申请，驳回意见为【' + res.handleComment + '】', '提示', {
                 type: 'error',
+                distinguishCancelAndClose: true,
                 confirmButtonText: '我知道了',
                 cancelButtonText: '重新提交',
                 showCancelButton: true,
-              }).catch(() => {
-                patient.value.sid = store.getters['user/sid']
-                patient.value.zjdzDatetime = res.settleDatetime
-                dismissCalculate(patient.value)
-                  .then(() => {
-                    settleApply.value.patNo = patient.value.inpatientNo
-                    settleApply.value.times = patient.value.admissTimes
-                    settleApply.value.ledgerSn = patient.value.ledgerSn
-                    settleApply.value.type = res.type
-                    settleApply.value.inputComment = null
-                    settleApply.value.settleDatetime = res.settleDatetime
-                    showSettleApplyForm.value = true
-                  })
-                  .catch((res) => {
-                    if (res.code && res.code === 1004) {
-                      negativeFees.value = res.data
-                      showNegativeFee.value = true
-                      dismissCalMsg.value = res.message
-                    } else {
-                      dismissCalMsg.value = res.toString()
-                    }
-                  })
+              }).catch((action) => {
+                if (action === 'cancel') {
+                  patient.value.sid = store.getters['user/sid']
+                  patient.value.zjdzDatetime = res.settleDatetime
+                  dismissCalculate(patient.value)
+                    .then(() => {
+                      settleApply.value.patNo = patient.value.inpatientNo
+                      settleApply.value.times = patient.value.admissTimes
+                      settleApply.value.ledgerSn = patient.value.ledgerSn
+                      settleApply.value.type = res.type
+                      settleApply.value.inputComment = null
+                      settleApply.value.settleDatetime = res.settleDatetime
+                      showSettleApplyForm.value = true
+                    })
+                    .catch((res) => {
+                      if (res.code && res.code === 1004) {
+                        negativeFees.value = res.data
+                        showNegativeFee.value = true
+                        dismissCalMsg.value = res.message
+                      } else {
+                        dismissCalMsg.value = res.toString()
+                      }
+                    })
+                }
               })
               break
           }