From 6ecd5b23904d2e862dd572ab7feb1a85824fc9ad Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 05 5月 2025 17:07:20 +0800
Subject: [PATCH] 前端页面构造
---
HIAWms/web/src/widgets/WmsContainer/Controllers/WmsContainerDrawer.tsx | 12 +++
HIAWms/web/src/widgets/WmsContainer/Views/Pages/WmsContainer/WmsContainer.tsx | 4
HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts | 47 +++++++--------
HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsStore/WmsStore.tsx | 4
HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx | 8 ++
HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts | 79 +++++++++++++++++++-------
6 files changed, 100 insertions(+), 54 deletions(-)
diff --git a/HIAWms/web/src/widgets/WmsContainer/Controllers/WmsContainerDrawer.tsx b/HIAWms/web/src/widgets/WmsContainer/Controllers/WmsContainerDrawer.tsx
index 816c927..f863c80 100644
--- a/HIAWms/web/src/widgets/WmsContainer/Controllers/WmsContainerDrawer.tsx
+++ b/HIAWms/web/src/widgets/WmsContainer/Controllers/WmsContainerDrawer.tsx
@@ -301,7 +301,17 @@
updateCheckData()
disabled.value = true
} else {
- formData.value = {}
+ formData.value = {
+ containerType: 1,
+ containerStatus: 1,
+ specLength: 1200,
+ specWidth: 1200,
+ specHeight: 1200,
+ limitLength: 1200,
+ limitWidth: 1200,
+ limitHeight: 1200,
+ maxWeight: 400,
+ }
disabled.value = false
updateCheckData()
}
diff --git a/HIAWms/web/src/widgets/WmsContainer/Views/Pages/WmsContainer/WmsContainer.tsx b/HIAWms/web/src/widgets/WmsContainer/Views/Pages/WmsContainer/WmsContainer.tsx
index 62624bf..d3fe7d2 100644
--- a/HIAWms/web/src/widgets/WmsContainer/Views/Pages/WmsContainer/WmsContainer.tsx
+++ b/HIAWms/web/src/widgets/WmsContainer/Views/Pages/WmsContainer/WmsContainer.tsx
@@ -298,12 +298,12 @@
瀵煎嚭
</IconButton>
</div>
- <Search
+ {/* <Search
placeholder="璇疯緭鍏ュ叧閿瓧"
v-model={search.value}
onConfirm={onSearch}
style={{ marginTop: '-1px' }}
- />
+ /> */}
</div>
<RenderBaseTable
url="/api/v1/HIAWms/wmsContainer"
diff --git a/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts b/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts
index ffae795..326c88d 100644
--- a/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts
+++ b/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts
@@ -52,12 +52,6 @@
rules: [{ required: true, message: '搴撳尯鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
},
{
- label: '鎻忚堪',
- prop: 'areaDesc',
- el: 'input',
- placeholder: '璇疯緭鍏ユ弿杩�',
- },
- {
label: '搴撳尯鐘舵��',
prop: 'areaStatus',
el: 'select',
@@ -85,32 +79,30 @@
// storeValueAndLabel: true,
placeholder: '璇疯緭鍏ヤ粨搴撲唬鐮�',
},
+ // {
+ // label: '浠撳簱鍚嶇О',
+ // prop: 'storeName',
+ // el: 'input',
+ // placeholder: '璇疯緭鍏ヤ粨搴撳悕绉�',
+ // },
+ // {
+ // label: '鎺掑簭',
+ // prop: 'sort',
+ // el: 'input-number',
+ // placeholder: '璇疯緭鍏ユ帓搴�',
+ // rules: [{ required: true, message: '鎺掑簭涓嶈兘涓虹┖', trigger: 'blur' }],
+ // },
{
- label: '浠撳簱鍚嶇О',
- prop: 'storeName',
+ label: '鎻忚堪',
+ prop: 'areaDesc',
el: 'input',
- placeholder: '璇疯緭鍏ヤ粨搴撳悕绉�',
- },
- {
- label: '鎺掑簭',
- prop: 'sort',
- el: 'input-number',
- placeholder: '璇疯緭鍏ユ帓搴�',
- rules: [{ required: true, message: '鎺掑簭涓嶈兘涓虹┖', trigger: 'blur' }],
+ placeholder: '璇疯緭鍏ユ弿杩�',
},
{
label: '澶囨敞',
prop: 'remark',
el: 'input',
placeholder: '璇疯緭鍏ュ娉�',
- },
- {
- label: '鏄惁绂佺敤',
- prop: 'isDisabled',
- el: 'switch',
- rules: [
- { required: true, message: '鏄惁绂佺敤涓嶈兘涓虹┖', trigger: 'change' },
- ],
},
])
/**
@@ -157,7 +149,6 @@
// storeName: formData.value.storeName, // 浠撳簱鍚嶇О
remark: formData.value.remark, // 澶囨敞
}
- console.log(data)
if (!current.value) {
await wmsAreaDrawer.addWmsArea(data)
} else {
@@ -227,7 +218,11 @@
updateCheckData()
} else {
disabled.value = false
- formData.value = {}
+ formData.value = {
+ areaStatus: 1, // 搴撳尯鐘舵��
+ areaType: 1, // 搴撳尯绫诲瀷
+ storeCode: storeList[0],
+ }
updateCheckData()
}
}
diff --git a/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts b/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts
index c008604..c9a3b5e 100644
--- a/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts
+++ b/HIAWms/web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts
@@ -5,6 +5,10 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
+import {
+ getAreaAreaDataList,
+ getWmsEnumData,
+} from '@/widgets/HIAWms/Models/Service/WmsMaterialDrawer'
export const useWmsPlaceDrawer = (props: any, ctx?: any) => {
const wmsPlaceDrawer = injectModel<WmsPlaceDrawer>('wmsPlaceDrawer')
@@ -42,11 +46,7 @@
label: '璐т綅绫诲瀷',
prop: 'storageTypeNo',
el: 'select',
- options: [
- { label: '绫诲瀷1', value: 1 },
- { label: '绫诲瀷2', value: 2 },
- // 鏍规嵁瀹為檯鐨� PlaceTypeEnum 娣诲姞鏇村閫夐」
- ],
+ options: [],
placeholder: '璇烽�夋嫨璐т綅绫诲瀷',
rules: [
{ required: true, message: '璐т綅绫诲瀷涓嶈兘涓虹┖', trigger: 'change' },
@@ -56,11 +56,7 @@
label: '璐т綅鐘舵��',
prop: 'placeStatus',
el: 'select',
- options: [
- { label: '鐘舵��1', value: 1 },
- { label: '鐘舵��2', value: 2 },
- // 鏍规嵁瀹為檯鐨� PlaceStatusEnum 娣诲姞鏇村閫夐」
- ],
+ options: [],
placeholder: '璇烽�夋嫨璐т綅鐘舵��',
rules: [
{ required: true, message: '璐т綅鐘舵�佷笉鑳戒负绌�', trigger: 'change' },
@@ -69,8 +65,9 @@
{
label: '鎵�鍦ㄥ簱鍖�',
prop: 'areaCode',
- el: 'input',
- placeholder: '璇疯緭鍏ユ墍鍦ㄥ簱鍖�',
+ el: 'select',
+ options: [],
+ placeholder: '璇烽�夋嫨鎵�鍦ㄥ簱鍖�',
rules: [{ required: true, message: '鎵�鍦ㄥ簱鍖轰笉鑳戒负绌�', trigger: 'blur' }],
},
{
@@ -103,10 +100,7 @@
label: '鏄惁閿佸畾',
prop: 'islock',
el: 'select',
- options: [
- { label: '鏄�', value: 1 },
- { label: '鍚�', value: 2 },
- ],
+ options: [],
placeholder: '璇烽�夋嫨鏄惁閿佸畾',
rules: [
{ required: true, message: '鏄惁閿佸畾涓嶈兘涓虹┖', trigger: 'change' },
@@ -116,10 +110,7 @@
label: '鏄惁绌烘墭',
prop: 'emptyContainer',
el: 'select',
- options: [
- { label: '鏄�', value: 1 },
- { label: '鍚�', value: 2 },
- ],
+ options: [],
placeholder: '璇烽�夋嫨鏄惁绌烘墭',
rules: [
{ required: true, message: '鏄惁绌烘墭涓嶈兘涓虹┖', trigger: 'change' },
@@ -194,10 +185,48 @@
},
}
}
+
+ const updateFormItemOptions = (propName: string, enumData: any[]) => {
+ const item = formItems.find((item) => item.prop === propName)
+ if (item && enumData) {
+ item.options = enumData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
+ }
+ }
+
+ const updateFormAreaOptions = (propName: string, enumData: any[]) => {
+ const item = formItems.find((item) => item.prop === propName)
+ if (item && enumData) {
+ item.options = enumData.map((item) => ({
+ label: item.areaName,
+ value: item.areaNo,
+ }))
+ }
+ }
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
const onOpen = async () => {
+ const storageTypeNoData = await getWmsEnumData({
+ EnumName: 'PlaceTypeEnum',
+ })
+ updateFormItemOptions('storageTypeNo', storageTypeNoData)
+
+ const placeStatusData = await getWmsEnumData({
+ EnumName: 'PlaceStatusEnum',
+ })
+ updateFormItemOptions('placeStatus', placeStatusData)
+ const yesNoData = await getWmsEnumData({
+ EnumName: 'YesNoEnum',
+ })
+ updateFormItemOptions('islock', yesNoData)
+ updateFormItemOptions('emptyContainer', yesNoData)
+
+ const areaList = await getAreaAreaDataList()
+ updateFormAreaOptions('areaCode', areaList)
+
if (current.value) {
const res = await wmsPlaceDrawer.getWmsPlaceDetail(current.value)
@@ -217,7 +246,15 @@
}
updateCheckData()
} else {
- formData.value = {}
+ formData.value = {
+ storageTypeNo: 1, // 璐т綅绫诲瀷
+ placeStatus: 1, // 璐т綅鐘舵��
+ areaCode: areaList[0], // 鎵�鍦ㄥ簱鍖�
+ aisle: 1, // 宸烽亾
+ layerNo: 1, // 灞�
+ islock: 2, // 鏄惁閿佸畾
+ emptyContainer: 2, // 鏄惁绌烘墭
+ }
updateCheckData()
}
}
diff --git a/HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx b/HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx
index e99ba47..ddd7982 100644
--- a/HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx
+++ b/HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx
@@ -69,6 +69,10 @@
...queryForm.value,
storageTypeNo: queryForm.value.storageTypeNo || '', // 澶勭悊涓嬫媺
placeStatus: queryForm.value.placeStatus || '',
+ islock: queryForm.value.islock || '',
+ aisle: queryForm.value.aisle || '',
+ areaCode: queryForm.value.areaCode || '',
+ emptyContainer: queryForm.value.emptyContainer || '',
}))
// 鍔ㄦ�佹灇涓鹃�夐」
@@ -404,12 +408,12 @@
瀵煎嚭
</IconButton>
</div>
- <Search
+ {/* <Search
placeholder="璇疯緭鍏ュ叧閿瓧"
v-model={search.value}
onConfirm={onSearch}
style={{ marginTop: '-1px' }}
- />
+ /> */}
</div>
<RenderBaseTable
url="/api/v1/HIAWms/wmsPlace"
diff --git a/HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsStore/WmsStore.tsx b/HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsStore/WmsStore.tsx
index 02708d2..82d75dd 100644
--- a/HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsStore/WmsStore.tsx
+++ b/HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsStore/WmsStore.tsx
@@ -222,12 +222,12 @@
瀵煎嚭
</IconButton>
</div>
- <Search
+ {/* <Search
placeholder="璇疯緭鍏ュ叧閿瓧"
v-model={search.value}
onConfirm={onSearch}
style={{ marginTop: '-1px' }}
- />
+ /> */}
</div>
<RenderBaseTable
url="/api/v1/HIAWms/wmsStore"
--
Gitblit v1.9.3