Merge remote-tracking branch 'origin/master'

src/components/TableForm/src/TableForm.vue

@@ -52,8 +52,8 @@
           ref="TableBaseForm_Ref" 
           :model="row" 
           style="width: 100%;" 
-          :rules="tableFormRules"
+          :rules="row?.tableFormRules || tableFormRules"
-          :class="tableFormRules ? '' : 'noRulesForm'">
+          :class="row?.tableFormRules || tableFormRules ? '' : 'noRulesForm'">
           <!-- 字符串输入框 -->
           <el-form-item 
             v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"

src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts

@@ -483,6 +483,7 @@ export const DeviceInspectionDetailRules = reactive({
   status: [required],
   actualMinutes: [required, { validator: validateNum, message: '请输入正整数', trigger: 'blur' }],
   maintenance: [required],
+  completionTime: [{ required: true, message: '该项为必填项', trigger: 'blur' }],
   uncompleted: [{ required: true, message: '该项为必填项', trigger: 'blur' }]
 })
 

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

@@ -501,20 +501,21 @@ const onChange = (field, cur, item) => {
   }
 }
 
-const formSelectChange = (field, cur, item) =>{
+const formSelectChange = (field, cur, item) => {
+  item.tableFormRules = cloneDeep(DeviceInspectionDetailRules)
   if (field == 'status') {
     if (cur == '1') {
       DeviceInspectionDetail.allSchemas.tableFormColumns.find(item => item.field == 'uncompleted').disabled = false
       DeviceInspectionDetail.allSchemas.tableFormColumns.find(item => item.field == 'completionTime').disabled = true
       item['completionTime']=''
-      DeviceInspectionDetailRules.uncompleted = [{ required: true, message: '该项为必填项' }]
+      item.tableFormRules.uncompleted = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
-      DeviceInspectionDetailRules.completionTime = [{ required: false }]
+      item.tableFormRules.completionTime = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
     } else {
       DeviceInspectionDetail.allSchemas.tableFormColumns.find(item => item.field == 'uncompleted').disabled = true
       DeviceInspectionDetail.allSchemas.tableFormColumns.find(item => item.field == 'completionTime').disabled = false
       item['uncompleted']=''
-      DeviceInspectionDetailRules.uncompleted = [{ required: false }]
+      item.tableFormRules.uncompleted = [{ required: false, message: '该项为必填项' , trigger: ['blur','change']}]
-      DeviceInspectionDetailRules.completionTime = [{ required: true , message: '该项为必填项'}]
+      item.tableFormRules.completionTime = [{ required: true, message: '该项为必填项' , trigger: ['blur','change']}]
     }
   }
 }