diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue index e170cf4..9b6ef25 100644 --- a/src/components/customerOrg/customerOrgEdit.vue +++ b/src/components/customerOrg/customerOrgEdit.vue @@ -93,7 +93,7 @@ - + @@ -108,6 +108,11 @@ + + + + + @@ -258,7 +263,8 @@ export default { salesPerson: "", salesPersonPhone: "", medicalTypeId:'', - personnelTypeId:'' + personnelTypeId:'', + isRecommend:'N', }, //初始化 单位 记录 目前新增与更新是一致 formInit: {}, rules: { diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index 0f951fc..08ecda5 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -776,6 +776,14 @@ export default { this.moreResult.result = row.result; this.moreResult.defaultResult = row.defaultResult; this.moreResult.index = index; + if(!row.result){ + this.selection.start = 0 + this.selection.end = 0 + }else{ + this.selection.start = row.result.length + this.selection.end = row.result.length + } + console.log('显示模板初始光标',this.selection) // "itemId": "3a0c517f-cbdb-9fff-e300-1f76b3e47580", // "result": "00000", // "diagnosisId": "3a0ed8a2-72d9-ee50-78aa-5b1f474f2921", @@ -834,16 +842,19 @@ export default { // 单击选择结果模版的结果 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('item',item) //点击结果前 == 默认结果 + if (!moreResult || moreResult == this.moreResult.defaultResult ) { 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 - }else if(moreResult.includes(item.result)){ - // 结果包含已选时，不作处理 + console.log('=默认结果光标',this.selection) + }else if(moreResult.includes(item.result) && !resultIsNum){ + // 结果包含已选（且不是数字）时，不作处理 }else { let choosedResult = item.result if(this.LocalConfig.doctorCheck.isSplitChooseResult == 'Y') choosedResult = '；' + choosedResult @@ -1113,15 +1124,16 @@ export default { result = symbols; } 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; + console.log('插入结果后光标',this.selection) }, // 获取光标位置的函数 getCaretPosition() { let input = document.getElementById("resultBox"); this.selection.start = input.selectionStart; this.selection.end = input.selectionEnd; - // console.log('selection',this.selection) + console.log('点击后光标',this.selection) }, watchSelection() { this.$nextTick(() => { diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue index 0362b5a..9775563 100644 --- a/src/components/doctorCheck/CheckSumSug.vue +++ b/src/components/doctorCheck/CheckSumSug.vue @@ -65,9 +65,9 @@ bordercolor="#909399"> - + - + diff --git a/src/components/doctorCheck/QueueCheckList.vue b/src/components/doctorCheck/QueueCheckList.vue index 3512b64..18d58d4 100644 --- a/src/components/doctorCheck/QueueCheckList.vue +++ b/src/components/doctorCheck/QueueCheckList.vue @@ -48,9 +48,9 @@ --> -
+
+ :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)" @row-contextmenu="rClick"> @@ -63,7 +63,7 @@
- 呼叫
@@ -83,8 +83,8 @@
已呼人员：
-
- + @@ -104,9 +104,9 @@
过号人员：
-
+
+ :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)" @row-contextmenu="rClick"> @@ -133,7 +133,7 @@
- @@ -187,7 +187,7 @@ export default { // 避免单击事件与双击事件冲突 clickTime1: 0, clickTime2: 0, - + dialogWinQueue:false, }; }, @@ -323,14 +323,17 @@ export default { }); break; case "1": // 呼叫 + // 未选中时，自动选第1个 if (!row.queueRegisterId) { if (this.waitDetail.length > 0) row = this.waitDetail[0]; } + if (!row.queueRegisterId) this.$message.warning({ showClose: true, message: "未可操作的数据，或未选择候诊人员", }); + if (this.alreadyCalledDetail.length > 0) prePatientRegisterId = this.alreadyCalledDetail[0].patientRegisterId break; @@ -373,6 +376,11 @@ export default { completeFlag, }).then((res) => { if (res.code > -1) { + if(completeFlag == '1'){ + this.waitRow = {} + } + + // 刷新排队列表 this.getQueueRegisterList( this.LocalConfig.doctorCheck.queueRoom, this.LocalConfig.doctorCheck.queueItemTypeIds @@ -478,8 +486,17 @@ export default { .then((res) => { if (res.code > -1) { this.waitDetail = res.data.waitDetail; + this.waitDetail.forEach(e => { + e.state = 'wait' + }); this.alreadyCalledDetail = res.data.alreadyCalledDetail; + this.alreadyCalledDetail.forEach(e => { + e.state = 'alreadyCall' + }); this.overNumberDetail = res.data.overNumberDetail; + this.overNumberDetail.forEach(e => { + e.state = 'over' + }); resolve(res); } else { @@ -535,49 +552,90 @@ export default { } this.dataTransOpts.plus.queue++; - this.dialogWin.queue = true; + this.dialogWinQueue = true; }, // 选择候诊人员 rowClickWait(row) { - - this.clickTime1 = new Date().getTime() - - setTimeout(() => { - if (this.clickTime1 > this.clickTime2) { - this.waitRow = row; - this.queueParams = { - patientRegisterId: row.patientRegisterId, - }; - } - }, 400); - - - + this.waitRow = row; + this.queueParams = { + patientRegisterId: row.patientRegisterId, + }; }, // 选择过号人员 rowClickAlready(row) { - this.clickTime1 = new Date().getTime() - setTimeout(() => { - if (this.clickTime1 > this.clickTime2) { - this.alreadyRow = row; - this.queueParams = { - patientRegisterId: row.patientRegisterId, - }; - } - }, 400); + this.alreadyRow = row; + this.queueParams = { + patientRegisterId: row.patientRegisterId, + }; }, // 选择过号人员 - rowClickOver(row) { - this.clickTime1 = new Date().getTime() - setTimeout(() => { - if (this.clickTime1 > this.clickTime2) { - this.overRow = row; - } - }, 400); + rowClickOver(row) { + this.overRow = row; + }, + + // 右击选择人员 + rClick(row, column, event) { + this.queueParams = { + patientRegisterId: row.patientRegisterId, + state: row.state, + queueRegisterId: row.queueRegisterId + }; }, + + // 右击 + onContextmenu(event) { + if (!this.queueParams.patientRegisterId) return false + + //菜单项 + let items = []; + + if (this.queueParams.state == 'wait') { + items.push({ + label: "呼叫", + onClick: () => { + this.btnCall(this.queueParams, '1') + }, + }) + + items.push({ + label: "取消排队", + onClick: () => { + postapi('/api/app/QueueRegister/DeleteByPatientRegisterId', { + patientRegisterId: this.queueParams.patientRegisterId + }).then(res => { + if (res.code > -1) { + this.$message.success({ showClose: true, message: '操作成功！' }) + this.getQueueRegisterList(this.LocalConfig.doctorCheck.queueRoom, this.LocalConfig.doctorCheck.queueItemTypeIds) + } + }) + }, + }) + } + + + items.push({ + label: "排队", + onClick: () => { + this.fnQueue() + }, + }) + + this.$contextmenu({ + items, + event, + x: event.clientX, + y: event.clientY, + customClass: "custom-class", + zIndex: 3, + minWidth: 80, + }); + + return false; + }, + }, //监听事件 diff --git a/src/components/occDisease/CheckDetails.vue b/src/components/occDisease/CheckDetails.vue index 2b3e0a3..96edf7a 100644 --- a/src/components/occDisease/CheckDetails.vue +++ b/src/components/occDisease/CheckDetails.vue @@ -82,7 +82,7 @@ export default { } }) .catch((err) => { - this.$message({ type: "error", message: `操作失败，原因：${err}` }); + this.$message({ type: "error", message: `操作失败，原因(/api/app/OccupationalDisease/GetDetailResults)：${err}` }); }); }, diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue index 23f2344..711a632 100644 --- a/src/components/patientRegister/PatientRegisterItem.vue +++ b/src/components/patientRegister/PatientRegisterItem.vue @@ -116,7 +116,7 @@
- + - - + + diff --git a/src/components/patientRegister/patientRegisterAsbItem.vue b/src/components/patientRegister/patientRegisterAsbItem.vue index 57604c1..1aa24fb 100644 --- a/src/components/patientRegister/patientRegisterAsbItem.vue +++ b/src/components/patientRegister/patientRegisterAsbItem.vue @@ -45,9 +45,9 @@ - + diff --git a/src/components/queue/Queue.vue b/src/components/queue/Queue.vue index 19d3921..8ab5252 100644 --- a/src/components/queue/Queue.vue +++ b/src/components/queue/Queue.vue @@ -9,62 +9,68 @@
-
-
未分诊组合项目：
- - - - - -
已分诊科室：
- - - - - - - - - - - -
-
-
房间：
- - - -
- 人工分诊排队 -
-
- AI智能分诊 -
-
当前人员：
-
- {{ queueRegister.patientName }} -
-
当前排队房间：
-
- {{ queueRegister.roomName }} +
+
+
+
未分诊组合项目：
+ + + + +
+
+
房间：
+ + + +
-
当前候诊人数：
-
- {{ queueRegister.queueCount }} + +
+
已分诊科室：
+
当前人员：{{ queueRegister.patientName }}
+
排队房间：{{ queueRegister.roomName }}
+
候诊人数：{{ queueRegister.queueCount }}
-
- 关闭 +
+ + + + + + + + + + + +
+ +
+ 人工分诊排队 +
+
+ AI智能分诊 +
+
+ 取消排队 +
+
+ 关闭 +
+
+