diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 16eae4a35..14e24389f 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -885,7 +885,6 @@ export default {
     打开:'Open',
     保存:'Save',
     下一步:'Next',
-    下一步:'Next',
     请选择筛选对象:'Please select filter',
     请输入内容:'Please inputr content',
     附件:'Attachment',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index d5bec6b15..ddc8193f9 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -885,7 +885,6 @@ export default {
     打开:'打开',
     保存:'保存',
     下一步:'下一步',
-    下一步:'下一步',
     请选择筛选对象:'请选择筛选对象',
     请输入内容:'请输入内容',
     附件:'附件',
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 8572f2373..80332842f 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -3,6 +3,316 @@ import { dateFormatter } from '@/utils/formatTime'
 import { fa } from 'element-plus/es/locale'
 import * as PackageunitApi from '@/api/wms/packageunit'
 import { Select } from '@element-plus/icons-vue/dist/types'
+export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装类型',
+    field: 'type',
+    dictType: DICT_TYPE.PACK_UNIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '长',
+    field: 'length',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '宽',
+    field: 'width',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '高',
+    field: 'height',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '单位',
+    field: 'unit',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装描述',
+    field: 'desc',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否重复使用',
+    field: 'reuse',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否管理包装库存',
+    field: 'manageBalance',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    isDetail: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除者',
+    field: 'deleterId',
+    sort: 'custom',
+    isDetail: false,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isDetail: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isDetail: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '地点',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isDetail: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    isDetail: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
 
 export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -13,15 +323,31 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+  },{
+    label: '父包装代码',
+    field: 'parentCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit1.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
-  // {
-  //   label: '父包装代码',
-  //   field: 'parentCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '包装名称',
     field: 'name',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 1086fa936..fc80a2a7c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -64,7 +64,7 @@
                     </el-table>
                   </div>
                 </template>
-              </el-table-column>
+              </el-table-column> 
               <el-table-column label="托行号" width="100" prop="tPoNumber" align="center" />
               <el-table-column label="箱个数" width="100" prop="xNumber" align="center">
                 <template #default="scope1">
@@ -155,12 +155,12 @@ const openLabel = (tableList) => {
   tableData.value = tableList
   intData()
 }
-const oneId = ref(0)//每托的id
-const twoId = ref(0)//每箱的id
+const oneId = ref(0) //每托的id
+const twoId = ref(0) //每箱的id
 const intData = () => {
   // 目前托信息等于包装规格1
   tableData.value.forEach((item) => {
-    item.packQty1 = 3
+    item.packQty1 = 11
 
     // 判断托信息是否存在
     if (item.packUnit && item.packQty) {
@@ -170,70 +170,67 @@ const intData = () => {
       item.otherNumber = parseFloat(item.packQty) / parseFloat(item.secondPackQty)
       // 数量%每箱数量  获取总共几箱
       item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
+      // 数量%托数量  获取总共几托
+      item.allTuoQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.packQty))
       item.children = []
+      // 循环托
       for (let i = 0; i < item.packQty1; i++) {
         oneId.value++
-        // 如果有余数
-        if (item.lastNumber) {
-          // 最后一条信息直接展示余数的信息
-          if (i == item.packQty1 - 1) {
-            item.children.push({
-              id: oneId.value,
-              tPoNumber: i + 1,
-              xNumber: Math.ceil(item.lastNumber / parseFloat(item.secondPackQty)),
-              qtyOne: item.lastNumber
-            })
-          } else {
-            // 其他数据展示一托的全部箱数和全部数量
-            item.children.push({
-              id: oneId.value,
-              tPoNumber: i + 1,
-              xNumber: item.otherNumber,
-              qtyOne: item.packQty
-            })
+        // 先给所有托一个默认对象值
+        item.children[i] = {
+          id: oneId.value,
+          tPoNumber: i + 1,
+          xNumber: '',
+          qtyOne: ''
+        }
+        // 循环当前数量所需要的托数量
+        for (let j = 0; j < item.allTuoQty; j++) {
+          if (i == j) {
+            // 如果有余数
+            if (item.lastNumber) {
+              // 最后一条信息直接展示余数的信息
+              if (j == item.allTuoQty - 1) {
+              item.children[j].xNumber =  Math.ceil(item.lastNumber / parseFloat(item.secondPackQty))
+              item.children[j].qtyOne = item.lastNumber
+              }else{
+                // 其他数据展示一托的全部箱数和全部数量
+              item.children[j].xNumber = item.otherNumber
+              item.children[j].qtyOne = item.packQty
+            }
+            }else{
+              // 如果沒有余数,直接展示一托的全部箱数和全部数量
+              item.children[j].xNumber = item.otherNumber
+              item.children[j].qtyOne = item.packQty
+            }
+           
           }
-        } else {
-          // 如果沒有余数,直接展示一托的全部箱数和全部数量
-          item.children.push({
-            id: oneId.value,
-            tPoNumber: i + 1,
-            xNumber: item.otherNumber,
-            qtyOne: item.packQty
-          })
         }
       }
       // 判断箱信息是否存在
       if (item.secondPackUnit && item.secondPackQty) {
         item.children.forEach((cur, key) => {
           cur.children = []
-          // 数量除以托数量获取余数
-          cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(item.secondPackQty)
-          for (let j = 0; j < cur.xNumber; j++) {
+          // 数量除以箱数量获取余数
+          cur.xLastNumber = parseFloat(cur.qtyOne) % parseFloat(item.secondPackQty)
+          // cur.xiangNumber = Math.ceil(parseFloat(cur.qtyOne) / parseFloat(item.secondPackQty))
+          for (let i = 0; i < cur.xNumber; i++) {
             twoId.value++
+            cur.children[i]={
+              id: twoId.value,
+              xPoNumber: i + 1,
+            }
             // 如果有余数
             if (cur.xLastNumber) {
               // 最后一条信息直接展示余数的信息
-              if (j == cur.xNumbery - 1) {
-                cur.children.push({
-                  id: twoId.value,
-                  xPoNumber: j + 1,
-                  qtyTwo: cur.xLastNumber
-                })
+              if (i == cur.xNumber - 1) {
+                cur.children[i].qtyTwo = cur.xLastNumber
               } else {
                 // 其他数据展示一托的全部箱数和全部数量
-                cur.children.push({
-                  id: twoId.value,
-                  xPoNumber: j + 1,
-                  qtyTwo: item.secondPackQty
-                })
+                cur.children[i].qtyTwo = item.secondPackQty
               }
             } else {
               // 如果沒有余数,直接展示一托的全部箱数和全部数量
-              cur.children.push({
-                id: twoId.value,
-                xPoNumber: j + 1,
-                qtyTwo: item.secondPackQty
-              })
+              cur.children[i].qtyTwo = item.secondPackQty
             }
           }
         })
@@ -241,38 +238,44 @@ const intData = () => {
     } else {
       // 数量除以箱数量获取余数
       item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.secondPackQty)
+      // 数量%每箱数量  获取总共几箱
+      item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
       item.children = []
-      console.log(item.packQty1)
+      console.log(333,item.lastNumber)
+      // 循环箱
       for (let i = 0; i < item.packQty1; i++) {
         oneId.value++
-        if (item.lastNumber) {
-          // 最后一条信息直接展示余数的信息
-          if (i == item.packQty - 1) {
-            item.children.push({
-              id: oneId.value,
-              xPoNumber: i + 1,
-              qtyOne: item.lastNumber
-            })
-          } else {
-            // 其他数据展示一托的全部箱数和全部数量
-            item.children.push({
-              id: oneId.value,
-              xPoNumber: i + 1,
-              qtyOne: item.secondPackQty
-            })
+        // 先给所有托一个默认对象值
+        item.children[i] = {
+          id: oneId.value,
+          xPoNumber: i + 1,
+          qtyOne: ''
+        }
+        console.log(444,item.allPackQty)
+         // 循环当前数量所需要的箱数量
+         for (let j = 0; j < item.allPackQty; j++) {
+          if (i == j) {
+            // 如果有余数
+            if (item.lastNumber) {
+              // 最后一条信息直接展示余数的信息
+              if (j == item.allPackQty - 1) {
+              item.children[j].qtyOne = item.lastNumber
+              }else{
+                // 其他数据展示一托的全部箱数和全部数量
+              item.children[j].qtyOne = item.secondPackQty
+            }
+            }else{
+              // 如果沒有余数,直接展示一托的全部箱数和全部数量
+              item.children[j].qtyOne = item.secondPackQty
+            }
+           
           }
-        } else {
-          item.children.push({
-            id: oneId.value,
-            xPoNumber: i + 1,
-            qtyOne: item.secondPackQty
-          })
         }
       }
-      console.log(item.children)
+     
     }
   })
-  console.log(tableData.value)
+  console.log(111, tableData.value)
 }
 /** 弹窗按钮 */
 let Butttondata: any = []
@@ -297,10 +300,10 @@ const submitForm = () => {
   let arr = tableData.value.map((item) => {
     item.allNumber = 0
     // 判断托信息是否存在
-      item.children.forEach((cur) => {
-        item.allNumber += parseFloat(cur.qtyOne) || 0
-      })
-   
+    item.children.forEach((cur) => {
+      item.allNumber += parseFloat(cur.qtyOne) || 0
+    })
+
     if (item.allNumber == parseFloat(item.orderQty)) {
       return true
     } else {
@@ -383,6 +386,7 @@ const blurOne = (oneRow, twoRow) => {
     twoRow.xNumber = oneRow.otherNumber
     twoRow.children = []
     twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
+    return
   }
   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
   let num = 0
@@ -392,6 +396,7 @@ const blurOne = (oneRow, twoRow) => {
   if (num > oneRow.allPackQty) {
     message.warning('总箱数不可以大于' + oneRow.allPackQty)
     twoRow.xNumber = ''
+    twoRow.qtyOne = ''
     return
   }
   // 托信息修改的時候箱数据自动排列
@@ -437,7 +442,7 @@ const blurTwo = (oneRow, twoRow, threeRow) => {
   console.log(parseFloat(threeRow.qtyTwo))
   console.log(parseFloat(oneRow.secondPackQty))
   if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.secondPackQty)) {
-    message.warning('数量最多为'+oneRow.secondPackQty)
+    message.warning('数量最多为' + oneRow.secondPackQty)
     threeRow.qtyTwo = oneRow.secondPackQty
     return
   }