diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..c146a5e Binary files /dev/null and b/dist.zip differ diff --git a/src/assets/住院费用.png b/src/assets/住院费用.png new file mode 100644 index 0000000..b74743e Binary files /dev/null and b/src/assets/住院费用.png differ diff --git a/src/assets/住院费用清单.png b/src/assets/住院费用清单.png new file mode 100644 index 0000000..e03dea7 Binary files /dev/null and b/src/assets/住院费用清单.png differ diff --git a/src/assets/预交金.png b/src/assets/预交金.png new file mode 100644 index 0000000..78efec4 Binary files /dev/null and b/src/assets/预交金.png differ diff --git a/src/request/api.js b/src/request/api.js index 349aa16..26c7e72 100644 --- a/src/request/api.js +++ b/src/request/api.js @@ -331,6 +331,11 @@ export const apiUpdateBA = p => post('/bingan/apiUpdateBA', p); //退费接口 export const WxRefundOrder = p => post('/pay/wxpay/refundOrder', p); +//获取线上缴费金额总数 +export const SumWxBalance = p => post('/sfs/SumWxBalance', p); +//获取线上退费金额 +export const DelWxBalance = p => post('/sfs/DelWxBalance', p); + diff --git a/src/router/index.js b/src/router/index.js index fa787be..b1b2fe2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -89,6 +89,10 @@ import Zhdz_ai from "../views/Zhdz_ai.vue"; import tui from "../views/tui.vue"; import ybAUTH from "../views/ybAUTH.vue"; import Zstj_home from "../views/Zstj_home.vue"; +import ZYindex2 from "../views/ZYindex2.vue"; +import ZYdetail from "../views/ZYdetail.vue"; + + Vue.use(VueRouter); const router = new VueRouter({ @@ -637,6 +641,22 @@ const router = new VueRouter({ meta: { title: "住院管理", }, + }, + { + path: "/ZYindex2", + name: "ZYindex2", + component: ZYindex2, + meta: { + title: "住院列表", + }, + }, + { + path: "/ZYdetail", + name: "ZYdetail", + component: ZYdetail, + meta: { + title: "住院详情", + }, }, { path: "/ZYCharge", diff --git a/src/views/Bayj_wdsq.vue b/src/views/Bayj_wdsq.vue index ca07179..048e419 100644 --- a/src/views/Bayj_wdsq.vue +++ b/src/views/Bayj_wdsq.vue @@ -388,6 +388,18 @@ export default { // 确认支付 confirmPayment() { + // 检查当前时间是否在23:00-00:01之间,这个时间段内禁止充值 + const now = new Date(); + const hours = now.getHours(); + const minutes = now.getMinutes(); + + if ((hours === 23 && minutes >= 0) || (hours === 0 && minutes <= 1)) { + Toast({ + message: '当前时间段(23:00-00:01)正在对账,暂不支持支付操作,请0点过后再试!', + duration: 5000 + }); + return; + } // 防止重复点击:如果正在支付中,直接返回 if (this.isPaying) return; diff --git a/src/views/Ghxq.vue b/src/views/Ghxq.vue index 7044f97..adab20a 100644 --- a/src/views/Ghxq.vue +++ b/src/views/Ghxq.vue @@ -358,14 +358,14 @@ export default { Toast("请选择支付方式"); return; } - // 检查当前时间是否在23:48-00:01之间,这个时间段内禁止充值 + // 检查当前时间是否在23:00-00:01之间,这个时间段内禁止充值 const now = new Date(); const hours = now.getHours(); const minutes = now.getMinutes(); - if ((hours === 23 && minutes >= 48) || (hours === 0 && minutes <= 1)) { + if ((hours === 23 && minutes >= 0) || (hours === 0 && minutes <= 1)) { Toast({ - message: '当前时间段(23:48-00:01)正在对账,暂不支持支付操作,请0点过后再试!', + message: '当前时间段(23:00-00:01)正在对账,暂不支持支付操作,请0点过后再试!', duration: 5000 }); return; diff --git a/src/views/Home.vue b/src/views/Home.vue index 796b007..fef2e3b 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -79,7 +79,7 @@
  • - + 住院管理
  • diff --git a/src/views/JiaoFei_detail.vue b/src/views/JiaoFei_detail.vue index c4f98be..06bfd93 100644 --- a/src/views/JiaoFei_detail.vue +++ b/src/views/JiaoFei_detail.vue @@ -262,9 +262,9 @@ export default { const hours = now.getHours(); const minutes = now.getMinutes(); - if ((hours === 23 && minutes >= 48) || (hours === 0 && minutes <= 1)) { + if ((hours === 23 && minutes >= 0) || (hours === 0 && minutes <= 1)) { Toast({ - message: '当前时间段(23:48-00:01)正在对账,暂不支持支付操作,请0点过后再试!', + message: '当前时间段(23:00-00:01)正在对账,暂不支持支付操作,请0点过后再试!', duration: 5000 }); return; diff --git a/src/views/Member_wdbg.vue b/src/views/Member_wdbg.vue index ea66635..8fff544 100644 --- a/src/views/Member_wdbg.vue +++ b/src/views/Member_wdbg.vue @@ -506,12 +506,17 @@ console.log(item); let that = this; that.list = []; that.lislist = []; + // 计算加1天后的结束日期 + let endDate = new Date(that.enddate); + endDate.setDate(endDate.getDate() + 1); + let formattedEndDate = that.formatDate(endDate); + let formData = { QueryCode: that.card.cardNo, //QueryCode:"0001238384", QueryType: 1, StartTime: that.startdate + " 00:00:00", - EndTime: that.enddate + " 23:59:59", + EndTime: formattedEndDate+ " 23:59:59", }; if (that.card.cardNo == null) { Toast("请选择就诊人"); diff --git a/src/views/ZYCharge.vue b/src/views/ZYCharge.vue index 9180431..aeb967a 100644 --- a/src/views/ZYCharge.vue +++ b/src/views/ZYCharge.vue @@ -1,8 +1,8 @@