|
@ -59,7 +59,8 @@ |
|
|
takeOverPageJob, |
|
|
takeOverPageJob, |
|
|
cancleTakeOverPageJob, |
|
|
cancleTakeOverPageJob, |
|
|
getOverPageJobDetail, |
|
|
getOverPageJobDetail, |
|
|
overPageSubmit |
|
|
overPageSubmit, |
|
|
|
|
|
getPackageLabel |
|
|
} from '@/api/request2.js'; |
|
|
} from '@/api/request2.js'; |
|
|
|
|
|
|
|
|
import { |
|
|
import { |
|
@ -328,7 +329,17 @@ |
|
|
overPageSubmit(params).then(res => { |
|
|
overPageSubmit(params).then(res => { |
|
|
uni.hideLoading() |
|
|
uni.hideLoading() |
|
|
if (res.data) { |
|
|
if (res.data) { |
|
|
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>" + res.data) |
|
|
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>",res.data.map(item=>({ |
|
|
|
|
|
itemNumber: item.itemCode, // 物品代码 |
|
|
|
|
|
itemName: item.itemName, // 物品名称 |
|
|
|
|
|
referenceOrderRow: item.poLine, // 订单行 |
|
|
|
|
|
referenceOrderCode: item.poNumber, // 订单号 |
|
|
|
|
|
supplierCode: item.supplierCode, // 供应商 |
|
|
|
|
|
packageCode: item.number, // 包装号 |
|
|
|
|
|
amount: item.qty, // 数量 |
|
|
|
|
|
barcodeString: '', // 标签信息 |
|
|
|
|
|
barcodeBase64: '' |
|
|
|
|
|
}))) |
|
|
} else { |
|
|
} else { |
|
|
this.showErrorMessage("提交失败[" + res.msg + "]") |
|
|
this.showErrorMessage("提交失败[" + res.msg + "]") |
|
|
} |
|
|
} |
|
@ -508,9 +519,25 @@ |
|
|
this.$refs.comMessage.showCommitSuccess(); |
|
|
this.$refs.comMessage.showCommitSuccess(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
showCommitSuccessMessage(hint) { |
|
|
showCommitSuccessMessage(hint,pointData) { |
|
|
|
|
|
Promise.all(pointData.map(item=>{ |
|
|
|
|
|
return getPackageLabel(item.packageCode) |
|
|
|
|
|
})).then(res=>{ |
|
|
|
|
|
res.forEach(item=>{ |
|
|
|
|
|
const point = pointData.find(pointItem=>pointItem.packageCode==item.data.list[0].relateNumber) |
|
|
|
|
|
point.barcodeString = item.data.list[0].barcodeString |
|
|
|
|
|
}) |
|
|
this.$refs.comMessage.showSuccessMessage(hint, res => { |
|
|
this.$refs.comMessage.showSuccessMessage(hint, res => { |
|
|
|
|
|
|
|
|
|
|
|
if(pointData.length>0){ |
|
|
|
|
|
uni.navigateTo({ |
|
|
|
|
|
url: `/pages/point/index?points=${JSON.stringify(pointData)}` |
|
|
|
|
|
}); |
|
|
|
|
|
}else{ |
|
|
navigateBack(1) |
|
|
navigateBack(1) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|