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,102 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
/**
|
||||
* 获取单据待审批列表
|
||||
*/
|
||||
export function getReceiptList(queryParams) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/receipt-page',
|
||||
method: 'get',
|
||||
params: queryParams
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化
|
||||
*/
|
||||
export function init() {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/init',
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 审批通过
|
||||
*/
|
||||
export function purchaseInventoryApproved(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/purchase-inventory-approved?busNo=' + busNo,
|
||||
method: 'put',
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 领用出库审批通过
|
||||
*/
|
||||
export function requisitionIssueApproved(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/requisition-issue-approved?busNo=' + busNo,
|
||||
method: 'put',
|
||||
})
|
||||
}
|
||||
// 领用退库审批通过
|
||||
export function returnIssueApproved(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/return-issue-approved?busNo=' + busNo,
|
||||
method: 'put',
|
||||
})
|
||||
}
|
||||
// 报损审批通过
|
||||
export function lossReportApproved(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/loss-report-approved?busNo=' + busNo,
|
||||
method: 'put',
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 商品调拨审批通过
|
||||
*/
|
||||
export function productTransferApproved(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/product-transfer-approved?busNo=' + busNo,
|
||||
method: 'put',
|
||||
})
|
||||
}
|
||||
/**
|
||||
* 盘点审批通过
|
||||
*/
|
||||
export function productStocktakingApproved(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/product-stocktaking-approved?busNo=' + busNo,
|
||||
method: 'put',
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 审批驳回
|
||||
*/
|
||||
export function reject(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/reject?busNo=' + busNo,
|
||||
method: 'put',
|
||||
})
|
||||
}
|
||||
// 入库单据详情
|
||||
export function getpurchaseInventoryDetail(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/purchase/inventory-receipt',
|
||||
method: 'get',
|
||||
params: { busNo } // 确保参数正确传递
|
||||
})
|
||||
}
|
||||
// 查询已退库单详情
|
||||
export function getpurchaseInventoryDetailReturn(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/return/return-detail',
|
||||
method: 'get',
|
||||
params: { busNo }
|
||||
})
|
||||
}
|
||||
434
backup/vxetable-migration-20260602/medicationmanagement/billapproval/index.vue
Executable file
434
backup/vxetable-migration-20260602/medicationmanagement/billapproval/index.vue
Executable file
@@ -0,0 +1,434 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div class="table-header">
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
class="table-header-search"
|
||||
placeholder="单据号"
|
||||
/>
|
||||
<el-select
|
||||
v-model="queryParams.statusEnum"
|
||||
class="table-header-search"
|
||||
placeholder="审批状态"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in supplyStatusOption"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-select
|
||||
v-model="queryParams.typeEnum"
|
||||
class="table-header-search"
|
||||
placeholder="单据类型"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in supplyTypeOption"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-date-picker
|
||||
v-model="queryParams.applyTime"
|
||||
placeholder="请选择申请日期"
|
||||
type="date"
|
||||
size="default"
|
||||
placement="bottom"
|
||||
value-format="YYYY-MM-DD"
|
||||
@change="handleDateQuery"
|
||||
/>
|
||||
<el-button
|
||||
class="table-header-button"
|
||||
type="primary"
|
||||
plain
|
||||
icon="Download"
|
||||
@click="handleExport"
|
||||
>
|
||||
导出
|
||||
</el-button>
|
||||
<el-button
|
||||
class="table-header-button"
|
||||
icon="Refresh"
|
||||
@click="
|
||||
() => {
|
||||
queryParams = {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
statusEnum: undefined,
|
||||
searchKey: undefined,
|
||||
typeEnum: undefined,
|
||||
};
|
||||
getList();
|
||||
}
|
||||
"
|
||||
>
|
||||
重置
|
||||
</el-button>
|
||||
<el-button
|
||||
class="table-header-button"
|
||||
type="primary"
|
||||
icon="Search"
|
||||
@click="getList"
|
||||
>
|
||||
搜索
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
max-height="700"
|
||||
:data="receiptList"
|
||||
row-key="supplyBusNo"
|
||||
>
|
||||
<el-table-column
|
||||
label="单据号"
|
||||
align="center"
|
||||
prop="supplyBusNo"
|
||||
width="160"
|
||||
/>
|
||||
<el-table-column
|
||||
label="审批状态"
|
||||
align="center"
|
||||
prop="statusEnum_enumText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="单据类型"
|
||||
align="center"
|
||||
prop="typeEnum_enumText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="经手人"
|
||||
align="center"
|
||||
prop="practitionerId_dictText"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.practitionerId_dictText || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="供应商"
|
||||
align="center"
|
||||
prop="supplierId_dictText"
|
||||
width="180"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.supplierId_dictText || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="目的仓库"
|
||||
align="center"
|
||||
prop="purposeLocationId_dictText"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.purposeLocationId_dictText || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="总金额"
|
||||
align="center"
|
||||
prop="totalAmount"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.totalAmount">{{ scope.row.totalAmount }} 元 </span>
|
||||
<span v-else>{{ '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="申请人"
|
||||
align="center"
|
||||
prop="applicantId_dictText"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.applicantId_dictText || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="申请时间"
|
||||
align="center"
|
||||
prop="applyTime"
|
||||
width="180"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ formatDate(scope.row.applyTime) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="审批人"
|
||||
align="center"
|
||||
prop="approverId_dictText"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.approverId_dictText || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="审批时间"
|
||||
align="center"
|
||||
prop="approvalTime"
|
||||
width="180"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ formatDate(scope.row.approvalTime) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
width="200"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
:disabled="scope.row.statusEnum == 3 || scope.row.statusEnum == 4"
|
||||
@click="handelApplys(scope.row, 'apply')"
|
||||
>
|
||||
审批
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="handelApplys(scope.row, 'view')"
|
||||
>
|
||||
查看
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<ChkstockDetailsDialog
|
||||
ref="detailsDialogRef"
|
||||
:is-apply="isApply"
|
||||
/>
|
||||
<TransferDetailsDialog
|
||||
ref="tranDetailsDialogRef"
|
||||
:is-apply="isApply"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="Billapproval">
|
||||
import {
|
||||
getpurchaseInventoryDetail,
|
||||
getReceiptList,
|
||||
init,
|
||||
lossReportApproved,
|
||||
productStocktakingApproved,
|
||||
productTransferApproved,
|
||||
purchaseInventoryApproved,
|
||||
requisitionIssueApproved,
|
||||
returnIssueApproved,
|
||||
} from './components/api';
|
||||
import {useStore} from '@/store/store';
|
||||
import {formatDate} from '@/utils/index';
|
||||
import ChkstockDetailsDialog from '@/views/medicationmanagement/chkstock/components/chkstockDetailsDialog.vue';
|
||||
import TransferDetailsDialog from '@/views/medicationmanagement/transferManagent/components/transferDetailsDialog.vue';
|
||||
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
const store = useStore();
|
||||
const { proxy } = getCurrentInstance();
|
||||
const emit = defineEmits(['selectAdviceBase']);
|
||||
const total = ref(0);
|
||||
const isApply = ref(false);
|
||||
const queryParams = ref({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
});
|
||||
const receiptList = ref([]);
|
||||
const supplyTypeOption = ref([]);
|
||||
const supplyStatusOption = ref([]);
|
||||
const loading = ref(false);
|
||||
|
||||
watch(
|
||||
() => route.query.type,
|
||||
(newVlaue) => {
|
||||
if (newVlaue) {
|
||||
getList();
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
getList();
|
||||
function getList() {
|
||||
loading.value = true;
|
||||
getReceiptList(queryParams.value).then((res) => {
|
||||
receiptList.value = res.data.records;
|
||||
total.value = res.data.total;
|
||||
loading.value = false;
|
||||
});
|
||||
}
|
||||
|
||||
function handelApply(row) {
|
||||
if (row.typeEnum == 2 || row.typeEnum == 8) {
|
||||
//商品调拨 8 批量
|
||||
productTransferApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
} else if (row.typeEnum == 7) {
|
||||
//领用出库审批通过
|
||||
requisitionIssueApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
} else if (row.typeEnum == 9) {
|
||||
//领用退库审批通过
|
||||
returnIssueApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
} else if (row.typeEnum == 4 || row.typeEnum == 10) {
|
||||
//盘点审批 批量盘点10通过
|
||||
productStocktakingApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
} else if (row.typeEnum == 6) {
|
||||
// 报损审批通过
|
||||
lossReportApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
purchaseInventoryApproved(row.supplyBusNo).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getList();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 审批,查看
|
||||
function handelApplys(row, view) {
|
||||
if (row.typeEnum == 100086) {
|
||||
//商品调拨
|
||||
// 跳转到审核页面
|
||||
router.replace({
|
||||
path: '/medicationmanagement/transferManagement/transferManagent',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else if (row.typeEnum == 8 || row.typeEnum == 2) {
|
||||
//8 批量
|
||||
isApply.value = true;
|
||||
proxy.$refs['tranDetailsDialogRef'].open(row.supplyBusNo);
|
||||
} else if (row.typeEnum == 7) {
|
||||
//领用出库审批通过
|
||||
router.replace({
|
||||
path: '/medicationmanagement/requisitionManagement/requisitionManagement',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else if (row.typeEnum == 9) {
|
||||
//领用退库审批通过
|
||||
router.replace({
|
||||
path: '/medicationmanagement/requisitionManagement/returningInventory',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else if (row.typeEnum == 4) {
|
||||
isApply.value = true;
|
||||
//盘点审批
|
||||
proxy.$refs['detailsDialogRef'].open(row.supplyBusNo);
|
||||
} else if (row.typeEnum == 10) {
|
||||
// 批量盘点
|
||||
router.replace({
|
||||
path: '/medicationmanagement/chkstock/chkstockBatch',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else if (row.typeEnum == 6) {
|
||||
// 报损审批通过
|
||||
router.replace({
|
||||
path: '/medicationmanagement/lossReportingManagement/lossReportingManagement',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
} else if (row.typeEnum == 5) {
|
||||
// 采购退货通过5
|
||||
router.replace({
|
||||
path: '/medicationmanagement/medicationmanagement/returnedPurchase',
|
||||
query: { originalSupplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
// });
|
||||
} else {
|
||||
// 采购入库 1
|
||||
getpurchaseInventoryDetail(row.supplyBusNo).then((response) => {
|
||||
let currentData = response.data;
|
||||
// 从明细数据中获取仓库ID并设置到row，确保跳转后仓库字段能正确显示
|
||||
if (currentData && currentData.length > 0 && !row.purposeLocationId) {
|
||||
row.purposeLocationId = currentData[0].purposeLocationId;
|
||||
row.purposeLocationId_dictText = currentData[0].purposeLocationName;
|
||||
}
|
||||
store.setCurrentData({ editRow: row, item: currentData });
|
||||
router.replace({
|
||||
path: '/medicationmanagement/medicationmanagement/purchaseDocument',
|
||||
query: { supplyBusNo: row.supplyBusNo, view: view },
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function handleDateQuery(value) {
|
||||
if (value) {
|
||||
queryParams.value.applyTimeSTime = value + ' 00:00:00';
|
||||
queryParams.value.applyTimeETime = value + ' 23:59:59';
|
||||
} else {
|
||||
queryParams.value.applyTimeSTime = undefined;
|
||||
queryParams.value.applyTimeETime = undefined;
|
||||
}
|
||||
}
|
||||
function handleExport() {
|
||||
proxy.downloadGet(
|
||||
'inventory-manage/receipt/export-excel',
|
||||
{
|
||||
...queryParams.value,
|
||||
},
|
||||
`库存审批单_${proxy.formatDateStr(new Date(), 'YYYY-MM-DD')}.xlsx`
|
||||
);
|
||||
}
|
||||
optionInit();
|
||||
function optionInit() {
|
||||
init().then((res) => {
|
||||
supplyTypeOption.value = res.data.supplyTypeOptions;
|
||||
supplyStatusOption.value = res.data.supplyStatusOptions;
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.table-header-search {
|
||||
width: 200px;
|
||||
float: left;
|
||||
margin-right: 15px;
|
||||
}
|
||||
.table-header {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 15px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.table-header-button {
|
||||
float: right;
|
||||
margin-left: 10px;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user