Browse Source

no message

xiaochan 2 years ago
parent
commit
d6d0c3e822

+ 7 - 3
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-edit/YzEditor.vue

@@ -276,7 +276,12 @@ import {
   frequCodeEnum,
   yaoPinPingLvData,
   geiYaoFangShiData,
-  yzMitt, huanZheXinXi, frequencyConfig, addTempOrderNo, yiZhuDataInit, setYzOrderGroup, setOrderDataAndTwinkle
+  yzMitt,
+  huanZheXinXi,
+  frequencyConfig,
+  addTempOrderNo,
+  yiZhuDataInit,
+  setOrderDataAndTwinkle
 } from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
 import {ElMessageBox} from "element-plus";
 import YzDialog from "@/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/dialog/YzDialog";
@@ -288,7 +293,6 @@ import DoctorAuthorization
   from "@/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/components/DoctorAuthorization.vue";
 import sleep from "@/utils/sleep";
 import XEUtils from 'xe-utils'
-import res from "@babel/standalone";
 
 const props = defineProps({
   patientInfo: {
@@ -454,6 +458,7 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
       if (stringNotBlank(row.execDept)) {
         yiZhuData.value.execUnit = row.execDept
         yiZhuData.value.execUnitName = row.execDeptName
+        xcMessage.warning('请注意,已使用默认执行科室,如需修改请在执行科室下拉框中搜索科室。')
       } else {
         yiZhuData.value.execUnit = props.patientInfo.zkWard
         yiZhuData.value.execUnitName = props.patientInfo.zkWardName
@@ -465,7 +470,6 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
       }
     }
 
-
     if (!yiZhuData.value.frequCode) {
       yiZhuData.value.frequCode = 'ONCE'
       yiZhuData.value.frequCodeName = '一次'

+ 12 - 8
src/utils/xckeydown.ts

@@ -8,6 +8,14 @@ document.onkeydown = function (event: KeyboardEvent): void {
     xcEvent.value = event
 }
 
+const preventDefault = (event: Event) => {
+    event.returnValue = false
+    try {
+        event.preventDefault()
+    } catch {
+    }
+}
+
 export const shortcutTrigger = (event, registerShortcuts, disabled = false) => {
     for (let listKey in registerShortcuts) {
         let data = registerShortcuts[listKey]
@@ -15,16 +23,14 @@ export const shortcutTrigger = (event, registerShortcuts, disabled = false) => {
             // 同时按下
             let pressSimultaneously = listKey + 'Key'
             if (event[pressSimultaneously] && event.key === key) {
-                event.returnValue = false
-                event.preventDefault()
+                preventDefault(event)
                 if (whetherToDisable(disabled)) return;
                 data[key]()
                 return
             }
             if (key === 'direction') {
                 if ((event[pressSimultaneously] && direction.includes(event.code))) {
-                    event.returnValue = false
-                    event.preventDefault()
+                    preventDefault(event)
                     if (whetherToDisable(disabled)) return;
                     data['direction'](event.key)
                     return
@@ -32,8 +38,7 @@ export const shortcutTrigger = (event, registerShortcuts, disabled = false) => {
             }
             if (key === 'number') {
                 if (event[pressSimultaneously] && event.code === ('Digit' + event.key)) {
-                    event.returnValue = false
-                    event.preventDefault()
+                    preventDefault(event)
                     if (whetherToDisable(disabled)) return;
                     data['number'](event.key)
                     return
@@ -41,8 +46,7 @@ export const shortcutTrigger = (event, registerShortcuts, disabled = false) => {
             }
         }
         if (listKey === event.key) {
-            event.returnValue = false
-            event.preventDefault()
+            preventDefault(event)
             if (whetherToDisable()) return;
             registerShortcuts[listKey]()
             return