Skip to content

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

Merge branch 'master' of http://60.216.109.204:8082/renhongzhi/sle-web-settlement

parents 05c37dd1 634ab5f8
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 15 deletions
.env.development
View file @ 50f319d0
......@@ -8,12 +8,12 @@ NODE_ENV = 'development'
VUE_APP_BASE_API = ''
# 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:8802'
VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
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://10.10.9.219:8802'
# 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:9902'
# VUE_APP_BASE_URL_SFC = 'http://10.10.40.69:9903'
# VUE_APP_BASE_URL = 'http://192.169.4.171:8002'
# VUE_APP_BASE_URL = 'http://10.10.40.10:8099'
......
src/components/ReadcardsNewSFC/index.vue
View file @ 50f319d0
......@@ -409,7 +409,7 @@ export default {
insurance: this.insurance,
cache: '1',
yltclb:this.man_name=='4'?'4': this.selectTableArr[0].settle_type.is_mb ? '4' : '6',
xzbz: this.selectTableArr[0].settle_type.is_gs ? 'D' : 'C',
xzbz:this.man_name=='5'?'D':this.selectTableArr[0].settle_type.is_gs ? 'D' : 'C',
card_type: '02',
}
queryBasicInfo(this.param)
......@@ -447,7 +447,7 @@ export default {
qr_code: '',
id_card: this.form.physicalCard, //,'370104202109020049'
dzpzywm: '301',
xzbz: this.selectTableArr[0].settle_type.is_gs ? 'D' : 'C',
xzbz:this.man_name=='5'?'D':this.selectTableArr[0].settle_type.is_gs ? 'D' : 'C',
card_no: this.form.idcard, //,'A73079277'
sbm: this.form.p_sbm, //,'370100D156000005006ACF514551621F'
name: this.form.xm, //'刘楚潇'
......@@ -476,7 +476,7 @@ export default {
id_card: this.patientData.id_card,
qr_code: this.form.physicalCard,
dzpzywm: '301',
xzbz: this.selectTableArr[0].settle_type.is_gs ? 'D' : 'C',
xzbz:this.man_name=='5'?'D':this.selectTableArr[0].settle_type.is_gs ? 'D' : 'C',
card_no: this.patientData.patient_id,
sbm: this.patientData.p_sbm,
name: this.patientData.name,
......
src/views/jiesuan/outpatientCharging.vue
View file @ 50f319d0
......@@ -121,8 +121,8 @@
<el-table-column prop="amount" align="center" label="单价" width="100"> </el-table-column>
<el-table-column prop="qty" align="center" label="数量" width="100"> </el-table-column>
<el-table-column prop="total" align="center" label="金额" width="100"> </el-table-column>
<el-table-column prop="item_spec" label="单位" width="150"> </el-table-column>
<el-table-column prop="item_code" label="项目代码" width="100" :show-overflow-tooltip="true"> </el-table-column>
<el-table-column prop="item_spec" label="单位" width="150" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="item_code" label="项目代码" width="100" :show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column prop="project_name" label="项目名称" width="90"> </el-table-column> -->
<el-table-column prop="executive_dept_name" label="执行科室" width="110"> </el-table-column>
<el-table-column prop="zfbl" align="center" label="自付比例" width="100">
......@@ -757,10 +757,10 @@ export default {
value: '1',
label: '自费',
},
{
value: '5',
label: '工伤',
},
// {
// value: '5',
// label: '工伤',
// },
],
channels: '',
man_name: '',
......@@ -1422,12 +1422,12 @@ export default {
})
return false
}
console.log('this.preSettlement',this.preSettlement,this.YBData,this.MBList.MBList_x,this.MBList.MBList_y)
if (this.preSettlement) {
this.yibaoshowNew = true
this.yujiesuanload = false
}else{
console.log('this.preSettlement',this.preSettlement,this.YBData,this.MBList.MBList_x,this.MBList.MBList_y)
selectCardYiboPreselect( this.YBData,this.MBList.MBList_x,this.MBList.MBList_y)
this.selectCardYiboPreselect( this.YBData,this.MBList.MBList_x,this.MBList.MBList_y)
}
// this.yibaoshow = true
......@@ -2035,7 +2035,7 @@ export default {
patient_id: this.patientData.patient_id,
cache_key: data.cache_key,
prescription_nos: this.cost_id,
is_mt: this.man_name == '4' ? true : this.man_name == '3' ? false : this.man_name == '2' ? true : this.selectTableArr[0] ? this.selectTableArr[0].settle_type.is_mt : '',
is_mt: this.man_name == '5' ? true :this.man_name == '4' ? true : this.man_name == '3' ? false : this.man_name == '2' ? true : this.selectTableArr[0] ? this.selectTableArr[0].settle_type.is_mt : '',
family_pay: false,
settle_type: this.selectTableArr[0] ? this.selectTableArr[0].settle_type.code : '',
})
......
src/views/jiesuan/outpatientTwoSFC.vue
View file @ 50f319d0
......@@ -345,7 +345,7 @@
:max="bxxxinfo.personal_balance"
min="0"
type="number"
:disabled="form.insurance_type == 'LONGDISTANCE'"
></el-input>
</div>
</el-form-item>
......@@ -2095,7 +2095,9 @@ export default {
this.bxxxinfo.grzhzf = 0
let 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)
if (this.bxxxinfo.personal_balance >= djf) {
this.bxxxinfo.grzhzf = djf
}
if (this.bxxxinfo.personal_balance < djf) {
this.bxxxinfo.grzhzf = this.bxxxinfo.personal_balance
......
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