Commit b44b5e4a by wusiyi

feat: 工厂订单new列表操作物流相关按钮可见页面修改 #1004198

parent 6b8f53c8
...@@ -741,11 +741,12 @@ ...@@ -741,11 +741,12 @@
size="small" size="small"
@click.stop="handleChangeLogistics(row)" @click.stop="handleChangeLogistics(row)"
> >
更换物流 更换物流方式
</ElButton> </ElButton>
<ElButton <ElButton
v-if=" v-if="
[ [
'ALL',
'PENDING_RECEIVE', 'PENDING_RECEIVE',
'PENDING_CREATE_LOGISTICS', 'PENDING_CREATE_LOGISTICS',
'PENDING_SCHEDULE', 'PENDING_SCHEDULE',
...@@ -1264,6 +1265,7 @@ const receiverAddressForm = ref<AddressInfo>({ ...@@ -1264,6 +1265,7 @@ const receiverAddressForm = ref<AddressInfo>({
const showPendingLogisticsUpdateAddress = (row: FactoryOrderNewListData) => const showPendingLogisticsUpdateAddress = (row: FactoryOrderNewListData) =>
[ [
'ALL',
'PENDING_RECEIVE', 'PENDING_RECEIVE',
'PENDING_CREATE_LOGISTICS', 'PENDING_CREATE_LOGISTICS',
'PENDING_SCHEDULE', 'PENDING_SCHEDULE',
...@@ -1273,9 +1275,13 @@ const showPendingLogisticsUpdateAddress = (row: FactoryOrderNewListData) => ...@@ -1273,9 +1275,13 @@ const showPendingLogisticsUpdateAddress = (row: FactoryOrderNewListData) =>
].includes(status.value) && row.shipmentType === 1 ].includes(status.value) && row.shipmentType === 1
const showChangeLogistics = (row: FactoryOrderNewListData) => const showChangeLogistics = (row: FactoryOrderNewListData) =>
['PENDING_SCHEDULE', 'PICKING', 'PENDING_DELIVERY', 'SUSPEND'].includes( [
status.value, 'ALL',
) && row.shipmentType === 1 'PENDING_SCHEDULE',
'PICKING',
'PENDING_DELIVERY',
'SUSPEND',
].includes(status.value) && row.shipmentType === 1
const submitFactoryOrderReceiverAddress = (data: AddressInfo) => const submitFactoryOrderReceiverAddress = (data: AddressInfo) =>
updateReceiverAddressApi(data) updateReceiverAddressApi(data)
...@@ -1519,7 +1525,7 @@ const mainColumns = computed(() => [ ...@@ -1519,7 +1525,7 @@ const mainColumns = computed(() => [
{ {
prop: 'operation', prop: 'operation',
label: '操作', label: '操作',
minWidth: 220, minWidth: 300,
align: 'center', align: 'center',
slot: 'operation', slot: 'operation',
fixed: 'right', fixed: 'right',
......
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