质检结果必填；修改合格证时间转换类型；

src/views/inspectionWork/components/baseInfo.vue

@@ -36,7 +36,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="6">
-        <el-form-item label="批次号:" prop=" batchNo">
+        <el-form-item label="批次号:" prop="batchNo">
           <el-input v-model="form.batchNo" disabled />
         </el-form-item>
       </el-col>
@@ -282,7 +282,7 @@ export default {
           { required: true, message: '请选择质检人', trigger: 'change' }
         ],
         qualityResults: [
-          { required: true, message: '请选择质检状态', trigger: 'change' }
+          { required: true, message: '请选择质检结果', trigger: 'change' }
         ]
       },
       produceTaskList: [],
@@ -299,6 +299,9 @@ export default {
   methods: {
     toggleExpand() {
       this.isExpanded = !this.isExpanded;
+      this.$nextTick(() => {
+        this.$refs.form1.clearValidate();
+      });
     },
     async getDictListIqoCode(code) {
       let { data: res } = await getByCode(code);

src/views/inspectionWork/edit.vue

@@ -528,35 +528,30 @@ export default {
     // 报工
     handleReporting(index, row) {
       this.$refs.baseInfoRefs.$refs.form1.validate((valid) => {
-        if (!valid) {
-          return false;
-        }
+        if (!this.form.qualityResults) return this.$message.error('请选择质检结果')
+        if (!valid) return false;
+
         this.loading = true;
 
         if (this.qualityType == 2 && this.isReportProcessProduce) {
           for (let i = 0; i < this.sampleList.length; i++) {
-
             const disposalStatus = this.sampleList[i].disposalStatus;
-            console.log(disposalStatus, 'disposalStatus')
 
             if (disposalStatus == null) {
-              this.$message.error('请完成以下样品处置！')
               this.loading = false;
-              return
+              this.$message.error('请完成以下样品处置！')
+              return;
             }
-
           }
         }
 
-
         for (let i = 0; i < this.sampleList.length; i++) {
-
           const qualityStatus = this.sampleList[i].qualityStatus;
 
           if (qualityStatus == '2') {
-            this.$message.error('请完成以下样品质检！')
             this.loading = false;
-            return
+            this.$message.error('请完成以下样品质检！');
+            return;
           }
         }
 

src/views/inspectionWork/index.vue

@@ -17,12 +17,12 @@
           </el-link>
         </template>
 
-<!--        <template v-slot:qualityPlanName="{ row }">-->
-<!--          <div v-if="row.qualityPlanId"> {{ row.qualityPlanName }}</div>-->
-<!--          <div v-else><el-tag size="mini">自建</el-tag></div>-->
-<!--        </template>-->
+        <!--        <template v-slot:qualityPlanName="{ row }">-->
+        <!--          <div v-if="row.qualityPlanId"> {{ row.qualityPlanName }}</div>-->
+        <!--          <div v-else><el-tag size="mini">自建</el-tag></div>-->
+        <!--        </template>-->
         <template v-slot:sourceCode="{ row }">
-          <div v-if="row.qualityType ==1"> {{ row.qualityPlanCode }}</div>
+          <div v-if="row.qualityType == 1"> {{ row.qualityPlanCode }}</div>
           <div v-if="row.qualityType == 2">{{ row.workOrderCode }}</div>
         </template>
 
@@ -145,7 +145,7 @@ export default {
           align: 'center',
           width: 120,
           showOverflowTooltip: true
-        },{
+        }, {
           prop: 'qualityName',
           label: '质检人',
           align: 'center',
@@ -353,6 +353,9 @@ export default {
     },
     async handleSubmit() {
       this.rowData.certificateNumber = this.formData.certificateNumber;
+      this.rowData.qualityTimeStart = new Date(this.rowData.qualityTimeStart);
+      this.rowData.qualityTimeEnd = new Date(this.rowData.qualityTimeEnd);
+      
       const data = await updateCertificateNumber(this.rowData)
       if (data) {
         this.$message.success('修改成功！');