更新vxetable框架并升级前端组件框架

This commit is contained in:
2026-06-03 11:19:52 +08:00
parent 5b6b23331d
commit 5a2050a736
385 changed files with 19691 additions and 21188 deletions

View File

@@ -1,4 +1,4 @@
<template>
<template>
<div
v-loading="readCardLoading"
style="display: flex; justify-content: space-between"
@@ -57,42 +57,42 @@
搜索
</el-button>
</div>
<el-table
<vxe-table
ref="patientListRef"
height="620"
:data="patientList"
row-key="encounterId"
:row-config="{ keyField: 'encounterId', keyField: 'id' }"
highlight-current-row
@cell-click="clickRow"
>
<el-table-column
label="住院号"
<vxe-column
title="住院号"
align="center"
prop="encounterBusNo"
field="encounterBusNo"
/>
<!-- <el-table-column label="床号" align="center" prop="bedNo" /> -->
<el-table-column
label="姓名"
<!-- <vxe-column title="床号" align="center" field="bedNo" /> -->
<vxe-column
title="姓名"
align="center"
prop="patientName"
field="patientName"
/>
<el-table-column
label="账户余额"
<vxe-column
title="账户余额"
align="center"
prop="balanceAmount"
field="balanceAmount"
/>
<!-- <el-table-column label="时间" align="center" prop="receptionTime" width="160">
<!-- <vxe-column title="时间" align="center" field="receptionTime" width="160">
<template #default="scope">
{{ formatDate(scope.row.receptionTime) }}
</template>
</el-table-column> -->
<el-table-column
label="结算状态"
</vxe-column> -->
<vxe-column
title="结算状态"
align="center"
prop="encounterStatus_enumText"
field="encounterStatus_enumText"
/>
</el-table>
</vxe-table>
</div>
</el-card>
<div style="width: 69%">
@@ -213,70 +213,69 @@
</el-button>
<span style="float: right">合计金额{{ totalAmounts ? totalAmounts.toFixed(2) : 0 }}</span>
</div>
<el-table
<vxe-table
ref="chargeListRef"
v-loading="chargeLoading"
height="530"
:data="chargeFilterList"
row-key="id"
:span-method="objectSpanMethod"
border
@selection-change="handleSelectionChange"
@checkbox-change="handleSelectionChange"
>
<el-table-column
type="selection"
<vxe-column
type="checkbox"
:selectable="checkSelectable"
width="55"
/>
<el-table-column
label="单据号"
<vxe-column
title="单据号"
align="center"
prop="busNo"
field="busNo"
width="180"
/>
<el-table-column
label=" 开立科室"
<vxe-column
title=" 开立科室"
align="center"
prop="requestingOrgId"
field="requestingOrgId"
width="180"
/>
<el-table-column
label="处方号"
<vxe-column
title="处方号"
align="center"
prop="prescriptionNo"
field="prescriptionNo"
width="180"
/>
<el-table-column
label="收费项目"
<vxe-column
title="收费项目"
align="center"
prop="itemName"
field="itemName"
width="200"
/>
<el-table-column
label="数量"
<vxe-column
title="数量"
align="center"
prop="quantityValue"
field="quantityValue"
width="80"
/>
<el-table-column
label="医疗类型"
<vxe-column
title="医疗类型"
align="center"
prop="medTypeCode_dictText"
field="medTypeCode_dictText"
/>
<el-table-column
label="医保编码"
<vxe-column
title="医保编码"
align="center"
prop="ybNo"
field="ybNo"
/>
<el-table-column
label="费用性质"
<vxe-column
title="费用性质"
align="center"
prop="contractName"
field="contractName"
/>
<el-table-column
label="结算状态"
<vxe-column
title="结算状态"
align="center"
prop="statusEnum_enumText"
field="statusEnum_enumText"
width="150"
>
<template #default="scope">
@@ -309,71 +308,71 @@
{{ scope.row.statusEnum_enumText }}
</el-tag>
</template>
</el-table-column>
<el-table-column
label="金额"
</vxe-column>
<vxe-column
title="金额"
align="right"
prop="totalPrice"
field="totalPrice"
header-align="center"
>
<template #default="scope">
{{ scope.row.totalPrice.toFixed(2) + ' 元' || '0.00' + ' 元' }}
</template>
</el-table-column>
<el-table-column
label="收款人"
</vxe-column>
<vxe-column
title="收款人"
align="center"
prop="entererId_dictText"
field="entererId_dictText"
/>
<el-table-column
label="收费时间"
<vxe-column
title="收费时间"
align="center"
prop="billDate"
field="billDate"
width="180"
/>
<el-table-column
label="应收金额"
<vxe-column
title="应收金额"
align="right"
prop="receivableAmount"
field="receivableAmount"
header-align="center"
>
<template #default="scope">
{{ scope.row.receivableAmount.toFixed(2) + ' 元' || '0.00' + ' 元' }}
</template>
</el-table-column>
<el-table-column
label="实收金额"
</vxe-column>
<vxe-column
title="实收金额"
align="right"
prop="receivedAmount"
field="receivedAmount"
header-align="center"
>
<template #default="scope">
{{ scope.row.receivedAmount.toFixed(2) + ' 元' || '0.00' + ' 元' }}
</template>
</el-table-column>
<el-table-column
label="优惠金额"
</vxe-column>
<vxe-column
title="优惠金额"
align="right"
prop="discountAmount"
field="discountAmount"
header-align="center"
>
<template #default="scope">
{{ scope.row.discountAmount.toFixed(2) + ' 元' || '0.00' + ' 元' }}
</template>
</el-table-column>
<el-table-column
label="折扣率"
</vxe-column>
<vxe-column
title="折扣率"
align="right"
prop="discountRate"
field="discountRate"
header-align="center"
>
<template #default="scope">
<!-- discountRate是一个字符串类型的 -->
{{ Number(scope.row.discountRate).toFixed(2) + '%' || '0.00' + '%' }}
</template>
</el-table-column>
<el-table-column
label="操作"
</vxe-column>
<vxe-column
title="操作"
align="center"
fixed="right"
header-align="center"
@@ -389,8 +388,8 @@
打印
</el-button>
</template>
</el-table-column>
</el-table>
</vxe-column>
</vxe-table>
</el-card>
</div>
<ChargeDialog
@@ -431,7 +430,7 @@ import ChargeDialog from './components/chargeDialog.vue';
import {formatDateStr} from '@/utils';
import useUserStore from '@/store/modules/user';
import Decimal from 'decimal.js';
import moment from 'moment';
import dayjs from 'dayjs';
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
@@ -467,7 +466,7 @@ const receptionTime = ref([
// 计算当前时间+6天
const accumulateDay = () => {
// 获取当前时间
let now = moment();
let now = dayjs();
// 在当前时间上加一天
let tomorrow = now.add(6, 'days');
// 格式化为年-月-日的格式
@@ -489,10 +488,10 @@ const costSearch = () => {
if (costSearchTime.value === null) {
chargeFilterList.value = chargeList.value;
} else {
const startTime = moment(costSearchTime.value[0], 'YYYY-MM-DD');
const endTime = moment(costSearchTime.value[1], 'YYYY-MM-DD');
const startTime = dayjs(costSearchTime.value[0], 'YYYY-MM-DD');
const endTime = dayjs(costSearchTime.value[1], 'YYYY-MM-DD');
const filterData = chargeList.value.filter((item) => {
const itemDate = moment(item.billDate || '', 'YYYY-MM-DD'); // 将数据项的日期也格式化为moment对象
const itemDate = dayjs(item.billDate || '', 'YYYY-MM-DD'); // 将数据项的日期也格式化为moment对象
return itemDate.isBetween(startTime, endTime, null, '[]'); // 使用isBetween方法进行范围判断'[]'表示包含边界值
});
chargeFilterList.value = filterData;
@@ -575,7 +574,7 @@ function clickRow(row) {
chargeList.value = res.data;
setTimeout(() => {
chargeLoading.value = false;
chargeListRef.value.toggleAllSelection();
chargeListRef.value.toggleAllCheckboxRow();
}, 100);
});
}
@@ -910,7 +909,7 @@ function printCharge(row) {
background-color: transparent !important;
}
:deep(.el-table__body) tr:hover td.no-hover-column {
:deep(.vxe-table--body) tr:hover td.no-hover-column {
background-color: inherit !important;
}
</style>