Skip to content

省
省二结算
Commit e6062544 authored by 任鸿志's avatar 任鸿志
Browse files
Options

工商改造

parent fdc8998e
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 87 deletions
package.json
View file @ e6062544
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"build:prod": "vue-cli-service build && node ./deploy-test.js", "build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build && node ./deploy-test.js", "build:stage": "vue-cli-service build && node ./deploy-test.js",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src" "lint": "eslint --ext .js,.vue src"
......
src/views/jiesuan/outpatient.vue
View file @ e6062544
...@@ -26,7 +26,15 @@ ...@@ -26,7 +26,15 @@
<div class="box-card" style="width: 49%"> <div class="box-card" style="width: 49%">
<div class="box_card_title"> <div class="box_card_title">
<div>结算清单</div> <div>结算清单</div>
<div style="font-weight: 500;" v-if="isGS">工商时间
<el-date-picker
size="mini"
v-model="GSdatatime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</div>
<div style="display: flex" > <div style="display: flex" >
<el-checkbox v-model="man_name">转为自费账单</el-checkbox> <el-checkbox v-model="man_name">转为自费账单</el-checkbox>
<!-- <div style="line-height: 40px">结算类型</div> <!-- <div style="line-height: 40px">结算类型</div>
...@@ -35,11 +43,8 @@ ...@@ -35,11 +43,8 @@
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option> <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select> </el-select>
</div> --> </div> -->
</div> </div>
</div> </div>
<div class="content-left-type" style="height: 30px; line-height: 30px; padding: 0 10px"> <div class="content-left-type" style="height: 30px; line-height: 30px; padding: 0 10px">
<el-radio-group v-model="patientInfo.yblx" size="medium" @input="seletei"> <el-radio-group v-model="patientInfo.yblx" size="medium" @input="seletei">
<el-radio :label="item.settle_type.name" v-for="(item, index) in typeList" :key="index">{{ item.settle_type.name }}</el-radio> <el-radio :label="item.settle_type.name" v-for="(item, index) in typeList" :key="index">{{ item.settle_type.name }}</el-radio>
...@@ -388,54 +393,6 @@ ...@@ -388,54 +393,6 @@
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
<!--
<div class="boxmain">
<el-form-item>
<div class="form_item">
<el-tag class="label" color="#E7EEFF" style='color:#1a5bfd; font-weight: 600;'>病人负担金额</el-tag>
<el-input v-model="bxxxinfo.patient_burden" disabled style='color:black'></el-input>
</div>
</el-form-item>
<el-form-item>
<div class="form_item">
<el-tag class="label" color="#E7EEFF" style='color:#1a5bfd; font-weight: 600;'>共济账户支付</el-tag>
<el-input v-model="bxxxinfo.gjzhzf" type="number"
:max="bxxxinfo.family_balance" min="0" @input="gjzhifu()"></el-input>
</div>
</el-form-item>
<el-form-item>
<div class="form_item">
<el-tag class="label" color="#E7EEFF" style='color:#1a5bfd; font-weight: 600;'>院内账户支付</el-tag>
<el-input v-model="bxxxinfo.his_deduct_amount" type="number"
:max="bxxxinfo.cash_balance" min="0" @input="gjzhifu"></el-input>
</div>
</el-form-item>
</div>
<div class="boxmain">
<el-form-item>
<div class="form_item">
<el-tag class="label" color="#E7EEFF" style='color:#1a5bfd; font-weight: 600;'>医保个账支付</el-tag>
<el-input v-model="bxxxinfo.grzhzf" @input="gjzhifu()" @blur="grzhzfBlur()"
:max="bxxxinfo.personal_balance" min="0" type="number"
:disabled="form.insurance_type == 'LONGDISTANCE'"></el-input>
</div>
</el-form-item>
<el-form-item>
<div class="form_item">
<el-tag class="label" color="#E7EEFF" style='color:#1a5bfd; font-weight: 600;'>待缴费</el-tag>
<el-input v-model="form.djf"></el-input>
</div>
</el-form-item>
<el-form-item>
<div class="form_item">
<el-tag class="label" color="#E7EEFF" style='color:#1a5bfd; font-weight: 600;'>待缴费</el-tag>
<el-input v-model="form.djf"></el-input>
</div>
</el-form-item>
</div>
-->
</div> </div>
</el-card> </el-card>
<div style="display: flex"> <div style="display: flex">
...@@ -528,6 +485,14 @@ ...@@ -528,6 +485,14 @@
<el-button type="primary" @click="selectCardYiboPre(moreshowdata.data, moreshowdata.x, moreshowdata.y, zhenduan)">确 定</el-button> <el-button type="primary" @click="selectCardYiboPre(moreshowdata.data, moreshowdata.x, moreshowdata.y, zhenduan)">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="提示" :visible.sync="GSshow" width="30%" v-loading="moreLoading">
<span>{{ dataText }}</span>
<span slot="footer" class="dialog-footer">
<el-button @click="GSshow = false">确定</el-button>
</span>
</el-dialog>
<!-- <el-dialog title="提示" :visible.sync="found" width="30%" v-loading="moreLoading"> <!-- <el-dialog title="提示" :visible.sync="found" width="30%" v-loading="moreLoading">
<span>是否进行西药房签到排队？</span> <span>是否进行西药房签到排队？</span>
...@@ -559,6 +524,10 @@ export default { ...@@ -559,6 +524,10 @@ export default {
name: 'Outpatient', name: 'Outpatient',
data() { data() {
return { return {
dataText:'',
GSshow:false,
isGS:false,
GSdatatime:'',
found: false, found: false,
yujiesuanLoading: false, yujiesuanLoading: false,
progress: 0, progress: 0,
...@@ -2006,6 +1975,7 @@ export default { ...@@ -2006,6 +1975,7 @@ export default {
}, },
//选中昨天列表请求右边选中方法 //选中昨天列表请求右边选中方法
handleSelectionChange(array) { handleSelectionChange(array) {
this.isGS=false
let that = this let that = this
let x = array let x = array
if (array.length > 1) { if (array.length > 1) {
...@@ -2148,6 +2118,7 @@ export default { ...@@ -2148,6 +2118,7 @@ export default {
this.jiesuan() this.jiesuan()
} }
} }
this.isGS=this.selectTableArr[0]?.settle_type.is_gs
}, },
// 结算类型赋默认值 // 结算类型赋默认值
setPersonType(e) { setPersonType(e) {
...@@ -2317,6 +2288,7 @@ export default { ...@@ -2317,6 +2288,7 @@ export default {
this.form = data this.form = data
this.form.rqlbName = data.rqlb == 'A' ? '职工' : data.rqlb == 'B' ? '居民' : '' this.form.rqlbName = data.rqlb == 'A' ? '职工' : data.rqlb == 'B' ? '居民' : ''
settlementPre({ settlementPre({
injury_date:this.GSdatatime,
p_jbbm: zhenduan, p_jbbm: zhenduan,
patient_id: this.patientData.patient_id, patient_id: this.patientData.patient_id,
cache_key: data.cache_key, cache_key: data.cache_key,
...@@ -2326,6 +2298,10 @@ export default { ...@@ -2326,6 +2298,10 @@ export default {
settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '', settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '',
}) })
.then(res => { .then(res => {
if (res.data.mzxets!='') {
this.dataText=res.data.mzxets
this.GSshow=true
}
this.yujiesuanLoading = false this.yujiesuanLoading = false
this.moreLoading = false this.moreLoading = false
this.bxxxinfo = res.data this.bxxxinfo = res.data
......
src/views/jiesuan/refoundSFC.vue
View file @ e6062544
...@@ -2,30 +2,54 @@ ...@@ -2,30 +2,54 @@
<div class="app-container" v-loading="allLoading"> <div class="app-container" v-loading="allLoading">
<el-card class="userInfo_box"> <el-card class="userInfo_box">
<div class="boxmain"> <div class="boxmain">
<div class="boxmain"> <div class="btslist" v-if="!cardNoShow">
<div class="btslist"> <el-button @click="cardtype('1')" style="color: #3d7ff5; width: 80px; font-size: 17px; font-weight: 600; border-radius: 8px">读卡</el-button>
<el-button @click="cardtype('1')" style="color: #3d7ff5; width: 97px; font-size: 17px; font-weight: 600; border-radius: 8px">读卡</el-button>
</div> </div>
<div class="userInfo_div" v-if="patientData"> <div class="userInfo_div" v-if="patientData.name">
<div class="userInfo_div_1"> <div class="userInfo_div_1">
<div class="userInfo_name">{{ patientData ? patientData.name : '' }}</div> <div class="userInfo_name">{{ patientData.name || '' }}</div>
<div class="userInfo_sex">{{ patientData.sex ? patientData.sex.name : '' }}</div> <div class="userInfo_sex">{{ patientData.sex ? patientData.sex.name : '' }}</div>
<div class="userInfo_age">{{ patientData ? patientData.age : '' }}岁</div> <div class="userInfo_age">{{ patientData.age }}岁</div>
<div class="userInfo_div_2">就诊卡：{{ patientData ? patientData.patient_id : '' }}</div> <div class="yibaoInfo_div">
</div>
</div>
<div class="yibaoInfo_div" v-if="patientData">
<div class="yibaoInfo_div_1">{{ patientData.type ? patientData.type.name : '' }}</div> <div class="yibaoInfo_div_1">{{ patientData.type ? patientData.type.name : '' }}</div>
</div> </div>
<div class="yibaoInfo_div_2">就诊卡：{{ patientData.patient_id }}</div>
<div class="yibaoInfo_div_2">身份证号：{{ patientData.id_card }}</div>
</div> </div>
<div class="btslist">
<el-button @click="jiesuan" style="color: #3d7ff5; width: 110px; font-size: 17px; font-weight: 600; border-radius: 8px">撤销结算</el-button>
</div> </div>
</div> </div>
</el-card> </el-card>
<div style="justify-content: space-around; margin-top: 10px"> <div>
<div class="box_card_title"> <div class="box-border"></div>结算处理</div>
<el-table
ref="multipleTable"
@selection-change="handleSelectionChange"
:data="refundList"
tooltip-effect="dark"
style="width: 100%; height: calc(100vh - 490px)"
:header-cell-style="{ background: '#E7EEFF', color: '#333333' }"
v-loading="loading"
element-loading-text="拼命加载中"
>
<template slot="empty">
<el-empty :image="tempsrc" :image-size="200" description="暂无数据"></el-empty>
</template>
<el-table-column type="selection" width="55" multiple></el-table-column>
<el-table-column prop="operatorName" label="收费人"> </el-table-column>
<el-table-column prop="rcptNo" label="收据号码" > </el-table-column>
<el-table-column prop="visitDate" label="收费日期" > </el-table-column>
<el-table-column prop="totalCosts" align="center" label="总金额" ></el-table-column>
<el-table-column prop="settleTypeName" align="center" label="结算类型"></el-table-column>
<!-- <el-table-column prop="" align="center" label="电子发票" width="110"> </el-table-column>
<el-table-column prop="" align="center" label="冲红票" width="110"> </el-table-column> -->
</el-table>
</div>
<div style="display: flex; justify-content: space-around; margin-top: 10px">
<div class="box-card"> <div class="box-card">
<div class="box_card_title">结算处理</div> <div class="box_card_title"> <div class="box-border"></div>结算处理</div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
...@@ -49,8 +73,8 @@ ...@@ -49,8 +73,8 @@
<el-table-column prop="" align="center" label="冲红票" width="110"> </el-table-column> --> <el-table-column prop="" 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> <div class="box_card_title"><div class="box-border"></div>费用明细</div>
<el-table :data="costlist" tooltip-effect="dark" style="width: 100%; height: calc(100vh - 480px)" v-loading="loading2" element-loading-text="拼命加载中"> <el-table :data="costlist" tooltip-effect="dark" style="width: 100%; height: calc(100vh - 480px)" v-loading="loading2" element-loading-text="拼命加载中">
<template slot="empty"> <template slot="empty">
<el-empty :image="tempsrc" :image-size="200" description="暂无数据"></el-empty> <el-empty :image="tempsrc" :image-size="200" description="暂无数据"></el-empty>
...@@ -847,8 +871,9 @@ export default { ...@@ -847,8 +871,9 @@ export default {
} }
.btslist { .btslist {
width: 50%; display: flex;
margin-top: 5px; align-items: center;
.btns { .btns {
float: left; float: left;
...@@ -927,7 +952,14 @@ export default { ...@@ -927,7 +952,14 @@ export default {
} }
} }
} }
.box-border{
margin-top: 3px;
margin-right: 10px;
width: 5px;
height: 16px;
background-color: #1890ff;
border-radius: 5px;
}
.content-left-heji { .content-left-heji {
position: absolute; position: absolute;
// bottom: 20px; // bottom: 20px;
...@@ -990,20 +1022,21 @@ export default { ...@@ -990,20 +1022,21 @@ export default {
.boxmain { .boxmain {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
} }
.app-container { .app-container {
} }
::v-deep .el-card__body { ::v-deep .el-card__body {
padding: 10px; padding: 5px 9px;
} }
::v-deep .fullbox { ::v-deep .fullbox {
background-color: #f2f8ff; background-color: #f2f8ff;
} }
::v-deep .el-button--medium {
padding: 5px 10px;
}
::v-deep.el-dialog:not(.is-fullscreen) { ::v-deep.el-dialog:not(.is-fullscreen) {
margin-top: 2vh !important; margin-top: 2vh !important;
} }
...@@ -1030,7 +1063,7 @@ export default { ...@@ -1030,7 +1063,7 @@ export default {
.userInfo_box { .userInfo_box {
width: 99%; width: 99%;
margin: 0 auto; margin: 0 auto;
background: linear-gradient(180deg, #a9c2ff 0%, #ffffff 100%); background: #7977ff;
box-shadow: 0px 3px 4.7px 0px #004aff26; box-shadow: 0px 3px 4.7px 0px #004aff26;
border-radius: 4px; border-radius: 4px;
...@@ -1045,14 +1078,16 @@ export default { ...@@ -1045,14 +1078,16 @@ export default {
.userInfo_div_1 { .userInfo_div_1 {
display: flex; display: flex;
align-items: center; align-items: center;
color: white;
.userInfo_name { .userInfo_name {
font-size: 18px; font-size: 18px;
font-weight: 700; font-weight: 700;
color: white;
} }
.userInfo_sex { .userInfo_sex {
margin: 0 25px; margin: 0 25px;
color: white;
} }
} }
...@@ -1064,7 +1099,8 @@ export default { ...@@ -1064,7 +1099,8 @@ export default {
.yibaoInfo_div { .yibaoInfo_div {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: white;
margin: 0 10px;
.yibaoInfo_div_1 { .yibaoInfo_div_1 {
width: max-content; width: max-content;
border-radius: 3px; border-radius: 3px;
...@@ -1074,12 +1110,14 @@ export default { ...@@ -1074,12 +1110,14 @@ export default {
color: #004aff; color: #004aff;
} }
}
.yibaoInfo_div_2 { .yibaoInfo_div_2 {
margin-right: 20px;
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
color: #333; color: white;
margin-top: 8px;
}
} }
} }
...@@ -1124,8 +1162,10 @@ export default { ...@@ -1124,8 +1162,10 @@ export default {
.box-card { .box-card {
background: #fff; background: #fff;
border-radius: 5px; border-radius: 5px;
width: 49%;
.box_card_title { .box_card_title {
display: flex;
box-sizing: border-box; box-sizing: border-box;
padding: 5px; padding: 5px;
font-size: 16px; font-size: 16px;
......
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