Merge origin/release/test and preserve local frontend changes
This commit is contained in:
@@ -371,7 +371,7 @@ describe('UnifiedOrdersView contract', () => {
|
||||
expect(source).toContain("row.nextAction === 'APPROVE_ORDER'")
|
||||
expect(source).toContain("can('platform:order:approve')")
|
||||
expect(source).toContain('await approvePlatformUnifiedOrder(tenantId, orderId)')
|
||||
expect(source).toContain('title="审核订单"')
|
||||
expect(source).toContain("orderDialogTitle('审核订单', approvalOrder?.inboundCode)")
|
||||
expect(source).toContain('confirm-text="审核通过"')
|
||||
expect(source).not.toContain('assignPlatformUnifiedOrderCarrier')
|
||||
expect(source).not.toContain('listPlatformPartners')
|
||||
@@ -424,7 +424,7 @@ describe('UnifiedOrdersView contract', () => {
|
||||
})
|
||||
|
||||
it('keeps customer remarks read-only and edits the three collaboration remarks together', () => {
|
||||
expect(source).toContain('title="编辑订单备注"')
|
||||
expect(source).toContain("orderDialogTitle('编辑订单备注', noteOrder?.inboundCode)")
|
||||
expect(source).toContain('label="客户备注(只读)"')
|
||||
expect(source).toContain(':model-value="noteOrder?.customerRemark')
|
||||
expect(source).toContain('v-model="noteForm.internalRemark"')
|
||||
|
||||
Reference in New Issue
Block a user