Skip to content

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

refactor(env): 更新环境变量并优化结算功能 

- 更新 .env.development 文件中的 API URL
- 在 outpatientCharging.vue 中添加执行
parent bd576104
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 12 deletions
.env.development
View file @ 9df34392
...@@ -12,8 +12,8 @@ VUE_APP_BASE_API = '' ...@@ -12,8 +12,8 @@ VUE_APP_BASE_API = ''
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:9902' # VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
# VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:8802' 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'
# VUE_APP_BASE_URL = 'http://newfinance.fanxyinfo.cn' # VUE_APP_BASE_URL = 'http://newfinance.fanxyinfo.cn'
......
src/views/jiesuan/outpatientCharging.vue
View file @ 9df34392
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
</template> </template>
<el-table-column align="center" type="selection" width="45"> </el-table-column> <el-table-column align="center" type="selection" width="45"> </el-table-column>
<el-table-column prop="occurrence_dept_name" label="开单科室" :show-overflow-tooltip="true"> </el-table-column> <el-table-column prop="occurrence_dept_name" label="开单科室" :show-overflow-tooltip="true"> </el-table-column>
<el-table-column prop="executive_dept_name" label="执行科室" :show-overflow-tooltip="true"> </el-table-column>
<el-table-column prop="doct_name" label="医生姓名" width="90" :show-overflow-tooltip="true"> </el-table-column> <el-table-column prop="doct_name" label="医生姓名" width="90" :show-overflow-tooltip="true"> </el-table-column>
<el-table-column prop="occurrence_time" label="挂号日期" width="100" :show-overflow-tooltip="true"> </el-table-column> <el-table-column prop="occurrence_time" label="挂号日期" width="100" :show-overflow-tooltip="true"> </el-table-column>
...@@ -374,7 +375,7 @@ ...@@ -374,7 +375,7 @@
></el-input> ></el-input>
</div> </div>
</el-form-item> </el-form-item>
<!-- <el-form-item> <el-form-item>
<div class="form_item"> <div class="form_item">
<el-tag class="label" color="#E7EEFF" style="color: #1a5bfd; font-weight: 600"><span>现金支付</span></el-tag> <el-tag class="label" color="#E7EEFF" style="color: #1a5bfd; font-weight: 600"><span>现金支付</span></el-tag>
<el-input v-model="xj_amount" type="number" disabled></el-input> <el-input v-model="xj_amount" type="number" disabled></el-input>
...@@ -385,7 +386,7 @@ ...@@ -385,7 +386,7 @@
<el-tag class="label" color="#E7EEFF" style="color: #1a5bfd; font-weight: 600"><span>聚合支付</span></el-tag> <el-tag class="label" color="#E7EEFF" style="color: #1a5bfd; font-weight: 600"><span>聚合支付</span></el-tag>
<el-input v-model="source_pay_amount" type="number" disabled></el-input> <el-input v-model="source_pay_amount" type="number" disabled></el-input>
</div> </div>
</el-form-item> --> </el-form-item>
</div> </div>
<div class="boxmain"> <div class="boxmain">
<el-form-item> <el-form-item>
...@@ -414,7 +415,7 @@ ...@@ -414,7 +415,7 @@
</div> </div>
</el-form-item> </el-form-item>
<div> <div>
<el-button type="primary" @click="qrjsmiss('1')" style="position: absolute; right: 21px; bottom: 8px">确认结算</el-button> <el-button type="primary" @click="qrjsmiss('1')" style="position: absolute; right: 21px; bottom: 8px" :loading="saveLoding">确认结算</el-button>
<!-- :disabled="sureshow" --> <!-- :disabled="sureshow" -->
</div> </div>
</div> </div>
...@@ -635,6 +636,7 @@ export default { ...@@ -635,6 +636,7 @@ export default {
name: 'Outpatient', name: 'Outpatient',
data() { data() {
return { return {
saveLoding:false,
invoicepostData:{}, invoicepostData:{},
invoicepostVisible:false, invoicepostVisible:false,
GSdatatime: '', GSdatatime: '',
...@@ -1036,8 +1038,8 @@ export default { ...@@ -1036,8 +1038,8 @@ export default {
//当共济支付开关打开时，其他额度根据共济变动 //当共济支付开关打开时，其他额度根据共济变动
gjzhifu(e) { gjzhifu(e) {
this.$forceUpdate() this.$forceUpdate()
// let chongzhi = this.source_pay_amount * 1 + this.xj_amount * 1 let chongzhi = this.source_pay_amount * 1 + this.xj_amount * 1
this.form.djf = this.round(this.round(this.round(this.bxxxinfo.patient_burden - this.bxxxinfo.gjzhzf, 2) - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.grzhzf, 2) this.form.djf = this.round(this.round(this.round(this.round(this.bxxxinfo.patient_burden - this.bxxxinfo.gjzhzf, 2) - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.grzhzf, 2) - chongzhi,2)
//this.round( // - chongzhi, //this.round( // - chongzhi,
// 2, // 2,
// ) // )
...@@ -1181,15 +1183,15 @@ export default { ...@@ -1181,15 +1183,15 @@ export default {
this.xj_amount = this.form.djf this.xj_amount = this.form.djf
this.source_pay_amount = 0 this.source_pay_amount = 0
} }
this.bxxxinfo.his_deduct_amount = this.form.djf + this.bxxxinfo.his_deduct_amount //接口返回新的院内账户余额
// this.bxxxinfo.cash_balance = this.bxxxinfo.cash_balance+ this.form.djf//response.data.hisBalance * 1
// this.bxxxinfo.his_deduct_amount = this.form.djf + this.bxxxinfo.his_deduct_amount
this.form.djf = 0 this.form.djf = 0
//接口返回新的院内账户余额
// this.bxxxinfo.cash_balance = response.data.hisBalance * 1
let djsold = this.round(this.bxxxinfo.brfdje - this.bxxxinfo.grzhzf, 2) let djsold = this.round(this.bxxxinfo.brfdje - this.bxxxinfo.grzhzf, 2)
let chongzhi = this.source_pay_amount * 1 + this.xj_amount * 1 let chongzhi = this.source_pay_amount * 1 + this.xj_amount * 1
//充值成功后的代缴费金额 //充值成功后的代缴费金额
this.form.djf = this.round(this.round(this.round(djsold - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.gjzhzf, 2)- chongzhi, 2) //this.round(- chongzhi, 2) this.form.djf = this.round(this.round(this.round(djsold - this.bxxxinfo.his_deduct_amount, 2) - this.bxxxinfo.gjzhzf, 2)- chongzhi, 2) //this.round(- chongzhi, 2)
console.log(response, '充值成功++++++++++++++++')
//微信支付宝弹窗 //微信支付宝弹窗
this.uploadfeeshow = false this.uploadfeeshow = false
// 总的大弹窗 // 总的大弹窗
...@@ -1203,7 +1205,7 @@ export default { ...@@ -1203,7 +1205,7 @@ export default {
type: 'error', type: 'error',
}) })
} }
console.log(response, '充值成功++++++++++++++++')
}) })
.finally(() => { .finally(() => {
this.cash_disable = false this.cash_disable = false
...@@ -1849,11 +1851,13 @@ export default { ...@@ -1849,11 +1851,13 @@ export default {
}, },
//确认结算判断 //确认结算判断
qrjsmiss(e) { qrjsmiss(e) {
this.saveLoding=true
if (this.typelistno == 'UNKNOWN') { if (this.typelistno == 'UNKNOWN') {
this.$message({ this.$message({
message: '请到15号医保审核窗口，审核后缴费！', message: '请到15号医保审核窗口，审核后缴费！',
type: 'error', type: 'error',
}) })
this.saveLoding=false
} }
this.sureshow = true this.sureshow = true
if (this.form.djf > 0) { if (this.form.djf > 0) {
...@@ -1862,6 +1866,7 @@ export default { ...@@ -1862,6 +1866,7 @@ export default {
type: 'warning', type: 'warning',
}) })
this.sureshow = false this.sureshow = false
this.saveLoding=false
return false return false
} }
if (this.select_type == '01') { if (this.select_type == '01') {
...@@ -1988,6 +1993,7 @@ export default { ...@@ -1988,6 +1993,7 @@ export default {
message: '院内账户支付金额不能大于院内账户余额', message: '院内账户支付金额不能大于院内账户余额',
type: 'warning', type: 'warning',
}) })
this.saveLoding=false
return false return false
} }
if (this.bxxxinfo.grzhzf > this.bxxxinfo.personal_balance) { if (this.bxxxinfo.grzhzf > this.bxxxinfo.personal_balance) {
...@@ -1995,6 +2001,7 @@ export default { ...@@ -1995,6 +2001,7 @@ export default {
message: '医保个账支付金额不能大于医保账户余额', message: '医保个账支付金额不能大于医保账户余额',
type: 'warning', type: 'warning',
}) })
this.saveLoding=false
return false return false
} }
if (this.bxxxinfo.gjzhzf > this.bxxxinfo.family_balance) { if (this.bxxxinfo.gjzhzf > this.bxxxinfo.family_balance) {
...@@ -2002,6 +2009,7 @@ export default { ...@@ -2002,6 +2009,7 @@ export default {
message: '共济账户支付金额不能大于共济账户余额', message: '共济账户支付金额不能大于共济账户余额',
type: 'warning', type: 'warning',
}) })
this.saveLoding=false
return false return false
} }
// this.only_qq = this.only_qq + 1 // this.only_qq = this.only_qq + 1
...@@ -2040,6 +2048,7 @@ export default { ...@@ -2040,6 +2048,7 @@ export default {
_this.channels = response.data.settle_type.name _this.channels = response.data.settle_type.name
this.$message.success('结算成功') this.$message.success('结算成功')
this.addEventListener() this.addEventListener()
this.saveLoding=false
this.dialogVisible = false this.dialogVisible = false
this.sureshow = false this.sureshow = false
this.loadingapplyList = false this.loadingapplyList = false
...@@ -2067,6 +2076,7 @@ export default { ...@@ -2067,6 +2076,7 @@ export default {
}) })
}) })
.finally(res => { .finally(res => {
this.saveLoding=false
this.loadingapplyList = false this.loadingapplyList = false
this.dialogVisible = false this.dialogVisible = false
this.sureshow = false this.sureshow = false
...@@ -2634,6 +2644,7 @@ export default { ...@@ -2634,6 +2644,7 @@ export default {
message: '院内账户支付金额不能大于院内账户余额', message: '院内账户支付金额不能大于院内账户余额',
type: 'warning', type: 'warning',
}) })
this.saveLoding=false
return false return false
} }
if (this.bxxxinfo.grzhzf > this.bxxxinfo.personal_balance) { if (this.bxxxinfo.grzhzf > this.bxxxinfo.personal_balance) {
...@@ -2641,6 +2652,7 @@ export default { ...@@ -2641,6 +2652,7 @@ export default {
message: '医保个账支付金额不能大于医保账户余额', message: '医保个账支付金额不能大于医保账户余额',
type: 'warning', type: 'warning',
}) })
this.saveLoding=false
return false return false
} }
if (this.bxxxinfo.gjzhzf > this.bxxxinfo.family_balance) { if (this.bxxxinfo.gjzhzf > this.bxxxinfo.family_balance) {
...@@ -2648,6 +2660,7 @@ export default { ...@@ -2648,6 +2660,7 @@ export default {
message: '共济账户支付金额不能大于共济账户余额', message: '共济账户支付金额不能大于共济账户余额',
type: 'warning', type: 'warning',
}) })
this.saveLoding=false
return false return false
} }
let y = { let y = {
...@@ -2668,6 +2681,7 @@ export default { ...@@ -2668,6 +2681,7 @@ export default {
.then(response => { .then(response => {
const _this = this const _this = this
this.$message.success('结算成功') this.$message.success('结算成功')
this.saveLoding=false
this.dialogVisible = false this.dialogVisible = false
this.sureshow = false this.sureshow = false
this.loadingapplyList = false this.loadingapplyList = false
...@@ -2687,6 +2701,7 @@ export default { ...@@ -2687,6 +2701,7 @@ export default {
}) })
.catch(err => {}) .catch(err => {})
.finally(res => { .finally(res => {
this.saveLoding=false
this.loadingapplyList = false this.loadingapplyList = false
// this.dialogVisible = false // this.dialogVisible = false
this.sureshow = false this.sureshow = false
......
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