Skip to content

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

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

parents 68a127f6 b0133953
Show whitespace changes
Inline Side-by-side
Showing with 199 additions and 6 deletions
.env.development
View file @ 69f97ac4
...@@ -11,7 +11,7 @@ VUE_APP_BASE_API = '' ...@@ -11,7 +11,7 @@ VUE_APP_BASE_API = ''
# VUE_APP_BASE_URL = 'http://10.10.40.69:9903' # VUE_APP_BASE_URL = 'http://10.10.40.69:9903'
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: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:9902'
# VUE_APP_BASE_URL_SFC = 'http://127.0.0.1:9902' # VUE_APP_BASE_URL_SFC = 'http://127.0.0.1:9902'
......
src/api/all.js
View file @ 69f97ac4
...@@ -213,6 +213,8 @@ export const api = { ...@@ -213,6 +213,8 @@ export const api = {
basic:'/api/dir/departments/basic', //获取科室信息 basic:'/api/dir/departments/basic', //获取科室信息
}, },
mz:{ mz:{
destroy_yd_gz:'api/dw/destroy_yd_gz/destroy',
destroy_ewm_gz:'api/dw/destroy_ewm_gz/destroy',
jhsubmit:'/api/plug_sign/submit', jhsubmit:'/api/plug_sign/submit',
pdxx:'/api/patient/mz', pdxx:'/api/patient/mz',
mzxx:'/api/dw/query_bassic_info', mzxx:'/api/dw/query_bassic_info',
......
src/api/mz.js
View file @ 69f97ac4
...@@ -238,3 +238,18 @@ export function selfFundedSettle (data) { ...@@ -238,3 +238,18 @@ export function selfFundedSettle (data) {
params:data params:data
}) })
} }
export function destroy_yd_gz (data) {
return request({
url: Vue.prototype.$api.mz.destroy_yd_gz,
method: 'post',
params:data
})
}
export function destroy_ewm_gz (data) {
return request({
url: Vue.prototype.$api.mz.destroy_ewm_gz,
method: 'post',
params:data
})
}
\ No newline at end of file
src/permission.js
View file @ 69f97ac4
...@@ -7,7 +7,7 @@ import store from './store' ...@@ -7,7 +7,7 @@ import store from './store'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
NProgress.configure({ showSpinner: false }) NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/register','/401','/staff/profile','/yibaomanager/outpatient','/yibaomanager/outpatientTwo','/yibaomanager/outpatientTwoSFC','/yibaomanager/refound','/yibaomanager/refoundSFC','/yibaomanager/patientInfo','/yibaomanager/dwText','/yibaomanager/outpatientCharging','/yibaomanager/outpatientYfang'] const whiteList = ['/login', '/register','/401','/staff/profile','/yibaomanager/outpatient','/yibaomanager/outpatientTwo','/yibaomanager/outpatientTwoSFC','/yibaomanager/refound','/yibaomanager/refoundSFC','/yibaomanager/patientInfo','/yibaomanager/dwText','/yibaomanager/outpatientCharging','/yibaomanager/outpatientYfang','/yibaomanager/unilateralRefund']
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
NProgress.start() NProgress.start()
var reg = new RegExp('(^|&)' + 'token' + '=([^&]*)(&|$)') var reg = new RegExp('(^|&)' + 'token' + '=([^&]*)(&|$)')
......
src/router/index.js
View file @ 69f97ac4
...@@ -226,6 +226,21 @@ export const constantRoutes = [ ...@@ -226,6 +226,21 @@ export const constantRoutes = [
meta: { title: "查询患者余额", icon: "user" } meta: { title: "查询患者余额", icon: "user" }
} }
] ]
},
{
path: "/yibaomanager",
component: Layout,
hidden: true,
redirect: "noredirect",
children: [
{
path: "unilateralRefund",
component: resolve =>
require(["@/views/jiesuan/unilateralRefund"], resolve),
name: "Profile",
meta: { title: "单边退款", icon: "user" }
}
]
}, },
{ {
path: "/yibaomanager", path: "/yibaomanager",
......
src/store/modules/permission.js
View file @ 69f97ac4
...@@ -133,6 +133,15 @@ const permission = { ...@@ -133,6 +133,15 @@ const permission = {
name: "Refund_1", name: "Refund_1",
path: "/yibaomanager", path: "/yibaomanager",
type: 1, type: 1,
},
{
alwaysShow: false,
children: [{ path: "unilateralRefund", component: "jiesuan/unilateralRefund", type: 2, name: "Refund", meta: { title: "单边退款", icon: "el-icon-monitor" } }],
component: "Layout",
meta: { title: "单边退款", icon: "el-icon-monitor" },
name: "Refund_1",
path: "/yibaomanager",
type: 1,
}, },
{ {
alwaysShow: false, alwaysShow: false,
......
src/views/jiesuan/outpatient.vue
View file @ 69f97ac4
...@@ -2075,6 +2075,12 @@ export default { ...@@ -2075,6 +2075,12 @@ export default {
let that = this let that = this
let x = array let x = array
if (array.length > 1) { if (array.length > 1) {
if (!(array.every(item => item.doct_name === arr[0].doct_name))) {
that.$message({
message: '本次勾选账单，含多个医生开立的费用',
type: 'warning',
})
}
var set = new Set() var set = new Set()
for (var i = 0; i < array.length; i++) { for (var i = 0; i < array.length; i++) {
set.add(array[i].distinct_no) set.add(array[i].distinct_no)
......
src/views/jiesuan/outpatientCharging.vue
View file @ 69f97ac4
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
<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="bxxxinfo.grzhzf" @input="gjzhifu()" @blur="grzhzfBlur()" type="number" :disabled="form.insurance_type == 'LONGDISTANCE'"></el-input> <el-input v-model="bxxxinfo.grzhzf" @input="gjzhifu()" @blur="grzhzfBlur()" type="number" :disabled="form.insurance_type == 'LONGDISTANCE' || bxxxinfo.personal_pay_syd * 1 !=0"></el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -2175,6 +2175,12 @@ export default { ...@@ -2175,6 +2175,12 @@ export default {
let that = this let that = this
let x = array let x = array
if (array.length > 1) { if (array.length > 1) {
if (!(array.every(item => item.doct_name === arr[0].doct_name))) {
that.$message({
message: '本次勾选账单，含多个医生开立的费用',
type: 'warning',
})
}
var set = new Set() var set = new Set()
for (var i = 0; i < array.length; i++) { for (var i = 0; i < array.length; i++) {
set.add(array[i].distinct_no) set.add(array[i].distinct_no)
...@@ -2542,12 +2548,16 @@ export default { ...@@ -2542,12 +2548,16 @@ export default {
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) //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) - this.bxxxinfo.personal_pay_syd,2) 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) //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) - this.bxxxinfo.personal_pay_syd,2)
if (this.bxxxinfo.personal_balance >= djf) { if (this.bxxxinfo.personal_balance >= djf) {
this.bxxxinfo.grzhzf = djf this.bxxxinfo.grzhzf = djf
// if (this.form.insurance_type == 'LONGDISTANCE') { if (this.bxxxinfo.personal_pay_syd * 1 != 0) {
// this.bxxxinfo.grzhzf = 0 this.bxxxinfo.grzhzf = this.bxxxinfo.personal_pay_syd
// }
}
} }
if (this.bxxxinfo.personal_balance < djf) { if (this.bxxxinfo.personal_balance < djf) {
this.bxxxinfo.grzhzf = this.bxxxinfo.personal_balance this.bxxxinfo.grzhzf = this.bxxxinfo.personal_balance
if (this.bxxxinfo.personal_pay_syd * 1 != 0) {
this.bxxxinfo.grzhzf = this.bxxxinfo.personal_pay_syd
}
// if (this.form.insurance_type == 'LONGDISTANCE') { // if (this.form.insurance_type == 'LONGDISTANCE') {
// this.bxxxinfo.grzhzf = 0 // this.bxxxinfo.grzhzf = 0
// } // }
......
src/views/jiesuan/unilateralRefund.vue 0 → 100644
View file @ 69f97ac4
<template>
<div class="app-container" v-loading="allLoading">
<el-card class="userInfo_box">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="异地个账撤销" name="1">
<el-form ref="form" :model="form" label-width="100px">
<el-form-item label="地纬账号">
<el-input v-model="form.dw_user"></el-input>
</el-form-item>
<el-form-item label="订单号">
<el-input v-model="form.order_id"></el-input>
</el-form-item>
<el-form-item label="社保机构编号">
<el-input v-model="form.social_code"></el-input>
</el-form-item>
<el-form-item label="身份证号">
<el-input v-model="form.id_card"></el-input>
</el-form-item>
<el-form-item label="退款金额">
<el-input v-model="form.refund_money"></el-input>
</el-form-item>
<el-form-item label="姓名">
<el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">确定</el-button>
<el-button>取消</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="二维码个账撤销" name="2">
<el-form ref="formEWM" :model="formEWM" label-width="100px">
<el-form-item label="地纬账号">
<el-input v-model="formEWM.dw_user"></el-input>
</el-form-item>
<el-form-item label="二维码">
<el-input v-model="formEWM.ewm"></el-input>
</el-form-item>
<el-form-item label="结算号ID">
<el-input v-model="formEWM.jsh_id"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmitEWM">确定</el-button>
<el-button>取消</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
</el-tabs>
</el-card>
<!-- 读卡弹窗 -->
</div>
</template>
<script>
import { destroy_ewm_gz,destroy_yd_gz } from '@/api/mz'
export default {
name: 'Outpatient',
components: {
},
data() {
return {
allLoading:false,
activeName: '1',
form: {
name: '',
refund_money: '',
id_card: '',
social_code: '',
order_id: '',
dw_user: '',
},
formEWM: {
jsh_id: '',
ewm: '',
dw_user: '',
},
}
},
mounted() {},
created() {},
methods: {
handleClick(tab, event) {
console.log(tab, event)
},
onSubmit() {
this.allLoading = true
destroy_yd_gz(this.form)
.then(response => {
this.$message({
message: '成功撤销！',
type: 'success',
})
})
.catch(e => {
this.$message({
message: e.message,
type: 'error',
})
})
.finally(() => {
this.allLoading = false
})
console.log('submit!')
},
onSubmitEWM() {
this.allLoading = true
destroy_ewm_gz(this.formEWM)
.then(response => {
this.$message({
message: '成功撤销！',
type: 'success',
})
})
.catch(e => {
this.$message({
message: e.message,
type: 'error',
})
})
.finally(() => {
this.allLoading = false
})
console.log('submit!')
},
},
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped></style>
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