diff --git a/src/views/wms/itempackaging/ItempackagingForm.vue b/src/views/wms/itempackaging/ItempackagingForm.vue
deleted file mode 100644
index 577a28417..000000000
--- a/src/views/wms/itempackaging/ItempackagingForm.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <Form ref="formRef" v-loading="formLoading" :rules="ItempackagingRules" :schema="Itempackaging.allSchemas.formSchema" :is-col="true" />
-    <template #footer>
-      <ButtonBase :Butttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
-    </template>
-  </Dialog>
-  <SearchTable ref="searchTableRef" dialogTitle="物料基础信息" />
-</template>
-<script setup lang="ts">
-import { Itempackaging, ItempackagingRules, ItemBasic  } from '@/utils/disposition/tableColumns'
-import * as ItempackagingApi from '@/api/wms/itempackaging'
-import { SearchTable } from '@/components/SearchTable';
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import ButtonBase from '@/components/XButton/src/ButtonBase.vue' 
-
-import * as ItembasicApi from '@/api/wms/itembasic'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-
-const formRef = ref() // 表单 Ref
-
-/** 弹层操作 */
-const searchTableRef = ref()
-const opensearchTable = () => {
-  searchTableRef.value.open('物品基础信息', ItemBasic.allSchemas, ItembasicApi.getItembasicPage)
-}
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      const res = await ItempackagingApi.getItempackaging(id)
-      unref(formRef)?.setValues(res)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 弹窗按钮 */
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
-]
-
-/** 按钮事件 */
-const buttonBaseClick = (val) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  const elForm = unref(formRef)?.getElFormRef()
-  // 校验表单
-  if (!elForm) return
-  const valid = await elForm.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = unref(formRef)?.formModel as ItempackagingApi.ItempackagingVO
-    if (formType.value === 'create') {
-      await ItempackagingApi.createItempackaging(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await ItempackagingApi.updateItempackaging(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  unref(formRef)?.resetFields()
-}
-</script>
diff --git a/src/views/wms/itempackaging/index.vue b/src/views/wms/itempackaging/index.vue
index c5c5ab5bf..b88b826a2 100644
--- a/src/views/wms/itempackaging/index.vue
+++ b/src/views/wms/itempackaging/index.vue
@@ -5,10 +5,7 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-  />
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -29,16 +26,23 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase
-          :Butttondata="butttondata"
-          @button-base-click="buttonTableClick($event,row)"
-        />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <ItempackagingForm ref="formRef" @success="getList" />
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="ItempackagingRules" 
+    :formAllSchemas="Itempackaging.allSchemas" 
+    searchTableTitle="物料基础信息"
+    :searchTableAllSchemas="ItemBasic.allSchemas"
+    :searchTablePage="ItembasicApi.getItembasicPage"
+    :apiUpdate="ItempackagingApi.updateItempackaging"
+    :apiCreate="ItempackagingApi.createItempackaging"
+  />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Itempackaging.allSchemas" />
@@ -50,14 +54,14 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as ItempackagingApi from '@/api/wms/itempackaging'
-import ItempackagingForm from './ItempackagingForm.vue'
-import { Itempackaging } from '@/utils/disposition/tableColumns'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Itempackaging, ItempackagingRules, ItemBasic } from '@/utils/disposition/tableColumns'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 
-
 defineOptions({ name: 'Itempackaging' })
 
 const message = useMessage() // 消息弹窗
@@ -110,18 +114,19 @@ const butttondata = [
 ]
 
 // 列表-操作按钮事件 
-const buttonTableClick = (val, row) => {
+const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
-    openForm('update', row.id)
+    // const res = await ItempackagingApi.getItempackaging(row.id)
+    openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
 
 /** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
 }
 
 /** 详情操作 */