+
lis分组
-
-
-
+
+
+
+
+
+
+
+
血量
@@ -847,7 +854,7 @@ const route = useRoute();
// 存储LIS分组数据
const lisGroupList = ref([]);
// 选中的LIS分组
-const selectedLisGroup = ref('');
+const selectedLisGroup = ref(undefined);
// LIS分组加载状态
const loadingLisGroup = ref(false);
@@ -894,7 +901,7 @@ const getLisGroupList = async () => {
}
}
- lisGroupList.value = items;
+ lisGroupList.value = items.map(item => ({ ...item, id: Number(item.id) }));
} else {
ElMessage.error('获取LIS分组数据失败');
}
@@ -1552,20 +1559,10 @@ const deletePackageItem = (index) => {
};
-// 更新项目金额（考虑折扣）
+// 更新项目金额（金额 = 数量 × 单价，不应用折扣；折扣只影响套餐总金额）
const updateItemAmount = (item) => {
- // 计算项目原价金额
- const originalAmount = (item.quantity || 1) * (item.unitPrice || 0.00);
-
- // 应用折扣到项目金额
- let discountedAmount = originalAmount;
- if (discount.value && !isNaN(parseFloat(discount.value))) {
- const discountRate = parseFloat(discount.value) / 100;
- discountedAmount = originalAmount * (1 - discountRate);
- }
-
- // 更新项目金额
- item.amount = parseFloat(discountedAmount.toFixed(2));
+ // 金额 = 数量 × 单价
+ item.amount = parseFloat(((item.quantity || 1) * (item.unitPrice || 0.00)).toFixed(2));
// 注意：serviceFee 由用户手动输入，不在此处覆盖
@@ -1647,15 +1644,9 @@ const cancelEditItem = (index) => {
// 计算套餐金额和服务费
const calculateAmounts = () => {
- // 更新每个项目的折扣金额和总金额
+ // 更新每个项目的金额（金额 = 数量 × 单价，不受折扣影响）和总金额
packageItems.value.forEach(item => {
- const originalAmount = (item.quantity || 1) * (item.unitPrice || 0.00);
- let discountedAmount = originalAmount;
- if (discount.value && !isNaN(parseFloat(discount.value))) {
- const discountRate = parseFloat(discount.value) / 100;
- discountedAmount = originalAmount * (1 - discountRate);
- }
- item.amount = parseFloat(discountedAmount.toFixed(2));
+ item.amount = parseFloat(((item.quantity || 1) * (item.unitPrice || 0.00)).toFixed(2));
// serviceFee 由用户手动输入，不覆盖；只更新 totalAmount
item.totalAmount = parseFloat(((item.amount) + (item.serviceFee || 0)).toFixed(2));
});
@@ -1663,9 +1654,14 @@ const calculateAmounts = () => {
// 汇总各明细行服务费到基本信息服务费（只读展示）
serviceFee.value = parseFloat(packageItems.value.reduce((sum, item) => sum + (item.serviceFee || 0), 0).toFixed(2));
- // 套餐总金额 = 各行折扣后金额之和 + 各行服务费之和
- const totalAmount = packageItems.value.reduce((sum, item) => sum + (item.amount || 0) + (item.serviceFee || 0), 0);
- packageAmount.value = parseFloat(totalAmount.toFixed(2));
+ // 套餐总金额 = (各行金额之和 + 各行服务费之和) × 折扣比例
+ const rawTotal = packageItems.value.reduce((sum, item) => sum + (item.amount || 0) + (item.serviceFee || 0), 0);
+ let finalTotal = rawTotal;
+ if (discount.value && !isNaN(parseFloat(discount.value)) && parseFloat(discount.value) > 0) {
+ const discountRate = parseFloat(discount.value) / 100; // 80 → 0.8，表示八折保留80%
+ finalTotal = rawTotal * discountRate;
+ }
+ packageAmount.value = parseFloat(finalTotal.toFixed(2));
};
const itemNameRefs = ref([]);
@@ -2019,7 +2015,7 @@ const saveItem = async (item) => {
const submitData = {
busNo: item.code.trim(),
name: item.name.trim(),
- categoryCode: inspectionCategoryCode.value,
+ categoryCode: inspectionCategoryCode.value , // '22' 为检验分类的固定字典值，防止字典未加载时为空
inspectionTypeId: item.inspectionTypeId || null,
feePackageId: item.feePackageId || null,
subItemId: item.subItemId || null,
@@ -2183,7 +2179,7 @@ const handleSave = () => {
enablePackagePrice: enablePackagePrice.value,
packageAmount: packageAmount.value,
serviceFee: serviceFee.value,
- lisGroup: selectedLisGroup.value, // 从下拉框获取
+ lisGroup: selectedLisGroup.value || null,
bloodVolume: bloodVolume.value,
remarks: remarks.value,
orgName: (tenantOptions.value.find(t => t.value === selectedTenantId.value)?.label) || userStore.orgName || '', // 卫生机构
@@ -2423,13 +2419,13 @@ const savePackageData = async (basicInfo, detailData) => {
// 关闭加载提示
loading.close();
- ElMessage.success('保存成功');
-
if (isEditMode) {
- // 编辑模式：重新加载最新数据，保持在编辑页面
- loadInspectionPackage(String(packageId));
+ // 编辑模式：提示更新成功并跳转到套餐管理页面
+ ElMessage.success('更新成功');
+ router.push({ path: '/maintainSystem/Inspection/PackageManagement' });
} else {
// 新增模式：保存成功后重置表单
+ ElMessage.success('保存成功');
doResetForm();
}
@@ -2498,7 +2494,7 @@ const doResetForm = () => {
enablePackagePrice.value = true;
packageAmount.value = 0.00;
serviceFee.value = 0.00;
- selectedLisGroup.value = '';
+ selectedLisGroup.value = undefined;
bloodVolume.value = '';
remarks.value = '';
@@ -2522,6 +2518,11 @@ const loadInspectionPackage = async (packageId) => {
background: 'rgba(0, 0, 0, 0.7)',
});
+ // 确保 lis分组列表已加载，否则编辑时下拉框无法显示名称
+ if (lisGroupList.value.length === 0) {
+ await getLisGroupList();
+ }
+
// 获取基本信息
const basicResponse = await getInspectionPackage(packageId);
if (basicResponse.code !== 200) {
@@ -2551,7 +2552,7 @@ const loadInspectionPackage = async (packageId) => {
enablePackagePrice.value = basicData.enablePackagePrice !== false;
packageAmount.value = parseFloat(basicData.packageAmount || 0);
serviceFee.value = parseFloat(basicData.serviceFee || 0);
- selectedLisGroup.value = basicData.lisGroup || '';
+ selectedLisGroup.value = (basicData.lisGroup != null && basicData.lisGroup !== 0 && basicData.lisGroup !== '0') ? Number(basicData.lisGroup) : undefined;
bloodVolume.value = basicData.bloodVolume || '';
remarks.value = basicData.remarks || '';