From 02575fca7d4f7bff86057db2605311c29e8a9ca6 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 29 May 2024 10:38:26 +0800
Subject: [PATCH] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E4=BF=9D?=
 =?UTF-8?q?=E5=85=BB=E5=B7=A5=E5=8D=95=E5=AD=90=E6=98=8E=E7=BB=86=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/equipmentMaintenanceMain/DetailEam.vue      |  8 +++++---
 .../equipmentMaintenanceMain.data.ts                | 13 +++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/eam/equipmentMaintenanceMain/DetailEam.vue b/src/views/eam/equipmentMaintenanceMain/DetailEam.vue
index 73d717f9e..98d3c3939 100644
--- a/src/views/eam/equipmentMaintenanceMain/DetailEam.vue
+++ b/src/views/eam/equipmentMaintenanceMain/DetailEam.vue
@@ -825,9 +825,9 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const openForm = async (type: string, row?: number) => {
 
-
   formRef.value.open(type, row, masterParmas.value)
   emit('detailOpenForm', type, row)
+
   if(type == "create"){
     EquipmentMaintenanceDetail.allSchemas.formSchema.forEach((item) => {
       if(item.field == 'peoples'){
@@ -843,7 +843,6 @@ const openForm = async (type: string, row?: number) => {
       }
       if(item.field == 'completionTime'){
         item.componentProps.disabled = true
-        EquipmentMaintenanceDetailRules.completionTime[0].required = false
       }
       if(item.field == 'result'){
         item.componentProps.disabled = true
@@ -858,8 +857,12 @@ const openForm = async (type: string, row?: number) => {
       }
     })
   }else{
+    row.peoples = row.peoples.toString()
+    row.estimatedMinutes = row.estimatedMinutes.toString()
+    row.actualMinutes = row.actualMinutes.toString()
     EquipmentMaintenanceDetail.allSchemas.formSchema.forEach((item) => {
       if(item.field == 'peoples'){
+        console.log(item);
         item.componentProps.disabled = false
         EquipmentMaintenanceDetailRules.peoples[0].required = true
       }
@@ -872,7 +875,6 @@ const openForm = async (type: string, row?: number) => {
       }
       if(item.field == 'completionTime'){
         item.componentProps.disabled = false
-        EquipmentMaintenanceDetailRules.completionTime[0].required = true
       }
       if(item.field == 'result'){
         item.componentProps.disabled = false
diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
index 9090ba7dc..baa6e75c2 100644
--- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
@@ -383,12 +383,13 @@ export const EquipmentMaintenanceDetailRules = reactive({
       validator:validateroundNumber,
       message: '请输入正确的正整数',
       trigger: 'blur'}],
-  completionTime: [
-    {
-      required:false ,
-      message:'该项为必填项',
-      tagger:['blur']
-    }],
+  completionTime: [required],
+    // [
+    // {
+    //   required:false ,
+    //   message:'该项为必填项',
+    //   tagger:['blur']
+    // }],
   result: [
     {
       required:false ,