diff --git a/src/views/order/platformStoreOrder/CreateLogisticsModal.vue b/src/views/order/platformStoreOrder/CreateLogisticsModal.vue index 3b7c7f6..09fe03b 100644 --- a/src/views/order/platformStoreOrder/CreateLogisticsModal.vue +++ b/src/views/order/platformStoreOrder/CreateLogisticsModal.vue @@ -242,6 +242,17 @@ const title = computed(() => { return t('order.platformStoreOrder.createLogistics.title') }) +const submitOkText = computed(() => { + if (isFulfillWms.value) return t('order.platformStoreOrder.createFulfillWms.submit') + if (isFulfill.value) return t('order.platformStoreOrder.createFulfill.submit') + return t('order.platformStoreOrder.createLogistics.submit') +}) + +async function onFooterOk() { + const ok = await handleSubmit() + if (ok) close() +} + const activeDraft = computed(() => drafts.value.find((d) => d.storeOrderId === activeId.value)) const activeShipLines = computed(() => activeDraft.value?.lines || []) @@ -1034,22 +1045,12 @@ watch(inboundMethod, (method) => { :title="title" :width="isFulfill ? '1360px' : '1080px'" :top="isFulfill ? '20px' : '6vh'" - :ok-loading="submitting" - :ok-text=" - isFulfillWms - ? t('order.platformStoreOrder.createFulfillWms.submit') - : isFulfill - ? t('order.platformStoreOrder.createFulfill.submit') - : t('order.platformStoreOrder.createLogistics.submit') - " - :ok-button-props="{ disabled: !canSubmit || loading }" unmount-on-close :body-style="{ padding: '12px 16px', maxHeight: isFulfill ? 'calc(100vh - 140px)' : 'calc(100vh - 160px)', overflow: isFulfill ? 'hidden' : 'auto', }" - :on-before-ok="handleSubmit" @cancel="close" >
{{ t('common.loading') }}
@@ -1077,7 +1078,7 @@ watch(inboundMethod, (method) => { }} - + -
- - - {{ t('order.placeOrder.agreement.label') }} - -
- - {{ productLabel }} - - · {{ drafts.length }} {{ t('order.platformStoreOrder.createLogistics.unitOrders') }} - - -
@@ -1746,6 +1733,34 @@ watch(inboundMethod, (method) => {
+ + { } } -.psc-submit-bar { +.psc-modal-footer { display: flex; align-items: center; - justify-content: space-between; - gap: 12px; + gap: 12px 16px; flex-wrap: wrap; - margin-bottom: 10px; - padding: 12px 16px; - flex-shrink: 0; + width: 100%; } .order-agreement-bar { @@ -2071,10 +2083,19 @@ watch(inboundMethod, (method) => { } } -.psc-submit-bar__hint { - margin-left: auto; +.psc-modal-footer__hint { font-size: 12px; color: var(--color-text-3); + flex: 1; + min-width: 120px; +} + +.psc-modal-footer__actions { + display: inline-flex; + align-items: center; + gap: 8px; + margin-left: auto; + flex-shrink: 0; } .psc-agreement-body {