From 15f18da91449a861e76fe9fa7af1857e1a6a1e5e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 28 Nov 2024 17:28:15 +0800
Subject: [PATCH] =?UTF-8?q?YT-1318=E7=B3=BB=E7=BB=9F=E4=B8=AD=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E7=9A=84=E5=9C=B0?=
 =?UTF-8?q?=E6=96=B9=EF=BC=8C=E6=89=B9=E6=AC=A1=E5=92=8C=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E9=83=BD=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRequestMain/index.vue              |  2 +-
 .../productionreturnRequestMain.data.ts                | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index 56db1ed92..7ab6a4c2d 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -135,7 +135,7 @@ const tableColumns = ref([...ProductionreturnRequestMain.allSchemas.tableColumns
 
 //创建标签
 const detailListTableColumns =cloneDeep(ProductionreturnRequestDetailLabel.allSchemas) 
-const detailListTableColumnsRules =cloneDeep(ProductionreturnRequestDetailLabel) 
+const detailListTableColumnsRules =cloneDeep(ProductionreturnRequestDetailLabelRules) 
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 89ce5ec80..fed75d689 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -1478,6 +1478,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     },
     tableForm: {
       disabled: true,
+      type: 'FormDate',
+      format: 'YYYYMMDD',
       valueFormat: 'YYYYMMDD',
     },
     form: {
@@ -1670,7 +1672,11 @@ export const ProductionreturnRequestDetailLabelRules = reactive({
   ],
   productionLineCodePackage: [
     { required: true, message: '请选择生产线', trigger: 'change' }
-  ]
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: ['blur', 'change'] }
+  ],
+ 
 })
 
 
@@ -1724,7 +1730,7 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       width: 150,
     },
   },
-  {
+{
     label: '物料类型',
     field: 'itemType',
     sort: 'custom',