From 5dca80e209be174573faeae4f88371da6ee8c3ef Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Wed, 15 May 2024 10:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=BD=E8=BD=A6=E9=95=9C=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deviceMaintenance.data.ts                 |  4 +--
 .../eam/basic/inspection/inspection.data.ts   |  4 +--
 .../moldMaintenance/moldMaintenance.data.ts   |  4 +--
 .../deviceSpotInspectionRecordMain.data.ts    | 25 +++++++++++++++++++
 .../moldSpotInspectionRecordMain.data.ts      | 17 +++++++++++++
 5 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
index fe686d5..eac0e94 100644
--- a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
+++ b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
@@ -66,7 +66,7 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
     label: '设备保养部位',
     field: 'equipmentParts',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
   },
   {
     label: '设备编号',
@@ -100,7 +100,7 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
     label: '设备名称',
     field: 'deviceName',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     isForm: false,
   },
   {
diff --git a/src/views/eam/basic/inspection/inspection.data.ts b/src/views/eam/basic/inspection/inspection.data.ts
index e3abb28..0d353de 100644
--- a/src/views/eam/basic/inspection/inspection.data.ts
+++ b/src/views/eam/basic/inspection/inspection.data.ts
@@ -65,7 +65,7 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
     label: '设备编号',
     field: 'deviceNumber',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -93,7 +93,7 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
     label: '设备名称',
     field: 'deviceName',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     isForm: false,
   },
   {
diff --git a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
index 401a1c1..91c7a93 100644
--- a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
+++ b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
@@ -70,7 +70,7 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
     label: '模具编号',
     field: 'deviceNumber',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -98,7 +98,7 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
     label: '模具名称',
     field: 'deviceName',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     isForm: false,
   },
   {
diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts
index 3a70469..efc735d 100644
--- a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts
+++ b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts
@@ -186,6 +186,31 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive<CrudSchema
       width: '300',
     },
   },
+  {
+    label: '审批意见',
+    field: 'approveOpinion',
+    sort: 'custom',
+    table: {
+      width: '300',
+    },
+  },{
+    label: '点检时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    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')]
+      }
+    },table: {
+      width: '150',
+    },
+    isForm:false
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/mold/moldSpotInspectionRecordMain/moldSpotInspectionRecordMain.data.ts b/src/views/eam/mold/moldSpotInspectionRecordMain/moldSpotInspectionRecordMain.data.ts
index 88ad4dc..ad4d575 100644
--- a/src/views/eam/mold/moldSpotInspectionRecordMain/moldSpotInspectionRecordMain.data.ts
+++ b/src/views/eam/mold/moldSpotInspectionRecordMain/moldSpotInspectionRecordMain.data.ts
@@ -186,6 +186,23 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive<CrudSchema
     table: {
       width: '300',
     },
+  },{
+    label: '点检时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    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')]
+      }
+    },table: {
+      width: '150',
+    },
+    isForm:false
   },
   {
     label: '操作',