From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 04 6月 2025 17:42:13 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx index c3b230a..8b7a547 100644 --- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx +++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx @@ -18,6 +18,7 @@ getAreaAreaDataList, getWmsEnumData, } from '@/widgets/HIAWms/Models/Service/WmsMaterialDrawer' +import { lang } from '@/libs/Language/Language' export const useWmsPlaceDrawer = (props: any, ctx?: any) => { const wmsPlaceDrawer = injectModel<WmsPlaceDrawer>('wmsPlaceDrawer') @@ -26,6 +27,7 @@ */ const initiateData: Ref<Record<string, any>> = ref({}) const formData = ref<Record<string, any>>({}) + const areas = ref([]) // ref const formRef = ref() @@ -137,6 +139,19 @@ ], }, { + label: '鏄惁绂佺敤', + prop: 'isDisabled', + el: 'select', + options: [ + { label: '鏄�', value: true }, + { label: '鍚�', value: false }, + ], + placeholder: '璇烽�夋嫨鏄惁绂佺敤', + rules: [ + { required: true, message: '鏄惁绂佺敤涓嶈兘涓虹┖', trigger: 'change' }, + ], + }, + { label: '鏈�澶у簱瀛樻暟', prop: 'maxStockNumber', el: (props: any, { attrs }: SetupContext) => { @@ -146,6 +161,7 @@ ...attrs, }) }, + width: '100%', placeholder: '鏈�澶у簱瀛樻暟', rules: [ { required: true, message: '鏄惁绌烘墭涓嶈兘涓虹┖', trigger: 'change' }, @@ -203,11 +219,13 @@ emptyContainer: formData.value.emptyContainer, // 鏄惁绌烘墭 maxStockNumber: formData.value.maxStockNumber, // 鏈�澶у簱瀛樻暟 remark: formData.value.remark, // 澶囨敞 + isDisabled: formData.value.isDisabled, // 鏄惁绂佺敤 } if (!current.value) { await wmsPlaceDrawer.addWmsPlace(data) } else { const id = current.value.id + console.log(data, 'data') await wmsPlaceDrawer.updateWmsPlace(id, data) } ElMessage.success('淇濆瓨鎴愬姛') @@ -261,6 +279,7 @@ updateFormItemOptions('emptyContainer', yesNoData) const areaList = await getAreaAreaDataList() + areas.value = areaList updateFormAreaOptions('areaCode', areaList) if (current.value) { @@ -279,6 +298,7 @@ emptyContainer: res.emptyContainer, // 鏄惁绌烘墭 remark: res.remark, // 澶囨敞 maxStockNumber: res.maxStockNumber, // 鏈�澶у簱瀛樻暟 + isDisabled: res.isDisabled, // 鏄惁绂佺敤 id: res.id, // 涓婚敭ID } updateCheckData() @@ -286,11 +306,13 @@ formData.value = { storageTypeNo: 1, // 璐т綅绫诲瀷 placeStatus: 1, // 璐т綅鐘舵�� - areaCode: areaList[0], // 鎵�鍦ㄥ簱鍖� + areaCode: areaList[0].areaNo, // 鎵�鍦ㄥ簱鍖� aisle: 1, // 宸烽亾 layerNo: 1, // 灞� islock: 0, // 鏄惁閿佸畾 + isDisabled: false, // 鏄惁绂佺敤 emptyContainer: 0, // 鏄惁绌烘墭 + maxStockNumber: 100, } updateCheckData() } -- Gitblit v1.9.3