Browse Source

优化提示语句

xiaochan 2 years ago
parent
commit
94d3dffad2

+ 0 - 3
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/report-of-infectious-diseases/ReportOfInfectiousDiseases.vue

@@ -15,7 +15,6 @@
 
 <script setup name='ReportOfInfectiousDiseases'>
 import DialogDiseases from "./DialogDiseases.vue";
-import {isDev} from "@/utils/public";
 import XcDialogV2 from "@/components/xiao-chan/dialog/XcDialogV2.vue";
 
 const props = defineProps({
@@ -42,8 +41,6 @@ const dialogRef = ref(null)
 const confirm = () => {
   dialogRef.value.confirm()
 }
-
-
 </script>
 
 <style scoped lang="scss">

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

@@ -605,9 +605,7 @@ const qingKong = () => {
 
 // 判断是否可以编辑
 const isEdit = computed(() => {
-  return !!(stringIsBlank(yiZhuData.value.actOrderNo)
-      || yiZhuData.value.statusFlag !== '1'
-      || stringIsBlank(props.patientInfo.inpatientNo));
+  return (stringIsBlank(yiZhuData.value.actOrderNo) || yiZhuData.value.statusFlag !== '1' || stringIsBlank(props.patientInfo.inpatientNo));
 })
 
 let baoCunXinXiRef = ref(null)
@@ -620,9 +618,9 @@ const toAddAnOrder = async () => {
     BizException(ExceptionEnum.MESSAGE_ERROR, '请先选择患者')
   }
   if (stringIsBlank(yiZhuData.value.actOrderNo) || yiZhuData.value.actOrderNo === addTempOrderNo) {
-    BizException(ExceptionEnum.MESSAGE_ERROR, '请先选择一个医嘱')
+    BizException(ExceptionEnum.MESSAGE_ERROR, '工作台中,没有正在编辑的医嘱。')
   }
-  // 有 医嘱 不是 录入就说明在看医嘱 直接清空就可以了
+  // 不是录入状态的医嘱,直接清空就可以了
   if (stringNotBlank(yiZhuData.value.orderCode) && yiZhuData.value.statusFlag !== '1') {
     setTheTemporaryVariableMedicalOrder()
     return true

+ 0 - 1
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-header/YzQueryCondition.vue

@@ -296,7 +296,6 @@ const confirmTheDoctorSOrderWithMedicineClick = () => {
     BizException(ExceptionEnum.MESSAGE_ERROR, '请先选择患者')
   }
   confirmLoading.value = true
-
   confirmTheDoctorSOrderWithMedicine(props.patientInfo.inpatientNo, props.patientInfo.admissTimes).then((res) => {
     if (res?.error) {
       errorMsg.value.type = 3

+ 0 - 2
src/views/hospitalization/zhu-yuan-yi-sheng/Home.vue

@@ -42,8 +42,6 @@ import YzTag from "@/components/zhu-yuan-yi-sheng/YzTag.vue";
 import {useElementSize} from "@vueuse/core";
 import router from "@/router";
 import {shortcutTrigger, xcEvent} from "@/utils/xckeydown";
-import {initWebSocket} from "@/utils/websocket";
-import {uuid} from "@/utils/getUuid";
 
 const windowSize = computed(() => {
   return store.state.app.windowSize

+ 6 - 10
src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.ts

@@ -38,7 +38,6 @@ export function youWuXuanZheHuanZhe() {
     return false
 }
 
-
 export function getSelfBuy(val) {
     if (stringIsBlank(val)) return ""
     switch (val) {
@@ -54,7 +53,6 @@ export function getSelfBuy(val) {
 }
 
 export let zkList = ref([])
-
 export const frequCodeEnum = {
     all: 'all',
     temporary: 'temporary',
@@ -62,7 +60,6 @@ export const frequCodeEnum = {
     always: 'ALWAYS',
     takeMedicine: 'takeMedicine',
 }
-
 // 生成的长期医嘱频率
 export const frequencyConfig = 'QD'
 export const addTempOrderNo: number = -1
@@ -171,9 +168,9 @@ export interface yzType {
     associationFlag?: boolean
     doctorName: string
 }
-
 // 医嘱数据
 export const yiZhuData = ref<yzType>({
+    actOrderNo: addTempOrderNo,
     admissTimes: 0,
     confirmTime: "",
     deptCode: "",
@@ -199,7 +196,6 @@ export const yiZhuData = ref<yzType>({
     wardCode: "",
     wardName: "",
     id: '',
-    actOrderNo: addTempOrderNo,
     orderName: '',
     orderCode: '',
     // 频率
@@ -327,7 +323,6 @@ export const yiZhuDataInit = () => {
         packSize: 0
     }
 }
-
 // 保存医嘱数据
 export const yzData = ref<Array<yzType>>([])
 
@@ -428,8 +423,9 @@ export function yzDataToTree(data: yzType[]): yzType[] {
 }
 
 export const setOrderDataAndTwinkle = async (order, data: yzType[]) => {
-    let temp = data
-    let tempMap = new Map()
+    let temp = data;
+    let tempMap = new Map();
+
     XEUtils.arrayEach(temp, (item) => {
         tempMap.set(item.actOrderNo, item)
     })
@@ -454,8 +450,8 @@ export const setOrderDataAndTwinkle = async (order, data: yzType[]) => {
         yzData.value.push(...list);
     }
 
-    await nextTick()
-    setYzOrderGroup()
+    await nextTick();
+    setYzOrderGroup();
     // 设置高亮
     yzMitt.emit('setOrderNoTwinkle', order);
 }

+ 1 - 1
src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/YiZhuLuRu.vue

@@ -204,7 +204,6 @@ const voidOrdersClick = (val) => {
   orderQuash(val)
 }
 
-
 /**
  * 右键点击查看医嘱产生的费用
  * @param val
@@ -214,6 +213,7 @@ let doctorSOrderFee = $ref({
   problem: {},
   totalCost: {}
 })
+
 let chargeDetails = $ref({
   dialog: false,
   data: [],