Compare commits
No commits in common. "5211f818fc008bb6cd99b0519f53220f4ab252d6" and "072f4dd833079afe9f1da34b7f221fdc371c8293" have entirely different histories.
5211f818fc
...
072f4dd833
@ -2389,12 +2389,6 @@ const openAddDrawer = (row?: any) => {
|
||||
showReadOnlyTip()
|
||||
return
|
||||
}
|
||||
// 收货单未设置货主时不允许创建商品
|
||||
const receivingStoreId = Number(props.row?.store_id ?? props.row?.store?.id)
|
||||
if (!Number.isFinite(receivingStoreId) || receivingStoreId <= 0) {
|
||||
ElMessage.warning('请先设置收货单货主')
|
||||
return
|
||||
}
|
||||
// row here is product row, but store info comes from parent receiving row (props.row)
|
||||
addDrawerStore.value = props.row?.store || { id: props.row?.store_id, name: props.row?.store_name }
|
||||
if (row) {
|
||||
|
||||
@ -1727,7 +1727,7 @@ function initializeSiteSelection(
|
||||
}
|
||||
|
||||
function syncExtDataByServiceSelection() {
|
||||
const expressCode = String(formData.express_code || formData.sys_express_code || '').trim()
|
||||
const expressCode = String(formData.express_code || '').trim()
|
||||
if (!selectedShopId.value || !expressCode) {
|
||||
formData.ext_data = undefined
|
||||
return
|
||||
@ -1742,7 +1742,20 @@ function syncExtDataByServiceSelection() {
|
||||
bucket[field.attrCode] = toServicePayloadValue(v)
|
||||
})
|
||||
|
||||
formData.ext_data = Object.keys(valueByService).length > 0 ? valueByService : undefined
|
||||
const serviceSelection: Record<string, any> = {}
|
||||
Object.entries(valueByService).forEach(([serviceCode, attrValues]) => {
|
||||
const entries = Object.entries(attrValues || {})
|
||||
if (entries.length === 0) return
|
||||
if (entries.length === 1) {
|
||||
const firstEntry = entries[0]
|
||||
if (!firstEntry) return
|
||||
serviceSelection[serviceCode] = firstEntry[1]
|
||||
return
|
||||
}
|
||||
serviceSelection[serviceCode] = attrValues
|
||||
})
|
||||
|
||||
formData.ext_data = Object.keys(serviceSelection).length > 0 ? serviceSelection : undefined
|
||||
}
|
||||
|
||||
async function handleExpressCodeChange() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user