合并

src/views/patch/index.vue

@@ -82,7 +82,6 @@
           <el-button type="primary" plain icon="Plus" size="small" @click="handleProgressAdd()"> 新增进度 </el-button>
         </div>
         <el-table v-loading="progressLoading" :data="progressList" border empty-text="暂无进度数据" style="width: 100%">
-          <el-table-column prop="slaveId" label="执行人ID" align="center" width="120" />
           <el-table-column prop="slaveName" label="执行人姓名" align="center" width="150" />
           <el-table-column prop="progress" label="进度" align="center" width="120" />
           <el-table-column prop="remark" label="备注" align="center" />
@@ -145,6 +144,12 @@
     <!-- 新增/修改任务弹窗 -->
     <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>