Commit 03650995 authored by WindyWTH's avatar WindyWTH

Merge branch 'ECCS-3108' into test

parents 43bbddb3 d054b3ce
...@@ -533,7 +533,9 @@ export default { ...@@ -533,7 +533,9 @@ export default {
code: 1 code: 1
} }
], ],
tableHeight1: 200 // 全部账单表格高度 tableHeight1: 200, // 全部账单表格高度
delTimer: null,
addTimer: null
} }
}, },
mixins: [mixins], mixins: [mixins],
...@@ -783,7 +785,6 @@ export default { ...@@ -783,7 +785,6 @@ export default {
}, },
watch: { watch: {
activeKey1(val) { activeKey1(val) {
console.log(val)
this.searchForm = { this.searchForm = {
billDate: [], billDate: [],
mrnNo: '', // 病历号 mrnNo: '', // 病历号
...@@ -856,14 +857,12 @@ export default { ...@@ -856,14 +857,12 @@ export default {
}) })
.then((res) => { .then((res) => {
if (res.returnCode == '0000') { if (res.returnCode == '0000') {
console.log(res.content)
this.ciReceiptTotalVo = res.content this.ciReceiptTotalVo = res.content
} }
}) })
}, },
// 计算表格最大高度 // 计算表格最大高度
calcTableHeight() { calcTableHeight() {
console.log('1111')
const dom = this.$refs.burt const dom = this.$refs.burt
const containterH = dom.clientHeight const containterH = dom.clientHeight
const gobackH = document.querySelector('.back-container').clientHeight const gobackH = document.querySelector('.back-container').clientHeight
...@@ -873,7 +872,6 @@ export default { ...@@ -873,7 +872,6 @@ export default {
const paddingSum = paddingT + paddingB const paddingSum = paddingT + paddingB
this.tableHeight = containterH - 340 - gobackH - paddingSum this.tableHeight = containterH - 340 - gobackH - paddingSum
this.tableHeight1 = containterH - 400 - gobackH - paddingSum this.tableHeight1 = containterH - 400 - gobackH - paddingSum
console.log(this.tableHeight, '=========tableHeight')
// 设置每页展示条数 // 设置每页展示条数
const pageSize = Math.floor((this.tableHeight1 - 10) / 32) const pageSize = Math.floor((this.tableHeight1 - 10) / 32)
this.$set(this.pagination, 'pageSize', pageSize) this.$set(this.pagination, 'pageSize', pageSize)
...@@ -935,9 +933,21 @@ export default { ...@@ -935,9 +933,21 @@ export default {
) )
this.selectedRowKeys.splice(index, 1) this.selectedRowKeys.splice(index, 1)
this.selectedRows.splice(index, 1) this.selectedRows.splice(index, 1)
this._confirmDelReceipt([selectedRow]) this.clearTimer('delTimer')
this.delTimer = setTimeout(() => {
this._confirmDelReceipt([selectedRow])
}, 5000)
}
this.clearTimer('addTimer')
this.addTimer = setTimeout(() => {
this.addNewEvt(0)
}, 5000)
},
clearTimer(prop) {
if (this[prop]) {
clearTimeout(this[prop])
this[prop] = null
} }
this.addNewEvt(0)
}, },
onSelectAll(selected, selectedRows, changeRows) { onSelectAll(selected, selectedRows, changeRows) {
if (selected) { if (selected) {
...@@ -962,9 +972,15 @@ export default { ...@@ -962,9 +972,15 @@ export default {
this.selectedRowKeys.splice(findIndex, 1) this.selectedRowKeys.splice(findIndex, 1)
this.selectedRows.splice(findIndex, 1) this.selectedRows.splice(findIndex, 1)
}) })
this._confirmDelReceipt(changeRows) this.clearTimer('delTimer')
this.delTimer = setTimeout(() => {
this._confirmDelReceipt(changeRows)
}, 5000)
} }
this.addNewEvt(0) this.clearTimer('addTimer')
this.addTimer = setTimeout(() => {
this.addNewEvt(0)
}, 5000)
}, },
// 全选 // 全选
selectAllList() { selectAllList() {
...@@ -1013,6 +1029,7 @@ export default { ...@@ -1013,6 +1029,7 @@ export default {
} }
}, },
_confirmDelReceipt(records) { _confirmDelReceipt(records) {
this.clearTimer('delTimer')
if (!this.backMoneyNo) return if (!this.backMoneyNo) return
const receiptVoList = records const receiptVoList = records
.filter((item) => { .filter((item) => {
...@@ -1066,6 +1083,13 @@ export default { ...@@ -1066,6 +1083,13 @@ export default {
...pager ...pager
} }
this._getNewEOBList() this._getNewEOBList()
// 切换分页重新触发自动保存
if (this.addTimer) {
this.clearTimer('addTimer')
this.addTimer = setTimeout(() => {
this.addNewEvt(0)
}, 5000)
}
}, },
// 获取保险公司下拉选项 // 获取保险公司下拉选项
_getCompanyOptions() { _getCompanyOptions() {
...@@ -1188,6 +1212,7 @@ export default { ...@@ -1188,6 +1212,7 @@ export default {
}, },
//新建/保存回款 //新建/保存回款
addNewEvt(backStatus) { addNewEvt(backStatus) {
this.clearTimer('addTimer')
if (!this.form.payorCode) { if (!this.form.payorCode) {
this.$message.warning('请选择保险公司') this.$message.warning('请选择保险公司')
return return
...@@ -1243,6 +1268,7 @@ export default { ...@@ -1243,6 +1268,7 @@ export default {
this.savedStatus = true this.savedStatus = true
this.$message.success(`${msg}成功`) this.$message.success(`${msg}成功`)
this.selectedRowKeys = [] this.selectedRowKeys = []
this.pagination.pageNum = 1
this.getData() this.getData()
this._getNewEOBList() this._getNewEOBList()
......
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