diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index e2a5f9c5..c024dc03 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -157,7 +157,7 @@ import { ref, reactive, onMounted, computed } from 'vue' import { ElMessage } from 'element-plus' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' -import { orderDeliveryOrder } from '@/api/order.deliveryorder/orderdeliveryOrder' +import { orderDeliveryOrder } from '@/api/order.deliveryOrder/orderdeliveryOrder' import { deliveryAvailableFields, diff --git a/src/views/warehouse/PropertyForm.vue b/src/views/warehouse/PropertyForm.vue index 55066b0a..d091308c 100644 --- a/src/views/warehouse/PropertyForm.vue +++ b/src/views/warehouse/PropertyForm.vue @@ -55,8 +55,8 @@ - - + @@ -95,6 +95,7 @@ import { ref, reactive, watch, onMounted, onBeforeUnmount, getCurrentInstance, } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import * as warehouseApi from '@/api/warehouse/warehouse' +import * as indexApi from '@/api/index/index' const props = defineProps({ title: { type: String, default: '仓位属性管理' }, @@ -143,7 +144,7 @@ const formRules = { { max: 100, message: '长度不能超过100个字符', trigger: 'blur' }, { validator: (rule:any, value:any, callback:any) => validateBarcode(rule, value, callback), trigger: 'blur' } ], - location_type_id: [{ required: true, message: '请选择仓位类型', trigger: 'change' }], + location_type_id: [{ required: true, message: '请选择库位类型', trigger: 'change' }], pick_sequence: [{ type: 'number', min: 0, max: 9999, message: '拣货顺序必须在0-9999之间', trigger: 'blur' }] } @@ -248,13 +249,16 @@ async function loadSpaceData(spaceId: any) { async function loadLocationTypes() { typeLoading.value = true try { - locationTypes.value = [ - { id: 1, type_name: '普通仓位' }, - { id: 2, type_name: '拣货仓位' }, - { id: 3, type_name: '存储仓位' } - ] + const res: any = await indexApi.getLocationTypeList() + const data = res && (res.data || res.list || res) + const arr = Array.isArray(data) ? data : [] + locationTypes.value = arr.map((lt: any) => ({ + id: lt.id, + type_name: lt.type_name ?? lt.name ?? String(lt.id) + })) } catch (error) { - console.error('加载仓位类型失败:', error) + console.error('加载库位类型失败:', error) + locationTypes.value = [] } finally { typeLoading.value = false } diff --git a/src/views/warehouse/RackSpaceManagement.vue b/src/views/warehouse/RackSpaceManagement.vue index 937b4992..f4d2d3dc 100644 --- a/src/views/warehouse/RackSpaceManagement.vue +++ b/src/views/warehouse/RackSpaceManagement.vue @@ -20,7 +20,7 @@ 导出 - + 导入批量修改 @@ -45,6 +45,11 @@ + + +
@@ -56,13 +61,16 @@
+
+ +