合并远程分支并保留仓储转运整单补箱与打印入口
This commit is contained in:
@@ -45,7 +45,8 @@ const props = withDefaults(defineProps<{ service: ServiceType; createPage?: bool
|
||||
const auth = useAuthStore()
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
const detailNumber = computed(() => props.detailNo || String(route.params.detailNo || ''))
|
||||
// 缓存列表不订阅其他详情页的路由参数,避免离开时清空筛选并重复请求。
|
||||
const detailNumber = computed(() => props.detailPage ? props.detailNo || String(route.params.detailNo || '') : '')
|
||||
const canCreate = computed(() => auth.hasPermission(({
|
||||
labeling: 'merchant:overseas-warehouse:relabel:create',
|
||||
transfer: 'merchant:overseas-warehouse:transfer:create',
|
||||
@@ -1856,7 +1857,7 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
|
||||
<div class="warehouse-section-heading warehouse-transfer-receipt-heading"><h3>预报箱唛({{ selectedDetail?.packageCount || 0 }} 箱)</h3><div class="warehouse-transfer-receipt-actions"><el-button v-if="canIncreaseForecast" type="primary" size="small" @click="openIncreaseForecast"><Plus :size="14" />增加预报箱数</el-button><el-button type="primary" size="small" @click="printTransferCartons(String(selectedDetail?.transferNo || ''))"><Printer :size="14" />打印预报箱唛</el-button><el-button size="small" @click="showForecastCartons = true">查看预报箱唛</el-button></div></div>
|
||||
<el-dialog v-model="showForecastCartons" title="预报箱唛明细" width="900px" align-center destroy-on-close append-to-body><el-table :data="selectedDetail?.cartons || []" size="small" border><el-table-column prop="cartonMark" label="仓库唛头" min-width="300" /><el-table-column label="预报SKU" min-width="240"><template #default="{ row }">{{ selectedDetail?.items?.find(item => String(item.id) === String(row.transferItemId))?.skuCode || '—' }}</template></el-table-column><el-table-column label="清点状态" width="130"><template #default="{ row }">{{ row.status === 'COUNTED' ? '已清点' : row.status === 'NOT_RECEIVED' ? '未收到' : '待清点' }}</template></el-table-column></el-table><template #footer><el-button @click="showForecastCartons = false">关闭</el-button></template></el-dialog>
|
||||
<el-dialog v-model="increaseForecastOpen" title="增加预报箱数" width="560px" align-center destroy-on-close append-to-body :close-on-click-modal="!increasingForecast" :show-close="!increasingForecast">
|
||||
<el-form label-width="110px"><el-form-item label="新增箱数"><el-input-number v-model="increaseForecastForm.additionalCount" :disabled="increasingForecast" :min="1" :max="Math.max(1, 5000 - Number(forecastSnapshot?.packageCount || 0))" :precision="0" /></el-form-item></el-form><p class="warehouse-form-hint">保留原箱唛,仅补生成新增箱唛;箱内SKU和件数以PDA清点为准,SKU预报总件数保持不变。</p>
|
||||
<el-form label-width="110px"><el-form-item label="新增箱数"><el-input-number v-model="increaseForecastForm.additionalCount" placeholder="请输入新增箱数" :disabled="increasingForecast" :min="1" :max="Math.max(1, 5000 - Number(forecastSnapshot?.packageCount || 0))" :precision="0" /></el-form-item></el-form><p class="warehouse-form-hint">保留原箱唛,仅补生成新增箱唛;箱内SKU和件数以PDA清点为准,SKU预报总件数保持不变。</p>
|
||||
<template #footer><el-button :disabled="increasingForecast" @click="increaseForecastOpen = false">取消</el-button><el-button type="primary" :loading="increasingForecast" @click="saveIncreaseForecast">确认增加</el-button></template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readFileSync } from 'node:fs'
|
||||
import { computed, effectScope, nextTick, reactive, ref, watch } from 'vue'
|
||||
import ts from 'typescript'
|
||||
|
||||
const source = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url), 'utf8')
|
||||
const detailNumber = source.match(/^const detailNumber = .*$/m)[0]
|
||||
const routeWatcher = source.slice(source.indexOf('watch(() => [props.service,'), source.indexOf('watch(mode,'))
|
||||
const activation = source.slice(source.indexOf('let activatedOnce = false'), source.indexOf('onBeforeUnmount(() =>'))
|
||||
const code = ts.transpileModule([detailNumber, routeWatcher, activation].join('\n'), { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
|
||||
function harness(detailPage = false) {
|
||||
const scope = effectScope(), props = reactive({ service: 'transfer', createPage: false, detailPage, detailNo: '' })
|
||||
const route = reactive({ params: { detailNo: detailPage ? 'TRANSFER-A' : undefined } })
|
||||
const mode = ref(detailPage ? 'detail' : 'list'), page = ref(3), filters = reactive({ number: 'TRANSFER-FILTER', warehouse: 'warehouse-1', status: 'RECEIVED' })
|
||||
const calls = [], activationCallbacks = []
|
||||
const resetFilters = () => { calls.push('resetFilters'); Object.assign(filters, { number: '', warehouse: '', status: '' }) }
|
||||
const loadPage = () => { calls.push({ kind: 'list', page: page.value, ...filters }) }
|
||||
scope.run(() => new Function('computed', 'watch', 'props', 'route', 'mode', 'page', 'resetFilters', 'resetForm', 'openCreate', 'loadDetailPage', 'loadPage', 'onActivated', code)(computed, watch, props, route, mode, page, resetFilters, () => calls.push('resetForm'), () => calls.push('create'), () => calls.push('detail'), loadPage, callback => activationCallbacks.push(callback)))
|
||||
return { scope, props, route, mode, page, filters, calls, activate: () => activationCallbacks.forEach(callback => callback()) }
|
||||
}
|
||||
|
||||
test('cached transfer list ignores detail navigation and refreshes once on return with its original filters and page', async () => {
|
||||
const state = harness()
|
||||
try {
|
||||
state.activate()
|
||||
state.route.params.detailNo = 'TRANSFER-A'
|
||||
await nextTick()
|
||||
assert.deepEqual(state.calls, [])
|
||||
assert.equal(state.page.value, 3)
|
||||
assert.equal(state.filters.number, 'TRANSFER-FILTER')
|
||||
state.route.params.detailNo = 'TRANSFER-B'
|
||||
await nextTick()
|
||||
assert.deepEqual(state.calls, [])
|
||||
state.route.params.detailNo = undefined
|
||||
await nextTick()
|
||||
state.activate()
|
||||
assert.deepEqual(state.calls, [{ kind: 'list', page: 3, number: 'TRANSFER-FILTER', warehouse: 'warehouse-1', status: 'RECEIVED' }])
|
||||
} finally { state.scope.stop() }
|
||||
})
|
||||
|
||||
test('real detail pages still react to another detail number without loading a background list', async () => {
|
||||
const state = harness(true)
|
||||
try {
|
||||
state.route.params.detailNo = 'TRANSFER-B'
|
||||
await nextTick()
|
||||
assert.deepEqual(state.calls, ['resetFilters', 'resetForm', 'detail'])
|
||||
} finally { state.scope.stop() }
|
||||
})
|
||||
Reference in New Issue
Block a user