Skip to content

F
factory_front
Commit 7661482b by wusiyi
Options

fix: 修改工厂订单new订单行物流相关按钮展示范围 #1004198

parent b44b5e4a
Showing with 11 additions and 28 deletions
src/views/order/factoryOrderNew/index.vue
...@@ -726,7 +726,10 @@ ...@@ -726,7 +726,10 @@
}} }}
</ElButton> </ElButton>
<ElButton <ElButton
v-if="showPendingLogisticsUpdateAddress(row)" v-if="
showPendingLogisticsUpdateAddress(row) &&
row.shipmentType === 1
"
type="primary" type="primary"
link link
size="small" size="small"
...@@ -744,17 +747,7 @@ ...@@ -744,17 +747,7 @@
更换物流方式 更换物流方式
</ElButton> </ElButton>
<ElButton <ElButton
v-if=" v-if="showPendingLogisticsUpdateAddress(row)"
[
'ALL',
'PENDING_RECEIVE',
'PENDING_CREATE_LOGISTICS',
'PENDING_SCHEDULE',
'PICKING',
'PENDING_DELIVERY',
'SUSPEND',
].includes(status)
"
type="success" type="success"
link link
size="small" size="small"
...@@ -1264,24 +1257,14 @@ const receiverAddressForm = ref<AddressInfo>({ ...@@ -1264,24 +1257,14 @@ const receiverAddressForm = ref<AddressInfo>({
}) })
const showPendingLogisticsUpdateAddress = (row: FactoryOrderNewListData) => const showPendingLogisticsUpdateAddress = (row: FactoryOrderNewListData) =>
[ status.value === 'ALL' ||
'ALL', status.value === 'PENDING_CREATE_LOGISTICS' ||
'PENDING_RECEIVE', (status.value === 'SUSPEND' && suspendedSubTab.value === 2)
'PENDING_CREATE_LOGISTICS',
'PENDING_SCHEDULE',
'PICKING',
'PENDING_DELIVERY',
'SUSPEND',
].includes(status.value) && row.shipmentType === 1
const showChangeLogistics = (row: FactoryOrderNewListData) => const showChangeLogistics = (row: FactoryOrderNewListData) =>
[ (status.value === 'ALL' ||
'ALL', (status.value === 'SUSPEND' && suspendedSubTab.value === 2)) &&
'PENDING_SCHEDULE', row.shipmentType === 1
'PICKING',
'PENDING_DELIVERY',
'SUSPEND',
].includes(status.value) && row.shipmentType === 1
const submitFactoryOrderReceiverAddress = (data: AddressInfo) => const submitFactoryOrderReceiverAddress = (data: AddressInfo) =>
updateReceiverAddressApi(data) updateReceiverAddressApi(data)
......
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