bug550\556569
This commit is contained in:
@@ -58,7 +58,11 @@
|
||||
<el-table-column prop="busNo" label="单据号" align="center" width="150" />
|
||||
<el-table-column prop="applicantName" label="申请人" align="center" width="100" />
|
||||
<el-table-column prop="locationName" label="发药药房" align="center" />
|
||||
<el-table-column prop="statusEnum_enumText" label="状态" align="center" />
|
||||
<el-table-column prop="statusEnum_enumText" label="状态" align="center">
|
||||
<template #default="scope">
|
||||
{{ formatSummaryStatusText(scope.row) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="applyTime" label="汇总日期" align="center" width="140">
|
||||
<template #default="scope">
|
||||
{{ scope.row.applyTime ? parseTime(scope.row.applyTime, '{y}-{m}-{d}') : '-' }}
|
||||
@@ -139,6 +143,32 @@ import {getCurrentInstance, ref} from 'vue';
|
||||
import {getFromSummaryDetails, getFromSummaryInit, getFromSummaryList, totalSendDrug,} from './api.js';
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
|
||||
/** 发药汇总单状态展示(汇总申请→已提交,发药→已发药) */
|
||||
const SUMMARY_STATUS_DISPLAY = {
|
||||
2: '已提交',
|
||||
4: '已发药',
|
||||
};
|
||||
const LEGACY_SUMMARY_STATUS_TEXT = {
|
||||
待配药: '已提交',
|
||||
已发放: '已发药',
|
||||
};
|
||||
|
||||
function formatSummaryStatusText(row) {
|
||||
const code = Number(row?.statusEnum);
|
||||
if (SUMMARY_STATUS_DISPLAY[code]) {
|
||||
return SUMMARY_STATUS_DISPLAY[code];
|
||||
}
|
||||
return LEGACY_SUMMARY_STATUS_TEXT[row?.statusEnum_enumText] || row?.statusEnum_enumText || '-';
|
||||
}
|
||||
|
||||
function mapSummaryStatusOptions(options = []) {
|
||||
return options.map((item) => ({
|
||||
...item,
|
||||
label: SUMMARY_STATUS_DISPLAY[item.value] ?? LEGACY_SUMMARY_STATUS_TEXT[item.label] ?? item.label,
|
||||
}));
|
||||
}
|
||||
|
||||
const statusEnumOptions = ref([]);
|
||||
const summaryList = ref([]);
|
||||
const queryParams = ref({
|
||||
@@ -222,7 +252,7 @@ function handleSend(row) {
|
||||
const getStatusOption = async () => {
|
||||
try {
|
||||
const res = await getFromSummaryInit();
|
||||
statusEnumOptions.value = res.data.dispenseStatusOptions;
|
||||
statusEnumOptions.value = mapSummaryStatusOptions(res.data.dispenseStatusOptions);
|
||||
} catch (error) {}
|
||||
};
|
||||
getStatusOption();
|
||||
|
||||
Reference in New Issue
Block a user