|
@@ -339,7 +339,7 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
|
|
|
if (row.serial === '01' || row.serial === '99') {
|
|
|
try {
|
|
|
let res = await huoQuFeiYongXinXi(row.orderCode, row.serial, props.patientInfo.zkWard)
|
|
|
- openTheOrderPopUpWindow()
|
|
|
+
|
|
|
// 加载药品计量
|
|
|
yaoPinJiLiangData.value = res.yaoPingJiLiang
|
|
|
if (newData) {
|
|
@@ -389,8 +389,7 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ openTheOrderPopUpWindow()
|
|
|
} catch (e) {
|
|
|
if (yiZhuData.value.statusFlag === '1') {
|
|
|
await Sleep(200)
|
|
@@ -455,10 +454,18 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
|
|
|
if (currentPage.value === 'takeMedicine') {
|
|
|
yiZhuData.value.selfBuy = '4'
|
|
|
}
|
|
|
+ // 显示父医嘱的名称
|
|
|
+ if (yiZhuData.value.statusFlag !== '1' && yiZhuData.value.parentNo) {
|
|
|
+ fuYiZhuData.value = []
|
|
|
+ fuYiZhuData.value.push({
|
|
|
+ actOrderNo: yiZhuData.value.parentNo,
|
|
|
+ orderName: yiZhuData.value.parentNoName,
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
// 如果搜索了医嘱那么 这里就需要 重新赋值,不认表格就没办法变化了,把原来的换掉
|
|
|
for (let i = 0, len = yzData.value.length; i < len; i++) {
|
|
|
- let item = yzData.value[i]
|
|
|
+ let item = yzData.value[i];
|
|
|
if (yiZhuData.value.actOrderNo === item.actOrderNo) {
|
|
|
yzData.value[i] = yiZhuData.value
|
|
|
return
|