Skip to content

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

refactor(jiesuan): 门诊结算页面逻辑调整 

- 移除自动打印结算凭条的弹窗确认
- 根据 webSource 参数控制打印逻辑
- 注释掉部分冗余代码
- 优化结算流程中的条件判断
parent b4f4843a
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 35 deletions
src/views/jiesuan/outpatient.vue
View file @ 8cb7dc5f
...@@ -757,8 +757,10 @@ export default { ...@@ -757,8 +757,10 @@ export default {
this.socketInit() this.socketInit()
}, },
created() { created() {
let dept = this.$route.query.webSource
console.log(dept,'ooooooooooooooo')
// if (this.$route.query?.jobNumber) { // if (this.$route.query?.jobNumber) {
// localStorage.setItem('jobNumber', this.$route.query.jobNumber) // localStorage.setItem('jobNumber', this.$route.query.webSource)
// } // }
this.settleType = this.$route.query?.settleType || '' this.settleType = this.$route.query?.settleType || ''
this.channel = this.$route.query?.channel || '' this.channel = this.$route.query?.channel || ''
...@@ -2047,18 +2049,21 @@ export default { ...@@ -2047,18 +2049,21 @@ export default {
// } // }
let dept = localStorage.getItem('deptCode') let dept = localStorage.getItem('deptCode')
if (dept != '0502') { if (dept != '0502') {
this.$confirm('是否打印结算凭条?', '提示', { if (deptthis.$route.query.webSource!=6) {
confirmButtonText: '是', _this.printcard(jshidprint)
cancelButtonText: '否', }
type: 'warning' // this.$confirm('是否打印结算凭条?', '提示', {
}).then(() => { // confirmButtonText: '是',
_this.printcard(jshidprint) // cancelButtonText: '否',
}).catch(() => { // type: 'warning'
this.$message({ // }).then(() => {
type: 'info',
message: '已取消' // }).catch(() => {
}); // this.$message({
}); // type: 'info',
// message: '已取消'
// });
// });
// this.$alert('是否打印结算凭条？', '提示', { // this.$alert('是否打印结算凭条？', '提示', {
// confirmButtonText: '确定', // confirmButtonText: '确定',
// callback: action => { // callback: action => {
...@@ -2170,9 +2175,9 @@ export default { ...@@ -2170,9 +2175,9 @@ export default {
this.costlist = [] this.costlist = []
this.loading2 = false this.loading2 = false
} }
if (this.tylist.length == 1) { // if (this.tylist.length == 1) {
this.jiesuan() // this.jiesuan()
} // }
// }) // })
} else { } else {
this.selectTableArr = array this.selectTableArr = array
...@@ -2217,9 +2222,9 @@ export default { ...@@ -2217,9 +2222,9 @@ export default {
this.costlist = [] this.costlist = []
this.loading2 = false this.loading2 = false
} }
if (this.tylist.length == 1) { // if (this.tylist.length == 1) {
this.jiesuan() // this.jiesuan()
} // }
} }
} else { } else {
this.selectTableArr = array this.selectTableArr = array
...@@ -2264,9 +2269,9 @@ export default { ...@@ -2264,9 +2269,9 @@ export default {
this.costlist = [] this.costlist = []
this.loading2 = false this.loading2 = false
} }
if (this.tylist.length == 1) { // if (this.tylist.length == 1) {
this.jiesuan() // this.jiesuan()
} // }
} }
this.isGS = this.selectTableArr[0]?.settle_type.is_gs this.isGS = this.selectTableArr[0]?.settle_type.is_gs
}, },
...@@ -2928,18 +2933,21 @@ export default { ...@@ -2928,18 +2933,21 @@ export default {
let dept = localStorage.getItem('deptCode') let dept = localStorage.getItem('deptCode')
if (dept != '0502') { if (dept != '0502') {
this.$confirm('是否打印结算凭条?', '提示', { if (deptthis.$route.query.webSource!=6) {
confirmButtonText: '是', _this.printcard(jshidprint)
cancelButtonText: '否', }
type: 'warning' // this.$confirm('是否打印结算凭条?', '提示', {
}).then(() => { // confirmButtonText: '是',
_this.printcard(jshidprint) // cancelButtonText: '否',
}).catch(() => { // type: 'warning'
this.$message({ // }).then(() => {
type: 'info', // _this.printcard(jshidprint)
message: '已取消' // }).catch(() => {
}); // this.$message({
}); // type: 'info',
// message: '已取消'
// });
// });
// this.$alert('是否打印结算凭条？', '提示', { // this.$alert('是否打印结算凭条？', '提示', {
// confirmButtonText: '确定', // confirmButtonText: '确定',
// callback: action => { // callback: action => {
......
src/views/jiesuan/patientInfo.vue
View file @ 8cb7dc5f
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<el-option v-for="item in patientData.mzdbjbs_arr" :key="item.code" :label="item.name" :value="item.code"> <el-option v-for="item in patientData.mzdbjbs_arr" :key="item.code" :label="item.name" :value="item.code">
</el-option> </el-option>
</el-select> </el-select>
<el-input v-model="patientData.mzdbjbs" disabled></el-input> <!-- <el-input v-model="patientData.mzdbjbs" disabled></el-input> -->
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
......
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