Sfoglia il codice sorgente

调整项目管理甘特图的出差请假颜色

Lijy 3 anni fa
parent
commit
ba2614f0cc

+ 5 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -7,8 +7,9 @@
                     
                 </el-form-item>
                 <el-form-item >
-                    <div>
-                    <el-input style="float:left;" v-model="keyword" class="input-with-select" placeholder="请输入项目名称关键字" clearable="true">
+                    <!-- <div style="display: flex;align-items: center;height: 40px;"> -->
+                    <div style="display: flex;align-items: center;height: 40px;">
+                    <el-input v-model="keyword" class="input-with-select" placeholder="请输入项目名称关键字" clearable="true" size="small">
                         <el-select v-model="searchField" style="width:120px;"  slot="prepend" placeholder="请选择">
                             <el-option label="项目名称" value=1 ></el-option>
                             <el-option label="项目编号" value=2></el-option>
@@ -20,7 +21,7 @@
 
                 <el-form-item >
                     <span style="margin-left:5px;margin-right:5px;color:#606266;">状态</span>
-                    <el-select v-model="status" style="width:110px;"  placeholder="请选择" @change="searchList">
+                    <el-select v-model="status" style="width:110px;"  placeholder="请选择" @change="searchList" size="small">
                         <el-option label="全部" value=0 ></el-option>
                         <el-option label="进行中" value=1 ></el-option>
                         <el-option label="已完成" value=2 ></el-option>
@@ -30,7 +31,7 @@
                 <!-- 分类筛选 -->
                 <el-form-item >
                     <span style="margin-left:5px;margin-right:5px;color:#606266;">分类</span>
-                    <el-select v-model="statusClf" style="width:110px;"  placeholder="请选择" clearable @change="searchClfList">
+                    <el-select v-model="statusClf" style="width:110px;"  placeholder="请选择" clearable @change="searchClfList" size="small">
                         <el-option v-for="item in baseClfList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
                     </el-select>
                 </el-form-item>

+ 8 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -204,6 +204,14 @@ export default {
                               //     list[index].time123 = list[index].duration
                               //   }
                               //   console.log("list",list);
+                                for(var i in res.data) {
+                                  if(res.data[i].id.indexOf('出差') != '-1') {
+                                    res.data[i].color = '#E6A23C'
+                                  }
+                                  if(res.data[i].id.indexOf('请假') != '-1') {
+                                    res.data[i].color = '#F56C6C'
+                                  }
+                                }
                                 this.tasks = {data:res.data};
                                 this.isDataLoaded = true;
                                 // console.log("getlist",this.tasks);