From 05a44cbb9996a5aad1f396bcd8dfa848d57d5fff Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 23 Apr 2024 19:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=8E=B7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E5=88=B0=E5=8C=85=E8=A3=85=E5=8F=B7=EF=BC=8C?=
 =?UTF-8?q?=E5=88=B0=E6=89=B9=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.wyf                                      | 16 +++++-----
 .../purchasereceiptJobMain.data.ts            | 31 +++++++++++++++++--
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/.env.wyf b/.env.wyf
index a957ea11d..ee1d6eb3a 100644
--- a/.env.wyf
+++ b/.env.wyf
@@ -3,16 +3,16 @@ NODE_ENV=test
 
 VITE_DEV=false
 
-# # # # 请求路径
-# VITE_BASE_URL='http://192.168.0.108:12080'
-# # 上传路径
-# VITE_UPLOAD_URL='http://192.168.0.108:12080/admin-api/infra/file/upload'
-
 # 请求路径
-VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
-
+VITE_BASE_URL='http://192.168.0.108:12080'
 # 上传路径
-VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://192.168.0.108:12080/admin-api/infra/file/upload'
+
+# # 请求路径
+# VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
+
+# # 上传路径
+# VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 952bc0156..1c5634cfa 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -608,7 +608,29 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120,
       fixed: 'right'
     },
-  }
+  },
+  {
+    label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
+    field: 'toPackingNumber',
+    sort: 'custom',
+    isForm:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    sortTableDefault:1001,
+  },
+  {
+    label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面
+    field: 'toBatch',
+    sort: 'custom',
+    isForm:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    sortTableDefault:1001,
+  },
 ]))
 
 //表单校验
@@ -675,6 +697,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch:true,
+    hiddenInMain:true,
     sortTableDefault:1001,
     sortSearchDefault:1002
   },
@@ -696,7 +719,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:1000,
     sortSearchDefault:1000,
-    isSearch:true
+    isSearch:true,
+    hiddenInMain:true,
   },
   {
     label: '替代批次',
@@ -1025,7 +1049,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     },
     isTableForm:true,
-  }
+  },
+  
 ]))
 
 //表单校验