|
@@ -178,7 +178,13 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
-
|
|
|
+ <el-dialog title="此患者有未处理的药单" v-model="showUnhandledDrugOrder" width="400px">
|
|
|
+ <el-table :data="negativeFees" empty-text=" " height="300">
|
|
|
+ <el-table-column property="groupName" label="药房" width="120"></el-table-column>
|
|
|
+ <el-table-column property="pageNo" label="药单号" width="120"></el-table-column>
|
|
|
+ <el-table-column property="pageNoTy" label="退药单号" width="120"></el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </el-dialog>
|
|
|
<el-dialog title="撤销检验项目" v-model="conventionsVisible" fullscreen @close="closeThreeConventions">
|
|
|
<el-table :data="roughConventions" @row-click="clickConvention" highlight-current-row :height="actOrderHeight" @selection-change="handleSelectConvention">
|
|
|
<el-table-column type="selection"></el-table-column>
|
|
@@ -379,26 +385,28 @@ export default {
|
|
|
if (null === res.status) {
|
|
|
patient.value.sid = store.getters['user/sid']
|
|
|
patient.value.zjdzDatetime = getDatetime()
|
|
|
- dismissCalculate(patient.value)
|
|
|
- .then(() => {
|
|
|
- settleApply.value.patNo = patient.value.inpatientNo
|
|
|
- settleApply.value.times = patient.value.admissTimes
|
|
|
- settleApply.value.ledgerSn = patient.value.ledgerSn
|
|
|
- settleApply.value.type = midSetl ? 2 : 1
|
|
|
- settleApply.value.settleDatetime = res.settleDatetime
|
|
|
- settleApply.value.acctUsedFlag = '0'
|
|
|
- settleApply.value.inputComment = midSetl ? null : '医嘱离院。'
|
|
|
- showSettleApplyForm.value = true
|
|
|
- })
|
|
|
- .catch((res2) => {
|
|
|
- if (res2.code && res2.code === 1004) {
|
|
|
- negativeFees.value = res2.data
|
|
|
- showNegativeFee.value = true
|
|
|
- dismissCalMsg.value = res2.message
|
|
|
- } else {
|
|
|
- dismissCalMsg.value = res2.toString()
|
|
|
- }
|
|
|
- })
|
|
|
+ dismissCalculate(patient.value).then(() => {
|
|
|
+ settleApply.value.patNo = patient.value.inpatientNo
|
|
|
+ settleApply.value.times = patient.value.admissTimes
|
|
|
+ settleApply.value.ledgerSn = patient.value.ledgerSn
|
|
|
+ settleApply.value.type = midSetl ? 2 : 1
|
|
|
+ settleApply.value.settleDatetime = res.settleDatetime
|
|
|
+ settleApply.value.acctUsedFlag = '0'
|
|
|
+ settleApply.value.inputComment = midSetl ? null : '医嘱离院。'
|
|
|
+ showSettleApplyForm.value = true
|
|
|
+ }).catch((res2) => {
|
|
|
+ if (res2.code && res2.code === 1004) {
|
|
|
+ negativeFees.value = res2.data
|
|
|
+ dismissCalMsg.value = res2.message
|
|
|
+ showNegativeFee.value = true
|
|
|
+ } else if(res2.code && res2.code === 1104) {
|
|
|
+ negativeFees.value = res2.data
|
|
|
+ dismissCalMsg.value = res2.message
|
|
|
+ showUnhandledDrugOrder.value = true
|
|
|
+ } else {
|
|
|
+ dismissCalMsg.value = res2.toString()
|
|
|
+ }
|
|
|
+ })
|
|
|
} else {
|
|
|
switch (res.status) {
|
|
|
case 0:
|
|
@@ -444,8 +452,12 @@ export default {
|
|
|
.catch((res) => {
|
|
|
if (res.code && res.code === 1004) {
|
|
|
negativeFees.value = res.data
|
|
|
+ dismissCalMsg.value = res.message
|
|
|
showNegativeFee.value = true
|
|
|
+ } else if(res.code && res.code === 1104) {
|
|
|
+ negativeFees.value = res.data
|
|
|
dismissCalMsg.value = res.message
|
|
|
+ showUnhandledDrugOrder.value = true
|
|
|
} else {
|
|
|
dismissCalMsg.value = res.toString()
|
|
|
}
|
|
@@ -473,6 +485,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
const showNegativeFee = ref(false)
|
|
|
+ const showUnhandledDrugOrder = ref(false)
|
|
|
const negativeFees = ref([])
|
|
|
|
|
|
const doCalFee = () => {
|
|
@@ -487,8 +500,12 @@ export default {
|
|
|
.catch((res) => {
|
|
|
if (res.code && res.code === 1004) {
|
|
|
negativeFees.value = res.data
|
|
|
+ dismissCalMsg.value = res.message
|
|
|
showNegativeFee.value = true
|
|
|
+ } else if(res.code && res.code === 1104) {
|
|
|
+ negativeFees.value = res.data
|
|
|
dismissCalMsg.value = res.message
|
|
|
+ showUnhandledDrugOrder.value = true
|
|
|
} else {
|
|
|
dismissCalMsg.value = res.toString()
|
|
|
}
|
|
@@ -746,6 +763,7 @@ export default {
|
|
|
switchActOrder,
|
|
|
closeActOrder,
|
|
|
showNegativeFee,
|
|
|
+ showUnhandledDrugOrder,
|
|
|
negativeFees,
|
|
|
getOrderStatus,
|
|
|
getOrderDetailStatus,
|