优化

src/modules/overseas-warehouse/components/DispatchDocumentsDialog.vue

@@ -56,6 +56,7 @@ async function selectDelivery(value: string) { if (value !== selected.value && a
 async function beforeClose(done: () => void) { if (await canLeave()) done() }
 function selectTab(value: string) { if (!busy.value) { tab.value = value } }
 function saved() { emit('saved') }
+function pickupCompleted() { open.value = false; emit('saved') }
 async function loadingSaved() { emit('saved'); await load() }
 watch(() => [open.value, props.dispatchNo] as const, ([visible]) => {
   sequence++; detail.value = null; selected.value = ''; tab.value = 'RECEIPT'; error.value = null; directLooseboard.value = false
@@ -63,11 +64,11 @@ watch(() => [open.value, props.dispatchNo] as const, ([visible]) => {
 }, { immediate: true })
 </script>
 <template>
-  <AppDialog v-model="open" class="admin-density admin-density-dialog admin-workbench is-dialog" :title="'管理资料 · ' + (dispatchNo || '—')" width="min(1100px, calc(100vw - 40px))" fullscreenable :loading="loading" :confirm-loading="busy" :before-close="beforeClose" :show-confirm="tab === 'RECEIPT' && Boolean(editor?.canEdit)" :confirm-disabled="loading || editor?.loading || editor?.conflict" confirm-text="保存资料" cancel-text="关闭" @confirm="editor?.save()">
+  <AppDialog v-model="open" class="admin-density admin-density-dialog admin-workbench is-dialog" :title="'管理资料 · ' + (dispatchNo || '—')" width="min(1100px, calc(100vw - 40px))" fullscreenable :loading="loading" :confirm-loading="busy" :before-close="beforeClose" :show-confirm="tab === 'LOOSEBOARD' ? Boolean(looseboardEditor?.canCompletePickup) : tab === 'RECEIPT' && Boolean(editor?.canEdit)" :confirm-disabled="loading || busy || (tab === 'RECEIPT' && (editor?.loading || editor?.conflict))" :confirm-text="tab === 'LOOSEBOARD' ? '取货完成' : '保存资料'" cancel-text="关闭" @confirm="tab === 'LOOSEBOARD' ? looseboardEditor?.confirmPickup() : editor?.save()">
     <LoadErrorState v-if="error" compact title="排车资料读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <template v-if="detail">
       <div class="density-status-tabs" role="tablist" aria-label="排车资料类别"><button v-for="item in tabs" :key="item.key" role="tab" :aria-selected="tab === item.key" :disabled="busy" :class="{ 'is-active': tab === item.key }" @click="selectTab(item.key)">{{ item.label }}</button></div>
-      <DispatchLooseboardExecution v-if="hasLooseboard" v-show="tab === 'LOOSEBOARD'" ref="looseboardEditor" :key="dispatchNo" :dispatch-no="dispatchNo" @mode="directLooseboard = $event" @saved="loadingSaved" />
+      <DispatchLooseboardExecution v-if="hasLooseboard" v-show="tab === 'LOOSEBOARD'" ref="looseboardEditor" :key="dispatchNo" :dispatch-no="dispatchNo" @mode="directLooseboard = $event" @saved="loadingSaved" @pickup-completed="pickupCompleted" />
       <DispatchLoadingDocuments v-if="tab === 'LOADING'" ref="loadingEditor" :key="dispatchNo" :dispatch-no="dispatchNo" @saved="loadingSaved" />
       <div v-show="tab === 'RECEIPT'" v-if="!beforeDeparture">
         <el-form v-if="deliveries.length > 1" class="density-form" label-position="left" label-width="80px"><el-form-item label="派送单"><el-select :model-value="selected" :disabled="busy || !access.can(permission.deliveryList)" aria-label="选择派送单" @update:model-value="selectDelivery"><el-option v-for="item in deliveries" :key="item.deliveryNo" :value="item.deliveryNo" :label="item.deliveryNo" /></el-select></el-form-item></el-form>