From 0bb4080a32b8ff8d1262edeb09eb51fc8a9b00ab Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 14 Dec 2024 14:05:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=AC=AC=E4=B8=80=E6=9D=A1=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 60 +++++++++----------
 .../supplierdeliverRequestMain.data.ts        |  3 +
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 08a41d8de..b6672a658 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -727,29 +727,29 @@ const getGenerateLabelList = async (row) => {
       item.packUnitInitOptions = item.boxPackaging
       item.secondPackUnitInitOptions = item.palletPackaging || []
      
-      let obj = item?.boxPackaging[0]
-      if (obj) {
-        item.packUnit = obj.packUnit
-        item.packQty = obj.packQty
-        if (!item.packQty) {
-          // 如果没有数量可以输入
-          SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
-            if (item.field == 'packQty') {
-              item.tableForm.disabled = false
-            }
-          })
-        } else {
-          // 有数量不可以输入
-           SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
-            if (item.field == 'packQty') {
-              item.tableForm.disabled = true
-            }
-          })
-        }
-      } else {
-        item.packUnit = ''
-        item.packQty = ''
-      }
+      // let obj = item?.boxPackaging[0]
+      // if (obj) {
+      //   item.packUnit = obj.packUnit
+      //   item.packQty = obj.packQty
+      //   if (!item.packQty) {
+      //     // 如果没有数量可以输入
+      //     SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+      //       if (item.field == 'packQty') {
+      //         item.tableForm.disabled = false
+      //       }
+      //     })
+      //   } else {
+      //     // 有数量不可以输入
+      //      SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
+      //       if (item.field == 'packQty') {
+      //         item.tableForm.disabled = true
+      //       }
+      //     })
+      //   }
+      // } else {
+      //   item.packUnit = ''
+      //   item.packQty = ''
+      // }
        if (item.convertRate==0 || item.convertRate == 1) {
         item.balanceQty = item.qty
         item.purchaseStdQty = item.packQty
@@ -757,13 +757,13 @@ const getGenerateLabelList = async (row) => {
         item.balanceQty = parseFloat(Decimal(item.qty).mul(Decimal(item.convertRate)).toNumber().toFixed(5))
         item.purchaseStdQty = parseFloat(Decimal(parseFloat(item.packQty)).div(Decimal(parseFloat(item.convertRate))).toNumber())
       }
-      // 有托规格显示托规格，没有显示第一条规格
-      item.secondPackUnit = obj?.parentPackUnit
-        ? obj.parentPackUnit
-        : item?.secondPackUnitInitOptions[0]?.packUnit
-      item.secondPackQty = obj?.parentPackUnit
-        ? obj.parentPackQty
-        : item?.secondPackUnitInitOptions[0]?.packQty
+      // // 有托规格显示托规格，没有显示第一条规格
+      // item.secondPackUnit = obj?.parentPackUnit
+      //   ? obj.parentPackUnit
+      //   : item?.secondPackUnitInitOptions[0]?.packUnit
+      // item.secondPackQty = obj?.parentPackUnit
+      //   ? obj.parentPackQty
+      //   : item?.secondPackUnitInitOptions[0]?.packQty
     })
   })
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index c3618b8be..d956c8356 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1333,6 +1333,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     // formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
     //   return valueFilter.find((account) => account.value == cellValue)?.label
     // },
+    table: {
+      width:150
+    },
     sortTableDefault: 10000,
     form: {
       component: 'Switch',