解决bug

src/views/patch/index.vue

@@ -144,12 +144,10 @@
     <!-- 新增/修改任务弹窗 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body destroy-on-close>
       <el-form ref="masterFormRef" :model="form" :rules="rules" label-width="100px">
-        <<<<<<< HEAD =======
         <el-input v-model="form.projectId" placeholder="请输入项目ID" :readonly="!!currentProjectId" :disabled="!!currentProjectId" v-if="false" />
         <template #help>
           <span v-if="currentProjectId" class="text-success">已自动关联当前选中项目</span>
         </template>
-        >>>>>>> 4511145f52e1caf07eea31e374583c6602fdfcfc
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </el-form-item>