From 5b064706073829946b64be17444a82bb9abf8a1b Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Wed, 30 Oct 2024 15:25:50 +0800
Subject: [PATCH] =?UTF-8?q?YT-550=E5=BA=94=E5=8A=A0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9A=E7=94=9F=E6=95=88=E6=97=B6=E9=97=B4=E3=80=81=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemSyntheticRelation.data.ts             | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts
index c06a468ed..cb338d498 100644
--- a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts
@@ -1,6 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 import * as ItembasicApi from "@/api/wms/itembasic";
+import {dateFormatter} from "@/utils/formatTime";
 
 // 表单校验
 export const ItemSyntheticRelationRules = reactive({
@@ -76,6 +77,56 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm:false,
   },
+  {
+    label: '生效时间',
+    field: 'effectiveDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: true,
+    isForm: true,
+    isDetail:true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expirationDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: true,
+    isForm: true,
+    isDetail:true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
   {
     label: '备注',
     field: 'remark',