From 4b121c2891ee0746feb7c314f75b68c1e8fe991c Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Thu, 6 Jun 2024 13:39:43 +0800
Subject: [PATCH] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=E5=B7=A5=E5=8D=95=20=E5=AD=90=E8=A1=A8=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=B4=E4=BF=AE=E6=8E=AA=E6=96=BD=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentRepairJobMain.data.ts            | 12 +++++--
 .../eam/equipmentRepairJobMain/index.vue      | 31 ++++++++++++++++---
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
index 2b9c97950..f516ddd2a 100644
--- a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
+++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
@@ -484,7 +484,10 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
 export const EquipmentRepairJobDetailRules = reactive({
   number: [required],
   masterId: [required],
-  concurrencyStamp: [required],
+  describing:[required],
+  faultCause:[required],
+  workOut:[required],
+  maintenances:[required],
 })
 
 export const EquipmentRepairJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
@@ -555,7 +558,7 @@ export const EquipmentRepairJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '维修人员字符串多个',
+    label: '维修人员',
     field: 'maintenances',
     sort: 'custom',
     isSearch: true,
@@ -592,7 +595,10 @@ export const EquipmentRepairJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '地点ID',
diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue
index dbfbfb27e..d341b418a 100644
--- a/src/views/eam/equipmentRepairJobMain/index.vue
+++ b/src/views/eam/equipmentRepairJobMain/index.vue
@@ -65,6 +65,9 @@
           :detailButtonIsShowAdd=statusBtn
           :detailButtonIsShowEdit=statusBtn
           :detailButtonIsShowDelete=statusBtn
+          @handleMainFefresh="handleMainFefresh"
+          @searchTableSuccessDetail="searchTableSuccessDetail"
+          :key="count"
   />
 
   <!-- 导入 -->
@@ -81,11 +84,6 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/views/eam/equipmentRepairJobMain/EquipmentRepairJobDetail.vue'
 import FinishForm2 from '@/views/eam/equipmentRepairJobMain/finishForm2.vue'
-import * as EquipmentMaintenanceMainApi from "@/api/eam/equipmentMaintenanceMain";
-import {
-  executeEquipmentRepairJobMain,
-  executEquipmentRepairJobMain
-} from "@/api/eam/equipmentRepairJobMain";
 
 defineOptions({ name: 'EquipmentRepairJobMain' })
 
@@ -230,6 +228,29 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicEquipmentRepairJobMain')
 }
 
+/** 页面操作 */
+let count = ref(0)
+const handleMainFefresh = async()=>{
+  count.value++
+  getList()
+}
+
+// 子页面查询字典页面返回
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    let result = '';
+    for (var i = 0; i < val.length; i++) {
+      result += val[i].code + ',';
+    }
+    if(result.endsWith(',')){
+      result = result.substring(0,result.length -1)
+    }
+    setV[formField] = result;
+    formRef.setValues(setV)
+  })
+}
+
 /** 完成按钮操作 */
 const finishForm2Ref = ref()
 const handleFinish = async (row) => {