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"
   >
     <div v-if="loading" class="psc-loading">{{ t('common.loading') }}</div>
@@ -1077,7 +1078,7 @@ watch(inboundMethod, (method) => {
             }}
           </span>
         </header>
-        <a-form layout="vertical" class="single-form-grid single-form-grid--compact">
+        <a-form layout="vertical" class="single-form-grid">
           <a-form-item
             :label="
               isFulfillWms
@@ -1401,20 +1402,6 @@ watch(inboundMethod, (method) => {
         </a-form>
       </section>
 
-      <div class="psc-submit-bar liquid-card">
-        <div class="order-agreement-bar">
-          <a-checkbox v-model="agreementChecked" />
-          <span class="agreement-link" @click="openAgreementModal">
-            {{ t('order.placeOrder.agreement.label') }}
-          </span>
-        </div>
-        <span class="psc-submit-bar__hint">
-          {{ productLabel }}
-          <template v-if="warehouseId"> · {{ warehouseLabel }}</template>
-          · {{ drafts.length }} {{ t('order.platformStoreOrder.createLogistics.unitOrders') }}
-        </span>
-      </div>
-
       <div v-if="showBatchBar" class="psc-batch-bar">
         <div class="psc-batch-bar__left">
           <a-switch v-model="batchMode" size="small" />
@@ -1746,6 +1733,34 @@ watch(inboundMethod, (method) => {
       </div>
 
     </div>
+
+    <template #footer>
+      <div class="psc-modal-footer">
+        <div class="order-agreement-bar">
+          <a-checkbox v-model="agreementChecked" />
+          <span class="agreement-link" @click="openAgreementModal">
+            {{ t('order.placeOrder.agreement.label') }}
+          </span>
+        </div>
+        <span class="psc-modal-footer__hint">
+          {{ productLabel }}
+          <template v-if="warehouseId"> · {{ warehouseLabel }}</template>
+          · {{ drafts.length }} {{ t('order.platformStoreOrder.createLogistics.unitOrders') }}
+        </span>
+        <div class="psc-modal-footer__actions">
+          <a-button @click="close">{{ t('common.cancel') }}</a-button>
+          <a-button
+            type="primary"
+            class="app-btn-primary-soft"
+            :loading="submitting"
+            :disabled="!canSubmit || loading"
+            @click="onFooterOk"
+          >
+            {{ submitOkText }}
+          </a-button>
+        </div>
+      </div>
+    </template>
   </a-modal>
 
   <a-modal
@@ -2041,15 +2056,12 @@ watch(inboundMethod, (method) => {
   }
 }
 
-.psc-submit-bar {
+.psc-modal-footer {
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  gap: 12px 16px;
-  gap: 12px;
   flex-wrap: wrap;
-  margin-bottom: 10px;
+  width: 100%;
-  padding: 12px 16px;
-  flex-shrink: 0;
 }
 
 .order-agreement-bar {
@@ -2071,10 +2083,19 @@ watch(inboundMethod, (method) => {
   }
 }
 
-.psc-submit-bar__hint {
+.psc-modal-footer__hint {
-  margin-left: auto;
   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 {