Merge branch 'daily_0.4.4' into http_test

src/views/workbench/components/searchSection.vue

@@ -41,7 +41,7 @@
         <div class="teamMember">排期类型：</div>
         <el-checkbox v-model="checkAllMember_1" :indeterminate="isIndeterminate_1" class="fromName" @change="checkAllScheduling">全选 </el-checkbox>
         <el-checkbox-group v-model="scheduling" @change="membersChange_1">
-          <el-checkbox v-for="item in taskScheduleEvent" :key="item.code" :label="item.code">
+          <el-checkbox v-for="(item, itemIndex) in taskScheduleEvent" :key="itemIndex" :label="item.code">
             <div class="check-point">
               {{ item.msg }}
               <div class="point" :style="{'background-color': mapTypeColor[item.code].bgColor}" />
@@ -263,7 +263,7 @@ export default {
     },
     updateParent() { // 刷新父组件数据
       this.$emit('change')
-      this.$emit('update:value', this.filtrate)
+      this.$emit('update:value', { ...this.filtrate })
     }
   }
 }

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,12 +141,18 @@ 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'),
           endTime: moment(this.timeSelectVal[1]).format('YYYY.MM.DD')
-        }
+        },
+        peoples: [
+          ...this.filtrate.checkedMembers
+        ]
       }
       this.loading = true
       if (this.radio1 === '按日程') {