优化
This commit is contained in:
@@ -134,7 +134,12 @@ describe('UnifiedOrdersView contract', () => {
|
||||
for (const uncontractedKey of [
|
||||
'internalOrderStatus', 'holdCargo', 'companyName', 'pickupMethod', 'associatedFiles', 'createdBy',
|
||||
]) expect(columnSource).not.toContain(`key: '${uncontractedKey}'`)
|
||||
expect(columnSource.indexOf("key: 'actions'")).toBeLessThan(columnSource.indexOf("key: 'inboundCode'"))
|
||||
const actionsColumnIndex = columnSource.indexOf("key: 'actions'")
|
||||
const selectionColumnIndex = columnSource.indexOf("key: 'selection'")
|
||||
const inboundCodeColumnIndex = columnSource.indexOf("key: 'inboundCode'")
|
||||
expect(actionsColumnIndex).toBeGreaterThanOrEqual(0)
|
||||
expect(selectionColumnIndex).toBeGreaterThan(actionsColumnIndex)
|
||||
expect(inboundCodeColumnIndex).toBeGreaterThan(selectionColumnIndex)
|
||||
expect(columnSource).not.toContain("key: 'coLoadGroup'")
|
||||
expect(columnSource).not.toContain("key: 'orderNo'")
|
||||
expect(columnSource).toContain("key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 160, slotName: 'inboundCode'")
|
||||
|
||||
@@ -621,6 +621,7 @@ const queryFields = computed(() => showAdvancedFilters.value
|
||||
: primaryQueryFields.value)
|
||||
|
||||
const columns = computed<DataTableColumn[]>(() => [
|
||||
// 业务表格保持操作列第一;批量选择列仅在有对应权限时紧随其后。
|
||||
{ key: 'actions', label: '操作', width: 290, fixed: 'left', slotName: 'actions' },
|
||||
...(can('platform:order:approve') || can('platform:firstleg:smart-loading:assign') || can('platform:order:export') || can('platform:firstleg:inbound:view') ? [{
|
||||
key: 'selection', type: 'selection', width: 48, fixed: 'left',
|
||||
|
||||
Reference in New Issue
Block a user