|
@@ -5,7 +5,7 @@
|
|
|
<el-option v-for="item in userWards" :value="item.value" :label="item.label"></el-option>
|
|
|
</el-select>
|
|
|
<span class="ml12">
|
|
|
- 执行日期:<el-date-picker v-model="queryParams.executeDate" :clearable="false" style="width: 102px"></el-date-picker>
|
|
|
+ 执行日期:<el-date-picker v-model="queryParams.executeDate" :clearable="false" style="width: 102px" @change="datePickChange"></el-date-picker>
|
|
|
</span>
|
|
|
<span class="ml12">床位范围:
|
|
|
<el-select v-model="queryParams.bedNoStart" style="width: 70px" value-key="bedNo"
|
|
@@ -60,7 +60,6 @@
|
|
|
<template #main>
|
|
|
<div style="display: flex; flex-wrap: wrap" id="infusion_list">
|
|
|
<div v-if="queryParams.cardType === 'INFUSION_CARD'">
|
|
|
-
|
|
|
<div v-for="(item, index) in patientInfusionInfos" :id="item.patInfo.patNo">
|
|
|
<div class="crad-area"
|
|
|
style="width: 90%; margin: 8px 12px; padding: 4px; border: 1px solid red ;display: flex;justify-content: center; align-items: center;">
|
|
@@ -80,7 +79,8 @@
|
|
|
</div>
|
|
|
<!-- <div class="print-hiden-area" style="margin: 0px 12px">
|
|
|
<div class="print-bottle-card-area" style="display: flex;margin: 0px;">
|
|
|
- <div v-for="(item, index) in printPatientBottleInfos" :id="item.patInfo.patNo + '-' + index" style="width: 240px;margin-right: 10px;">
|
|
|
+ <div v-for="(item, index) in printPatientBottleInfos" :id="item.patInfo.patNo + '-' + index"
|
|
|
+ style="width: 240px;margin-right: 10px;">
|
|
|
<bottle-card :drugs="item.bottleCardDrugs" :pat-info="item.patInfo" :yz-date="queryParams.executeDate"
|
|
|
:bottle-group="item.bottleGroup" style="margin-bottom: 10px;">
|
|
|
</bottle-card>
|
|
@@ -161,7 +161,14 @@ const handleTypeChange = () => {
|
|
|
patientInfusionInfos.value = []
|
|
|
}
|
|
|
|
|
|
+const datePickChange = () => {
|
|
|
+ patientInfusionInfos.value = []
|
|
|
+ queryParams.executeDate = formatDate(queryParams.executeDate)
|
|
|
+ console.log("patientInfusionInfos",patientInfusionInfos.value)
|
|
|
+}
|
|
|
+
|
|
|
const executeQuery = () => {
|
|
|
+ patientInfusionInfos.value = []
|
|
|
queryParams.executeDate = formatDate(queryParams.executeDate)
|
|
|
queryParams.bedNos = []
|
|
|
patientBedList.value.forEach(bed => {
|
|
@@ -170,26 +177,28 @@ const executeQuery = () => {
|
|
|
}
|
|
|
})
|
|
|
queryInfusionCardOrBottleCard(queryParams).then(res => {
|
|
|
- patientInfusionInfos.value = res
|
|
|
- if (queryParams.cardType !== 'INFUSION_CARD' && patientInfusionInfos.value.length > 0) {
|
|
|
- //瓶贴分配药品组号
|
|
|
- patientInfusionInfos.value.forEach(item => {
|
|
|
- let group = patientInfusionInfos.value.filter(citem => citem.patInfo.patNo === item.patInfo.patNo)
|
|
|
- group.forEach((v, vindex) => {
|
|
|
- let target = patientInfusionInfos.value.find(citem => citem.bottleCardDrugs[0].actOrderNo === v.bottleCardDrugs[0].actOrderNo)
|
|
|
- target.bottleGroup = vindex + 1 + "/" + group.length
|
|
|
- // console.log("target",target)
|
|
|
+ nextTick(() => {
|
|
|
+ patientInfusionInfos.value = res
|
|
|
+ if (queryParams.cardType !== 'INFUSION_CARD' && patientInfusionInfos.value.length > 0) {
|
|
|
+ //瓶贴分配药品组号
|
|
|
+ patientInfusionInfos.value.forEach(item => {
|
|
|
+ let group = patientInfusionInfos.value.filter(citem => citem.patInfo.patNo === item.patInfo.patNo)
|
|
|
+ group.forEach((v, vindex) => {
|
|
|
+ let target = patientInfusionInfos.value.find(citem => citem.bottleCardDrugs[0].actOrderNo === v.bottleCardDrugs[0].actOrderNo)
|
|
|
+ target.bottleGroup = vindex + 1 + "/" + group.length
|
|
|
+ // console.log("target",target)
|
|
|
+ })
|
|
|
+ // console.log("group",group)
|
|
|
+ // console.log("index")
|
|
|
})
|
|
|
- // console.log("group",group)
|
|
|
- // console.log("index")
|
|
|
- })
|
|
|
- // console.log("patientInfusionInfo s",patientInfusionInfos.value)
|
|
|
- }
|
|
|
- // for (let i = 0; i < 2; i++) {
|
|
|
- // patientInfusionInfos.value = [...patientInfusionInfos.value, ...res]
|
|
|
- // }
|
|
|
- // printPatientBottleInfos.value = res
|
|
|
- printDate.value = getDatetime()
|
|
|
+ // console.log("patientInfusionInfo s",patientInfusionInfos.value)
|
|
|
+ }
|
|
|
+ for (let i = 0; i < 2; i++) {
|
|
|
+ patientInfusionInfos.value = [...patientInfusionInfos.value, ...res]
|
|
|
+ }
|
|
|
+ // printPatientBottleInfos.value = res
|
|
|
+ printDate.value = getDatetime()
|
|
|
+ })
|
|
|
}).catch(() => {
|
|
|
patientInfusionInfos.value = []
|
|
|
})
|