pengjun 21 hours ago
parent
commit
49008a1881
  1. 17
      src/components/doctorCheck/CheckItemList.vue
  2. 4
      src/components/doctorCheck/CheckSumSug.vue
  3. 4
      src/views/charge/charge.vue

17
src/components/doctorCheck/CheckItemList.vue

@ -783,6 +783,7 @@ export default {
this.selection.start = row.result.length this.selection.start = row.result.length
this.selection.end = row.result.length this.selection.end = row.result.length
} }
console.log('显示模板初始光标',this.selection)
// "itemId": "3a0c517f-cbdb-9fff-e300-1f76b3e47580", // "itemId": "3a0c517f-cbdb-9fff-e300-1f76b3e47580",
// "result": "00000", // "result": "00000",
// "diagnosisId": "3a0ed8a2-72d9-ee50-78aa-5b1f474f2921", // "diagnosisId": "3a0ed8a2-72d9-ee50-78aa-5b1f474f2921",
@ -841,16 +842,19 @@ export default {
// //
clickResult(item) { clickResult(item) {
let moreResult = this.moreResult.result || ''
let moreResult = this.moreResult.result || ''
let resultIsNum = /^[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?$/.test(item.result);
// console.log('this.moreResult',JSON.stringify(this.moreResult)) // console.log('this.moreResult',JSON.stringify(this.moreResult))
// console.log('item',item) // console.log('item',item)
// == // ==
if (!moreResult || moreResult == this.moreResult.defaultResult ) { if (!moreResult || moreResult == this.moreResult.defaultResult ) {
this.moreResult.result = item.result this.moreResult.result = item.result
this.selection.start = length(item.result) - 1
this.selection.start = item?.result.length||0
this.selection.end = this.selection.start this.selection.end = this.selection.start
}else if(moreResult.includes(item.result)){
//
console.log('=默认结果光标',this.selection)
}else if(moreResult.includes(item.result) && !resultIsNum){
//
}else { }else {
let choosedResult = item.result let choosedResult = item.result
if(this.LocalConfig.doctorCheck.isSplitChooseResult == 'Y') choosedResult = ';' + choosedResult if(this.LocalConfig.doctorCheck.isSplitChooseResult == 'Y') choosedResult = ';' + choosedResult
@ -1120,15 +1124,16 @@ export default {
result = symbols; result = symbols;
} }
this.moreResult.result = result; this.moreResult.result = result;
this.selection.start = this.selection.start + length(symbols);
this.selection.start = this.selection.start + symbols.length;
this.selection.end = this.selection.start; this.selection.end = this.selection.start;
console.log('插入结果后光标',this.selection)
}, },
// //
getCaretPosition() { getCaretPosition() {
let input = document.getElementById("resultBox"); let input = document.getElementById("resultBox");
this.selection.start = input.selectionStart; this.selection.start = input.selectionStart;
this.selection.end = input.selectionEnd; this.selection.end = input.selectionEnd;
// console.log('selection',this.selection)
console.log('点击后光标',this.selection)
}, },
watchSelection() { watchSelection() {
this.$nextTick(() => { this.$nextTick(() => {

4
src/components/doctorCheck/CheckSumSug.vue

@ -65,9 +65,9 @@
bordercolor="#909399"> bordercolor="#909399">
<colgroup> <colgroup>
<col width="150"> <col width="150">
<col width="50">
<col min-width="120">
<col width="80"> <col width="80">
<col width="120">
<col width="50">
</colgroup> </colgroup>
<thead> <thead>
<tr height="30"> <tr height="30">

4
src/views/charge/charge.vue

@ -1124,7 +1124,7 @@ export default {
this.$message.warning("收费方式合计收款不可小于应收金额!"); this.$message.warning("收费方式合计收款不可小于应收金额!");
return; return;
} }
let chargeMoney = 0
let chargeMoney = Number(0)
this.chargePays.forEach(e => { this.chargePays.forEach(e => {
if (e.chargeMoney) { if (e.chargeMoney) {
if (e.payModeId == '01') { if (e.payModeId == '01') {
@ -1141,7 +1141,7 @@ export default {
cardRegisterId: e.cardRegisterId, cardRegisterId: e.cardRegisterId,
}); });
} }
chargeMoney += e.chargeMoney
chargeMoney += Number(e.chargeMoney)
} }
}); });

Loading…
Cancel
Save