洪海涛 hace 4 años
padre
commit
14c367f0b4
Se han modificado 1 ficheros con 19 adiciones y 4 borrados
  1. 19 4
      src/views/workbench/team/components/ganntViews.vue

+ 19 - 4
src/views/workbench/team/components/ganntViews.vue

@@ -20,12 +20,21 @@
       />
     </template>
     <div class="member-list">
-      <div class="teamMember">优先级:</div>
+      <search-section
+        ref="search-section"
+        :value.sync="filtrate"
+        :search-form="searchForm"
+        type="团队"
+        style="margin: 0 30px;"
+        @change="radioChange"
+        @loading="loading = false"
+      />
+<!--      <div class="teamMember">优先级:</div>
       <el-checkbox-group v-model="priorityList" @change="PrioritysChange_1">
         <el-checkbox v-for="item in taskList" :key="item.value" :label="item.value">
           <div class="check-point"> {{ item.label }} </div>
         </el-checkbox>
-      </el-checkbox-group>
+      </el-checkbox-group>-->
     </div>
     <div v-loading="loading">
       <div v-if="ganttShow">
@@ -47,11 +56,13 @@ import GanttHeader from 'gantt-elastic-header'
 import moment from 'moment'
 import teamGanttOptions from '@/views/workbench/ganttOptions/teamGantt'
 import teamOptions from '@/views/workbench/ganttOptions/teamPersonal'
+import searchSection from '@/views/workbench/components/searchSection'
 import { queryTeamWorkListByPeople, teamQueryTeamWorkListByTask } from '@/api/workSchedule'
 export default {
   components: {
     ganttElasticHeader: GanttHeader,
-    ganttElastic: GanttElastic
+    ganttElastic: GanttElastic,
+    searchSection
   },
   props: {
     search: {
@@ -81,6 +92,7 @@ export default {
         { value: 2, label: 'P2' },
         { value: 3, label: 'P3' }
       ],
+      filtrate: {},
       pickerOptions: {
         shortcuts: [{
           text: '最近一周',
@@ -129,7 +141,10 @@ export default {
           deptCodes: this.searchForm.deptCodes
         },
         searchScheduleInfo: {
-          priorityList: this.priorityList
+          origin: this.filtrate.origin,
+          scheduleTypeList: this.filtrate.scheduleTypeList,
+          selfScheduleTypeList: this.filtrate.selfScheduleTypeList,
+          priorityList: this.filtrate.priorityList
         },
         timeInfo: {
           startTime: moment(this.timeSelectVal[0]).format('YYYY.MM.DD'),