Merge branch 'master' into zjw

imt-ui/src/views/system/maintenance/maintenanceInfo/AlarmSubmitMaintenancePatrolPlanForm.vue

@@ -211,7 +211,7 @@ export default {
       if (this.inspectionPlanList.length === 0){
         this.$message.error("请至少选择一个点检方案");
       }else {
-        this.submitFormData.inspectionPlanId = this.inspectionPlanList.join(',');
+        this.$set(this.submitFormData, "inspectionPlanId", this.inspectionPlanList.join(','));
         this.submitFormData.inspectionPlanName = this.inspectionPlanTreeData.filter(item=>this.inspectionPlanList.includes(item.inspectionPlanId)).map(item=>item.inspectionName).join(',')
         this.inspectionPlanVisible = false;
       }
@@ -237,7 +237,7 @@ export default {
       console.log(this.submitFormData);
       this.submitFormLoading = true;
       try {
-        // await this.$refs.submitForm.validate();
+        await this.$refs.submitForm.validate();
         this.submitFormData.equipId = this.alarmFormData.equipId;
         this.submitFormData.customerId = this.alarmFormData.customerId;
         this.submitFormData.alarmId = this.alarmFormData.equipAlarmId;