提交代码

fhKeeper/formulahousekeeper/timesheet_mld/src/components/taskComponent.vue

@@ -66,7 +66,7 @@
                 <el-form-item label="任务完成校验" v-if="user.timeType.taskFileCharge">
                     <el-checkbox v-model="addForm.attachFileRequired" >是否必须上传成果文件</el-checkbox>
                 </el-form-item>
-                <el-form-item  :label="$t('taskdefinition')" prop="name">
+                <el-form-item  label="任务内容" prop="name">
                     <!-- <el-input v-model="addForm.name" :maxlength="40" :disabled="(this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !permissions.editAnyTask && !(groupResponsibleId == user.id)" :placeholder="$t('enterthetaskcontent')" clearable></el-input> -->
                     <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="addForm.name" :maxlength="500" :disabled="(this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !permissions.editAnyTask && !(groupResponsibleId == user.id)" clearable show-word-limit></el-input>
                 </el-form-item>

fhKeeper/formulahousekeeper/timesheet_mld/src/views/project/gantt.vue

@@ -412,8 +412,9 @@ export default {
       }
 
       // 更改为统一的
-      if([2,3,4,5,6].includes(taskStatus)) {
+      if([0,2,3,4,5,6].includes(taskStatus)) {
           return `<div class="task_text">
+            ${task.taskStatus == 0 ? `<div class="exclamation-circle circle greenStr" style="color: #8ecaf8">V</div><div class="exclamation-circle circle greenStr" style="color: #8ecaf8">V</div>` : ''}
             ${task.taskStatus == 2 ? `<div class="circle greyStr"></div>` : ''}
             ${task.taskStatus == 3 ? `<div class="circle orangeStr"></div> <div class="circle"></div>` : ''}
             ${task.taskStatus == 4 ? `<div class="exclamation-circle circle greenStr" style="color: #8ecaf8">V</div> <div class="circle orangeStr"></div>` : ''}