xiao 2 anni fa
parent
commit
e70b3ce367

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

@@ -260,7 +260,8 @@ import {
   queryParam,
   yiZhuData,
   yzData,
-  currentPage
+  currentPage,
+  isCydy
 } 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";
@@ -302,7 +303,7 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
     props.openGroupOrderTemplate(row.orderCode)
     return
   }
-  if (row.serial === '00' && currentPage.value === 'takeMedicine') {
+  if (row.serial === '00' && isCydy()) {
     qingKong()
     return BizException(ExceptionEnum.LOGICAL_ERROR, '出院带药不能开项目')
   }
@@ -324,7 +325,6 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
     yiZhuData.value.statusFlag = '1'
   }
   let newData = yiZhuData.value.statusFlag === '1'
-
   if (row.serial === '01' || row.serial === '99') {
     try {
       let res = await huoQuFeiYongXinXi(row.orderCode, row.serial, props.patientInfo.smallDept)
@@ -710,6 +710,9 @@ const errorMessageData = ref({})
  * @param val 数据
  */
 const clickError = (val) => {
+  if (yiZhuData.value.actOrderNo === 'tempOrderNo') {
+    qingKong()
+  }
   if (stringNotBlank(yiZhuData.value.actOrderNo)) {
     let param = {
       inpatientNo: props.patientInfo.inpatientNo,

+ 5 - 0
src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.js

@@ -242,4 +242,9 @@ export const clickOnThePatient = (row) => {
 
 export const currentPage = ref('')
 
+// 是出院带药
+export function isCydy() {
+    return currentPage.value === 'takeMedicine';
+}
+
 

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

@@ -66,7 +66,7 @@ import {
   winsize,
   zkList,
   selectedData,
-  queryParam, currentPage
+  queryParam, currentPage, isCydy
 } from '../public-js/zhu-yuan-yi-sheng'
 import store from '@/store'
 import {stringIsBlank} from '@/utils/blank-utils'