From f725a14875d6cbc8f6fe18e51b54fb8a60f870d6 Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Wed, 4 Nov 2026 16:31:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(inspection):=20=E6=B7=BB=E5=8A=A0=E9=AA=8C?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=8B=86=E5=88=86=E4=B8=8E=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增验货申请拆分和合并的API接口 - 在主列表添加多选框及拆分操作入口 - 新增合并验货申请按钮及前置校验逻辑 - 实现拆分弹窗及PO明细勾选拆出新单功能 - 实现合并弹窗及多单合并至最小后缀单功能 - 调整阶梯价格变更弹窗宽度以优化显示 --- src/api/inspection/inspectionRequestHeader.js | 6 + .../inspection/inspectionScheduleList.vue | 354 +++++++++++++++++- .../modules/supplier/supplierPartMoqPrice.vue | 2 +- 3 files changed, 360 insertions(+), 2 deletions(-) diff --git a/src/api/inspection/inspectionRequestHeader.js b/src/api/inspection/inspectionRequestHeader.js index cf3aed6..486fffb 100644 --- a/src/api/inspection/inspectionRequestHeader.js +++ b/src/api/inspection/inspectionRequestHeader.js @@ -108,3 +108,9 @@ export const deleteInspectionDetails = (data) => createAPI(`/inspection/deleteDe // 草稿编辑保存(合并删除/修改/新增/更新基础信息) export const editSaveInspectionRequest = (data) => createAPI(`/inspection/editSave`, 'post', data) + +// 拆分验货申请(仅已下达状态:勾选行拆出新单号,剩余行留原/改号码) +export const splitInspectionRequest = (data) => createAPI(`/inspection/split`, 'post', data) + +// 合并验货申请(仅已下达状态:同一原单拆出的 -N 单据多选合并,结果保留最小后缀单号) +export const mergeInspectionRequest = (data) => createAPI(`/inspection/merge`, 'post', data) diff --git a/src/views/modules/inspection/inspectionScheduleList.vue b/src/views/modules/inspection/inspectionScheduleList.vue index 5f6c26e..4c8b437 100644 --- a/src/views/modules/inspection/inspectionScheduleList.vue +++ b/src/views/modules/inspection/inspectionScheduleList.vue @@ -56,6 +56,7 @@ 查询 + 合并验货申请 @@ -112,6 +113,92 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ 已勾选 {{ splitSelection.length }} 行 / 共 {{ splitSubList.length }} 行;勾选行将拆入新申请单号,剩余行留在原(改号后)申请单号,拆分后两单需分别排程分配QC人员 +
+ + 拆分 + 关闭 + +
+ + + + + + + + + + + + + + + + + + + + +
+ 共 {{ mergeSubList.length }} 行PO明细将合并到 {{ mergeForm.targetNo }};合并后其余单号作废、明细整单重算,需重新排程分配QC人员 +
+ + 合并 + 关闭 + +
+ + 变更审批 + 拆分 @@ -192,7 +285,7 @@ diff --git a/src/views/modules/supplier/supplierPartMoqPrice.vue b/src/views/modules/supplier/supplierPartMoqPrice.vue index eade8ec..d056f7c 100644 --- a/src/views/modules/supplier/supplierPartMoqPrice.vue +++ b/src/views/modules/supplier/supplierPartMoqPrice.vue @@ -265,7 +265,7 @@