diff --git a/src/api/wms/inStockBill/types.ts b/src/api/wms/inStockBill/types.ts
index 5cc1b87..0e04ee0 100644
--- a/src/api/wms/inStockBill/types.ts
+++ b/src/api/wms/inStockBill/types.ts
@@ -27,7 +27,7 @@ export interface InStockBillVO {
   /**
    * 供应商
    */
-  supplier: string;
+  supplierName: string;
 
   /**
    * 联系人
@@ -73,7 +73,6 @@ export interface InStockBillVO {
    * 更新时间
    */
   updateTime: string;
-
 }
 
 export interface InStockBillForm extends BaseEntity {
@@ -105,7 +104,7 @@ export interface InStockBillForm extends BaseEntity {
   /**
    * 供应商
    */
-  supplier?: string;
+  supplierName?: string;
 
   /**
    * 联系人
@@ -141,11 +140,13 @@ export interface InStockBillForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
+  /**
+   * 物料明细列表
+   */
+  // materialDetails?: InStockBillMaterialDetail[];
 }
 
 export interface InStockBillQuery extends PageQuery {
-
   /**
    * 入库单类型
    */
@@ -164,7 +165,7 @@ export interface InStockBillQuery extends PageQuery {
   /**
    * 供应商
    */
-  supplier?: string;
+  supplierName?: string;
 
   /**
    * 入库单状态(1暂存 2审批中 3完成)
@@ -191,6 +192,3 @@ export interface InStockBillQuery extends PageQuery {
    */
   params?: any;
 }
-
-
-
diff --git a/src/api/wms/inStockDetails/index.ts b/src/api/wms/inStockDetails/index.ts
index 4f17b8e..884ce5d 100644
--- a/src/api/wms/inStockDetails/index.ts
+++ b/src/api/wms/inStockDetails/index.ts
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { InStockDetailsVO, InStockDetailsForm, InStockDetailsQuery } from '@/api/wms/inStockDetails/types';
+import { InStockDetailsForm, InStockDetailsQuery, InStockDetailsVO } from '@/api/wms/inStockDetails/types';
 
 /**
  * 查询入库单明细列表
@@ -67,10 +67,10 @@ export const delInStockDetails = (inStockDetailsId: string | number | Array<stri
  * @param query
  * @returns {*}
  */
-export function getWmsInStockDetailsList (query) {
-    return request({
-        url: '/wms/inStockDetails/getWmsInStockDetailsList',
-        method: 'get',
-        params: query
-    });
-};
+export function getWmsInStockDetailsList(query) {
+  return request({
+    url: '/wms/inStockDetails/getWmsInStockDetailsList',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/api/wms/inStockDetails/types.ts b/src/api/wms/inStockDetails/types.ts
index e4d64be..4c52dad 100644
--- a/src/api/wms/inStockDetails/types.ts
+++ b/src/api/wms/inStockDetails/types.ts
@@ -17,7 +17,7 @@ export interface InStockDetailsVO {
   /**
    * 物料ID
    */
-  materielId: string | number;
+  materialId: string | number;
 
   /**
    * 批次号
@@ -75,7 +75,7 @@ export interface InStockDetailsForm extends BaseEntity {
   /**
    * 物料ID
    */
-  materielId?: string | number;
+  materialId?: string | number;
 
   /**
    * 批次号
@@ -119,7 +119,7 @@ export interface InStockDetailsQuery extends PageQuery {
   /**
    * 物料ID
    */
-  materielId?: string | number;
+  materialId?: string | number;
 
   /**
    * 批次号
diff --git a/src/views/wms/inStockBill/add.vue b/src/views/wms/inStockBill/add.vue
deleted file mode 100644
index 09b03b1..0000000
--- a/src/views/wms/inStockBill/add.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <div class="p-2">
-    <el-card shadow="never">
-      <template #header>
-        <div class="flex justify-between items-center">
-          <h3 class="text-lg font-semibold">新增物料入库</h3>
-          <el-button type="primary" @click="goBack">返回列表</el-button>
-        </div>
-      </template>
-
-      <el-form ref="inStockBillFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-row :gutter="20">
-          <!-- 第一列 -->
-          <el-col :span="12">
-            <el-form-item label="入库单号" prop="inStockCode">
-              <el-input v-model="form.inStockCode" placeholder="请输入入库单号" />
-            </el-form-item>
-
-            <el-form-item label="入库单类型" prop="inStockType">
-              <el-select v-model="form.inStockType" placeholder="请选择入库单类型" style="width: 100%">
-                <el-option v-for="dict in wms_in_stock_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="关联单号" prop="inventoryAmount">
-              <el-input v-model="form.inventoryAmount" placeholder="请输入关联单号" />
-            </el-form-item>
-
-            <el-form-item label="供应商" prop="supplier">
-              <el-input v-model="form.supplier" placeholder="请输入供应商" />
-            </el-form-item>
-
-            <el-form-item label="联系人" prop="contactUser">
-              <el-input v-model="form.contactUser" placeholder="请输入联系人" />
-            </el-form-item>
-          </el-col>
-
-          <!-- 第二列 -->
-          <el-col :span="12">
-            <el-form-item label="联系电话" prop="contactNumber">
-              <el-input v-model="form.contactNumber" placeholder="请输入联系电话" />
-            </el-form-item>
-
-            <el-form-item label="入库单状态" prop="inStockBillStatus">
-              <el-select v-model="form.inStockBillStatus" placeholder="请选择入库单状态" style="width: 100%">
-                <el-option v-for="dict in wms_in_stock_bill_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="流程状态" prop="flowStatus">
-              <el-input v-model="form.flowStatus" placeholder="请输入流程状态" />
-            </el-form-item>
-
-            <el-form-item label="仓库ID" prop="warehouseId">
-              <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- 全宽字段 -->
-        <el-form-item label="入库说明" prop="directions">
-          <el-input v-model="form.directions" type="textarea" :rows="3" placeholder="请输入入库说明" style="width: 100%" />
-        </el-form-item>
-
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注" style="width: 100%" />
-        </el-form-item>
-      </el-form>
-
-      <!-- 底部操作按钮 -->
-      <div class="flex justify-center mt-6 space-x-4">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm" size="large">
-          <el-icon>
-            <Check />
-          </el-icon>
-          提交
-        </el-button>
-        <el-button @click="resetForm" size="large">
-          <el-icon>
-            <Refresh />
-          </el-icon>
-          重置
-        </el-button>
-        <el-button @click="goBack" size="large">
-          <el-icon>
-            <ArrowLeft />
-          </el-icon>
-          返回
-        </el-button>
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script setup name="InStockBillAdd" lang="ts">
-import { addInStockBill } from '@/api/wms/inStockBill';
-import { InStockBillForm } from '@/api/wms/inStockBill/types';
-import { ref } from 'vue';
-import { useRouter } from 'vue-router';
-
-const router = useRouter();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wms_in_stock_type, wms_in_stock_bill_status } = toRefs<any>(proxy?.useDict('wms_in_stock_type', 'wms_in_stock_bill_status'));
-
-const inStockBillFormRef = ref<ElFormInstance>();
-const buttonLoading = ref(false);
-
-const initFormData: InStockBillForm = {
-  inStockBillId: undefined,
-  inStockCode: undefined,
-  inStockType: undefined,
-  projectId: undefined,
-  inventoryAmount: undefined,
-  supplier: undefined,
-  contactUser: undefined,
-  contactNumber: undefined,
-  directions: undefined,
-  inStockBillStatus: undefined,
-  flowStatus: undefined,
-  warehouseId: undefined,
-  remark: undefined
-};
-
-const form = ref<InStockBillForm>({ ...initFormData });
-
-const rules = ref({
-  inStockCode: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
-  inStockType: [{ required: true, message: '入库单类型不能为空', trigger: 'change' }],
-  supplier: [{ required: true, message: '供应商不能为空', trigger: 'blur' }]
-});
-
-/** 提交表单 */
-const submitForm = () => {
-  inStockBillFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      try {
-        await addInStockBill(form.value);
-        proxy?.$modal.msgSuccess('新增成功');
-        goBack();
-      } catch (error) {
-        console.error('新增失败:', error);
-      } finally {
-        buttonLoading.value = false;
-      }
-    }
-  });
-};
-
-/** 重置表单 */
-const resetForm = () => {
-  form.value = { ...initFormData };
-  inStockBillFormRef.value?.resetFields();
-};
-
-/** 返回列表页 */
-const goBack = () => {
-  router.push('/wms/inStockBill');
-};
-
-// 页面加载时初始化
-onMounted(() => {
-  resetForm();
-});
-</script>
-
-<style scoped>
-.el-form-item {
-  margin-bottom: 20px;
-}
-
-.el-input,
-.el-select,
-.el-textarea {
-  width: 100%;
-}
-</style>
diff --git a/src/views/wms/inStockBill/index.vue b/src/views/wms/inStockBill/index.vue
index 5d536c3..c16ab51 100644
--- a/src/views/wms/inStockBill/index.vue
+++ b/src/views/wms/inStockBill/index.vue
@@ -13,7 +13,7 @@
               <el-input v-model="queryParams.inventoryAmount" placeholder="请输入关联单号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="供应商" prop="supplier">
-              <el-input v-model="queryParams.supplier" placeholder="请输入供应商" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.supplierName" placeholder="请输入供应商" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="入库单状态" prop="inStockBillStatus">
               <el-select v-model="queryParams.inStockBillStatus" placeholder="请选择入库单状态" clearable>
@@ -64,13 +64,34 @@
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
         </el-row>
-
       </template>
 
-      <el-table v-loading="loading" border :data="inStockBillList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+      <!--主表-->
+      <el-table
+        v-loading="loading"
+        border
+        :data="inStockBillList"
+        @selection-change="handleSelectionChange"
+        @expand-change="handleExpandChange"
+        :row-key="(row) => row.inStockBillId"
+      >
+        <el-table-column type="expand">
+          <template #default="{ row }">
+            <el-table :data="row.children" v-loading="row.loading" border style="width: 95%; margin: 0 auto; ">
+              <el-table-column prop="materialCode" align="center" label="物料编码" />
+              <el-table-column prop="materialName" align="center" label="物料名称" />
+              <el-table-column prop="batchNumber" align="center" label="批次号" />
+              <el-table-column prop="unitPrice" align="center" label="单价" />
+              <el-table-column prop="inStockAmount" align="center" label="入库数量" />
+              <el-table-column prop="unitName" align="center" label="单位" />
+              <el-table-column prop="totalPrice" align="center" label="总价" />
+            </el-table>
+          </template>
+        </el-table-column>
+
+        <!--        <el-table-column type="selection" width="55" align="center" />-->
         <el-table-column label="入库单ID" align="center" prop="inStockBillId" v-if="columns[0].visible" />
-        <el-table-column label="入库单号" align="center" prop="inStockCode" v-if="columns[2].visible" />
+        <el-table-column label="入库单号" align="center" prop="inStockCode" v-if="columns[2].visible" width="150" />
         <el-table-column label="入库单类型" align="center" prop="inStockType" v-if="columns[3].visible">
           <template #default="scope">
             <dict-tag :options="wms_in_stock_type" :value="scope.row.inStockType" />
@@ -88,7 +109,6 @@
           </template>
         </el-table-column>
         <el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[11].visible" />
-        <el-table-column label="仓库ID" align="center" prop="warehouseId" v-if="columns[12].visible" />
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[13].visible" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[17].visible">
           <template #default="scope">
@@ -115,7 +135,7 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加物料入库对话框 -->
-    <el-dialog title="添加物料入库" v-model="addDialog.visible" width="900px" append-to-body>
+    <el-dialog title="添加物料入库" v-model="addDialog.visible" width="1250px" append-to-body>
       <el-form ref="addFormRef" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -139,7 +159,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="供应商" prop="supplier">
-              <el-input v-model="form.supplier" placeholder="请输入供应商" />
+              <el-input v-model="form.supplierName" placeholder="请输入供应商" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -176,11 +196,55 @@
           <div v-if="selectedMaterials.length > 0" style="margin-top: 20px">
             <h4>已选择的物料：</h4>
             <el-table :data="selectedMaterials" border>
+              <!--              <el-table-column prop="materialId" label="物料编码" width="120"  header/>-->
               <el-table-column prop="materialCode" label="物料编码" width="120" />
               <el-table-column prop="materialName" label="物料名称" width="120" />
               <el-table-column prop="materialBrand" label="品牌" width="120" />
               <el-table-column prop="materialModel" label="型号" width="120" />
-              <el-table-column prop="unitName" label="单位" />
+              <el-table-column prop="batchNumber" label="批次号" width="150">
+                <template #default="scope">
+                  <el-input v-model="scope.row.batchNumber" placeholder="自动生成批次号" :readonly="true" size="small" />
+                </template>
+              </el-table-column>
+              <el-table-column prop="unitPrice" label="单价(元)" width="140">
+                <template #default="scope">
+                  <el-input-number
+                    v-model="scope.row.unitPrice"
+                    :min="0"
+                    :precision="2"
+                    :step="0.5"
+                    controls-position="right"
+                    size="small"
+                    placeholder="请输入单价"
+                    @change="calculateTotalPrice(scope.row)"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column prop="quantity" label="入库数量" width="140">
+                <template #default="scope">
+                  <el-input-number
+                    v-model="scope.row.quantity"
+                    :min="1"
+                    :precision="2"
+                    :step="0.5"
+                    controls-position="right"
+                    size="small"
+                    placeholder="请输入数量"
+                    @change="calculateTotalPrice(scope.row)"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column prop="unitName" label="单位" width="70" />
+              <el-table-column prop="totalPrice" label="总价(元)" width="120">
+                <template #default="scope">
+                  <span>{{ scope.row.totalPrice || 0 }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="80">
+                <template #default="scope">
+                  <el-button link type="danger" icon="Delete" @click="removeMaterial(scope.$index)"></el-button>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </el-card>
@@ -210,7 +274,7 @@
           <el-input v-model="form.inventoryAmount" placeholder="请输入关联单号" />
         </el-form-item>
         <el-form-item label="供应商" prop="supplier">
-          <el-input v-model="form.supplier" placeholder="请输入供应商" />
+          <el-input v-model="form.supplierName" placeholder="请输入供应商" />
         </el-form-item>
         <el-form-item label="联系人" prop="contactUser">
           <el-input v-model="form.contactUser" placeholder="请输入联系人" />
@@ -247,7 +311,22 @@
 import { addInStockBill, delInStockBill, getInStockBill, listInStockBill, updateInStockBill } from '@/api/wms/inStockBill';
 import { InStockBillForm, InStockBillQuery, InStockBillVO } from '@/api/wms/inStockBill/types';
 import { ref } from 'vue'; // 存储选中的物料信息
-import { useRouter } from 'vue-router';
+import { useRouter } from 'vue-router'; // 存储选中的物料信息
+import { getWmsInStockDetailsList } from '@/api/wms/inStockDetails'; // 添加展开行处理函数
+
+// 添加展开行处理函数
+const handleExpandChange = async (row, expandedRows) => {
+  if (expandedRows.length && !row.children) {
+    try {
+      row.loading = true;
+      const res = await getWmsInStockDetailsList({ inStockBillId: row.inStockBillId });
+      row.children = res.rows;
+    } finally {
+      row.loading = false;
+    }
+  }
+};
+
 // 存储选中的物料信息
 const selectedMaterials = ref([]);
 const materialSelectRef = ref();
@@ -269,6 +348,43 @@ const inStockBillFormRef = ref<ElFormInstance>();
 
 const addFormRef = ref<ElFormInstance>();
 
+// 处理物料选择确认回调
+const handleMaterialConfirm = (materials) => {
+  console.log('选中的物料:', materials);
+  // 为每个物料添加扩展字段
+  materials.forEach((material) => {
+    // 生成批次号：供应商代码 + 时间戳
+    // const supplierCode = form.value.supplierName ? form.value.supplier.substring(0, 4) : 'SUPP';
+    const timestamp = new Date().getTime();
+    // material.batchNumber = `${supplierCode}${timestamp}`;
+
+    // 设置默认单价为采购单价
+    material.unitPrice = material.purchasePrice || 0;
+    material.quantity = 1; // 默认数量为1
+    material.totalPrice = (material.unitPrice * material.quantity).toFixed(2);
+  });
+};
+
+// 计算总价
+const calculateTotalPrice = (material) => {
+  if (material.unitPrice && material.quantity) {
+    material.totalPrice = (material.unitPrice * material.quantity).toFixed(2);
+  } else {
+    material.totalPrice = 0;
+  }
+};
+
+// 删除物料行
+const removeMaterial = (index) => {
+  selectedMaterials.value.splice(index, 1);
+};
+
+// 打开物料选择对话框
+const openMaterialSelect = () => {
+  materialSelectRef.value.open();
+};
+// ... existing code ...
+
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
@@ -301,14 +417,13 @@ const columns = ref<FieldOption[]>([
   { key: 19, label: `更新时间`, visible: true }
 ]);
 
-
 const initFormData: InStockBillForm = {
   inStockBillId: undefined,
   inStockCode: undefined,
   inStockType: undefined,
   projectId: undefined,
   inventoryAmount: undefined,
-  supplier: undefined,
+  supplierName: undefined,
   contactUser: undefined,
   contactNumber: undefined,
   directions: undefined,
@@ -325,7 +440,7 @@ const data = reactive<PageData<InStockBillForm, InStockBillQuery>>({
     inStockType: undefined,
     projectId: undefined,
     inventoryAmount: undefined,
-    supplier: undefined,
+    supplierName: undefined,
     inStockBillStatus: undefined,
     flowStatus: undefined,
     warehouseId: undefined,
@@ -398,35 +513,61 @@ const handleAdd = () => {
 const handleAddSubmit = () => {
   addFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
-      addButtonLoading.value = true;
+      // 验证是否选择了物料
+      if (selectedMaterials.value.length === 0) {
+        proxy?.$modal.msgError('请至少选择一个物料');
+        return;
+      }
+
+      // 验证物料信息的完整性
+      const invalidMaterials = selectedMaterials.value.filter((material) => {
+        return !material.unitPrice || material.unitPrice <= 0 || !material.quantity || material.quantity <= 0;
+      });
+
+      if (invalidMaterials.length > 0) {
+        proxy?.$modal.msgError('请完善物料信息，确保单价和数量都大于0');
+        return;
+      }
+
+      buttonLoading.value = true;
       try {
-        await addInStockBill(addForm.value);
+        // 准备提交数据，包含物料明细
+        const submitData = {
+          ...form.value,
+          // 添加物料明细信息
+          inStockDetailsList: selectedMaterials.value.map((material) => ({
+            materialId: material.materialId, // 物料ID
+            batchNumber: material.batchNumber, // 批次号
+            unitPrice: material.unitPrice, // 单价
+            inStockAmount: material.quantity, // 数量
+            unitName: material.unitName, // 单位
+            totalPrice: material.totalPrice // 总价
+          }))
+        };
+
+        await addInStockBill(submitData);
         proxy?.$modal.msgSuccess('添加成功');
         addDialog.visible = false;
+
+        // 清空已选择的物料
+        selectedMaterials.value = [];
         await getList();
+      } catch (error) {
+        console.error('添加入库单失败:', error);
+        proxy?.$modal.msgError('添加失败，请重试');
       } finally {
-        addButtonLoading.value = false;
+        buttonLoading.value = false;
       }
     }
   });
-}
-
+};
 
 /** 添加表单取消 */
 const handleAddCancel = () => {
   addDialog.visible = false;
   addFormRef.value?.resetFields();
 };
-const openMaterialSelect = () => {
-  materialSelectRef.value.open();
-};
 
-// 处理物料选择确认回调
-const handleMaterialConfirm = (materials) => {
-  console.log('选中的物料:', materials);
-  // 在这里可以处理选中的物料数据
-  // materials 是一个数组，包含所有选中的物料信息
-};
 /** 修改按钮操作 */
 const handleUpdate = async (row?: InStockBillVO) => {
   reset();
diff --git a/src/views/wms/inStockDetails/index.vue b/src/views/wms/inStockDetails/index.vue
index ab33880..560d718 100644
--- a/src/views/wms/inStockDetails/index.vue
+++ b/src/views/wms/inStockDetails/index.vue
@@ -1,289 +1,295 @@
 <template>
-    <div class="p-2">
-        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-            <div v-show="showSearch" class="mb-[10px]">
-                <el-card shadow="hover">
-                    <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
-                                    <el-form-item label="入库单ID" prop="inStockBillId">
-                                        <el-input v-model="queryParams.inStockBillId" placeholder="请输入入库单ID" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="仓库ID" prop="warehouseId">
-                                        <el-input v-model="queryParams.warehouseId" placeholder="请输入仓库ID" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="物料ID" prop="materielId">
-                                        <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="批次号" prop="batchNumber">
-                                        <el-input v-model="queryParams.batchNumber" placeholder="请输入批次号" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                        <el-form-item>
-                            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-card>
-            </div>
-        </transition>
-
-        <el-card shadow="never">
-            <template #header>
-                <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:inStockDetails:add']">新增</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:inStockDetails:edit']">修改</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:inStockDetails:remove']">删除</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:inStockDetails:export']">导出</el-button>
-                    </el-col>
-                    <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
-                </el-row>
-            </template>
-
-            <el-table v-loading="loading" border :data="inStockDetailsList" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" align="center" />
-                        <el-table-column label="入库单明细ID" align="center" prop="inStockDetailsId" v-if="columns[0].visible"/>
-                        <el-table-column label="入库单ID" align="center" prop="inStockBillId" v-if="columns[2].visible"/>
-                        <el-table-column label="仓库ID" align="center" prop="warehouseId" v-if="columns[3].visible"/>
-                        <el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[4].visible"/>
-                        <el-table-column label="批次号" align="center" prop="batchNumber" v-if="columns[5].visible"/>
-                        <el-table-column label="单价" align="center" prop="unitPrice" v-if="columns[6].visible"/>
-                        <el-table-column label="入库数量" align="center" prop="inStockAmount" v-if="columns[7].visible"/>
-                        <el-table-column label="物料单位" align="center" prop="unitName" v-if="columns[8].visible"/>
-                        <el-table-column label="总价" align="center" prop="totalPrice" v-if="columns[9].visible"/>
-                        <el-table-column label="删除标志" align="center" prop="delFlag" v-if="columns[10].visible"/>
-                        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[13].visible">
-                            <template #default="scope">
-                                <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[15].visible">
-                            <template #default="scope">
-                                <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-                            </template>
-                        </el-table-column>
-                <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
-                    <template #default="scope">
-                        <el-tooltip content="修改" placement="top">
-                            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:inStockDetails:edit']"></el-button>
-                        </el-tooltip>
-                        <el-tooltip content="删除" placement="top">
-                            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:inStockDetails:remove']"></el-button>
-                        </el-tooltip>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+            <el-form-item label="入库单ID" prop="inStockBillId">
+              <el-input v-model="queryParams.inStockBillId" placeholder="请输入入库单ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="仓库ID" prop="warehouseId">
+              <el-input v-model="queryParams.warehouseId" placeholder="请输入仓库ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料ID" prop="materialId">
+              <el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="批次号" prop="batchNumber">
+              <el-input v-model="queryParams.batchNumber" placeholder="请输入批次号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
         </el-card>
-        <!-- 添加或修改入库单明细对话框 -->
-        <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-            <el-form ref="inStockDetailsFormRef" :model="form" :rules="rules" label-width="120px">
-                            <el-form-item label="入库单ID" prop="inStockBillId">
-                                <el-input v-model="form.inStockBillId" placeholder="请输入入库单ID" />
-                            </el-form-item>
-                            <el-form-item label="仓库ID" prop="warehouseId">
-                                <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
-                            </el-form-item>
-                            <el-form-item label="物料ID" prop="materielId">
-                                <el-input v-model="form.materielId" placeholder="请输入物料ID" />
-                            </el-form-item>
-                            <el-form-item label="批次号" prop="batchNumber">
-                                <el-input v-model="form.batchNumber" placeholder="请输入批次号" />
-                            </el-form-item>
-                            <el-form-item label="单价" prop="unitPrice">
-                                <el-input v-model="form.unitPrice" placeholder="请输入单价" />
-                            </el-form-item>
-                            <el-form-item label="入库数量" prop="inStockAmount">
-                                <el-input v-model="form.inStockAmount" placeholder="请输入入库数量" />
-                            </el-form-item>
-                            <el-form-item label="物料单位" prop="unitName">
-                                <el-input v-model="form.unitName" placeholder="请输入物料单位" />
-                            </el-form-item>
-                            <el-form-item label="总价" prop="totalPrice">
-                                <el-input v-model="form.totalPrice" placeholder="请输入总价" />
-                            </el-form-item>
-            </el-form>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-                    <el-button @click="cancel">取 消</el-button>
-                </div>
-            </template>
-        </el-dialog>
-    </div>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:inStockDetails:add']"> 新增 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:inStockDetails:edit']"
+              >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:inStockDetails:remove']"
+              >删除
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:inStockDetails:export']">导出 </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="inStockDetailsList" @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="入库单明细ID" align="center" prop="inStockDetailsId" v-if="columns[0].visible" />
+        <el-table-column label="入库单ID" align="center" prop="inStockBillId" v-if="columns[2].visible" />
+        <el-table-column label="仓库ID" align="center" prop="warehouseId" v-if="columns[3].visible" />
+        <el-table-column label="物料ID" align="center" prop="materialId" v-if="columns[4].visible" />
+        <el-table-column label="批次号" align="center" prop="batchNumber" v-if="columns[5].visible" />
+        <el-table-column label="单价" align="center" prop="unitPrice" v-if="columns[6].visible" />
+        <el-table-column label="入库数量" align="center" prop="inStockAmount" v-if="columns[7].visible" />
+        <el-table-column label="物料单位" align="center" prop="unitName" v-if="columns[8].visible" />
+        <el-table-column label="总价" align="center" prop="totalPrice" v-if="columns[9].visible" />
+        <el-table-column label="删除标志" align="center" prop="delFlag" v-if="columns[10].visible" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[13].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[15].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:inStockDetails:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:inStockDetails:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改入库单明细对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="inStockDetailsFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="入库单ID" prop="inStockBillId">
+          <el-input v-model="form.inStockBillId" placeholder="请输入入库单ID" />
+        </el-form-item>
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
+        </el-form-item>
+        <el-form-item label="物料ID" prop="materialId">
+          <el-input v-model="form.materialId" placeholder="请输入物料ID" />
+        </el-form-item>
+        <el-form-item label="批次号" prop="batchNumber">
+          <el-input v-model="form.batchNumber" placeholder="请输入批次号" />
+        </el-form-item>
+        <el-form-item label="单价" prop="unitPrice">
+          <el-input v-model="form.unitPrice" placeholder="请输入单价" />
+        </el-form-item>
+        <el-form-item label="入库数量" prop="inStockAmount">
+          <el-input v-model="form.inStockAmount" placeholder="请输入入库数量" />
+        </el-form-item>
+        <el-form-item label="物料单位" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入物料单位" />
+        </el-form-item>
+        <el-form-item label="总价" prop="totalPrice">
+          <el-input v-model="form.totalPrice" placeholder="请输入总价" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="InStockDetails" lang="ts">
-    import { listInStockDetails, getInStockDetails, delInStockDetails, addInStockDetails, updateInStockDetails } from '@/api/wms/inStockDetails';
-    import { InStockDetailsVO, InStockDetailsQuery, InStockDetailsForm } from '@/api/wms/inStockDetails/types';
+import { addInStockDetails, delInStockDetails, getInStockDetails, listInStockDetails, updateInStockDetails } from '@/api/wms/inStockDetails';
+import { InStockDetailsForm, InStockDetailsQuery, InStockDetailsVO } from '@/api/wms/inStockDetails/types';
 
-    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-    const inStockDetailsList = ref<InStockDetailsVO[]>([]);
-    const buttonLoading = ref(false);
-    const loading = ref(true);
-    const showSearch = ref(true);
-    const ids = ref<Array<string | number>>([]);
-    const single = ref(true);
-    const multiple = ref(true);
-    const total = ref(0);
+const inStockDetailsList = ref<InStockDetailsVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
 
-    const queryFormRef = ref<ElFormInstance>();
-    const inStockDetailsFormRef = ref<ElFormInstance>();
+const queryFormRef = ref<ElFormInstance>();
+const inStockDetailsFormRef = ref<ElFormInstance>();
 
-    const dialog = reactive<DialogOption>({
-        visible: false,
-        title: ''
-    });
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
 
-    // 列显隐信息
-    const columns = ref<FieldOption[]>([
-            { key: 0, label: `入库单明细ID`, visible: true },
-            { key: 1, label: `租户编号`, visible: true },
-            { key: 2, label: `入库单ID`, visible: true },
-            { key: 3, label: `仓库ID`, visible: true },
-            { key: 4, label: `物料ID`, visible: true },
-            { key: 5, label: `批次号`, visible: true },
-            { key: 6, label: `单价`, visible: true },
-            { key: 7, label: `入库数量`, visible: true },
-            { key: 8, label: `物料单位`, visible: true },
-            { key: 9, label: `总价`, visible: true },
-            { key: 10, label: `删除标志`, visible: true },
-            { key: 11, label: `创建部门`, visible: true },
-            { key: 12, label: `创建人`, visible: true },
-            { key: 13, label: `创建时间`, visible: true },
-            { key: 14, label: `更新人`, visible: true },
-            { key: 15, label: `更新时间`, visible: true },
-    ]);
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `入库单明细ID`, visible: true },
+  { key: 1, label: `租户编号`, visible: true },
+  { key: 2, label: `入库单ID`, visible: true },
+  { key: 3, label: `仓库ID`, visible: true },
+  { key: 4, label: `物料ID`, visible: true },
+  { key: 5, label: `批次号`, visible: true },
+  { key: 6, label: `单价`, visible: true },
+  { key: 7, label: `入库数量`, visible: true },
+  { key: 8, label: `物料单位`, visible: true },
+  { key: 9, label: `总价`, visible: true },
+  { key: 10, label: `删除标志`, visible: true },
+  { key: 11, label: `创建部门`, visible: true },
+  { key: 12, label: `创建人`, visible: true },
+  { key: 13, label: `创建时间`, visible: true },
+  { key: 14, label: `更新人`, visible: true },
+  { key: 15, label: `更新时间`, visible: true }
+]);
 
-    const initFormData: InStockDetailsForm = {
-                        inStockDetailsId: undefined,
-                        inStockBillId: undefined,
-                        warehouseId: undefined,
-                        materielId: undefined,
-                        batchNumber: undefined,
-                        unitPrice: undefined,
-                        inStockAmount: undefined,
-                        unitName: undefined,
-                        totalPrice: undefined,
+const initFormData: InStockDetailsForm = {
+  inStockDetailsId: undefined,
+  inStockBillId: undefined,
+  warehouseId: undefined,
+  materialId: undefined,
+  batchNumber: undefined,
+  unitPrice: undefined,
+  inStockAmount: undefined,
+  unitName: undefined,
+  totalPrice: undefined
+};
+const data = reactive<PageData<InStockDetailsForm, InStockDetailsQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    inStockBillId: undefined,
+    warehouseId: undefined,
+    materialId: undefined,
+    batchNumber: undefined,
+    params: {}
+  },
+  rules: {
+    inStockDetailsId: [{ required: true, message: '入库单明细ID不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询入库单明细列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listInStockDetails(queryParams.value);
+  inStockDetailsList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  inStockDetailsFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: InStockDetailsVO[]) => {
+  ids.value = selection.map((item) => item.inStockDetailsId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加入库单明细';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: InStockDetailsVO) => {
+  reset();
+  const _inStockDetailsId = row?.inStockDetailsId || ids.value[0];
+  const res = await getInStockDetails(_inStockDetailsId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改入库单明细';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  inStockDetailsFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.inStockDetailsId) {
+        await updateInStockDetails(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addInStockDetails(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
     }
-    const data = reactive<PageData<InStockDetailsForm, InStockDetailsQuery>>({
-        form: {...initFormData},
-        queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-                            inStockBillId: undefined,
-                            warehouseId: undefined,
-                            materielId: undefined,
-                            batchNumber: undefined,
-            params: {
-            }
-        },
-        rules: {
-                            inStockDetailsId: [
-                            { required: true, message: "入库单明细ID不能为空", trigger: "blur" }
-                        ],
-        }
-    });
+  });
+};
 
-    const { queryParams, form, rules } = toRefs(data);
+/** 删除按钮操作 */
+const handleDelete = async (row?: InStockDetailsVO) => {
+  const _inStockDetailsIds = row?.inStockDetailsId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除入库单明细编号为"' + _inStockDetailsIds + '"的数据项？').finally(() => (loading.value = false));
+  await delInStockDetails(_inStockDetailsIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
 
-    /** 查询入库单明细列表 */
-    const getList = async () => {
-        loading.value = true;
-        const res = await listInStockDetails(queryParams.value);
-            inStockDetailsList.value = res.rows;
-        total.value = res.total;
-        loading.value = false;
-    }
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'wms/inStockDetails/export',
+    {
+      ...queryParams.value
+    },
+    `inStockDetails_${new Date().getTime()}.xlsx`
+  );
+};
 
-    /** 取消按钮 */
-    const cancel = () => {
-        reset();
-        dialog.visible = false;
-    }
-
-    /** 表单重置 */
-    const reset = () => {
-        form.value = {...initFormData};
-            inStockDetailsFormRef.value?.resetFields();
-    }
-
-    /** 搜索按钮操作 */
-    const handleQuery = () => {
-        queryParams.value.pageNum = 1;
-        getList();
-    }
-
-    /** 重置按钮操作 */
-    const resetQuery = () => {
-        queryFormRef.value?.resetFields();
-        handleQuery();
-    }
-
-    /** 多选框选中数据 */
-    const handleSelectionChange = (selection: InStockDetailsVO[]) => {
-        ids.value = selection.map(item => item.inStockDetailsId);
-        single.value = selection.length != 1;
-        multiple.value = !selection.length;
-    }
-
-    /** 新增按钮操作 */
-    const handleAdd = () => {
-        reset();
-        dialog.visible = true;
-        dialog.title = "添加入库单明细";
-    }
-
-    /** 修改按钮操作 */
-    const handleUpdate = async (row?: InStockDetailsVO) => {
-        reset();
-        const _inStockDetailsId = row?.inStockDetailsId || ids.value[0]
-        const res = await getInStockDetails(_inStockDetailsId);
-        Object.assign(form.value, res.data);
-        dialog.visible = true;
-        dialog.title = "修改入库单明细";
-    }
-
-    /** 提交按钮 */
-    const submitForm = () => {
-            inStockDetailsFormRef.value?.validate(async (valid: boolean) => {
-            if (valid) {
-                buttonLoading.value = true;
-                if (form.value.inStockDetailsId) {
-                    await updateInStockDetails(form.value).finally(() =>  buttonLoading.value = false);
-                } else {
-                    await addInStockDetails(form.value).finally(() =>  buttonLoading.value = false);
-                }
-                proxy?.$modal.msgSuccess("操作成功");
-                dialog.visible = false;
-                await getList();
-            }
-        });
-    }
-
-    /** 删除按钮操作 */
-    const handleDelete = async (row?: InStockDetailsVO) => {
-        const _inStockDetailsIds = row?.inStockDetailsId || ids.value;
-        await proxy?.$modal.confirm('是否确认删除入库单明细编号为"' + _inStockDetailsIds + '"的数据项？').finally(() => loading.value = false);
-        await delInStockDetails(_inStockDetailsIds);
-        proxy?.$modal.msgSuccess("删除成功");
-        await getList();
-    }
-
-    /** 导出按钮操作 */
-    const handleExport = () => {
-        proxy?.download('wms/inStockDetails/export', {
-            ...queryParams.value
-        }, `inStockDetails_${new Date().getTime()}.xlsx`)
-    }
-
-    onMounted(() => {
-        getList();
-    });
+onMounted(() => {
+  getList();
+});
 </script>