字段修改

src/views/batchRecord/components/editModal.vue

@@ -312,8 +312,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="结论" required prop="conclution">
-                <el-radio-group v-model="form.conclution">
+              <el-form-item label="结论" required prop="conclusion">
+                <el-radio-group v-model="form.conclusion">
                   <el-radio :label="1">合格</el-radio>
                   <el-radio :label="2">不合格</el-radio>
                 </el-radio-group>
@@ -813,7 +813,7 @@
             if (any || details.length === 0) return;
 
             const every = details.every((i) => i.checkResult == 1);
-            this.form.conclution = every ? 1 : 2;
+            this.form.conclusion = every ? 1 : 2;
           }
         },
         deep: true
@@ -889,7 +889,7 @@
         checkValidityUnit: '',
         recordRulesExecuteMethodName: '',
         recordRulesExecuteMethodId: null,
-        conclution: null
+        conclusion: null
       };
 
       return {
@@ -1008,7 +1008,7 @@
               trigger: 'blur'
             }
           ],
-          conclution: [
+          conclusion: [
             { required: true, message: '请选择结论', trigger: 'blur' },
             { required: true, message: '请选择结论', trigger: 'change' }
           ],

src/views/produce/components/prenatalExamination/releaseRulesDialog.vue

@@ -199,8 +199,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="结论" required prop="conclution">
-            <el-radio-group v-model="addForm.conclution">
+          <el-form-item label="结论" required prop="conclusion">
+            <el-radio-group v-model="addForm.conclusion">
               <el-radio :label="1">合格</el-radio>
               <el-radio :label="2">不合格</el-radio>
             </el-radio-group>
@@ -467,8 +467,8 @@
           if (any || details.length === 0) return;
 
           const every = details.every((i) => i.checkResult == 1);
-          this.addForm.conclution = every ? 1 : 2;
-          console.log('this.addForm.conclution', this.addForm.conclution);
+          this.addForm.conclusion = every ? 1 : 2;
+          console.log('this.addForm.conclusion', this.addForm.conclusion);
         },
         deep: true
       }
@@ -482,7 +482,7 @@
         checkStartTime: '',
         checkValidity: null,
         checkValidityUnit: '',
-        conclution: null,
+        conclusion: null,
         isTempRecord: this.isTempRecord,
         details: [],
         deviceId: 0,
@@ -570,7 +570,7 @@
               trigger: 'blur'
             }
           ],
-          conclution: [
+          conclusion: [
             { required: true, message: '请选择结论', trigger: 'blur' },
             { required: true, message: '请选择结论', trigger: 'change' }
           ],
@@ -1075,7 +1075,7 @@
           this.addForm.checkStartTime = null;
           this.addForm.checkValidity = null;
           this.addForm.checkValidityUnit = '';
-          this.addForm.conclution = null;
+          this.addForm.conclusion = null;
           this.addForm.id = null;
           this.addForm.pickDetails = [];
           this.addForm.duration = 0;

src/views/produce/components/prenatalExamination/taskDialog.vue

@@ -98,7 +98,7 @@
         checkFinishTime: '',
         checkValidity: null,
         checkValidityUnit: '',
-        conclution: null,
+        conclusion: null,
         isTempRecord: this.isTempRecord,
         details: [],
         planList: [],
@@ -136,7 +136,7 @@
             { required: true, message: '请选择检查完成时间', trigger: 'blur' },
             { required: true, message: '请选择检查完成时间', trigger: 'change' }
           ],
-          conclution: [
+          conclusion: [
             { required: true, message: '请选择结论', trigger: 'blur' },
             { required: true, message: '请选择结论', trigger: 'change' }
           ],