Skip to content

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

env(development): 更新 API 地址并优化结算相关功能 

- 修改 VUE_APP_BASE_URL 和 VUE_APP_BASE_URL_SFC 的地址
- 优化 outpatient、outpatientCharging 和 outpatientYfang 组件中的结算逻辑
- 调整环境变量以适应开发环境
parent ec30768f
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 41 deletions
.env.development
View file @ 460af26e
...@@ -8,12 +8,12 @@ NODE_ENV = 'development' ...@@ -8,12 +8,12 @@ NODE_ENV = 'development'
VUE_APP_BASE_API = '' VUE_APP_BASE_API = ''
# VUE_APP_BASE_URL = 'http://192.169.24.231:8002' # VUE_APP_BASE_URL = 'http://192.169.24.231:8002'
# VUE_APP_BASE_URL = 'http://10.10.9.219:9902' # VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
VUE_APP_BASE_URL = 'http://10.10.9.219:9902' VUE_APP_BASE_URL = 'http://10.10.9.219:8802'
VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy' VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy'
# VUE_APP_BASE_URL = 'http://127.0.0.1:9902' # VUE_APP_BASE_URL = 'http://127.0.0.1:9902'
# VUE_APP_BASE_URL = 'http://10.10.9.219:8802' # VUE_APP_BASE_URL = 'http://10.10.9.219:8802'
# VUE_APP_BASE_URL = 'http://10.10.9.219:9902' # VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:9902' VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:8802'
# VUE_APP_BASE_URL_SFC = 'http://127.0.0.1:9902' # VUE_APP_BASE_URL_SFC = 'http://127.0.0.1:9902'
# VUE_APP_BASE_URL = 'http://192.169.4.171:8002' # VUE_APP_BASE_URL = 'http://192.169.4.171:8002'
# VUE_APP_BASE_URL = 'http://10.10.40.10:8099' # VUE_APP_BASE_URL = 'http://10.10.40.10:8099'
......
src/views/jiesuan/outpatient.vue
View file @ 460af26e
...@@ -2279,9 +2279,10 @@ export default { ...@@ -2279,9 +2279,10 @@ export default {
if (row.item_code == element.item_code) { if (row.item_code == element.item_code) {
// element.zfbl=response.data.dw_data[0].zfbl // element.zfbl=response.data.dw_data[0].zfbl
// element.zfbl_desc.push(response.data.zfbl_desc) // element.zfbl_desc.push(response.data.zfbl_desc)
response.data.zfbl_desc.forEach(elements => { element.zfbl_desc=response.data.zfbl_desc
element.zfbl_desc = response.data.zfbl_desc //[elements.key]=elements.value // response.data.zfbl_desc.forEach(elements => {
}) // element.zfbl_desc = response.data.zfbl_desc //[elements.key]=elements.value
// })
} }
}) })
if (response.data.zfbl_desc.length > 1) { if (response.data.zfbl_desc.length > 1) {
......
src/views/jiesuan/outpatientCharging.vue
View file @ 460af26e
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<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>
<div class="selectinput"> <div class="selectinput">
<el-select v-model="man_name" placeholder="请选择" @change="changePersonType(man_name)" clearable="true"> <el-select v-model="man_name" placeholder="请选择" @change="changePersonType(man_name)" :clearable="true">
<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>
...@@ -86,10 +86,16 @@ ...@@ -86,10 +86,16 @@
</el-table> </el-table>
</div> </div>
<div class="box-card-right"> <div class="box-card-right">
<div class="box_card_title" style="margin-bottom: 30px"> <div class="box_card_title" style="margin-bottom: 30px;">
<div @click="addEventListener()">费用明细</div> <div @click="addEventListener()" >费用明细</div>
<div><el-button type="primary" size="mini" round @click="jshistory">结算历史</el-button></div> <div><el-button type="primary" size="mini" round @click="jshistory">结算历史</el-button></div>
</div> </div>
<!-- <div class="selectinput">
慢病病种：
<el-select v-model="zhenduan" placeholder="请选择" :clearable="true">
<el-option v-for="item in moreshowdata.data.mzdbjbs_arr" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select>
</div> -->
<el-table <el-table
:data="costlist" :data="costlist"
tooltip-effect="dark" tooltip-effect="dark"
...@@ -576,7 +582,7 @@ ...@@ -576,7 +582,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-dialog title="提示" :visible.sync="moreshow" width="30%" v-loading="moreLoading"> <!-- <el-dialog title="提示" :visible.sync="moreshow" width="30%" v-loading="moreLoading">
<span>请选择诊断</span> <span>请选择诊断</span>
<el-radio-group v-model="zhenduan"> <el-radio-group v-model="zhenduan">
<el-radio :label="item.code" v-for="item in moreshowdata.data.mzdbjbs_arr" :key="item.value">{{ item.name }}</el-radio> <el-radio :label="item.code" v-for="item in moreshowdata.data.mzdbjbs_arr" :key="item.value">{{ item.name }}</el-radio>
...@@ -585,7 +591,7 @@ ...@@ -585,7 +591,7 @@
<el-button @click="moreshow = false">取 消</el-button> <el-button @click="moreshow = false">取 消</el-button>
<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"> <el-dialog title="提示" :visible.sync="GSshow" width="30%" v-loading="moreLoading">
<span>{{ dataText }}</span> <span>{{ dataText }}</span>
...@@ -686,7 +692,7 @@ export default { ...@@ -686,7 +692,7 @@ export default {
data: {}, data: {},
}, },
zhenduan: '', zhenduan: '',
moreshow: false, // moreshow: false,
familyType: '', familyType: '',
oldewmpingzheng: '', oldewmpingzheng: '',
ztvalue: '', ztvalue: '',
...@@ -1708,7 +1714,7 @@ export default { ...@@ -1708,7 +1714,7 @@ export default {
res.push(e[i]) res.push(e[i])
} }
} }
console.log(result, 'pppppppppppppppppp')
this.typeList = result this.typeList = result
this.patientInfo.yblx = this.typeList[0] ? this.typeList[0].settle_type.name : '' this.patientInfo.yblx = this.typeList[0] ? this.typeList[0].settle_type.name : ''
sele_one.push(e[0]) sele_one.push(e[0])
...@@ -1773,10 +1779,7 @@ export default { ...@@ -1773,10 +1779,7 @@ export default {
} }
}) })
// 医技预约channel=4不走审核 省职也要加审核 25-7-10 慢病审核 // 医技预约channel=4不走审核 省职也要加审核 25-7-10 慢病审核
if ( if ((this.channel != '4' && (this.man_name == '4' || (this.ismb && this.man_name == ''))) || (this.form.insurance_type == 'PROVINCE' && this.man_name != '1' && this.man_name != '3')) {
(this.channel != '4' && (this.man_name == '4' || (this.ismb && this.man_name == ''))) ||
(this.form.insurance_type == 'PROVINCE' && this.ztvalue.value != 'SELF_PAY' && this.ztvalue.value != 'LOCAL_YB' && this.man_name != '1' && this.man_name != '3')
) {
this.yujiesuanLoading = true this.yujiesuanLoading = true
const { code, data } = await verifyFeeStatus({ const { code, data } = await verifyFeeStatus({
patient_id: this.patientData.patient_id, patient_id: this.patientData.patient_id,
...@@ -1995,13 +1998,13 @@ export default { ...@@ -1995,13 +1998,13 @@ export default {
} }
if (this.select_type == '01') { if (this.select_type == '01') {
// if (this.form.insurance_type == 'LOCAL') { // if (this.form.insurance_type == 'LOCAL') {
// this.jeizhishow = true // this.jeizhishow = true
// const that = this // const that = this
// setTimeout(function () { // setTimeout(function () {
// that.handleSetFocusLast() // that.handleSetFocusLast()
// }, 300) // }, 300)
// } else { // } 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') { } 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() this.selfPre()
...@@ -2424,11 +2427,18 @@ export default { ...@@ -2424,11 +2427,18 @@ export default {
message: '获取成功,请重新选择比例', message: '获取成功,请重新选择比例',
type: 'success', type: 'success',
}) })
this.costlist.forEach(element => { this.costlist.forEach(element => {
if (row.item_code == element.item_code) { if (row.item_code == element.item_code) {
response.data.zfbl_desc.forEach(elements => { element.zfbl_desc=response.data.zfbl_desc
element.zfbl_desc = response.data.zfbl_desc //[elements.key]=elements.value
}) // element.zfbl=response.data.dw_data[0].zfbl
// element.zfbl_desc.push(response.data.zfbl_desc)
// response.data.zfbl_desc.forEach(elements => {
// let obj={key:elements.key,value:elements.value}
// element.zfbl_desc.push(obj) //[elements.key]=elements.value
// console.log( element.zfbl_desc.length, element.zfbl_desc,'oooooooooooooooooo')
// })
} }
}) })
if (response.data.zfbl_desc.length > 1) { if (response.data.zfbl_desc.length > 1) {
...@@ -2478,16 +2488,16 @@ export default { ...@@ -2478,16 +2488,16 @@ export default {
// 判断慢病 // 判断慢病
if ((this.selectTableArr[0]?.settle_type.is_mb || this.man_name == '4') && this.man_name != '1' && this.man_name != '2' && this.man_name != '3') { if ((this.selectTableArr[0]?.settle_type.is_mb || this.man_name == '4') && this.man_name != '1' && this.man_name != '2' && this.man_name != '3') {
// 判断多病种慢病 // 判断多病种慢病
if (data?.mzdbjbs_arr.length > 1) { // if (data?.mzdbjbs_arr.length > 1) {
this.moreshow = true // this.moreshow = true
this.moreshowdata = { // this.moreshowdata = {
data: data, // data: data,
x: x, // x: x,
y: y, // y: y,
} // }
} else { // } else {
this.selectCardYiboPre(data, x, y, data?.mzdbjbs_arr[0]?.code) this.selectCardYiboPre(data, x, y, data?.mzdbjbs_arr[0]?.code)
} // }
// // 慢病未审核禁止结算 // // 慢病未审核禁止结算
// if (this.selectTableArr.some(item => item.reviewed != '1')) { // if (this.selectTableArr.some(item => item.reviewed != '1')) {
// this.$alert('存在未审核的收费项目，请审核后再进行结算！', '提示', { // this.$alert('存在未审核的收费项目，请审核后再进行结算！', '提示', {
...@@ -2524,7 +2534,7 @@ export default { ...@@ -2524,7 +2534,7 @@ export default {
this.yujiesuanLoading = true this.yujiesuanLoading = true
this.xj_amount = 0 this.xj_amount = 0
this.source_pay_amount = 0 this.source_pay_amount = 0
this.moreshow = false // this.moreshow = false
this.moreLoading = true this.moreLoading = true
this.oldewmpingzheng = y this.oldewmpingzheng = y
this.select_type = x this.select_type = x
...@@ -3272,6 +3282,8 @@ export default { ...@@ -3272,6 +3282,8 @@ export default {
} }
.selectinput { .selectinput {
padding-left: 10px;
font-size: 15px;
::v-deep.el-input--medium .el-input__inner { ::v-deep.el-input--medium .el-input__inner {
height: 30px; height: 30px;
// margin-top: 5px; // margin-top: 5px;
...@@ -3342,7 +3354,7 @@ export default { ...@@ -3342,7 +3354,7 @@ export default {
align-items: center; align-items: center;
color: white; color: white;
.userInfo_name { .userInfo_name {
width: 85px; width: 85px;
margin-right: 20px; margin-right: 20px;
font-size: 18px; font-size: 18px;
font-weight: 700; font-weight: 700;
...@@ -3357,7 +3369,7 @@ export default { ...@@ -3357,7 +3369,7 @@ export default {
.userInfo_sex { .userInfo_sex {
margin-right: 20px; margin-right: 20px;
// margin: 0 25px; // margin: 0 25px;
color: white; color: white;
} }
} }
......
src/views/jiesuan/outpatientYfang.vue
View file @ 460af26e
...@@ -2187,9 +2187,10 @@ export default { ...@@ -2187,9 +2187,10 @@ export default {
}) })
this.costlist.forEach(element => { this.costlist.forEach(element => {
if (row.item_code == element.item_code) { if (row.item_code == element.item_code) {
response.data.zfbl_desc.forEach(elements => { element.zfbl_desc=response.data.zfbl_desc
element.zfbl_desc = response.data.zfbl_desc //[elements.key]=elements.value // response.data.zfbl_desc.forEach(elements => {
}) // element.zfbl_desc = response.data.zfbl_desc //[elements.key]=elements.value
// })
} }
}) })
if (response.data.zfbl_desc.length > 1) { if (response.data.zfbl_desc.length > 1) {
......
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