diff --git a/src/api/index/index.ts b/src/api/index/index.ts index 56f9971d..8d28d997 100644 --- a/src/api/index/index.ts +++ b/src/api/index/index.ts @@ -221,4 +221,18 @@ export function recognizeLicensePlate(data:any){ data: data, isSystemApi: true } as any) +} + +export function getLocationTypeList(data?: Record) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'index.getLocationTypeList', + v: '1.0', + timestamp: new Date().getTime() + }, + data: data ?? {}, + isSystemApi: true + } as any) } \ No newline at end of file diff --git a/src/api/warehouse/warehouse.ts b/src/api/warehouse/warehouse.ts index 2a90ca3f..806dbd57 100644 --- a/src/api/warehouse/warehouse.ts +++ b/src/api/warehouse/warehouse.ts @@ -297,3 +297,31 @@ export function getAreaRacks(area_id: any) { isSystemApi: true } as any) } + +export function exportRackSpaces(id: number | string) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'warehouse.exportRackSpaces', + v: '1.0', + timestamp: new Date().getTime() + }, + data: { id }, + isSystemApi: true + } as any) +} + +export function batchUpdateSpaceInfo(data: { items: Array> }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'warehouse.batchUpdateSpaceInfo', + v: '1.0', + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/components/UpperTable/index.vue b/src/components/UpperTable/index.vue index cfa40b49..2554886e 100644 --- a/src/components/UpperTable/index.vue +++ b/src/components/UpperTable/index.vue @@ -5,7 +5,7 @@ @@ -38,6 +40,10 @@ @@ -73,6 +80,10 @@ :filter-placement="column.filterPlacement" > @@ -192,7 +204,7 @@ diff --git a/src/views/order/orderManagement/form/CloneOrderForm.vue b/src/views/order/orderManagement/form/CloneOrderForm.vue new file mode 100644 index 00000000..9cabf9c1 --- /dev/null +++ b/src/views/order/orderManagement/form/CloneOrderForm.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/views/order/orderManagement/form/StorageAllocateForm.vue b/src/views/order/orderManagement/form/StorageAllocateForm.vue new file mode 100644 index 00000000..337066db --- /dev/null +++ b/src/views/order/orderManagement/form/StorageAllocateForm.vue @@ -0,0 +1,50 @@ + + + diff --git a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue new file mode 100644 index 00000000..46e39614 --- /dev/null +++ b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue @@ -0,0 +1,34 @@ + + + diff --git a/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue b/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue new file mode 100644 index 00000000..3697181f --- /dev/null +++ b/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index 3ab934bd..bb66ee2d 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -178,139 +178,46 @@ - -

是否确认分配?

- -
- - + - - - - {{ storagePendingOrderIds.length }} 条 - - - - - - - - - + - - - {{ updateOrderMetaOrderIds.length }} 条 - - - - - - - - - - - + - -
-

原订单ID:{{ cloneSourceOrderId || '-' }}

-

订单号:{{ cloneSourceOrderCode || '-' }}

-
- -
- - + - - - {{ selectionRows.length }} 条 - - - - + @submit="submitSyncOrderIds" + /> @@ -320,7 +227,7 @@