SBBJ-1217模具、设备，明细编辑、新增，选择完成，完成时间应是必填项；选择未完成，未完成原因应是必填项

src/components/Detail/src/Detail.vue

@@ -569,7 +569,7 @@ const openForm = async (type: string, row?: number) => {
   if (await props.openFormCallBack) {
     props.openFormCallBack(type, row, masterParmas.value, () => {
       formRef.value.open(type, row, masterParmas.value)
-    })
+    },detailAllSchemasRef.value)
   } else {
     formRef.value.open(type, row, masterParmas.value);
   }
@@ -680,7 +680,7 @@ watch(
 )
 
 function onChange(field, cur, item,formRef) {
-  emit('detailOnChange', field, cur, item,formRef)
+  emit('detailOnChange', field, cur, item,formRef,detailAllSchemasRef.value )
 }
 
 </script>

src/views/eam/device/deviceinspectionjob/index.vue

@@ -653,46 +653,44 @@ const submitForm = async (formType, data) => {
 }
 
 
-function detailOnChange(field, cur, item, formRef) {
-  console.log(2233,field)
-  // if (field == 'status') {
-  //   if (cur == '1') {
-  //     DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
-  //     DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
-  //     formRef.setValues({completionTime:''})
-  //     item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-  //     item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
-  //   } else {
-  //     DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
-  //     DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
-  //     formRef.setValues({uncompleted:''})
-  //     item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }]
-  //     item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-  //   }
-  // }
-}
-
-const openFormCallBack = (type, row, masterParmas, callback) => {
-  // if (row == undefined || row == null) {
-  //   DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
-  //   DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
-  //   DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0'
-  //   item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }]
-  //   item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-  // } else {
-  //   if (row.status == '1') {
-  //     DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
-  //     DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
-  //     item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项', trigger: ['blur', 'change'] }]
-  //     item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
-  //   } else {
-  //     DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
-  //     DeviceInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
-  //     item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }]
-  //     item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-  //   }
-  // }
- 
+function detailOnChange(field, cur, item, formRef, detailAllSchemas) {
+  if (field == 'status') {
+    if (cur == '1') {
+      detailAllSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
+      detailAllSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
+      formRef.setValues({completionTime:''})
+      DeviceInspectionDetailRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
+      DeviceInspectionDetailRules.completionTime = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }]
+    } else {
+      detailAllSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled =  true
+      detailAllSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
+      formRef.setValues({uncompleted:''})
+      DeviceInspectionDetailRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
+      DeviceInspectionDetailRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
+    }
+  }
+}
+
+const openFormCallBack = (type, row, masterParmas, callback,detailAllSchemasRef) => {
+  if (row == undefined || row == null) {
+    detailAllSchemasRef.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
+    detailAllSchemasRef.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
+    detailAllSchemasRef.formSchema.find(item => item.field == 'status').value = '0'
+    DeviceInspectionDetailRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
+    DeviceInspectionDetailRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
+  } else {
+    if (row.status == '1') {
+      detailAllSchemasRef.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
+      detailAllSchemasRef.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
+      DeviceInspectionDetailRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
+      DeviceInspectionDetailRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
+    } else {
+      detailAllSchemasRef.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
+      detailAllSchemasRef.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
+      DeviceInspectionDetailRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
+      DeviceInspectionDetailRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
+    }
+  }
   callback()
 }
 

src/views/eam/mold/moldinspectionjob/index.vue

@@ -576,8 +576,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
 }
 
 const detailOpenForm = (type, row) => {
-  console.log('type', type)
-  console.log('row', row)
   MoldInspectionDetail.allSchemas.tableFormColumns.map((item) => {})
 }
 
@@ -588,7 +586,6 @@ const detailValidate = (data) => {
 }
 // 子表提交
 const detailSubmitForm = async (formType, data, formRef, tableList) => {
-  console.log('data', data)
   try {
     let data1 = {
       id: data.id,
@@ -608,21 +605,16 @@ const detailSubmitForm = async (formType, data, formRef, tableList) => {
       uncompleted: data.uncompleted,
       itemNumbers: data.itemNumbers
     }
-    console.log('data1', data1)
     if (formType === 'create') {
-      console.log('create', data1)
       await MoldInspectionDetailApi.createMoldInspectionDetail(data1)
-      console.log('finish', data1)
       message.success(t('common.createSuccess'))
     } else {
       await MoldInspectionDetailApi.updateMoldInspectionDetail(data1)
       message.success(t('common.updateSuccess'))
     }
     formRef.dialogVisible = false
-    console.log('before', data1)
     // 刷新当前列表
     await detailRef.value.getList()
-    console.log('after', data1)
     detailRef.value.tableObject.tableList.forEach((item) => {
       if (item.itemNumbers?.length > 0) {
         let str = ''
@@ -661,7 +653,6 @@ const submitForm = async (formType, data) => {
     item.chargePeoples = item.chargePeoples.join(',')
     return item
   }) // 拼接子表数据参数
-  console.log(data.subList)
   try {
     if (formType === 'create') {
       await MoldInspectionMainApi.createMoldInspectionMain(data)
@@ -678,44 +669,44 @@ const submitForm = async (formType, data) => {
   }
 }
 
-function detailOnChange(field, cur, item, formRef) {
-  // if (field == 'status') {
-  //   if (cur == '1') {
-  //     MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
-  //     MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
-  //     formRef.setValues({completionTime:''})
-  //     item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-  //     item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
-  //   } else {
-  //     MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
-  //     MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
-  //     formRef.setValues({uncompleted:''})
-  //     item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-  //     item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-  //   }
-  // }
-}
-
-const openFormCallBack = (type, row, masterParmas, callback) => {
-  // if (row == undefined || row == null) {
-  //   MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
-  //   MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
-  //     MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0'
-  //     item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-  //     item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
-  // } else {
-  //   if (row.status == '1') {
-  //     MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
-  //     MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
-  //     item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-  //     item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
-  //   } else {
-  //     MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
-  //     MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
-  //     item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
-  //     item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-  //   }
-  // }
+function detailOnChange(field, cur, item, formRef, detailAllSchemas) {
+  if (field == 'status') {
+    if (cur == '1') {
+      detailAllSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
+      detailAllSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
+      formRef.setValues({completionTime:''})
+      MoldInspectionDetailRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
+      MoldInspectionDetailRules.completionTime = [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }]
+    } else {
+      detailAllSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled =  true
+      detailAllSchemas.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
+      formRef.setValues({uncompleted:''})
+      MoldInspectionDetailRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
+      MoldInspectionDetailRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
+    }
+  }
+}
+
+const openFormCallBack = (type, row, masterParmas, callback,detailAllSchemasRef) => {
+  if (row == undefined || row == null) {
+    detailAllSchemasRef.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
+    detailAllSchemasRef.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
+    detailAllSchemasRef.formSchema.find(item => item.field == 'status').value = '0'
+    MoldInspectionDetailRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
+    MoldInspectionDetailRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
+  } else {
+    if (row.status == '1') {
+      detailAllSchemasRef.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false
+      detailAllSchemasRef.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = true
+      MoldInspectionDetailRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
+      MoldInspectionDetailRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
+    } else {
+      detailAllSchemasRef.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true
+      detailAllSchemasRef.formSchema.find(item => item.field == 'completionTime').componentProps.disabled = false
+      MoldInspectionDetailRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
+      MoldInspectionDetailRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
+    }
+  }
   callback()
 }
 

src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts

@@ -442,6 +442,8 @@ export const MoldInspectionDetailRules = reactive({
   //   { validator:validateNum, message: '请输入正整数', trigger: 'blur'}
   // ],
   maintenance: [required],
+  completionTime: [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }],
+  uncompleted: [{ required: false, message: '该项为必填项', trigger: ['blur', 'change'] }]
 })
 
 
@@ -608,7 +610,8 @@ export const MoldInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
-        valueFormat: 'x'
+        valueFormat: 'x',
+        disabled: false,
       }
     },
     tableForm: {
@@ -626,7 +629,7 @@ export const MoldInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Input',
       componentProps: {
         type: 'textarea',
-        // disabled: true,
+        disabled: false,
       }
     }
   },