From affdd872518a1dd527924bcf8d9e27caec64e801 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 17:58:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |   2 +-
 .../supplierdeliverRequestMain/index.vue      |  60 +++--
 .../supplierdeliverRequestMain/labelForm.vue  | 254 +++++++++++++-----
 .../supplierdeliverRequestMain.data.ts        |   4 +-
 4 files changed, 224 insertions(+), 96 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 9e7f6cfd9..bd4735411 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -841,7 +841,7 @@ const buttonOperationClick = (row, label, index)=> {
 }
 
 
-defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth,searchTableRef}) // 提供 open 方法，用于打开弹窗
+defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth,searchTableRef,tableFormRef}) // 提供 open 方法，用于打开弹窗
 
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index f5a35e350..931410a00 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -154,7 +154,7 @@
     @clearInput="clearInput"
     :footButttondata="footButttondata"
     @footButtonClick="footButtonClick"
-    @formSelectChange='formSelectChangeLabel'
+    @formSelectChange="formSelectChangeLabel"
   />
   <!-- 上传质量报告 -->
   <BasicForm
@@ -646,27 +646,43 @@ const footButttondata = ref([
 const labelFormRef = ref()
 const footButtonClick = async (val) => {
   if (val == 'nextStep') {
-    labelFormRef.value.openLabel(detatableData1)
+    const validateForm = await formLabelRef.value.tableFormRef.validateForm()
+    if (!validateForm) {
+        return
+      }
+      const data = JSON.parse(JSON.stringify(detatableData1.value))
+    labelFormRef.value.openLabel(data)
   } else if (val == 'close') {
     formLabelRef.value.dialogVisible = false
   }
 }
-// 选择箱标签
-const formSelectChangeLabel =( field, val, row)=>{
-  if(field=='packUnit'){
-    let obj= row.boxPackaging.find(item=>item.packUnit ==val )
+// 选择箱规格 拖规格
+let tuoList = []
+const formSelectChangeLabel = (field, val, row) => {
+  if (field == 'packUnit') {
+    let obj = row.boxPackaging.find((item) => item.packUnit == val)
     row.packQty = obj.packQty
-    // 获取拖规格
+    row.parentCode = ''
+    // 获取托规格
     const params1 = {
-      itemCode:row.itemCode,
-	packUnit:row.packUnit
+      itemCode: row.itemCode,
+      packUnit: row.packUnit
     }
-    SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res)=>{
-
+    SupplierdeliverRequestDetailApi.getGenerateLabelParentList(params1).then((res) => {
+      tuoList = res
+      row.secondPackUnitInitOptions = res.map((cur) => {
+        return { label: cur.packName, value: cur.packUnit }
+      })
     })
   }
+  // 设置托
+  if (field == 'secondPackUnit') {
+    let obj = tuoList.find((item) => item.packUnit == val)
+    row.secondPackQty = obj.packQty
+  }
 }
-  // 获取部门 用于详情 部门回显
+
+// 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
@@ -682,7 +698,7 @@ const formRef = ref()
 const supplierdeliverFormRef = ref()
 
 const openForm = async (type: string, row?: number) => {
-  supplierdeliverFormRef.value.openForm(type, row,defaultSupplierCode.value)
+  supplierdeliverFormRef.value.openForm(type, row, defaultSupplierCode.value)
   // if(type == "update"){
   //   SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
   //     if(item.field == 'supplierCode'){
@@ -1177,16 +1193,16 @@ const formFormDateChange = (field, val, row, index) => {
   }
 }
 const defaultSupplierCode = ref('')
-  const getDefaultSupplier = async ()=>{
-    let supplier = await SupplierApi.getSupplierPageSCP({isSearch:false})
-    if(supplier.list&&supplier.list.length>0){
-      defaultSupplierCode.value = supplier.list[0]['code']
-    }else{
-      defaultSupplierCode.value = ''
-    }
-    console.log('defaultSupplierCode',defaultSupplierCode)
+const getDefaultSupplier = async () => {
+  let supplier = await SupplierApi.getSupplierPageSCP({ isSearch: false })
+  if (supplier.list && supplier.list.length > 0) {
+    defaultSupplierCode.value = supplier.list[0]['code']
+  } else {
+    defaultSupplierCode.value = ''
   }
-    
+  console.log('defaultSupplierCode', defaultSupplierCode)
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getDefaultSupplier()
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 42f72289b..e32e1f22f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -5,11 +5,14 @@
       border
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
+      v-if="tableData.length > 0 && dialogTableVisible == true"
+      @expand-change="expandChange"
     >
       <el-table-column type="expand" width="50">
         <template #default="scope">
           <div
             style="margin-left: 400px; margin-top: -8px; margin-bottom: -8px"
+            v-if="scope.row.secondPackUnit && scope.row.secondPackQty"
           >
             <el-table
               :data="scope.row.children"
@@ -62,7 +65,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">
@@ -87,7 +90,7 @@
               </el-table-column>
             </el-table>
           </div>
-          <!-- <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
+          <div style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px" v-else>
             <el-table :data="scope.row.children" border style="width: 300px" row-key="id">
               <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center" />
               <el-table-column label="数量" width="100" prop="qtyOne" align="center">
@@ -111,18 +114,18 @@
                 </template>
               </el-table-column>
             </el-table>
-          </div> -->
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
       <el-table-column label="批次" width="150" prop="batch" align="center" />
-      <el-table-column label="数量" width="100" prop="orderQty" align="center" />
+      <el-table-column label="数量" width="100" prop="qty" align="center" />
       <el-table-column label="计量单位" width="100" prop="uom" align="center" />
-      <el-table-column label="托个数" width="100" prop="packQty1" align="center" />
-      <el-table-column label="托规格" width="100" prop="packUnit" align="center" />
-      <el-table-column label="托数量" width="100" prop="packQty" align="center" />
-      <el-table-column label="箱规格" width="100" prop="secondPackUnit" align="center" />
-      <el-table-column label="箱数量" width="100" prop="secondPackQty" align="center" />
+      <el-table-column label="托个数" width="100" prop="allTuoQty" align="center" />
+      <el-table-column label="托规格" width="100" prop="secondPackUnit" align="center" />
+      <el-table-column label="托数量" width="100" prop="secondPackQty" align="center" />
+      <el-table-column label="箱规格" width="100" prop="packUnit" align="center" />
+      <el-table-column label="箱数量" width="100" prop="packQty" align="center" />
     </el-table>
     <template #footer>
       <slot name="foorter"></slot>
@@ -145,16 +148,126 @@ const props = defineProps({
 })
 
 const dialogTableVisible = ref(false)
+const defaultExpandAll = ref(false)
 
 const tableData = ref([])
 const openLabel = (tableList) => {
   console.log(tableList)
   dialogTableVisible.value = true
   tableData.value = tableList
-  intData()
+  defaultExpandAll.value = false
+  // intData()
+  intData1()
 }
 const oneId = ref(0) //每托的id
 const twoId = ref(0) //每箱的id
+const intData1 = () => {
+  tableData.value.forEach((row) => {
+    // 数量%托数量  获取总共几托
+    row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+  })
+}
+const expandChange = (row: any, expandedRows: any[]) => {
+  console.log(row)
+  console.log(expandedRows)
+  // 判断托信息是否存在
+  if (row.secondPackUnit && row.secondPackQty) {
+    // 数量除以托数量获取余数
+    row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
+    // 托数量/箱数量  一托可以放几箱
+    row.otherNumber = parseFloat(row.secondPackQty) / parseFloat(row.packQty)
+    // 数量%托数量  获取总共几托
+    row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.secondPackQty))
+    row.children = []
+    row.isTuo = 1//有托
+    // 循环托
+    for (let i = 0; i < row.allTuoQty; i++) {
+      oneId.value++
+      // 先给所有托一个默认对象值
+      row.children[i] = {
+        id: oneId.value,
+        tPoNumber: i + 1,
+        xNumber: '',
+        qtyOne: ''
+      }
+      // 如果有余数
+      if (row.lastNumber) {
+        // 最后一条信息直接展示余数的信息
+        if (i == row.allTuoQty - 1) {
+          row.children[i].xNumber = Math.ceil(row.lastNumber / parseFloat(row.packQty))
+          row.children[i].qtyOne = row.lastNumber
+        } else {
+          // 其他数据展示一托的全部箱数和全部数量
+          row.children[i].xNumber = row.otherNumber
+          row.children[i].qtyOne = row.secondPackQty
+        }
+      } else {
+        // 如果沒有余数,直接展示一托的全部箱数和全部数量
+        row.children[i].xNumber = row.otherNumber
+        row.children[i].qtyOne = row.secondPackQty
+      }
+    }
+    // 判断箱信息是否存在
+    if (row.packUnit && row.packQty) {
+      row.children.forEach((cur, key) => {
+        cur.children = []
+        // 数量除以箱数量获取余数
+        cur.xLastNumber = parseFloat(cur.qtyOne) % parseFloat(row.packQty)
+        // 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 (i == cur.xNumber - 1) {
+              cur.children[i].qtyTwo = cur.xLastNumber
+            } else {
+              // 其他数据展示一托的全部箱数和全部数量
+              cur.children[i].qtyTwo = row.packQty
+            }
+          } else {
+            // 如果沒有余数,直接展示一托的全部箱数和全部数量
+            cur.children[i].qtyTwo = row.packQty
+          }
+        }
+      })
+    }
+  } else {
+    // 数量除以箱数量获取余数
+    row.lastNumber = parseFloat(row.qty) % parseFloat(row.packQty)
+    // 数量%每箱数量  获取总共几箱
+    row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.isTuo = 0//无托
+    row.children = []
+    // 循环箱
+    for (let i = 0; i < row.allTuoQty; i++) {
+      oneId.value++
+      // 先给所有托一个默认对象值
+      row.children[i] = {
+        id: oneId.value,
+        xPoNumber: i + 1,
+        qtyOne: ''
+      }
+      // 如果有余数
+      if (row.lastNumber) {
+        // 最后一条信息直接展示余数的信息
+        if (i == row.allTuoQty - 1) {
+          row.children[i].qtyOne = row.lastNumber
+        } else {
+          // 其他数据展示一托的全部箱数和全部数量
+          row.children[i].qtyOne = row.packQty
+        }
+      } else {
+        // 如果沒有余数,直接展示一托的全部箱数和全部数量
+        row.children[i].qtyOne = row.packQty
+      }
+    }
+  }
+}
 const intData = () => {
   // 目前托信息等于包装规格1
   tableData.value.forEach((item) => {
@@ -163,13 +276,13 @@ const intData = () => {
     // 判断托信息是否存在
     if (item.packUnit && item.packQty) {
       // 数量除以托数量获取余数
-      item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.packQty)
+      item.lastNumber = parseFloat(item.qty) % parseFloat(item.packQty)
       // 托数量/箱数量  一托可以放几箱
       item.otherNumber = parseFloat(item.packQty) / parseFloat(item.secondPackQty)
       // 数量%每箱数量  获取总共几箱
-      item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
+      item.allPackQty = Math.ceil(parseFloat(item.qty) / parseFloat(item.secondPackQty))
       // 数量%托数量  获取总共几托
-      item.allTuoQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.packQty))
+      item.allTuoQty = Math.ceil(parseFloat(item.qty) / parseFloat(item.packQty))
       item.children = []
       // 循环托
       for (let i = 0; i < item.packQty1; i++) {
@@ -179,30 +292,31 @@ const intData = () => {
           id: oneId.value,
           tPoNumber: i + 1,
           xNumber: '',
-          qtyOne: ''
+          qtyOne: '',
+          children: []
         }
         // 循环当前数量所需要的托数量
-        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
-            }
-           
-          }
-        }
+        // 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
+        //     }
+
+        //   }
+        // }
       }
       // 判断箱信息是否存在
       if (item.secondPackUnit && item.secondPackQty) {
@@ -213,9 +327,9 @@ const intData = () => {
           // cur.xiangNumber = Math.ceil(parseFloat(cur.qtyOne) / parseFloat(item.secondPackQty))
           for (let i = 0; i < cur.xNumber; i++) {
             twoId.value++
-            cur.children[i]={
+            cur.children[i] = {
               id: twoId.value,
-              xPoNumber: i + 1,
+              xPoNumber: i + 1
             }
             // 如果有余数
             if (cur.xLastNumber) {
@@ -235,11 +349,11 @@ const intData = () => {
       }
     } else {
       // 数量除以箱数量获取余数
-      item.lastNumber = parseFloat(item.orderQty) % parseFloat(item.secondPackQty)
+      item.lastNumber = parseFloat(item.qty) % parseFloat(item.secondPackQty)
       // 数量%每箱数量  获取总共几箱
-      item.allPackQty = Math.ceil(parseFloat(item.orderQty) / parseFloat(item.secondPackQty))
+      item.allPackQty = Math.ceil(parseFloat(item.qty) / parseFloat(item.secondPackQty))
       item.children = []
-      console.log(333,item.lastNumber)
+      console.log(333, item.lastNumber)
       // 循环箱
       for (let i = 0; i < item.packQty1; i++) {
         oneId.value++
@@ -249,31 +363,27 @@ const intData = () => {
           xPoNumber: i + 1,
           qtyOne: ''
         }
-        console.log(444,item.allPackQty)
-         // 循环当前数量所需要的箱数量
-         for (let j = 0; j < item.allPackQty; j++) {
+        // 循环当前数量所需要的箱数量
+        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.lastNumber
+              } else {
                 // 其他数据展示一托的全部箱数和全部数量
-              item.children[j].qtyOne = item.secondPackQty
-            }
-            }else{
+                item.children[j].qtyOne = item.secondPackQty
+              }
+            } else {
               // 如果沒有余数,直接展示一托的全部箱数和全部数量
               item.children[j].qtyOne = item.secondPackQty
             }
-           
           }
         }
       }
-     
     }
   })
-  console.log(111, tableData.value)
 }
 /** 弹窗按钮 */
 let Butttondata: any = []
@@ -302,7 +412,7 @@ const submitForm = () => {
       item.allNumber += parseFloat(cur.qtyOne) || 0
     })
 
-    if (item.allNumber == parseFloat(item.orderQty)) {
+    if (item.allNumber == parseFloat(item.qty)) {
       return true
     } else {
       return false
@@ -319,16 +429,16 @@ const addT = (oneRow) => {
   oneId.value++
   oneRow.children.push({
     id: oneId.value,
-    tPoNumber: oneRow.children[oneRow.children.length - 1].tPoNumber + 1, //行号是上一行的行号加1
+    tPoNumber: (oneRow.children[oneRow.children.length - 1]?.tPoNumber || 0) + 1, //行号是上一行的行号加1
     xNumber: '',
     qtyOne: ''
   })
-  oneRow.packQty1 = oneRow.children.length
+  oneRow.allTuoQty = oneRow.children.length
 }
 // 移出托
 const removeT = (oneRow, oneIndex, twoRow, twoIndex) => {
   oneRow.children.splice(twoIndex, 1)
-  oneRow.packQty1 = oneRow.children.length
+  oneRow.allTuoQty = oneRow.children.length
 }
 // 添加箱
 const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
@@ -351,7 +461,7 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
       xPoNumber: oneRow.children[oneRow.children.length - 1].xPoNumber + 1,
       qtyOne: ''
     })
-    oneRow.packQty1 = oneRow.children.length
+    oneRow.allTuoQty = oneRow.children.length
   }
 }
 // 移除箱
@@ -368,7 +478,7 @@ const removeX = (oneRow, oneIndex, twoRow, twoIndex, threeRow, threeIndex, type)
     twoRow.xNumber = twoRow.children.length
   } else {
     oneRow.children.splice(twoIndex, 1)
-    oneRow.packQty1 = oneRow.children.length
+    oneRow.allTuoQty = oneRow.children.length
   }
 }
 // 是否显示展开图标
@@ -379,14 +489,16 @@ const getRowClass = (row) => {
 }
 // 托失去焦点
 const blurOne = (oneRow, twoRow) => {
+  if (!twoRow.xNumber) {
+    twoRow.qtyOne = ''
+  }
   if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) {
     message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
     twoRow.xNumber = oneRow.otherNumber
     twoRow.children = []
-    twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
-    return
+    twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
   }
-  twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.secondPackQty)
+  twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
   let num = 0
   oneRow.children.forEach((item) => {
     num += parseFloat(item.xNumber) || 0
@@ -399,11 +511,11 @@ const blurOne = (oneRow, twoRow) => {
   }
   // 托信息修改的時候箱数据自动排列
   // 判断箱信息是否存在
-  if (oneRow.secondPackUnit && oneRow.secondPackQty) {
+  if (oneRow.packUnit && oneRow.packQty) {
     oneRow.children.forEach((cur, key) => {
       cur.children = []
       // 数量除以托数量获取余数
-      cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(oneRow.secondPackQty)
+      cur.xLastNumber = parseFloat(cur.xNumber) % parseFloat(oneRow.packQty)
       for (let j = 0; j < cur.xNumber; j++) {
         twoId.value++
         // 如果有余数
@@ -420,7 +532,7 @@ const blurOne = (oneRow, twoRow) => {
             cur.children.push({
               id: twoId.value,
               xPoNumber: j + 1,
-              qtyTwo: oneRow.secondPackQty
+              qtyTwo: oneRow.packQty
             })
           }
         } else {
@@ -428,7 +540,7 @@ const blurOne = (oneRow, twoRow) => {
           cur.children.push({
             id: twoId.value,
             xPoNumber: j + 1,
-            qtyTwo: oneRow.secondPackQty
+            qtyTwo: oneRow.packQty
           })
         }
       }
@@ -438,10 +550,10 @@ const blurOne = (oneRow, twoRow) => {
 //在托下方的箱数量失去焦点
 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)
-    threeRow.qtyTwo = oneRow.secondPackQty
+  console.log(parseFloat(oneRow.packQty))
+  if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
+    message.warning('数量最多为' + oneRow.packQty)
+    threeRow.qtyTwo = oneRow.packQty
     return
   }
   let num = 0
@@ -452,9 +564,9 @@ const blurTwo = (oneRow, twoRow, threeRow) => {
 }
 // 箱数量失去焦点
 const blurThree = (oneRow, twoRow) => {
-  if (parseFloat(twoRow.qtyOne) > parseFloat(oneRow.secondPackQty)) {
-    message.warning('每箱个数最多' + oneRow.secondPackQty)
-    twoRow.qtyOne = oneRow.secondPackQty
+  if (parseFloat(twoRow.qtyOne) > parseFloat(oneRow.packQty)) {
+    message.warning('每箱个数最多' + oneRow.packQty)
+    twoRow.qtyOne = oneRow.packQty
   }
 }
 defineExpose({ openLabel }) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 0e5766b0b..ec88f1221 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1640,7 +1640,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
   },
   {
     label: '托规格',
-    field: 'parentCode',
+    field: 'secondPackUnit',
     isTable: true,
     sort: 'custom',
     form: {
@@ -1655,7 +1655,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
   },
   {
     label: '托规格数量',
-    field: 'parentQty',
+    field: 'secondPackQty',
     sort: 'custom',
     table: {
       width: 150