Merge projectA into B with conflict resolution

src/views/safety/safetyInspection/index.vue

@@ -98,6 +98,11 @@
         <el-form-item label="巡检结果" prop="inspectionResult">
           <el-input v-model="form.inspectionResult" placeholder="请输入巡检结果" />
         </el-form-item>
+        <el-form-item label="工单整改单位" prop="rectificationUnit">
+          <el-select v-model="form.rectificationUnit" placeholder="请选择整改单位类型">
+            <el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="整改班组" prop="teamId">
           <el-select v-model="form.teamId" placeholder="请选择整改班组">
             <el-option v-for="item in teamOpt" :key="item.value" :label="item.label" :value="item.value" @click="changeForeman(item.value)" />
@@ -198,6 +203,8 @@ const initFormData: SafetyInspectionForm = {
   reviewType: undefined,
   checkTime: undefined,
   rectificationTime: undefined,
+  rectificationUnit: undefined,
+
   reviewTime: undefined,
   checkFile: undefined,
   rectificationFile: undefined,
@@ -301,7 +308,7 @@ const submitForm = () => {
   safetyInspectionFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      form.value.projectId = currentProject.value.id;
+      form.value.projectId = currentProject.value?.id;
       if (form.value.id) {
         await updateSafetyInspection(form.value).finally(() => (buttonLoading.value = false));
       } else {