Commit 2845aab1 authored by 任鸿志's avatar 任鸿志

refactor(jiesuan): 门诊收费界面布局及功能调整

- 调整了界面布局,优化了元素间距和排版
- 注释掉了部分暂时不需要的功能按钮
- 修改了智慧医保支付的相关逻辑和显示
- 优化了表格样式和高度
- 调整了部分功能的位置和展示方式
parent cb91b543
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
</div> </div>
</el-card> </el-card>
<div style="display: flex; flex-direction: column; margin-top: 10px" v-loading="yujiesuanLoading"> <div style="display: flex; justify-content: space-between;; margin-top: 10px" v-loading="yujiesuanLoading">
<div class="box-card"> <div class="box-card">
<div class="box_card_title"> <div class="box_card_title">
<div style="display: flex; justify-content: space-between; width: 100%"> <div style="display: flex; justify-content: space-between; width: 100%">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<div style="display: flex"> <div style="display: flex">
<el-checkbox v-model="gz_name" style="margin-right: 10px">转为个账账单</el-checkbox> <el-checkbox v-model="gz_name" style="margin-right: 10px">转为个账账单</el-checkbox>
<el-checkbox v-model="man_name">转为自费账单</el-checkbox> <el-checkbox v-model="man_name">转为自费账单</el-checkbox>
<el-checkbox v-model="insurance_payment">智慧医保支付</el-checkbox> <!-- <el-checkbox v-model="insurance_payment">智慧医保支付</el-checkbox> -->
</div> </div>
<!-- <div style="display: flex" v-if="patientInfo.yblx != '01'"> <!-- <div style="display: flex" v-if="patientInfo.yblx != '01'">
<div style="line-height: 28px; width: 75px">结算类型:</div> <div style="line-height: 28px; width: 75px">结算类型:</div>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</el-select> </el-select>
</div> </div>
</div> --> </div> -->
<el-button type="primary" size="mini" round @click="jshistory">结算历史</el-button> <!-- <el-button type="primary" size="mini" round @click="jshistory">结算历史</el-button> -->
</div> </div>
</div> </div>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:data="tableDataList" :data="tableDataList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%; height: calc(30vh)" style="width: 100%;"
:header-cell-style="{ background: '#E7EEFF', color: '#333333' }" :header-cell-style="{ background: '#E7EEFF', color: '#333333' }"
v-loading="loading" v-loading="loading"
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
...@@ -74,16 +74,15 @@ ...@@ -74,16 +74,15 @@
<el-table-column prop="total" align="center" label="总金额" width="110"> </el-table-column> <el-table-column prop="total" align="center" label="总金额" width="110"> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="box-card" style="margin-top: 10px"> <div class="box-card">
<div class="box_card_title"> <div class="box_card_title" style="margin-bottom: 25px;">
<div @click="addEventListener()">费用明细</div> <div @click="addEventListener()">费用明细</div>
<div></div> <div> <el-button type="primary" size="mini" round @click="jshistory">结算历史</el-button></div>
</div> </div>
<el-table <el-table
:data="costlist" :data="costlist"
tooltip-effect="dark" tooltip-effect="dark"
:header-cell-style="{ background: '#E7EEFF', color: '#333333' }" :header-cell-style="{ background: '#E7EEFF', color: '#333333' }"
style="height: calc(29vh)"
:cell-style="styleBack" :cell-style="styleBack"
v-loading="loading2" v-loading="loading2"
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
...@@ -400,7 +399,7 @@ ...@@ -400,7 +399,7 @@
<el-form-item> <el-form-item>
<div style="display: flex; margin-top: 10px"> <div style="display: flex; margin-top: 10px">
<el-button style="margin-left: 5px" type="success" @click="zhifu('1')" :disabled="form.djf <= 0">聚合支付</el-button> <el-button style="margin-left: 5px" type="success" @click="zhifu('1')" :disabled="form.djf <= 0">聚合支付</el-button>
<!-- <el-button type="primary" @click="zhifu('2')" :disabled="form.djf <= 0">支付宝</el-button> --> <el-button type="primary" @click="zhifu('2')" :disabled="form.djf <= 0">智慧医保支付</el-button>
<!-- <el-button style="margin-left: 5px" type="warning" @click="zhifu('3')" <!-- <el-button style="margin-left: 5px" type="warning" @click="zhifu('3')"
:disabled="form.djf <= 0"> 银行卡</el-button> --> :disabled="form.djf <= 0"> 银行卡</el-button> -->
<el-button type="info" @click="zhifu('5')" :disabled="form.djf <= 0">现金</el-button> <el-button type="info" @click="zhifu('5')" :disabled="form.djf <= 0">现金</el-button>
...@@ -458,6 +457,7 @@ ...@@ -458,6 +457,7 @@
<div style="margin-bottom: 30px" v-if="feelist.channel == '1'"> <div style="margin-bottom: 30px" v-if="feelist.channel == '1'">
<span class="feetexts">付款方式——<span class="feetext">聚合</span>付款</span> <span class="feetexts">付款方式——<span class="feetext">聚合</span>付款</span>
</div> </div>
<div style="margin-bottom: 30px" v-if="feelist.channel == '3'"> <div style="margin-bottom: 30px" v-if="feelist.channel == '3'">
<span class="feetexts">付款方式——<span class="feetext">银行卡</span>付款</span> <span class="feetexts">付款方式——<span class="feetext">银行卡</span>付款</span>
</div> </div>
...@@ -496,6 +496,29 @@ ...@@ -496,6 +496,29 @@
<span>找零:{{ form.admin_djf > 0 ? zhmoney : '' }}</span> <span>找零:{{ form.admin_djf > 0 ? zhmoney : '' }}</span>
</div> </div>
</div> </div>
<el-input
v-if="feelist.channel == '2'"
v-model="form.admin_djf"
type="number"
@input="handleInput"
placeholder="智慧医保支付金额"
@keyup.enter.native="feesure(5)"
ref="inputXJ"
style="width: 300px"
></el-input>
<div v-if="feelist.channel == '2'" style="display: flex; font-size: 30px; color: red; line-height: 80px; justify-content: center">
<div style="margin-right: 20px">
<span>智慧医保收款:{{ form.admin_djf }}</span>
</div>
<div style="margin-right: 20px">
<span>待缴费:{{ form.djf }}</span>
</div>
<!-- <div>
<span>找零:{{ form.admin_djf > 0 ? zhmoney : '' }}</span>
</div> -->
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -1120,13 +1143,13 @@ export default { ...@@ -1120,13 +1143,13 @@ export default {
feesure(e) { feesure(e) {
this.cash_disable = true this.cash_disable = true
this.fullscreenLoading = true this.fullscreenLoading = true
if (e == '1' || e == '5') { if (e == '1' || e == '5'|| e == '2') {
// return false // return false
recharge({ recharge({
amount: this.form.djf, amount: this.form.djf,
authCode: this.fee.weixin, authCode: this.fee.weixin,
operatorNo: this.jobNumber, operatorNo: this.jobNumber,
payType: e == '1' ? 'cumsNative' : e == '5' ? 'cash' : '', // 支付类型 cumsNative 聚合支付 cash 现金 payType: e == '1' ? 'cumsNative' : e == '5' ? 'cash' : e == '2'?'智慧医保':'', // 支付类型 cumsNative 聚合支付 cash 现金
rechargeType: 1, // 是否预交金充值 1是 0否, rechargeType: 1, // 是否预交金充值 1是 0否,
patientId: this.patientData.patient_id, patientId: this.patientData.patient_id,
deptCode: this.dept, deptCode: this.dept,
...@@ -2696,7 +2719,7 @@ export default { ...@@ -2696,7 +2719,7 @@ export default {
padding: 5px 10px; padding: 5px 10px;
} }
::v-deep .el-table__body-wrapper { ::v-deep .el-table__body-wrapper {
height: calc(26vh); height: calc(66vh);
overflow-y: auto; overflow-y: auto;
} }
::v-deep.el-input--mini .el-input__inner { ::v-deep.el-input--mini .el-input__inner {
...@@ -3193,6 +3216,7 @@ export default { ...@@ -3193,6 +3216,7 @@ export default {
} }
.box-card { .box-card {
width: 49%;
background: #fff; background: #fff;
border-radius: 5px; border-radius: 5px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment