From 1873648a0225dfbf616c1d06b678701348db09e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com>
Date: Tue, 21 Nov 2023 09:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/index.vue          |  7 +------
 .../purchasereturnRequestMain.data.ts            | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 222f074a7..84b53ce4d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -104,9 +104,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
-      row['itemCode'] = val[0]['code']
-      row['poNumber'] = val[0]['number']
-      row['poLine'] = val[0]['lineNumber']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -121,9 +118,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    setV['itemCode'] = val[0]['code']
-    setV['poNumber'] = val[0]['number']
-    setV['poLine'] = val[0]['lineNumber']
+    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 7139eb679..6f679c041 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -88,6 +88,8 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '运输方式',
     field: 'transferMode',
     sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    dictClass: 'string',
     table: {
       width: 150
     },
@@ -572,7 +574,12 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchField: 'lineNumber',
       searchTitle: '采购订单信息',
       searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPage
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        isMainValue: true
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -582,7 +589,12 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchField: 'lineNumber',
         searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          isMainValue: true
+        }]
       }
     }
   },