Commit b6138559 by qinjianhui

fix: 更新报关信息打开谈款数据未清空bug修改

parent e24b3539
...@@ -701,7 +701,7 @@ ...@@ -701,7 +701,7 @@
修改地址 修改地址
</ElButton> </ElButton>
<ElButton <ElButton
v-if="showPendingLogisticsRefreshAddress()" v-if="row.status === 'PENDING_CREATE_LOGISTICS'"
type="primary" type="primary"
link link
size="small" size="small"
...@@ -780,6 +780,7 @@ ...@@ -780,6 +780,7 @@
@show-result="createLogisticsSuccess" @show-result="createLogisticsSuccess"
/> />
<UpdateCustomDeclarationInfoDialog <UpdateCustomDeclarationInfoDialog
ref="updateCustomsDialogRef"
v-model="updateCustomsDialogVisible" v-model="updateCustomsDialogVisible"
:order-selection="selectedRows" :order-selection="selectedRows"
:is-new-order="true" :is-new-order="true"
...@@ -1081,11 +1082,7 @@ const receiverAddressForm = ref<AddressInfo>({ ...@@ -1081,11 +1082,7 @@ const receiverAddressForm = ref<AddressInfo>({
}) })
const showPendingLogisticsUpdateAddress = (row: FactoryOrderNewListData) => const showPendingLogisticsUpdateAddress = (row: FactoryOrderNewListData) =>
status.value === 'PENDING_CREATE_LOGISTICS' && row.shipmentType === 1 row.status === 'PENDING_CREATE_LOGISTICS' && row.shipmentType === 1
const showPendingLogisticsRefreshAddress = () => {
if (status.value !== 'PENDING_CREATE_LOGISTICS') return false
}
const submitFactoryOrderReceiverAddress = (data: AddressInfo) => const submitFactoryOrderReceiverAddress = (data: AddressInfo) =>
updateReceiverAddressApi(data) updateReceiverAddressApi(data)
...@@ -1224,7 +1221,7 @@ const mainColumns = [ ...@@ -1224,7 +1221,7 @@ const mainColumns = [
minWidth: 160, minWidth: 160,
align: 'center', align: 'center',
}, },
{ prop: 'weight', label: '总克重', minWidth: 120, align: 'right' }, { prop: 'weight', label: '总克重(g)', minWidth: 120, align: 'right' },
{ {
prop: 'productNum', prop: 'productNum',
label: '商品总数量', label: '商品总数量',
...@@ -1352,7 +1349,7 @@ const baseProductColumns = computed(() => [ ...@@ -1352,7 +1349,7 @@ const baseProductColumns = computed(() => [
}, },
{ {
prop: 'weight', prop: 'weight',
label: '克重', label: '克重(g)',
minWidth: 100, minWidth: 100,
align: 'right', align: 'right',
}, },
...@@ -1659,12 +1656,20 @@ const handleLogisticsCommand = async (command: string) => { ...@@ -1659,12 +1656,20 @@ const handleLogisticsCommand = async (command: string) => {
} }
const handleSuspend = () => { const handleSuspend = () => {
if (!ensureSelection()) return if (!ensureSelection()) return
const ids = getSelectedIds() let ids: (number | string)[]
if (isCardLayout.value) {
ids = cardSelectList.value.map((row) => row.podOrderId as number)
} else {
ids = selectedRows.value.map((row) => row.id)
}
suspendDialogRef.value?.open(ids) suspendDialogRef.value?.open(ids)
} }
const handleUpdateCustomsInfo = () => { const updateCustomsDialogRef = ref()
const handleUpdateCustomsInfo = async () => {
if (!ensureSelection()) return if (!ensureSelection()) return
updateCustomsDialogVisible.value = true updateCustomsDialogVisible.value = true
await nextTick()
updateCustomsDialogRef.value?.resetForm()
} }
const handleTransferToArrange = async () => { const handleTransferToArrange = async () => {
......
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