From caf1e876bd0487d76dff041ecbe200becb5762c7 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 31 May 2024 19:24:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain.data.ts         | 105 +++++++++++-------
 1 file changed, 62 insertions(+), 43 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 2b302bfad..c2c4592a0 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -743,7 +743,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     table: {
       width: 150
-    }, 
+    },
+    isTableForm:false,
+    isTable:false, 
     hiddenInMain: true,
     tableForm:{
       disabled:true
@@ -760,7 +762,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     table: {
       width: 150
-    }, 
+    },
+    isTableForm:false,
+    isTable:false, 
     hiddenInMain: true,
     tableForm:{
       disabled:true
@@ -771,7 +775,22 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
   {
     label: '替代批次',
     field: 'altBatch',
@@ -880,6 +899,46 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //     disabled:false
   //   }
   // },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      // labelMessage: '信息提示说明！！！',
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位代码信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
+      searchCondition: [{
+        key: 'businessType',
+        value: 'PurchaseReturn',
+        message: '请填写业务类型',
+        isMainValue: false
+      }]
+    },
+    hiddenInMain: true,
+    isTable: false,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    hiddenInMain: true,
+    isTable: false,
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
   {
     label: '库存余额',
     field: 'inventoryBalance',
@@ -922,21 +981,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       precision: 6
     }
   },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    }, 
-    hiddenInMain: true,
-    isTable: false,
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    }
-  },
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -960,31 +1004,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }, 
-    tableForm:{
-      // labelMessage: '信息提示说明！！！',
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从库位代码',
-      searchField: 'code',
-      searchTitle: '库位代码信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
-      searchCondition: [{
-        key: 'businessType',
-        value: 'PurchaseReturn',
-        message: '请填写业务类型',
-        isMainValue: false
-      }]
-    },
-    hiddenInMain: true,
-    isTable: false,
-  },
   {
     label: '到库位代码',
     field: 'toLocationCode',