Commit ee688c69 by linjinhong

fix:【工厂端】【订单-PODCN】:CB类商品订单在待发货状态无法使用【普货拣货】按钮打印拣货单#1000558

parent 6855c54a
......@@ -54,6 +54,7 @@ declare module 'vue' {
ElTag: typeof import('element-plus/es')['ElTag']
ElTimeline: typeof import('element-plus/es')['ElTimeline']
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
ElTree: typeof import('element-plus/es')['ElTree']
ElUpload: typeof import('element-plus/es')['ElUpload']
......
......@@ -806,7 +806,7 @@
</span>
<span v-if="status === 'WAIT_SHIPMENT'" class="item">
<ElButton type="warning" @click="showPrintSku"
>打印库存sku标签</ElButton
>打印库存sku标签</ElButton
>
</span>
</ElFormItem>
......@@ -2981,13 +2981,15 @@ const changeExceptionOrder = async () => {
}
const showPrintSku = async () => {
if(!selection.value.length) {
if (!selection.value.length) {
return ElMessage.warning('请选择数据')
}
await printWarehouseSkuDialogRef.value?.open(1,selection.value.map((item) => item.id).join(','))
await printWarehouseSkuDialogRef.value?.open(
1,
selection.value.map((item) => item.id).join(','),
)
}
const handleExceptionConfirm = async () => {
try {
await exceptionFormRef.value.validate()
......@@ -3034,7 +3036,10 @@ const printNormal = async () => {
}
selection.value.forEach((s) => {
const f =
s.productList && s.productList.find((p) => p.productMark === 'normal')
s.productList &&
s.productList.find(
(p) => p.productMark === 'normal' || p.productMark === 'custom_normal',
)
if (f) arr.push(s.id)
})
if (!arr.length) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment