From d6a791f59feb5e038a77de64aeacaa5a6d6e204b Mon Sep 17 00:00:00 2001 From: wkc <978997012@qq.com> Date: Fri, 13 Mar 2026 16:49:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=91=98=E5=B7=A5=E4=B8=8E?= =?UTF-8?q?=E4=BA=B2=E5=B1=9E=E8=B5=84=E4=BA=A7=E5=AF=BC=E5=85=A5=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=93=BE=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ployee-family-asset-import-split-design.md | 5 +++ ruoyi-ui/src/api/ccdiBaseStaffAsset.js | 35 +++++++++++++++++++ ruoyi-ui/src/views/ccdiBaseStaff/index.vue | 16 ++++----- .../unit/employee-asset-api-contract.test.js | 30 +++++++++++----- .../unit/employee-asset-import-ui.test.js | 20 +++++++++++ .../staff-family-asset-api-contract.test.js | 9 +++++ ...taff-family-asset-detail-import-ui.test.js | 16 +++++++++ 7 files changed, 114 insertions(+), 17 deletions(-) create mode 100644 ruoyi-ui/src/api/ccdiBaseStaffAsset.js diff --git a/docs/plans/2026-03-13-employee-family-asset-import-split-design.md b/docs/plans/2026-03-13-employee-family-asset-import-split-design.md index 1012a9c..44b23ca 100644 --- a/docs/plans/2026-03-13-employee-family-asset-import-split-design.md +++ b/docs/plans/2026-03-13-employee-family-asset-import-split-design.md @@ -246,3 +246,8 @@ - 已新增员工资产独立导入接口 `/ccdi/baseStaff/asset/*` - 已将 `/ccdi/assetInfo/*` 收敛为亲属资产专用接口 - 已通过后端定向测试验证员工与亲属两套导入链路、模板名称和失败文案拆分生效 +- 2026-03-13 已完成前端拆分实现 +- 员工页已切换为员工资产专用前端 API `ruoyi-ui/src/api/ccdiBaseStaffAsset.js` +- 员工页上传地址、模板下载、状态轮询与失败记录查询已全部改为 `/ccdi/baseStaff/asset/*` +- 亲属页继续保持 `/ccdi/assetInfo/*` 导入链路与“亲属资产”提示文案 +- 已通过 4 个前端静态契约测试验证员工页与亲属页导入交互隔离生效 diff --git a/ruoyi-ui/src/api/ccdiBaseStaffAsset.js b/ruoyi-ui/src/api/ccdiBaseStaffAsset.js new file mode 100644 index 0000000..ce8b813 --- /dev/null +++ b/ruoyi-ui/src/api/ccdiBaseStaffAsset.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +// 下载员工资产导入模板 +export function importBaseStaffAssetTemplate() { + return request({ + url: '/ccdi/baseStaff/asset/importTemplate', + method: 'post' + }) +} + +// 导入员工资产数据 +export function importBaseStaffAssetData(data) { + return request({ + url: '/ccdi/baseStaff/asset/importData', + method: 'post', + data: data + }) +} + +// 查询员工资产导入状态 +export function getBaseStaffAssetImportStatus(taskId) { + return request({ + url: '/ccdi/baseStaff/asset/importStatus/' + taskId, + method: 'get' + }) +} + +// 查询员工资产导入失败记录 +export function getBaseStaffAssetImportFailures(taskId, pageNum, pageSize) { + return request({ + url: '/ccdi/baseStaff/asset/importFailures/' + taskId, + method: 'get', + params: { pageNum, pageSize } + }) +} diff --git a/ruoyi-ui/src/views/ccdiBaseStaff/index.vue b/ruoyi-ui/src/views/ccdiBaseStaff/index.vue index 24807dc..5adaec9 100644 --- a/ruoyi-ui/src/views/ccdiBaseStaff/index.vue +++ b/ruoyi-ui/src/views/ccdiBaseStaff/index.vue @@ -417,7 +417,7 @@ 下载员工资产模板
- 仅允许导入"xls"或"xlsx"格式文件，系统将根据 personId/person_id 自动识别归属员工。 + 仅支持导入员工本人资产数据，文件需为"xls"或"xlsx"格式，系统将根据 personId/person_id 自动识别归属员工。
@@ -520,9 +520,9 @@ import { updateBaseStaff } from "@/api/ccdiBaseStaff"; import { - getAssetImportFailures, - getAssetImportStatus -} from "@/api/ccdiAssetInfo"; + getBaseStaffAssetImportFailures, + getBaseStaffAssetImportStatus +} from "@/api/ccdiBaseStaffAsset"; import {deptTreeSelect} from "@/api/system/user"; import {getToken} from "@/utils/auth"; import Treeselect from "@riophae/vue-treeselect"; @@ -653,7 +653,7 @@ export default { title: "", isUploading: false, headers: { Authorization: "Bearer " + getToken() }, - url: process.env.VUE_APP_BASE_API + "/ccdi/assetInfo/importData" + url: process.env.VUE_APP_BASE_API + "/ccdi/baseStaff/asset/importData" }, assetFailureDialogVisible: false, assetFailureList: [], @@ -1182,7 +1182,7 @@ export default { this.download('ccdi/baseStaff/importTemplate', {}, `员工信息模板_${new Date().getTime()}.xlsx`) }, importAssetTemplate() { - this.download('ccdi/assetInfo/importTemplate', {}, `员工资产信息模板_${new Date().getTime()}.xlsx`) + this.download('ccdi/baseStaff/asset/importTemplate', {}, `员工资产信息模板_${new Date().getTime()}.xlsx`) }, // 文件上传中处理 handleFileUploadProgress(event, file, fileList) { @@ -1336,7 +1336,7 @@ export default { return; } - const response = await getAssetImportStatus(taskId); + const response = await getBaseStaffAssetImportStatus(taskId); if (response.data && response.data.status !== 'PROCESSING') { clearInterval(this.assetPollingTimer); @@ -1466,7 +1466,7 @@ export default { }, getAssetFailureList() { this.assetFailureLoading = true; - getAssetImportFailures( + getBaseStaffAssetImportFailures( this.assetCurrentTaskId, this.assetFailureQueryParams.pageNum, this.assetFailureQueryParams.pageSize diff --git a/ruoyi-ui/tests/unit/employee-asset-api-contract.test.js b/ruoyi-ui/tests/unit/employee-asset-api-contract.test.js index 5031a99..9f986e4 100644 --- a/ruoyi-ui/tests/unit/employee-asset-api-contract.test.js +++ b/ruoyi-ui/tests/unit/employee-asset-api-contract.test.js @@ -6,16 +6,19 @@ const baseStaffApiPath = path.resolve( __dirname, "../../src/api/ccdiBaseStaff.js" ); -const assetApiPath = path.resolve( +const baseStaffAssetApiPath = path.resolve( __dirname, - "../../src/api/ccdiAssetInfo.js" + "../../src/api/ccdiBaseStaffAsset.js" ); assert(fs.existsSync(baseStaffApiPath), "未找到员工 API 文件 ccdiBaseStaff.js"); -assert(fs.existsSync(assetApiPath), "未找到员工资产 API 文件 ccdiAssetInfo.js"); +assert( + fs.existsSync(baseStaffAssetApiPath), + "未找到员工资产 API 文件 ccdiBaseStaffAsset.js" +); const baseStaffSource = fs.readFileSync(baseStaffApiPath, "utf8"); -const assetSource = fs.readFileSync(assetApiPath, "utf8"); +const assetSource = fs.readFileSync(baseStaffAssetApiPath, "utf8"); [ "export function addBaseStaff(data)", @@ -29,16 +32,25 @@ const assetSource = fs.readFileSync(assetApiPath, "utf8"); }); [ - "export function importAssetTemplate()", - "export function importAssetData(data)", - "export function getAssetImportStatus(taskId)", - "export function getAssetImportFailures(taskId, pageNum, pageSize)", + "export function importBaseStaffAssetTemplate()", + "export function importBaseStaffAssetData(data)", + "export function getBaseStaffAssetImportStatus(taskId)", + "export function getBaseStaffAssetImportFailures(taskId, pageNum, pageSize)", + "/ccdi/baseStaff/asset/importTemplate", + "/ccdi/baseStaff/asset/importData", + "/ccdi/baseStaff/asset/importStatus/", + "/ccdi/baseStaff/asset/importFailures/", +].forEach((token) => { + assert(assetSource.includes(token), `员工资产 API 缺少关键契约: ${token}`); +}); + +[ "/ccdi/assetInfo/importTemplate", "/ccdi/assetInfo/importData", "/ccdi/assetInfo/importStatus/", "/ccdi/assetInfo/importFailures/", ].forEach((token) => { - assert(assetSource.includes(token), `员工资产 API 缺少关键契约: ${token}`); + assert(!assetSource.includes(token), `员工资产 API 不应再引用旧接口: ${token}`); }); console.log("employee-asset-api-contract test passed"); diff --git a/ruoyi-ui/tests/unit/employee-asset-import-ui.test.js b/ruoyi-ui/tests/unit/employee-asset-import-ui.test.js index 0715fb3..c8ed7a2 100644 --- a/ruoyi-ui/tests/unit/employee-asset-import-ui.test.js +++ b/ruoyi-ui/tests/unit/employee-asset-import-ui.test.js @@ -17,6 +17,13 @@ const source = fs.readFileSync(componentPath, "utf8"); "assetFailureDialogVisible", "employee_asset_import_last_task", "员工资产数据导入", + "下载员工资产模板", + "@/api/ccdiBaseStaffAsset", + "/ccdi/baseStaff/asset/importData", + "ccdi/baseStaff/asset/importTemplate", + "getBaseStaffAssetImportStatus", + "getBaseStaffAssetImportFailures", + "仅支持导入员工本人资产数据", ].forEach((token) => { assert( source.includes(token), @@ -24,4 +31,17 @@ const source = fs.readFileSync(componentPath, "utf8"); ); }); +[ + 'from "@/api/ccdiAssetInfo"', + "/ccdi/assetInfo/importData", + "ccdi/assetInfo/importTemplate", + "getAssetImportStatus(taskId)", + "getAssetImportFailures(", +].forEach((token) => { + assert( + !source.includes(token), + `员工资产导入 UI 不应再引用亲属资产接口: ${token}` + ); +}); + console.log("employee-asset-import-ui test passed"); diff --git a/ruoyi-ui/tests/unit/staff-family-asset-api-contract.test.js b/ruoyi-ui/tests/unit/staff-family-asset-api-contract.test.js index a293f1e..5259a4f 100644 --- a/ruoyi-ui/tests/unit/staff-family-asset-api-contract.test.js +++ b/ruoyi-ui/tests/unit/staff-family-asset-api-contract.test.js @@ -42,4 +42,13 @@ const assetSource = fs.readFileSync(assetApiPath, "utf8"); assert(assetSource.includes(token), `亲属资产 API 缺少关键契约: ${token}`); }); +[ + "/ccdi/baseStaff/asset/importTemplate", + "/ccdi/baseStaff/asset/importData", + "/ccdi/baseStaff/asset/importStatus/", + "/ccdi/baseStaff/asset/importFailures/", +].forEach((token) => { + assert(!assetSource.includes(token), `亲属资产 API 不应引用员工资产接口: ${token}`); +}); + console.log("staff-family-asset-api-contract test passed"); diff --git a/ruoyi-ui/tests/unit/staff-family-asset-detail-import-ui.test.js b/ruoyi-ui/tests/unit/staff-family-asset-detail-import-ui.test.js index 3ce1986..24ff598 100644 --- a/ruoyi-ui/tests/unit/staff-family-asset-detail-import-ui.test.js +++ b/ruoyi-ui/tests/unit/staff-family-asset-detail-import-ui.test.js @@ -24,6 +24,10 @@ const source = fs.readFileSync(componentPath, "utf8"); "startAssetImportStatusPolling(taskId)", "getAssetFailureList()", "clearAssetImportHistory()", + 'from "@/api/ccdiAssetInfo"', + "/ccdi/assetInfo/importData", + "ccdi/assetInfo/importTemplate", + "亲属资产信息模板_", ].forEach((token) => { assert(source.includes(token), `亲属资产导入 UI 缺少关键结构或状态: ${token}`); }); @@ -37,4 +41,16 @@ const source = fs.readFileSync(componentPath, "utf8"); assert(source.includes(token), `详情展示或禁改逻辑缺少关键结构: ${token}`); }); +[ + "@/api/ccdiBaseStaffAsset", + "/ccdi/baseStaff/asset/importData", + "ccdi/baseStaff/asset/importTemplate", + "下载员工资产模板", +].forEach((token) => { + assert( + !source.includes(token), + `亲属资产导入 UI 不应引用员工资产导入实现: ${token}` + ); +}); + console.log("staff-family-asset-detail-import-ui test passed");