From fe229a81cc5d28feef1f53cab4973818070e49b7 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 3 Jan 2024 17:24:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue                        | 6 ++++++
 .../customerreceipt/customerreceiptRequestMain/index.vue    | 4 +++-
 .../deliver/deliverRequestMain/index.vue                    | 2 ++
 .../deliverplan/deliverPlanMain/index.vue                   | 3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index ce21323b1..a013d3127 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -428,6 +428,12 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
           defaultButtons.defaultFilterBtn(null) // 筛选
           ]
         }
+        //客户收货详情筛选
+        if (props.fromeWhere == 'customerreceipt') {
+          HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+          ]
+        }
       }
 
       // 动态显示操作列按钮
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
index cfe6b33fd..f26f6b73b 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
@@ -51,6 +51,7 @@
     :apiUpdate="CustomerreceiptRequestMainApi.updateCustomerreceiptRequestMain"
     :apiCreate="CustomerreceiptRequestMainApi.createCustomerreceiptRequestMain"
     :isBusiness="true"
+    fromeWhere="customerreceipt"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
@@ -69,6 +70,7 @@
     :apiUpdate="CustomerreceiptRequestDetailApi.updateCustomerreceiptRequestDetail"
     :apiPage="CustomerreceiptRequestDetailApi.getCustomerreceiptRequestDetailPage"
     :apiDelete="CustomerreceiptRequestDetailApi.deleteCustomerreceiptRequestDetail"
+    fromeWhere="customerreceipt"
     :Echo="Echo"
   />
 
@@ -145,7 +147,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-    defaultButtons.defaultExportBtn({hasPermi:'wms:customerreceipt-request-main:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customerreceipt-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 7e7f59af8..a31ede765 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -285,6 +285,8 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
+  console.log(9999,row)
+  console.log(996669,type)
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
 }
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 3b0e17709..590fe3acb 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -109,6 +109,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       row[formField] = val[0][searchField]
     } else {
       const setV = {}
+      if(formField == 'itemCode') {
+        row['uom'] = val[0]['uom']
+      }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }