From dd835c1d0d878811d44f9830ac4a796be4092ed8 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 12:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/index.vue       | 22 +++++++++++++------
 .../purchasereturnRequestMain.data.ts         |  9 +++++---
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index f058f7772..773fcfd95 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -233,9 +233,11 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
     if (type == 'tableForm') {
       // 明细查询页赋值
 
-      if (formField == 'purchaseReceiptRecordNumber') {
+      if (formField == 'asnNumber') {
         row[formField] = val[0][searchField]
         //搜索记录单号--回显数据
+        row['purchaseReceiptRecordNumber'] = val[0]['number']
+        row['asnNumber'] = val[0]['asnNumber']
         row['supplierCode'] = val[0]['supplierCode']
         row['poNumber'] = val[0]['poNumber']
         row['poLine'] = val[0]['poLine']
@@ -308,18 +310,24 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
       }
     } else {
       const setV = {}
-       if (formField == 'supplierCode') {
+      if (formField == 'supplierCode') {
         console.log('formModelformModel',formRef.formModel)
         if( formRef.formModel['supplierCode'] != val[0]['code']){
-          setV['purchaseReceiptRecordNumber'] = ''
+          setV['asnNumber'] = ''
           setV['q2Number'] = ''
           tableData.value = []
         }
       }
+      if (formField == 'asnNumber') {
+          if( formRef.formModel['asnNumber'] != val[0]['asnNumber']){
+            setV['q2Number'] = ''
+            tableData.value = []
+          }
+        }
       if (formField == 'q2Number') {
       setV['q2Number'] = val[0]['number']
     }
-      if (formField == 'purchaseReceiptRecordNumber') {
+      if (formField == 'asnNumber') {
         // isShowButton.value = false
         setV[formField] = val[0][searchField]
         setV['purchaseReceiptRecordNumber'] = val[0]['number']
@@ -611,7 +619,7 @@ const openForm = async (type: string, row?: number) => {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = true
       }
-      if (item.field == 'purchaseReceiptRecordNumber') {
+      if (item.field == 'asnNumber') {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = true
       }
@@ -623,7 +631,7 @@ const openForm = async (type: string, row?: number) => {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = false
       }
-      if (item.field == 'purchaseReceiptRecordNumber') {
+      if (item.field == 'asnNumber') {
         item.componentProps.disabled = true
         item.componentProps.isSearchList = false
       }
@@ -891,7 +899,7 @@ const tableSelectionDelete = (selection) => {
     })
     nextTick(() => {
       const setV = {}
-      setV['purchaseReceiptRecordNumber'] = ''
+      setV['asnNumber'] = ''
       setV['supplierCode'] = ''
       formRef.setValues(setV)
     })
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 5f751f458..c20dbff8f 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -213,9 +213,12 @@ export const PurchasereturnRequestMain = useCrudSchemas(
         }
       }
     },
+    
     {
-      label: '采购收货记录单号',
-      field: 'purchaseReceiptRecordNumber',
+      // label: '采购收货记录单号',
+      // field: 'purchaseReceiptRecordNumber',
+      label: '发货单号',
+      field: 'asnNumber',
       sort: 'custom',
       table: {
         width: 180
@@ -226,7 +229,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(
           enterSearch: true,
           disabled: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
+          searchListPlaceholder: '请选择发货单号', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
           searchTitle: '采购收货记录', // 查询弹窗标题
           searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类