From cf83e0828b286b61b69a15005e6247d8b03f4cd8 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期日, 16 十一月 2025 19:14:03 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
index 51aa666..b052afb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js"
@@ -113,19 +113,19 @@
const getWarehouseList = async () => {
isLoadingWarehouses.value = true;
try {
- const { data, status } = await http.post('/api/Warehouse/GetWarehouseTypes');
+ const { data, status } = await http.post('/api/LocationInfo/GetLocationTypes');
if (status && Array.isArray(data)) {
// 鏍煎紡鍖栦粨搴撻�夐」锛氶�傞厤ElSelect鐨刲abel-value鏍煎紡
warehouses.value = data.map(item => ({
- label: item.warehouseTypeDesc,
- value: item.warehouseType
+ label: item.locationTypeDesc,
+ value: item.locationType
}));
} else {
- ElMessage.error('鑾峰彇浠撳簱鍒楄〃澶辫触');
+ ElMessage.error('鑾峰彇鍖哄煙鍒楄〃澶辫触');
warehouses.value = [];
}
} catch (err) {
- ElMessage.error('浠撳簱鏁版嵁璇锋眰寮傚父锛岃绋嶅悗閲嶈瘯');
+ ElMessage.error('鍖哄煙鏁版嵁璇锋眰寮傚父锛岃绋嶅悗閲嶈瘯');
warehouses.value = [];
} finally {
isLoadingWarehouses.value = false;
@@ -202,19 +202,19 @@
{ required: true, message: '璇疯緭鍏ユ枡绠辩爜', trigger: ['blur', 'enter'] }
],
warehouseCode:[
- { required: true, message: '璇烽�夋嫨浠撳簱', trigger: ['change', 'blur'] }
+ { required: true, message: '璇烽�夋嫨鍖哄煙', trigger: ['change', 'blur'] }
]
},
ref: 'batchInForm'
}, [
//浠撳簱鏁版嵁
- h(ElFormItem, { label: '浠撳簱', prop: 'warehouseCode', required: true }, [
+ h(ElFormItem, { label: '鍖哄煙', prop: 'warehouseCode', required: true }, [
h(ElSelect, {
modelValue: formData.warehouseCode,
'onUpdate:modelValue': (val) => {
formData.warehouseCode = val;
},
- placeholder: '璇烽�夋嫨鍏ュ簱浠撳簱',
+ placeholder: '璇烽�夋嫨鍏ュ簱鍖哄煙',
filterable: true, // 鏀寔鎼滅储浠撳簱
loading: isLoadingWarehouses.value, // 鍔犺浇鐘舵��
style: { width: '100%' }
--
Gitblit v1.9.3