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 @@