Merge origin/release/test and preserve local frontend changes

src/modules/inbounds/components/InboundTaskList.vue

@@ -11,6 +11,7 @@ import { listPlatformWarehouses } from '@/modules/warehouses'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import AppDialog from '@/shared/components/AppDialog.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import ListPageLayout from '@/shared/components/ListPageLayout.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
@@ -36,6 +37,7 @@ const props = defineProps<{ mode: InboundTaskMode; title?: string }>()
 const emit = defineEmits<{ changed: [] }>()
 const router = useRouter()
 const access = useAccessPreviewStore()
+const reviewPanelRef = ref<InstanceType<typeof MeasurementReviewPanel> | null>(null)
 const page = ref(1)
 const pageSize = ref(20)
 const loading = ref(false)
@@ -416,12 +418,14 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
         </DataTable></section>
     </ListPageLayout>
 
-    <el-dialog
+    <AppDialog
       v-if="isReview"
       v-model="reviewDialogOpen"
       :title="selectedInbound ? `${taskLabel} · ${selectedInbound.inboundCode || '入仓码待补充'}` : taskLabel"
       width="min(1560px, calc(100vw - 48px))"
       top="4vh"
+      fullscreenable
+      :show-confirm="false"
       destroy-on-close
       append-to-body
       :close-on-click-modal="!reviewNavigationLoading"
@@ -436,6 +440,8 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
       </el-alert>
       <MeasurementReviewPanel
         v-if="selectedInbound"
+        ref="reviewPanelRef"
+        :show-actions="false"
         :tenant-id="selectedInbound.tenantId"
         :inbound-id="selectedInbound.id"
         :fulfillment-type="selectedInbound.fulfillmentType"
@@ -446,7 +452,16 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
         :approval-completed="reviewApproved"
         @changed="handleTaskChanged"
       />
-    </el-dialog>
+      <template #footer="{ close }">
+        <div class="review-dialog-footer">
+          <el-button :disabled="reviewNavigationLoading" @click="close">关闭</el-button>
+          <template v-if="reviewPanelRef?.isPending && reviewPanelRef?.canReview">
+            <el-button type="primary" plain @click="reviewPanelRef?.enableWeightCorrection()">修改重量</el-button>
+            <el-button type="primary" :loading="reviewPanelRef?.actionLoading === 'approve' || reviewNavigationLoading" :disabled="reviewApproved" @click="reviewPanelRef?.confirmApprove()">{{ reviewApproved ? '审核已通过' : reviewPanelRef?.approvalButtonLabel }}</el-button>
+          </template>
+        </div>
+      </template>
+    </AppDialog>
 
     <InboundMeasurementDialog
       v-if="!isReview && selectedInbound"
@@ -463,6 +478,8 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
 </template>
 
 <style scoped>
+.review-dialog-footer { display: flex; align-items: center; justify-content: flex-end; flex-wrap: wrap; gap: var(--admin-space-4, 10px); }
+.review-dialog-footer :deep(.el-button) { margin-left: 0; }
 .inbound-task-page { min-width: 0; }
 .state-stack { display: grid; gap: var(--admin-space-5, 12px); }
 .review-navigation-error { margin-bottom: 14px; }
@@ -479,7 +496,6 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
 
 <style>
 .inbound-task-dialog.admin-density-workspace.el-dialog:not(.is-fullscreen) { height: auto; max-height: 92vh; overflow: hidden; }
-.inbound-task-dialog .el-dialog__body { max-height: calc(92vh - 62px); }
 @media (max-width: 520px) {
   .inbound-task-dialog .el-dialog__body { padding: 14px; }
 }