From aba9b3ca5dffc95a3ff30a28bf5b1ac032968f2f Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 30 May 2024 16:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierdeliverRequestMain/index.ts | 6 +++++ src/locales/en-US.ts | 1 + src/locales/zh-CN.ts | 1 + .../supplierdeliverRequestMain/index.vue | 26 +++++++++++++++---- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index dddc0c3a1..b85ae51c6 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -96,6 +96,12 @@ export const genLabel = async (data:SupplierdeliverRequestMainVO) => { return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel`,data }) } +// 校验是否修改了包装数量 +export const checkPackQty = async (data:SupplierdeliverRequestMainVO) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/checkPackQty`,data }) +} + + // 生成记录 export const genRecordsSupplierdeliverRequestMain = async (id) => { return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id }) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 8716cb4cf..a1b887cfa 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -774,6 +774,7 @@ export default { 物品包装信息:'Item packaging information', 系统提示:'System Prompt', 是否为此数据生成标签:'Do you generate labels for this data?', + 是否修改物料包装标包数量:'Do you want to modify the quantity of material packaging?', 是否处理所选中数据:'Do you process the selected data?', 发货:'shipments', 标签信息:'Label information', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index ea7b03a7d..285b29a13 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -774,6 +774,7 @@ export default { 物品包装信息:'物品包装信息', 系统提示:'系统提示', 是否为此数据生成标签:'是否为此数据生成标签', + 是否修改物料包装标包数量:'是否修改物料包装标包数量', 是否处理所选中数据:'是否处理所选中数据', 发货:'发货', 标签信息:'标签信息', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index feda09164..58ebb27b9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -788,11 +788,27 @@ const submitFormLabel = async (formType, data) => { console.log("formType==",formType) console.log("data==",data) data.subList = detatableData.tableList - console.log("detatableData",detatableData) - await message.confirm(t('ts.是否为此数据生成标签?')) - await SupplierdeliverRequestMainApi.genLabel(data) - isCreateLabel.value = true - message.success(t('ts.创建标签成功')) + // 校验物料包装规格数量是否修改 + let flag = false; + await SupplierdeliverRequestMainApi.checkPackQty(data).then(async res => { + if(res){ + await message.confirm(t('ts.是否修改物料包装标包数量')+'?').then(()=>{ + flag = true; //修改标包数量 + }).catch(() =>{ + flag = false + }) + }else{ + flag = true; //修改标包数量 + } + }) + console.log("返回结果",flag); + if(flag){ + console.log("detatableData",detatableData) + await message.confirm(t('ts.是否为此数据生成标签?')) + await SupplierdeliverRequestMainApi.genLabel(data) + isCreateLabel.value = true + message.success(t('ts.创建标签成功')) + } getList() } finally { formLabelRef.value.formLoading = false