Browse Source

修复

master_hella_20240701
zhaoxuebing 6 months ago
parent
commit
aba9b3ca5d
  1. 6
      src/api/wms/supplierdeliverRequestMain/index.ts
  2. 1
      src/locales/en-US.ts
  3. 1
      src/locales/zh-CN.ts
  4. 26
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

6
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 }) 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) => { export const genRecordsSupplierdeliverRequestMain = async (id) => {
return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id }) return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id })

1
src/locales/en-US.ts

@ -774,6 +774,7 @@ export default {
:'Item packaging information', :'Item packaging information',
:'System Prompt', :'System Prompt',
:'Do you generate labels for this data?', :'Do you generate labels for this data?',
:'Do you want to modify the quantity of material packaging?',
:'Do you process the selected data?', :'Do you process the selected data?',
:'shipments', :'shipments',
:'Label information', :'Label information',

1
src/locales/zh-CN.ts

@ -774,6 +774,7 @@ export default {
:'物品包装信息', :'物品包装信息',
:'系统提示', :'系统提示',
:'是否为此数据生成标签', :'是否为此数据生成标签',
:'是否修改物料包装标包数量',
:'是否处理所选中数据', :'是否处理所选中数据',
:'发货', :'发货',
:'标签信息', :'标签信息',

26
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -788,11 +788,27 @@ const submitFormLabel = async (formType, data) => {
console.log("formType==",formType) console.log("formType==",formType)
console.log("data==",data) console.log("data==",data)
data.subList = detatableData.tableList data.subList = detatableData.tableList
console.log("detatableData",detatableData) //
await message.confirm(t('ts.是否为此数据生成标签?')) let flag = false;
await SupplierdeliverRequestMainApi.genLabel(data) await SupplierdeliverRequestMainApi.checkPackQty(data).then(async res => {
isCreateLabel.value = true if(res){
message.success(t('ts.创建标签成功')) 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() getList()
} finally { } finally {
formLabelRef.value.formLoading = false formLabelRef.value.formLoading = false

Loading…
Cancel
Save