优化

2026-08-18 16:09:43 +08:00
parent f9ae2d94cb
commit 21249d1dde
52 changed files with 980 additions and 698 deletions
@@ -118,20 +118,17 @@ function preferredContainerId() {

 const candidateColumns: DataTableColumn[] = [
  { key: 'actions', label: '操作', width: 92, fixed: 'left', slotName: 'actions' },
-  { key: 'order', label: '入仓码', minWidth: 170, slotName: 'order' },
-  { key: 'goodsName', prop: 'goodsName', label: '货物', minWidth: 150 },
  { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 140 },
  { key: 'availablePackageCount', prop: 'availablePackageCount', label: '可用箱数', width: 100 },
-  { key: 'unitVolumeCbm', label: '单箱体积', width: 105, slotName: 'unitVolume' },
  { key: 'unitWeightKg', label: '单箱重量', width: 105, slotName: 'unitWeight' },
+  { key: 'unitVolumeCbm', label: '单箱体积', width: 105, slotName: 'unitVolume' },
 ]
 const itemColumns: DataTableColumn[] = [
  { key: 'actions', label: '操作', width: 170, fixed: 'left', slotName: 'actions' },
-  { key: 'order', label: '入仓码', minWidth: 170, slotName: 'order' },
-  { key: 'goods', label: '货物', minWidth: 160, slotName: 'goods' },
+  { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 140 },
  { key: 'packageCount', label: '分配箱数', width: 140, slotName: 'packageCount' },
-  { key: 'volumeCbm', label: '体积', width: 105, slotName: 'volume' },
  { key: 'grossWeightKg', label: '毛重', width: 110, slotName: 'weight' },
+  { key: 'volumeCbm', label: '体积', width: 105, slotName: 'volume' },
 ]

 function formatNumber(value: number, digits = 3) {
@@ -274,7 +271,7 @@ async function createPlan() {
 function openAssign(source: object) {
  const candidate = candidateRow(source)
  selectedCandidate.value = candidate
-  assignForm.packageCount = Math.min(candidate.availablePackageCount, 1)
+  assignForm.packageCount = candidate.availablePackageCount
  assignOpen.value = true
 }
 async function assign() {
@@ -292,8 +289,8 @@ async function assign() {
    }))
    assignOpen.value = false
    await loadSelectedData()
-    ElMessage.success('货物已加入当前柜次')
-  }, '分配货物失败', { preserveAssign: true })
+    ElMessage.success('明细已加入当前柜次')
+  }, '分配明细失败', { preserveAssign: true })
 }
 async function recommend() {
  if (!plan.value) return
@@ -312,7 +309,7 @@ async function adjust(source: object) {
    return
  }
  const max = adjustmentMax(item)
-  if (count > max) { ElMessage.warning(`该货物最多可分配 ${max} 箱`); return }
+  if (count > max) { ElMessage.warning(`该明细最多可分配 ${max} 箱`); return }
  await mutate(async () => {
    acceptPlan(await adjustSmartLoadingItem(plan.value!.id, item.id, count, plan.value!.version, item.version))
    await loadSelectedData()
@@ -322,7 +319,7 @@ async function adjust(source: object) {
 async function remove(source: object) {
  const item = itemRow(source)
  if (!plan.value || !item.canRemove) return
-  const confirmed = await ElMessageBox.confirm(`确认从当前柜次移除“${item.productNameZh || item.inboundCode || '该货物'}”吗？`, '移除装柜明细', {
+  const confirmed = await ElMessageBox.confirm(`确认从当前柜次移除“${item.customerName || '当前客户'}”的 ${item.packageCount} 箱明细吗？`, '移除装柜明细', {
    type: 'warning', confirmButtonText: '移除', cancelButtonText: '取消',
  }).catch(() => false)
  if (!confirmed || !plan.value) return
@@ -402,7 +399,7 @@ onMounted(() => { void load(); void loadCustomers() })
          <el-tab-pane v-for="channel in channelTabs" :key="channel.code" :label="channel.name" :name="channel.code" />
        </el-tabs>
        <dl class="compact-summary" aria-label="当前渠道装柜统计">
-          <div><dt>候选货物</dt><dd><strong>{{ filteredCandidates.length }}</strong> 条</dd></div>
+          <div><dt>候选明细</dt><dd><strong>{{ filteredCandidates.length }}</strong> 条</dd></div>
          <div><dt>柜次</dt><dd><strong>{{ filteredContainers.length }}</strong> 个</dd></div>
          <div><dt>已装</dt><dd><strong>{{ totalPackages }}</strong> 箱</dd></div>
          <div><dt>总重量</dt><dd><strong>{{ formatNumber(totalWeight, 1) }}</strong> kg</dd></div>
@@ -426,7 +423,7 @@ onMounted(() => { void load(); void loadCustomers() })
      <template v-else>
        <section class="dispatch-grid" aria-label="智能装柜调度台">
          <section class="dispatch-pane candidate-pane">
-            <header class="pane-header"><div><strong>候选入库单与货物</strong><small>{{ activeChannel?.name || '未选择渠道' }} · {{ selectedContainer?.warehouseName || '请先选择柜次' }}</small></div></header>
+            <header class="pane-header"><div><strong>候选装柜明细</strong><small>{{ activeChannel?.name || '未选择渠道' }} · {{ selectedContainer?.warehouseName || '请先选择柜次' }}</small></div></header>
            <DataTable
              :data="filteredCandidates"
              :columns="candidateColumns"
@@ -434,7 +431,7 @@ onMounted(() => { void load(); void loadCustomers() })
              stripe
              preference-key="global-smart-loading-candidates"
              column-settings-mode="hide"
-              :empty-text="selectedContainer ? '当前仓库暂无可装货物' : '暂无可用柜次'"
+              :empty-text="selectedContainer ? '当前仓库暂无可装明细' : '暂无可用柜次'"
            >
              <template #actions="{ row }">
                <el-button
@@ -446,14 +443,13 @@ onMounted(() => { void load(); void loadCustomers() })
                  @click="openAssign(row)"
                ><Plus :size="15" />加入</el-button>
              </template>
-              <template #order="{ row }"><strong>{{ row.inboundCode || '—' }}</strong></template>
-              <template #unitVolume="{ row }">{{ formatNumber(Number(row.unitVolumeCbm || 0)) }} m³</template>
              <template #unitWeight="{ row }">{{ formatNumber(Number(row.unitWeightKg || 0), 1) }} kg</template>
+              <template #unitVolume="{ row }">{{ formatNumber(Number(row.unitVolumeCbm || 0)) }} m³</template>
            </DataTable>
          </section>

          <aside class="dispatch-pane container-pane" aria-label="货柜列表">
-            <header class="pane-header"><div><strong>当前渠道柜次</strong><small>显示待装柜、预装编辑和尚未最终完成的 PDA 柜次</small></div></header>
+            <header class="pane-header"><div><strong>当前渠道柜次</strong></div></header>
            <div v-loading="loading" class="container-list">
              <el-empty v-if="!filteredContainers.length" description="暂无符合条件的货柜" :image-size="72" />
              <button
@@ -474,14 +470,14 @@ onMounted(() => { void load(); void loadCustomers() })
                <span>集装箱号：{{ displayActualContainerNo(item) }}</span>
                <span>渠道：{{ item.channelName || item.channelCode || '渠道待补充' }}</span>
                <span>仓库：{{ item.warehouseName || item.warehouseId || '仓库待补充' }} · 柜型：{{ item.containerType || '柜型待补充' }}</span>
-                <span v-if="!hasRealContainerNo(item)" class="container-option__hint">可先排货，开始装柜前录入集装箱号</span>
+                <!-- 空柜的操作时机由状态和操作按钮表达，不在每张柜次卡片重复提示。 -->
              </button>
            </div>
          </aside>

          <section class="dispatch-pane plan-pane">
            <header class="pane-header plan-header">
-              <div><strong>{{ hasRealContainerNo(selectedContainer) ? displayActualContainerNo(selectedContainer) : displayCabinetNo(selectedContainer) }} 装柜方案</strong><small>{{ selectedContainer ? `柜次号：${displayCabinetNo(selectedContainer)} · 集装箱号：${displayActualContainerNo(selectedContainer)}` : '尚未选择柜次' }}</small></div>
+              <div><strong>{{ hasRealContainerNo(selectedContainer) ? displayActualContainerNo(selectedContainer) : displayCabinetNo(selectedContainer) }} 装柜方案</strong></div>
              <div class="plan-actions">
                <el-tooltip content="刷新当前柜次" placement="top"><el-button aria-label="刷新当前柜次" :loading="selectionLoading" @click="loadSelectedData()"><RefreshCw :size="16" /></el-button></el-tooltip>
                <el-button v-if="canAssign && assignable && plan?.status === 'EDITING'" type="primary" plain :loading="mutating" @click="recommend"><Sparkles :size="16" />智能推荐</el-button>
@@ -504,17 +500,12 @@ onMounted(() => { void load(); void loadCustomers() })
              <el-button v-if="canCreate" type="primary" :loading="mutating" @click="createPlan"><Plus :size="16" />创建装柜方案</el-button>
            </el-empty>
            <template v-else-if="plan">
+              <!--
+                已下发 PDA 的可编辑说明不再常驻展示，避免挤占装柜明细空间。
+                操作权限仍由 plan.canEdit、canAdjust 和 canRemove 控制。
+              -->
              <el-alert
-                v-if="plan.status === 'LOADING' && plan.canEdit"
-                class="preload-readiness-alert"
-                type="warning"
-                :closable="false"
-                show-icon
-                title="已下发 PDA，仍可维护未完成的装柜明细"
-                description="新增、增加或移除未拣明细会刷新 PDA 明细与版本；PDA 端需要刷新后继续操作。"
-              />
-              <el-alert
-                v-else-if="!plan.canEdit"
+                v-if="!plan.canEdit"
                class="preload-readiness-alert"
                :type="plan.finalCompletionStatus === 'COMPLETED' ? 'success' : 'info'"
                :closable="false"
@@ -522,25 +513,16 @@ onMounted(() => { void load(); void loadCustomers() })
                :title="plan.finalCompletionStatus === 'IN_PROGRESS' ? '正在最终确认，装柜方案暂时只读' : plan.finalCompletionStatus === 'COMPLETED' ? '装柜已完成，方案永久只读' : '当前装柜方案只读'"
                :description="plan.blockedReason || '请刷新计划获取最新作业状态。'"
              />
-              <el-alert
-                class="preload-readiness-alert"
-                type="info"
-                :closable="false"
-                show-icon
-                title="推送预装仅生成预装清单，不会直接开放 PDA"
-                description="后续依次完成：补集装箱号、关联并放舱真实订舱、确认预装；全部满足后才生成 PDA 任务。"
-              />
+              <!-- 推送预装的流程说明已由操作确认框承载，不在方案区重复展示。 -->
              <div class="capacity-grid">
                <div><div class="meter-title"><span>体积</span><strong>{{ formatNumber(totalVolume) }} / {{ formatNumber(volumeLimit) }} m³</strong></div><el-progress :percentage="Math.min(displayedVolumePercent, 100)" :status="volumePercent > 100 ? 'exception' : undefined" /></div>
                <div><div class="meter-title"><span>重量</span><strong>{{ formatNumber(totalWeight, 1) }} / {{ formatNumber(weightLimit, 1) }} kg</strong></div><el-progress :percentage="Math.min(displayedWeightPercent, 100)" :status="weightPercent > 100 ? 'exception' : undefined" /></div>
              </div>
-              <DataTable :data="plan.items" :columns="itemColumns" :loading="selectionLoading || mutating" stripe preference-key="global-smart-loading-items" column-settings-mode="hide" empty-text="当前柜次暂无已装货物">
+              <DataTable :data="plan.items" :columns="itemColumns" :loading="selectionLoading || mutating" stripe preference-key="global-smart-loading-items" column-settings-mode="hide" empty-text="当前柜次暂无装柜明细">
                <template #actions="{ row }"><div class="row-actions"><el-button v-if="canAssign && editable && row.canAdjust" size="small" type="primary" plain :disabled="quantityDrafts[row.id] === row.packageCount" @click="adjust(row)"><Save :size="15" />保存</el-button><el-button v-if="canDelete && editable && row.canRemove" size="small" type="danger" plain @click="remove(row)"><Trash2 :size="15" />移除</el-button><small v-if="row.pickedPackageCount > 0">已拣 {{ row.pickedPackageCount }} 箱</small></div></template>
-                <template #order="{ row }"><strong>{{ row.inboundCode || '—' }}</strong></template>
-                <template #goods="{ row }"><strong>{{ row.productNameZh || '未命名货物' }}</strong><small>{{ row.skuCode || '无 SKU' }}</small></template>
                <template #packageCount="{ row }"><el-input-number v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :max="adjustmentMax(row)" :step="1" :disabled="!canAssign || !editable || !row.canAdjust" controls-position="right" /></template>
-                <template #volume="{ row }">{{ formatNumber(Number(row.volumeCbm || 0)) }} m³</template>
                <template #weight="{ row }">{{ formatNumber(Number(row.grossWeightKg || 0), 1) }} kg</template>
+                <template #volume="{ row }">{{ formatNumber(Number(row.volumeCbm || 0)) }} m³</template>
              </DataTable>
            </template>
          </section>
@@ -548,8 +530,8 @@ onMounted(() => { void load(); void loadCustomers() })

        <AppDialog v-model="assignOpen" title="加入当前柜次" :confirm-loading="mutating" confirm-text="确认加入" @confirm="assign">
          <div v-if="selectedCandidate" class="assign-dialog">
-            <p><strong>{{ selectedCandidate.goodsName || '未命名货物' }}</strong></p>
-            <p>{{ selectedCandidate.inboundCode || '入仓码暂缺' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱</p>
+            <p><strong>{{ selectedCandidate.customerName || '客户待补充' }}</strong></p>
+            <p>可用 {{ selectedCandidate.availablePackageCount }} 箱 · 单箱 {{ formatNumber(Number(selectedCandidate.unitWeightKg || 0), 1) }} kg · {{ formatNumber(Number(selectedCandidate.unitVolumeCbm || 0)) }} m³</p>
            <el-form label-position="top"><el-form-item label="本次分配箱数" required><el-input-number v-model="assignForm.packageCount" :min="1" :max="selectedCandidate.availablePackageCount" :step="1" controls-position="right" /></el-form-item></el-form>
          </div>
        </AppDialog>