Commit ec30768f authored by 任鸿志's avatar 任鸿志

refactor(env): 修改 API 基础 URL 并优化结算历史功能

- 修改 VUE_APP_BASE_URL 为 http://10.10.9.219:8802
- 优化结算历史功能,调整表格样式和布局
- 修复部分组件样式问题,如侧边栏和对话框样式
parent 8607eec9
......@@ -7,7 +7,7 @@ NODE_ENV = 'production'
# 统一结算平台/生产环境
VUE_APP_BASE_API = ''
# VUE_APP_BASE_URL = 'http://newfinance-system.fancyinfo.net'
VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
VUE_APP_BASE_URL = 'http://10.10.9.219:8802'
VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:8802'
VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy'
# VUE_APP_BASE_URL = 'http://med-api.fancyinfo.net'
......
......@@ -237,6 +237,7 @@
.hideSidebar {
.sidebar-container {
margin-left: 0px !important;
width: 54px !important;
}
......
......@@ -3,7 +3,7 @@
<el-dialog title="结算历史" :visible.sync="cardlist" @close="cardcolsein()" width="width: 90% !important;">
<el-form ref="ruleForm" :model="ruleForm" label-width="80px" :inline="true">
<div class="search">
<div style="display: flex;">
<div style="display: flex">
<div>
<el-form-item label="姓名">
<el-input v-model="ruleForm.name"></el-input>
......@@ -18,13 +18,7 @@
<el-input v-model="ruleForm.job_number"></el-input>
</el-form-item>
<el-form-item label="结算时间">
<el-date-picker
v-model="jsDate"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
<el-date-picker v-model="jsDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
......@@ -34,17 +28,21 @@
</el-form-item>
</div>
</div>
<div class="search_middle">
</div>
<div class="search_middle"></div>
</div>
</el-form>
<div style="padding-bottom: 25px;">
<el-table :data="tableData1" :header-cell-style="{ background: '#49ABF5', color: '#FFFFFF' }"
style="width: 100%; overflow-y: auto" tooltip-effect="dark" row-key="id"
<div style="padding-bottom: 25px">
<el-table
:data="tableData1"
:header-cell-style="{ background: '#49ABF5', color: '#FFFFFF' }"
style="width: 100%; overflow-y: auto"
tooltip-effect="dark"
row-key="id"
height="590"
ref="tableList" @expand-change="expandSelect" @row-click="rowClick">
ref="tableList"
@expand-change="expandSelect"
@row-click="rowClick"
>
<!-- :expand-row-keys="expands" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" -->
<!-- <el-table-column type="expand">
<template>
......@@ -57,7 +55,7 @@
</div>
</template>
</el-table-column> -->
<el-table-column prop="his_patient_id" label="id" > </el-table-column>
<el-table-column prop="his_patient_id" label="id"> </el-table-column>
<el-table-column prop="user_name" label="患者姓名">
<!-- <template slot-scope="scope">
<span>{{ scope.row.patient.xm }}</span>
......@@ -67,9 +65,9 @@
<el-table-column prop="amount" label="总金额"> </el-table-column>
<el-table-column prop="created_at" label="结算时间" width="150"> </el-table-column>
<el-table-column prop="operator_code" label="操作员"> </el-table-column>
<el-table-column prop="personal_pay" label="医保个账支付"> </el-table-column>
<el-table-column prop="insurance_burden" label="医保负担金额"> </el-table-column>
<el-table-column prop="cash_pay" label="院内账户支付"> </el-table-column>
<el-table-column prop="personal_pay" label="医保个账"> </el-table-column>
<el-table-column prop="insurance_burden" label="医保负担"> </el-table-column>
<el-table-column prop="cash_pay" label="院内账户"> </el-table-column>
<!-- <el-table-column label="发票状态">
<template slot-scope="scope">
<span>{{ scope.row.invoic }}</span>
......@@ -82,13 +80,11 @@
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button style="margin-bottom: 5px" @click.stop="printcard(scope.row)" type="primary"
size="small">重打告知单</el-button>
<el-button style="margin-bottom: 5px" @click.stop="printcard(scope.row)" type="primary" size="small">重打告知单</el-button>
<!-- <el-button style="margin-bottom: 5px" @click.stop="readcardshow(scope.row)" type="success"
size="small">重新尝试本次结算</el-button>
<el-button style="margin-bottom: 5px" @click.stop="deletelist(scope.row)" type="danger"
size="small">撤销本次结算</el-button> -->
</template>
</el-table-column>
</el-table>
......@@ -109,16 +105,29 @@
</el-form-item>
</div>
<div style="text-align: center">
<el-input v-if="yibaoinfo.cardtype == '02'" v-model="shenfenzheng" type="text" placeholder="请输入患者卡号"
@keyup.enter.native="queren" ref="input" style="width: 300px"></el-input>
<el-input
v-if="yibaoinfo.cardtype == '02'"
v-model="shenfenzheng"
type="text"
placeholder="请输入患者卡号"
@keyup.enter.native="queren"
ref="input"
style="width: 300px"
></el-input>
</div>
<div style="text-align: center">
<el-input v-if="yibaoinfo.cardtype == '01'" v-model="adminpingzhengma" type="text" placeholder="请输入患者卡号"
@keyup.enter.native="queren" ref="input" style="width: 300px"></el-input>
<el-input
v-if="yibaoinfo.cardtype == '01'"
v-model="adminpingzhengma"
type="text"
placeholder="请输入患者卡号"
@keyup.enter.native="queren"
ref="input"
style="width: 300px"
></el-input>
</div>
<div style="text-align: center">
<el-input v-if="yibaoinfo.cardtype == '00'" v-model="jiuzhencard" type="text" placeholder="请输入患者卡号"
@keyup.enter.native="queren" ref="input" style="width: 300px"></el-input>
<el-input v-if="yibaoinfo.cardtype == '00'" v-model="jiuzhencard" type="text" placeholder="请输入患者卡号" @keyup.enter.native="queren" ref="input" style="width: 300px"></el-input>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -130,8 +139,7 @@
</template>
<script>
import { settlement_history, pdxq, jsxx, printmis,mzxxs,mzxx } from '@/api/mz'
import { settlement_history, pdxq, jsxx, printmis, mzxxs, mzxx } from '@/api/mz'
import { getPatientInfo } from '@/api/patient'
import { getPatientInfo2 } from '@/api/jiesuan'
import printProof from '../../utils/print_proof'
......@@ -139,25 +147,25 @@ import getLodop from '../../assets/js/LodopFuncs'
export default {
name: 'SelectCard',
props: {
cardlistdata:null,
cardlistdata: null,
cardlist: Boolean,
flag: String,
xzbz: String,
},
data() {
return {
jsDate:[],
jsDate: [],
total: 0,
pageInfo: {
page: 1,
limit: 10,
},
shenfenzheng:'',
shenfenzheng: '',
ruleForm: {
name: "",
cardid: "",
name: '',
cardid: '',
id: '',
job_number: localStorage.getItem('jobNumber') ?? ''
job_number: localStorage.getItem('jobNumber') ?? '',
},
channel: '',
yibaoinfo: {
......@@ -177,7 +185,7 @@ export default {
tableData: [],
loading: false,
patientInfo: {},
patientinf: {}
patientinf: {},
}
},
......@@ -189,7 +197,6 @@ export default {
deep: true,
handler(to) {
if (to == true) {
this.desali()
}
},
......@@ -204,17 +211,17 @@ export default {
},
resetForm() {
this.ruleForm.name = ''
this.ruleForm.cardid = ""
this.ruleForm.cardid = ''
this.ruleForm.id = ''
this.ruleForm.job_number=''
this.ruleForm.job_number = ''
this.jsDate = []
this.desali()
},
socketInit() {
this.wj = new WebSocket('ws://127.0.0.1:9000/')
this.wj.onopen = function () { }
this.wj.onopen = function () {}
this.wj.onmessage = this.onmessagecard
this.wj.onclose = function () { }
this.wj.onclose = function () {}
},
queren() {
this.wj.send('{ "MethodName": "OpenDevice" }')
......@@ -222,10 +229,10 @@ export default {
// TODO: 输入框
// FIXME: 要修改的东西ASDASDAS
//读身份证
if (this.shenfenzheng!='') {
this.yibaoinfo.cardno =this.shenfenzheng
if (this.shenfenzheng != '') {
this.yibaoinfo.cardno = this.shenfenzheng
this.getmzxx('1')
}else{
} else {
this.wj.send('{ "MethodName": "OpenDevice" }')
this.wj.send('{ "MethodName": "ReadIDCard"}')
}
......@@ -376,20 +383,19 @@ export default {
this.yibaoshow = true
},
round(num, decimals) {
const factor = Math.pow(10, decimals);
return Math.round(num * factor) / factor;
const factor = Math.pow(10, decimals)
return Math.round(num * factor) / factor
},
recardfun(e) {
let x = {
// cache_uuid: this.patientInfo.cache_uuid == undefined ? "not" : this.patientInfo.cache_uuid,
cache_uuid:e.cache_uuid,
cache_uuid: e.cache_uuid,
his_pay_fee_nos: this.patientinf.his_pay_fee_nos,
patient_id: this.patientinf.patient.his_patient_id,
is_pre: 0,
grzhzf: this.patientinf.grzhzf,
gjzhzf:this.patientinf.gjzhzf,
gjzhzf: this.patientinf.gjzhzf,
his_deduct_amount: this.patientinf.his_deduct_amount,
}
jsxx(x)
.then(response => {
......@@ -398,7 +404,7 @@ export default {
const jshidprint = response.data.jshid
setTimeout(function () {
_this.printcard(jshidprint)
}, 2000);
}, 2000)
//刷新列表
pdxq({
......@@ -412,11 +418,9 @@ export default {
this.tableData.costs = response.data
this.tylist = response.data
this.tiles(this.tylist)
})
.finally((res) => {
.finally(res => {
this.loading = false
})
})
.finally(() => {
......@@ -445,8 +449,8 @@ export default {
let time = times[1]
let mdy = times[0]
mdy = mdy.split('/')
let month = parseInt(mdy[0]);
let day = parseInt(mdy[1]);
let month = parseInt(mdy[0])
let day = parseInt(mdy[1])
let year = parseInt(mdy[2])
return year + '-' + month + '-' + day + ' ' + time
},
......@@ -456,7 +460,7 @@ export default {
printmis({
patient_id: e.his_patient_id,
settle_id: e.jshid
settle_id: e.jshid,
})
.then(response => {
this.$message({
......@@ -465,39 +469,50 @@ export default {
})
let time = new Date()
let nowTime = time.toLocaleString('sv-SE');
let display= response.data.drug_window_name==''?'none':''
let other=this.round(this.round(this.round(response.data.zjje - response.data.brfdje,2) - response.data.ybzfje,2)-response.data.sydgrzhzf*1,2)
let sydmoney=this.round(response.data.brfdje*1 + response.data.sydgrzhzf*1,2)
let text=''
let textend=''
let texttitle=''
let found = false;
if (response.data.settle_fees!=null) {
let nowTime = time.toLocaleString('sv-SE')
let display = response.data.drug_window_name == '' ? 'none' : ''
let other = this.round(this.round(this.round(response.data.zjje - response.data.brfdje, 2) - response.data.ybzfje, 2) - response.data.sydgrzhzf * 1, 2)
let sydmoney = this.round(response.data.brfdje * 1 + response.data.sydgrzhzf * 1, 2)
let text = ''
let textend = ''
let texttitle = ''
let found = false
if (response.data.settle_fees != null) {
for (let index = 0; index < response.data.settle_fees.length; index++) {
texttitle=`<div ><span style="color: black;font-weight: 700">`+response.data.settle_fees[index].address+`(`+response.data.settle_fees[index].site+`)</span></div>
texttitle =
`<div ><span style="color: black;font-weight: 700">` +
response.data.settle_fees[index].address +
`(` +
response.data.settle_fees[index].site +
`)</span></div>
`
var textList=''
var textList = ''
for (let indexs = 0; indexs < response.data.settle_fees[index].list.length; indexs++) {
const element = response.data.settle_fees[index].list[indexs]
var noteList=''
if (element.administration_note!='') {
noteList='('+ element.administration_note+')'
}else{
noteList=''
}
textList=textList+`<div style='font-size: 13px;position: relative;'>
<div class="conline" style='width:60%;'>`+
element.item_name + noteList+`</div>
<div class="conline" style=' position: absolute;right: 60px;top: 0px;'>`+
element. qty +`</div>
<div class="conline" style=' position: absolute;right: 0px;top: 0px;'>`+element.total+`元</div>
var noteList = ''
if (element.administration_note != '') {
noteList = '(' + element.administration_note + ')'
} else {
noteList = ''
}
textList =
textList +
`<div style='font-size: 13px;position: relative;'>
<div class="conline" style='width:60%;'>` +
element.item_name +
noteList +
`</div>
<div class="conline" style=' position: absolute;right: 60px;top: 0px;'>` +
element.qty +
`</div>
<div class="conline" style=' position: absolute;right: 0px;top: 0px;'>` +
element.total +
`元</div>
</div>`
}
text =text+texttitle+ `<div style="margin-bottom:10px">`+textList+`</div>`
text = text + texttitle + `<div style="margin-bottom:10px">` + textList + `</div>`
// text +
// " <div style='font-size: 13px;position: relative'><div style='width:60%;overflow: hidden;height: 20px;'>" +
// response.data.settle_fees[index].item_name +
......@@ -508,8 +523,8 @@ export default {
// '</div></div>'
}
}
textend=`<div class="btnborder">`+text+`</div>`
// <div style=" width: 250px;"> <div class="zhong">采血取药专用</div></div>
textend = `<div class="btnborder">` + text + `</div>`
// <div style=" width: 250px;"> <div class="zhong">采血取药专用</div></div>
let user =
`
......@@ -560,18 +575,32 @@ export default {
<div class="conline"><span>就诊卡号:</span><span class="money">${response.data.id_card}</span></div>
<div class="conline"><span>交易方式:</span><span class="money">${response.data.trade_type}</span></div>
<div class="conline"><span>开单医师:</span><span class="money">${response.data.doctor_name}</span></div>
<div class="conline" style="${response.data.patient_burden!=0&&response.data.patient_burden!="0.00"==false?'display:none':'display:block'}"><span>个人负担金额:</span><span class="money" >${response.data.patient_burden}元</span></div>
<div class="conline" style="${(response.data.insurance_burden!=0&&response.data.insurance_burden!="0.00")==false?'display:none':'display:block'}"><span>医保负担金额:</span><span class="money" >${response.data.insurance_burden}元</span></div>
<div class="conline" style="${(response.data.personal_pay_syd!=0&&response.data.personal_pay_syd!="0.00")==false?'display:none':'display:block'}"><span>省异地个帐支付:</span><span class="money" >${response.data.personal_pay_syd}元</span></div>
<div class="conline" style="${(response.data.cash_pay!=0&&response.data.cash_pay!="0.00")==false?'display:none':'display:block'}"><span>院内账户支付:</span><span class="money" >${response.data.cash_pay}元</span></div>
<div class="conline" style="${(response.data.personal_pay!=0&&response.data.personal_pay!="0.00")==false?'display:none':'display:block'}"><span>医保账户支付:</span><span class="money" >${response.data.personal_pay}元 </span></div>
<div class="conline" style="${(response.data.family_pay!=0&&response.data.family_pay!="0.00")==false?'display:none':'display:block'}"><span>共济账户支付:</span><span class="money">${response.data.family_pay}元</span></div>
<div class="conline" style="${
response.data.patient_burden != 0 && (response.data.patient_burden != '0.00') == false ? 'display:none' : 'display:block'
}"><span>个人负担金额:</span><span class="money" >${response.data.patient_burden}元</span></div>
<div class="conline" style="${
(response.data.insurance_burden != 0 && response.data.insurance_burden != '0.00') == false ? 'display:none' : 'display:block'
}"><span>医保负担金额:</span><span class="money" >${response.data.insurance_burden}元</span></div>
<div class="conline" style="${
(response.data.personal_pay_syd != 0 && response.data.personal_pay_syd != '0.00') == false ? 'display:none' : 'display:block'
}"><span>省异地个帐支付:</span><span class="money" >${response.data.personal_pay_syd}元</span></div>
<div class="conline" style="${
(response.data.cash_pay != 0 && response.data.cash_pay != '0.00') == false ? 'display:none' : 'display:block'
}"><span>院内账户支付:</span><span class="money" >${response.data.cash_pay}元</span></div>
<div class="conline" style="${
(response.data.personal_pay != 0 && response.data.personal_pay != '0.00') == false ? 'display:none' : 'display:block'
}"><span>医保账户支付:</span><span class="money" >${response.data.personal_pay}元 </span></div>
<div class="conline" style="${
(response.data.family_pay != 0 && response.data.family_pay != '0.00') == false ? 'display:none' : 'display:block'
}"><span>共济账户支付:</span><span class="money">${response.data.family_pay}元</span></div>
<div class="btnborder conline"><span>费用合计:</span><span class="money">${response.data.amount}元</span></div>
`+textend+`
` +
textend +
`
<div><span>打印时间:</span><span>${nowTime}</span>
</div>
<div style='height:50px'><span>结算时间:</span><span>${response.data.js_date}</span> </div>
......@@ -580,98 +609,97 @@ export default {
</body>
</html>
`
// `<!DOCTYPE html>
// <html>
// <head>
// <meta charset="utf-8">
// <title></title>
// </head>
// <style>
// * {padding: 0px;margin: 0px;}
// .feiyong {font-size: 18px;display: flex;justify-content: space-between;}
// .zhong {text-align: center; width:100%}
// </style><body>
// <div style="margin-left:5px;">
// <div style=" width: 250px;">
// <div class="zhong"><b style="font-size: 22px;">山东省第二人民医院</b>
// </div>
// <div class="zhong"><b style="font-size: 22px;">缴费成功凭条</b>
// </div>
// <div class="zhong" style="margin-top: -5px;"><span>—————————————</span>
// </div>
// <div style="margin:-5px 0px 0px 18px; line-height: 20px;" >
// <div style="display: flex;">
// <div style='margin-right:20px'><span>姓名:</span><span>` +
// response.data.patient.name +
// `</span>
// </div>
// </div>
// <div><span>就诊卡号:</span><span>` +
// response.data.id_card +
// `</span>
// </div>
// <div style="display: flex; justify-content: space-between;">
// <div><span>交易方式:</span>:</span><span>` +
// response.data.trade_type +
// `</span>
// </div>
// </div>
// <div><span>执行科室:</span><span>` +
// response.data.executive_dept +
// `</span>
// </div>
// <div>
// <span>个人负担:</span><span>` +
// response.data.patient_burden +
// `</span><br>
// <span>医保负担:</span><span>` +
// response.data.insurance_burden +
// `</span><br>
// <span>院内账户支付:</span><span>` +
// response.data.cash_pay +
// `</span><br>
// <span>医保账户支付:</span><span>` +
// response.data.personal_pay +
// `</span><br>
// <span>省异地个帐支付:</span><span>` +
// response.data.personal_pay_syd ++
// `</span><br>
// <span>共济账户支付:</span><span>` +
// response.data.family_pay +
// `</span><br>
// <span>费用合计:</span><span>` +
// response.data.amount +
// `</span><br>
// </div>
// </div>
// <div class="zhong"><span>—————————————</span></div>
// <div style='font-size: 13px;position: relative;margin:0px 0px 0px 18px;'>
// <div style='width:60%;overflow: hidden;height: 20px;'>费用名称</div>
// <div style=' position: absolute;right: 60px;top: 0px;'>数量</div>
// <div style=' position: absolute;right: 0px;top: 0px;'>合计</div>
// </div>
// <div style='margin:0px 0px 0px 18px;'>` +
// text +
// `
// </div>
// <div class="zhong"><span>—————————————</span></div>
// <div style="display: flex;padding-bottom:40px">
// <div style='margin:0px 0px 0px 18px;'><span>操作时间:</span><span>` +
// e.created_at +
// `</span>
// </div>
// </div>
// </div>
// </div>
// </body>
// </html>
// `
// `<!DOCTYPE html>
// <html>
// <head>
// <meta charset="utf-8">
// <title></title>
// </head>
// <style>
// * {padding: 0px;margin: 0px;}
// .feiyong {font-size: 18px;display: flex;justify-content: space-between;}
// .zhong {text-align: center; width:100%}
// </style><body>
// <div style="margin-left:5px;">
// <div style=" width: 250px;">
// <div class="zhong"><b style="font-size: 22px;">山东省第二人民医院</b>
// </div>
// <div class="zhong"><b style="font-size: 22px;">缴费成功凭条</b>
// </div>
// <div class="zhong" style="margin-top: -5px;"><span>—————————————</span>
// </div>
// <div style="margin:-5px 0px 0px 18px; line-height: 20px;" >
// <div style="display: flex;">
// <div style='margin-right:20px'><span>姓名:</span><span>` +
// response.data.patient.name +
// `</span>
// </div>
// </div>
// <div><span>就诊卡号:</span><span>` +
// response.data.id_card +
// `</span>
// </div>
// <div style="display: flex; justify-content: space-between;">
// <div><span>交易方式:</span>:</span><span>` +
// response.data.trade_type +
// `</span>
// </div>
// </div>
// <div><span>执行科室:</span><span>` +
// response.data.executive_dept +
// `</span>
// </div>
// <div>
// <span>个人负担:</span><span>` +
// response.data.patient_burden +
// `</span><br>
// <span>医保负担:</span><span>` +
// response.data.insurance_burden +
// `</span><br>
// <span>院内账户支付:</span><span>` +
// response.data.cash_pay +
// `</span><br>
// <span>医保账户支付:</span><span>` +
// response.data.personal_pay +
// `</span><br>
// <span>省异地个帐支付:</span><span>` +
// response.data.personal_pay_syd ++
// `</span><br>
// <span>共济账户支付:</span><span>` +
// response.data.family_pay +
// `</span><br>
// <span>费用合计:</span><span>` +
// response.data.amount +
// `</span><br>
// </div>
// </div>
// <div class="zhong"><span>—————————————</span></div>
// <div style='font-size: 13px;position: relative;margin:0px 0px 0px 18px;'>
// <div style='width:60%;overflow: hidden;height: 20px;'>费用名称</div>
// <div style=' position: absolute;right: 60px;top: 0px;'>数量</div>
// <div style=' position: absolute;right: 0px;top: 0px;'>合计</div>
// </div>
// <div style='margin:0px 0px 0px 18px;'>` +
// text +
// `
// </div>
// <div class="zhong"><span>—————————————</span></div>
// <div style="display: flex;padding-bottom:40px">
// <div style='margin:0px 0px 0px 18px;'><span>操作时间:</span><span>` +
// e.created_at +
// `</span>
// </div>
// </div>
// </div>
// </div>
// </body>
// </html>
// `
// printProof(user)
var LODOP = getLodop()
if (LODOP) {
......@@ -688,7 +716,7 @@ export default {
})
}
})
.finally(() => { })
.finally(() => {})
},
resure(e) {
var x = {
......@@ -699,7 +727,6 @@ export default {
// pre_id: this.bxxxinfo.id,
grzhzf: this.bxxxinfo.grzhzf,
his_deduct_amount: this.bxxxinfo.his_deduct_amount,
}
jsxx(x)
.then(response => {
......@@ -715,14 +742,14 @@ export default {
})
},
deletelist(e) {
if (e.his_success==true){
if (e.his_success == true) {
this.$message({
message:'当前结算已完成,不允许在此撤销结算',
message: '当前结算已完成,不允许在此撤销结算',
type: 'error',
})
return false
}
window.location.href = "/yibaomanager/refound?a=" + e.jshid + "&s=1";
window.location.href = '/yibaomanager/refound?a=' + e.jshid + '&s=1'
},
cardcolsein() {
this.$emit('cardcolsein', false)
......@@ -737,9 +764,9 @@ export default {
user_name: this.ruleForm.name,
id_card: this.ruleForm.cardid,
his_patient_id: this.ruleForm.id,
operator_code:this.ruleForm.job_number,
operator_code: this.ruleForm.job_number,
start_time: this.jsDate[0] ? this.jsDate[0] : '',
end_time:this.jsDate[1] ? this.jsDate[1] : ''
end_time: this.jsDate[1] ? this.jsDate[1] : '',
// ...this.ruleForm
}
settlement_history(this.param)
......@@ -747,20 +774,18 @@ export default {
this.tableData1 = response.data
// this.total = response.meta.total
})
.finally(() => { })
.finally(() => {})
},
rowClick(row) {
//点击行时展开收起
pdxq({
his_patient_id: row.patient.his_patient_id,
})
.then(response => {
this.patientinfo = response.data
this.$refs.tableList.toggleRowExpansion(row)
})
.finally(() => {
})
.finally(() => {})
},
load(tree, treeNode, resolve) {
setTimeout(() => {
......@@ -779,7 +804,7 @@ export default {
</script>
<style>
.el-dialog:not(.is-fullscreen){
.el-dialog:not(.is-fullscreen) {
margin-top: 3vh !important;
}
.el-dialog {
......@@ -788,6 +813,5 @@ export default {
.el-table::before {
height: 0;
}
</style>
......@@ -86,7 +86,7 @@
</el-table>
</div>
<div class="box-card-right">
<div class="box_card_title" style="margin-bottom: 25px">
<div class="box_card_title" style="margin-bottom: 30px">
<div @click="addEventListener()">费用明细</div>
<div><el-button type="primary" size="mini" round @click="jshistory">结算历史</el-button></div>
</div>
......@@ -1995,13 +1995,13 @@ export default {
}
if (this.select_type == '01') {
// if (this.form.insurance_type == 'LOCAL') {
this.jeizhishow = true
const that = this
setTimeout(function () {
that.handleSetFocusLast()
}, 300)
// this.jeizhishow = true
// const that = this
// setTimeout(function () {
// that.handleSetFocusLast()
// }, 300)
// } else {
// this.qrjs()
this.qrjs()
// }
} else if ((this.ztvalue.value == 'SELF_PAY' || this.man_name == '1') && this.man_name != '2' && this.man_name != '3' && this.man_name != '4') {
this.selfPre()
......@@ -2931,7 +2931,7 @@ export default {
padding: 5px 10px;
}
::v-deep .el-table__body-wrapper {
height: calc(66vh);
height: calc(50vh);
overflow-y: auto;
}
::v-deep.el-input--mini .el-input__inner {
......@@ -3342,6 +3342,7 @@ export default {
align-items: center;
color: white;
.userInfo_name {
width: 85px;
margin-right: 20px;
font-size: 18px;
font-weight: 700;
......@@ -3349,13 +3350,14 @@ export default {
}
.userInfo_age {
margin-right: 20px;
width: 45px;
margin-right: 15px;
color: white;
}
.userInfo_sex {
margin-right: 20px;
margin: 0 25px;
// margin: 0 25px;
color: white;
}
}
......@@ -3392,7 +3394,7 @@ export default {
.footer_div {
width: 100%;
height: 56px;
height: 50px;
background: #fff;
display: flex;
align-items: center;
......
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