From fbe213a3bbcbf1a87fa6bd63d39c88994c3f19e7 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Tue, 27 May 2025 17:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=85=BB=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/device/devicemaintenancejob/index.vue |  8 +-
 .../moldMaintainOrderMain.data.ts             | 96 ++++++++++---------
 2 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/src/views/eam/device/devicemaintenancejob/index.vue b/src/views/eam/device/devicemaintenancejob/index.vue
index 3d03d47..496e7d8 100644
--- a/src/views/eam/device/devicemaintenancejob/index.vue
+++ b/src/views/eam/device/devicemaintenancejob/index.vue
@@ -774,9 +774,9 @@ const openFormSec =  async (type: string, row?: any) => {
   DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
         return item.field == 'maintenance'
   }).componentProps.disabled = true
-    DeviceMaintenanceMainSec.allSchemas.formSchema.find((item) => {
-    return item.field == 'type'
-  }).componentProps.disabled = true
+  //   DeviceMaintenanceMainSec.allSchemas.formSchema.find((item) => {
+  //   return item.field == 'type'
+  // }).componentProps.disabled = true
   DeviceMaintenanceMainSec.allSchemas.formSchema.find((item) => {
     return item.field == 'type'
   }).value = 'DEVICE'
@@ -813,7 +813,7 @@ const openFormSec =  async (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = async (row: any, titleName: any, titleValue: any) => {
-  if(row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'APPLYPASS'){
+  if(row.status == 'COMPLETED' || row.status == 'VERIFIED' || row.status == 'APPLYPASS' || row.status == 'APPROVEPASS'){
     DeviceMaintenanceDetailFilter.value.allSchemas.tableColumns = DeviceMaintenanceDetail.allSchemas.tableColumns.filter(item => item.field !== 'action');
   }else{
     DeviceMaintenanceDetailFilter.value.allSchemas.tableColumns = DeviceMaintenanceDetail.allSchemas.tableColumns;
diff --git a/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts b/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts
index f85b1ca..e3c7b39 100644
--- a/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts
+++ b/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts
@@ -35,15 +35,15 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left',
     },
   },
-  {
-    label: '保养计划单号',
-    field: 'planNumber',
-    sort: 'custom',
-    isSearch: false,
-    table: {
-      width: '150',
-    },
-  },
+  // {
+  //   label: '保养计划单号',
+  //   field: 'planNumber',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   table: {
+  //     width: '150',
+  //   },
+  // },
   {
     label: '模具',
     field: 'deviceNumber',
@@ -256,43 +256,47 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: '150',
     },
   },
-  // {
-  //   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')]
-  //     }
-  //   },
-  //   isForm: false,
-  // },
-  // {
-  //   label: '地点ID',
-  //   field: 'siteId',
-  //   sort: 'custom',
-  //   isSearch: false,
-  // },
-  // {
-  //   label: '是否可用',
-  //   field: 'available',
-  //   sort: 'custom',
-  //   isSearch: false,
-  // },
-  // {
-  //   label: '并发乐观锁',
-  //   field: 'concurrencyStamp',
-  //   sort: 'custom',
-  //   form: {
-  //     component: 'InputNumber',
-  //     value: 0
-  //   },
-  // },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+        table: {
+      width: '150',
+    },
+      isSearch: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false,
+      isSearch: 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')]
+        }
+      }
+    },
   {
     label: '操作',
     field: 'action',