优化
This commit is contained in:
@@ -23,7 +23,6 @@ import WeightOcrPanel from '../weight/components/WeightOcrPanel.vue'
|
||||
type FilterModel = QueryModel & {
|
||||
customerId: string
|
||||
inboundCode: string
|
||||
orderNo: string
|
||||
warehouseId: string
|
||||
expectedArrivalRange: string[]
|
||||
}
|
||||
@@ -36,7 +35,7 @@ const pageSize = ref(20)
|
||||
const loading = ref(false)
|
||||
const loadError = ref<ApiErrorDetails | null>(null)
|
||||
const result = ref({ records: [] as InboundOrderSummary[], total: 0 })
|
||||
const filters = ref<FilterModel>({ customerId: '', inboundCode: '', orderNo: '', warehouseId: '', expectedArrivalRange: [] })
|
||||
const filters = ref<FilterModel>({ customerId: '', inboundCode: '', warehouseId: '', expectedArrivalRange: [] })
|
||||
const appliedFilters = ref<FilterModel>({ ...filters.value, expectedArrivalRange: [] })
|
||||
const customers = ref<PlatformTenantResource[]>([])
|
||||
const customerLoadError = ref<ApiErrorDetails | null>(null)
|
||||
@@ -72,7 +71,6 @@ const queryFields = computed<QueryField[]>(() => [
|
||||
},
|
||||
{ key: 'warehouseId', type: 'select', label: '定位仓库', width: 220, placeholder: '全部仓库', options: warehouseOptions.value, props: { filterable: true } },
|
||||
{ key: 'inboundCode', type: 'input', label: '入仓码', width: 220, placeholder: '请输入入仓码' },
|
||||
{ key: 'orderNo', type: 'input', label: '订单号', width: 220, placeholder: '请输入订单号' },
|
||||
{ key: 'expectedArrivalRange', type: 'daterange', label: '预计到达时间', width: 320, placeholder: '请选择日期范围' },
|
||||
])
|
||||
|
||||
@@ -142,7 +140,6 @@ async function loadTasks() {
|
||||
size: pageSize.value,
|
||||
warehouseId: applied.warehouseId || undefined,
|
||||
inboundCode: applied.inboundCode.trim() || undefined,
|
||||
orderNo: applied.orderNo.trim() || undefined,
|
||||
expectedArrivalFrom: dateParam(applied.expectedArrivalRange[0]),
|
||||
expectedArrivalTo: dateParam(applied.expectedArrivalRange[1], true),
|
||||
}))
|
||||
@@ -163,7 +160,7 @@ function applyFilters() {
|
||||
}
|
||||
|
||||
function resetFilters() {
|
||||
filters.value = { customerId: '', inboundCode: '', orderNo: '', warehouseId: '', expectedArrivalRange: [] }
|
||||
filters.value = { customerId: '', inboundCode: '', warehouseId: '', expectedArrivalRange: [] }
|
||||
appliedFilters.value = { ...filters.value, expectedArrivalRange: [] }
|
||||
if (page.value === 1) void loadTasks()
|
||||
else page.value = 1
|
||||
@@ -260,7 +257,7 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
|
||||
<span v-if="!access.can(actionPermission) && (!access.can('platform:firstleg:inbound:view') || !(row as InboundOrderSummary).orderId)" class="muted-action">无操作权限</span>
|
||||
</div>
|
||||
</template>
|
||||
<template #inboundCode="{ row }"><div class="primary-cell"><strong>{{ text((row as InboundOrderSummary).inboundCode) }}</strong><span>订单 {{ text((row as InboundOrderSummary).orderNo) }}</span></div></template>
|
||||
<template #inboundCode="{ row }"><strong>{{ text((row as InboundOrderSummary).inboundCode) }}</strong></template>
|
||||
<template #processStatus="{ row }"><el-tag effect="light">{{ inboundStatusLabel((row as InboundOrderSummary).processStatus, inboundProcessStatusLabels) }}</el-tag></template>
|
||||
<template #measureReviewStatus="{ row }">{{ inboundStatusLabel((row as InboundOrderSummary).measureReviewStatus, inboundReviewStatusLabels) }}</template>
|
||||
<template #expectedArrivalAt="{ row }">{{ formatDate((row as InboundOrderSummary).expectedArrivalAt) }}</template>
|
||||
|
||||
@@ -23,9 +23,9 @@ describe('InboundWorkflowWorkspace', () => {
|
||||
})
|
||||
|
||||
it('opens measurement editing and review in prototype-sized centered dialogs', () => {
|
||||
expect(source).toContain('title="编辑入库测量数据"')
|
||||
expect(source).toContain(':title="`测量 · ${title}`"')
|
||||
expect(source).toContain('width="min(1240px, calc(100vw - 32px))"')
|
||||
expect(source).toContain('title="审核入库测量数据"')
|
||||
expect(source).toContain(':title="`测量审核 · ${title}`"')
|
||||
expect(source).toContain('width="min(1240px, calc(100vw - 32px))"')
|
||||
expect(source).toContain('height: 92vh')
|
||||
expect(source).toContain('max-height: 92vh')
|
||||
|
||||
@@ -194,7 +194,7 @@ onBeforeUnmount(() => {
|
||||
<el-dialog
|
||||
v-model="measurementDialogOpen"
|
||||
class="inbound-operation-dialog inbound-measurement-dialog"
|
||||
title="编辑入库测量数据"
|
||||
:title="`测量 · ${title}`"
|
||||
width="min(1240px, calc(100vw - 32px))"
|
||||
top="4vh"
|
||||
destroy-on-close
|
||||
@@ -221,7 +221,7 @@ onBeforeUnmount(() => {
|
||||
<el-dialog
|
||||
v-model="reviewDialogOpen"
|
||||
class="inbound-operation-dialog inbound-review-dialog"
|
||||
title="审核入库测量数据"
|
||||
:title="`测量审核 · ${title}`"
|
||||
width="min(1240px, calc(100vw - 32px))"
|
||||
top="4vh"
|
||||
destroy-on-close
|
||||
|
||||
Reference in New Issue
Block a user