feat: Spring Boot 3.5.14 全量升级 + 组件升级
核心升级: - Spring Boot 2.7.18 → 3.5.14 - MyBatis Plus 3.5.5 → 3.5.16 (spring-boot3-starter) - Springdoc 1.8.0 → 2.8.6 (OpenAPI 3) - Flowable 6.8.0 → 7.1.0 - Druid 1.2.x → 1.2.28 (boot3-starter) - kotlin-reflect 1.9.10 → 1.9.25 迁移适配: - javax → jakarta 命名空间 (620+ 文件) - Swagger 注解迁移到 OpenAPI 3 (@Tag/@Schema/@Operation/@Parameter) - Spring Security 6.2 适配 (antMatchers→requestMatchers, EnableMethodSecurity) - Druid 包名迁移 (boot→boot3) - Redis 配置路径迁移 (spring.redis→spring.data.redis) - Flyway 适配 (flyway-database-postgresql) - Flowable 7.x 适配 (MULE_TASK_IMAGE 移除) 修复: - spring-boot-maven-plugin 2.5.15→3.5.14 (SPI服务发现失效) - mybatis-plus-boot-starter 3.5.5→3.5.16 (kotlin-reflect+fastjson2冲突) - Flowable database-schema-update 启用自动建表 验证: 23/23 测试通过, 1374 API端点正常
This commit is contained in:
@@ -0,0 +1,445 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
ref="queryRef"
|
||||
:model="queryParams"
|
||||
:inline="true"
|
||||
label-width="90px"
|
||||
>
|
||||
<el-form-item
|
||||
label="药品名称："
|
||||
prop="searchKey"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
placeholder="药品编码/药品名称/名称拼音/供应商名"
|
||||
clearable
|
||||
style="width: 250px"
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="编码：" prop="medicationDefId">
|
||||
<el-input
|
||||
v-model="queryParams.medicationDefId"
|
||||
placeholder="编码："
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
<!-- <el-form-item label="剩余过期天数：" prop="remainingDays" label-width="110px">
|
||||
<el-input
|
||||
v-model="queryParams.remainingDays"
|
||||
placeholder="查询 ≤ X 天的记录"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
|
||||
<el-form-item
|
||||
label="药品类别："
|
||||
prop="categoryCode"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.categoryCode"
|
||||
placeholder="请选择药品类别"
|
||||
clearable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="categoryCode in item_category_code"
|
||||
:key="categoryCode.value"
|
||||
:label="categoryCode.label"
|
||||
:value="categoryCode.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="医保等级："
|
||||
prop="chrgitmLv"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.chrgitmLv"
|
||||
placeholder="请选择医保等级"
|
||||
clearable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="chrgitmLv_enumText in chrgitmLv_enumTextOptions"
|
||||
:key="chrgitmLv_enumText.value"
|
||||
:label="chrgitmLv_enumText.info"
|
||||
:value="chrgitmLv_enumText.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="仓库药房："
|
||||
prop="locationId"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.locationId"
|
||||
placeholder="请选择仓库药房"
|
||||
clearable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="supplyStatus in locationIdList"
|
||||
:key="supplyStatus.value"
|
||||
:label="supplyStatus.name"
|
||||
:value="supplyStatus.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="库存范围："
|
||||
prop="warehouseScope"
|
||||
>
|
||||
<el-select
|
||||
v-model="queryParams.warehouseScope"
|
||||
placeholder="请选择库存范围"
|
||||
clearable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="supplyStatus in inventory_range"
|
||||
:key="supplyStatus.value"
|
||||
:label="supplyStatus.label"
|
||||
:value="supplyStatus.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
>
|
||||
<el-col :span="1.5">
|
||||
<!-- v-hasPermi="['system:user:import']" -->
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Search"
|
||||
@click="handleQuery"
|
||||
>
|
||||
查询
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<!-- v-hasPermi="['system:user:export']" -->
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="CircleClose"
|
||||
@click="handleClear"
|
||||
>
|
||||
重置
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="purchaseinventoryList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="50"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
key="categoryCode_dictText"
|
||||
label="药品类别"
|
||||
align="center"
|
||||
prop="categoryCode_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="busNo"
|
||||
label="药品编码"
|
||||
align="center"
|
||||
prop="busNo"
|
||||
width="130"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="medicineName"
|
||||
label="药品名称"
|
||||
align="center"
|
||||
prop="medicineName"
|
||||
width="160"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="totalVolume"
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="totalVolume"
|
||||
width="120"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="quantityUnit"
|
||||
label="请领数量(本月药房入库数量)"
|
||||
align="center"
|
||||
prop="quantityUnit"
|
||||
width="190px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="price"
|
||||
label="请领进价"
|
||||
align="center"
|
||||
prop="price"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="retailPrice"
|
||||
label="请领零售价"
|
||||
align="center"
|
||||
prop="retailPrice"
|
||||
width="89px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="quantity"
|
||||
label="销售数量"
|
||||
align="center"
|
||||
prop="quantity"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="price"
|
||||
label="销售进价"
|
||||
align="center"
|
||||
prop="price"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="retailPrice"
|
||||
label="销售零售价"
|
||||
align="center"
|
||||
prop="retailPrice"
|
||||
width="89px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="quantity"
|
||||
label="返库数量(退货数量)"
|
||||
align="center"
|
||||
prop="quantity"
|
||||
width="140px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="price"
|
||||
label="返库进价"
|
||||
align="center"
|
||||
prop="price"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="retailPrice"
|
||||
label="返库零价"
|
||||
align="center"
|
||||
prop="retailPrice"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="quantity"
|
||||
label="报损数量"
|
||||
align="center"
|
||||
prop="quantity"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="price"
|
||||
label="报损进价"
|
||||
align="center"
|
||||
prop="price"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="retailPrice"
|
||||
label="报损零售价"
|
||||
align="center"
|
||||
prop="retailPrice"
|
||||
width="89px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="quantity"
|
||||
label="盘点数量"
|
||||
align="center"
|
||||
prop="quantity"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="price"
|
||||
label="盘点进价"
|
||||
align="center"
|
||||
prop="price"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="quantity"
|
||||
label="本期库存数量"
|
||||
align="center"
|
||||
prop="quantity"
|
||||
width="105px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="totalPrice"
|
||||
label="库存进价合计"
|
||||
align="center"
|
||||
prop="totalPrice"
|
||||
width="105"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
key="totalSalePrice"
|
||||
label="库存零价合计"
|
||||
align="center"
|
||||
prop="totalSalePrice"
|
||||
width="105"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="settlementDoc">
|
||||
import {getInit, getPharmacyCabinetList, getproductReturnPage} from './statisticalManagent';
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
|
||||
const {
|
||||
item_category_code,
|
||||
inventory_range,
|
||||
} = proxy.useDict(
|
||||
"item_category_code",
|
||||
"inventory_range",
|
||||
);
|
||||
|
||||
const purchaseinventoryList = ref([]);
|
||||
|
||||
const loading = ref(true);
|
||||
|
||||
const ids = ref([]);
|
||||
const single = ref(true);
|
||||
const multiple = ref(true);
|
||||
const total = ref(0);
|
||||
const supplyTypeOptions = ref(undefined);
|
||||
const supplyStatusOptions = ref(undefined);
|
||||
const chrgitmLv_enumTextOptions = ref([]);
|
||||
const locationIdList = ref([]);
|
||||
|
||||
const data = reactive({
|
||||
form: {},
|
||||
queryParams: {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
searchKey: undefined,
|
||||
remainingDays: undefined,
|
||||
// hospital:undefined,
|
||||
categoryCode: undefined,
|
||||
chrgitmLv: undefined,
|
||||
warehouseScope: undefined,
|
||||
locationId: undefined,
|
||||
// occurrenceTimeSTime:undefined,
|
||||
// occurrenceTimeETime:undefined,
|
||||
},
|
||||
rules: {},
|
||||
});
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data);
|
||||
|
||||
function getPharmacyCabinetLists() {
|
||||
getPharmacyCabinetList().then((response) => {
|
||||
locationIdList.value = response.data;
|
||||
});
|
||||
getInit().then((response) => {
|
||||
chrgitmLv_enumTextOptions.value = response.data.chrgitmLvOptions;
|
||||
});
|
||||
}
|
||||
/** 查询调拨管理项目列表 */
|
||||
function getList() {
|
||||
loading.value = true;
|
||||
getproductReturnPage(queryParams.value).then((res) => {
|
||||
loading.value = false;
|
||||
purchaseinventoryList.value = res.data.records;
|
||||
|
||||
if (purchaseinventoryList.value && purchaseinventoryList.value.length > 0) {
|
||||
purchaseinventoryList.value.map((k, index) => {
|
||||
k.inventoryStatusEnum_enumText =
|
||||
k.inventoryStatusEnum == 2 ? '未停供' : k.inventoryStatusEnum == 3 ? '已停供' : '';
|
||||
k.quantityUnit = k.quantity / k.partPercent;
|
||||
const integerPart1 = Math.floor(k.quantityUnit); // 获取整数部分
|
||||
const decimalPart1 = k.quantityUnit - integerPart1; // 获取小数部分
|
||||
|
||||
if (decimalPart1) {
|
||||
k.quantityUnit =
|
||||
integerPart1 +
|
||||
k.unitCode_dictText +
|
||||
(decimalPart1 * k.partPercent).toFixed(0) +
|
||||
k.minUnitCode_dictText;
|
||||
}
|
||||
k.price = k.price ? k.price.toFixed(2) : 0;
|
||||
k.retailPrice = k.retailPrice ? k.retailPrice.toFixed(2) : 0;
|
||||
k.totalPrice = k.price * (Number(k.quantity) / k.partPercent);
|
||||
k.totalPrice = k.totalPrice ? k.totalPrice.toFixed(2) : 0;
|
||||
k.totalSalePrice = k.retailPrice * (Number(k.quantity) / k.partPercent);
|
||||
k.totalSalePrice = k.totalSalePrice ? k.totalSalePrice.toFixed(2) : 0;
|
||||
});
|
||||
}
|
||||
total.value = res.data.total;
|
||||
});
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
function handleQuery() {
|
||||
// queryParams.value.occurrenceTimeSTime =
|
||||
// occurrenceTime.value && occurrenceTime.value.length == 2
|
||||
// ? occurrenceTime.value[0] + " 00:00:00"
|
||||
// : "";
|
||||
// queryParams.value.occurrenceTimeETime =
|
||||
// occurrenceTime.value && occurrenceTime.value.length == 2
|
||||
// ? occurrenceTime.value[1] + " 23:59:59"
|
||||
// : "";
|
||||
queryParams.value.pageNo = 1;
|
||||
getList();
|
||||
}
|
||||
|
||||
/** 清空条件按钮操作 */
|
||||
function handleClear() {
|
||||
// 清空查询条件
|
||||
proxy.resetForm('queryRef');
|
||||
getList();
|
||||
}
|
||||
|
||||
/** 选择条数 */
|
||||
function handleSelectionChange(selection) {
|
||||
ids.value = selection.map((item) => item.id);
|
||||
single.value = selection.length != 1;
|
||||
multiple.value = !selection.length;
|
||||
}
|
||||
|
||||
getList();
|
||||
getPharmacyCabinetLists();
|
||||
</script>
|
||||
<style scoped>
|
||||
.custom-tree-node {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user