Commit ca64941e by wusiyi

Merge branch 'dev'

parents 66018a90 f09e095a
...@@ -2526,6 +2526,7 @@ const interceptCurrent = ref(1) ...@@ -2526,6 +2526,7 @@ const interceptCurrent = ref(1)
const interceptStatus = ref(0) const interceptStatus = ref(0)
const userMarkList = ref<string[]>([]) const userMarkList = ref<string[]>([])
const selection = ref<PodUsOrderListData[]>([]) const selection = ref<PodUsOrderListData[]>([])
const currentItem = ref<PodUsOrderListData | null>(null)
const pickerOptions = { const pickerOptions = {
shortcuts: [ shortcuts: [
{ {
...@@ -4035,6 +4036,7 @@ const rejectOrder = async (type: string) => { ...@@ -4035,6 +4036,7 @@ const rejectOrder = async (type: string) => {
} }
const handleStockOut = async (row: PodUsOrderListData) => { const handleStockOut = async (row: PodUsOrderListData) => {
currentItem.value = row
wayDialogTitle.value = `切换物流(当前物流方式:${row.logisticsWayName})` wayDialogTitle.value = `切换物流(当前物流方式:${row.logisticsWayName})`
isChangeWay.value = true isChangeWay.value = true
...@@ -4116,8 +4118,8 @@ const changeWaySubmit = async (title: string) => { ...@@ -4116,8 +4118,8 @@ const changeWaySubmit = async (title: string) => {
try { try {
const params = { const params = {
updateByIdParam: { updateByIdParam: {
id: selection.value[0]?.id, id: currentItem.value?.id,
dataVersion: selection.value[0]?.version as number, dataVersion: currentItem.value?.version as number,
}, },
logisticsTrialCalculation: { ...changeWayRow.value }, logisticsTrialCalculation: { ...changeWayRow.value },
} }
......
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