PrinceLee 5 жил өмнө
parent
commit
6f437f7a61

+ 1 - 1
src/views/workbench/person/index.vue

@@ -300,7 +300,7 @@ export default {
           startTime: moment(view.activeStart).subtract(1, 'month').format('YYYY.MM.DD'),
           endTime: moment(view.activeEnd).add(1, 'month').format('YYYY.MM.DD')
         },
-        teamSearchInfo: null,
+        teamSearchInfo: { bizId: null },
         searchScheduleInfo: { origin: [0, 1] }
       }
       const res = await queryWorkListByTime(params)

+ 8 - 5
src/views/workbench/team/index.vue

@@ -46,7 +46,7 @@
           <el-tab-pane label="甘特图" name="2" />
         </el-tabs>
         <div class="detail-info">
-          <div class="member-list">
+          <div v-show="activeSchedule === '1'" class="member-list">
             <el-checkbox v-model="checkAllMember" style="margin: 0 20px 0 5px" @change="checkAllChange">全选</el-checkbox>
             <el-checkbox-group v-model="checkedMembers" @change="membersChange">
               <el-checkbox v-for="item in memberList" :key="item.idap" :label="item.idap">{{ item.name }}</el-checkbox>
@@ -62,8 +62,8 @@
             @select="select"
           >
             <el-checkbox-group v-model="origin" class="origin">
-              <el-checkbox :label="0" @change="queryTeamWorkListByTime">任务排期</el-checkbox>
-              <el-checkbox :label="1" @change="queryTeamWorkListByTime">日程</el-checkbox>
+              <el-checkbox :label="0" @change="queryTeamWorkListByTime(calendarView)">任务排期</el-checkbox>
+              <el-checkbox :label="1" @change="queryTeamWorkListByTime(calendarView)">日程</el-checkbox>
             </el-checkbox-group>
           </MyFullCalendar>
           <calender-detail
@@ -183,7 +183,8 @@ export default {
       const res = await queryTeamMember(params)
       if (res.code === 200) {
         this.memberList = this.handleMember(res.data)
-        console.log(this.memberList)
+        this.checkedMembers = this.memberList.map(item => item.idap)
+        this.checkAllMember = true
       }
     },
     handleMember(arr) {
@@ -289,9 +290,11 @@ export default {
           startTime: moment(view.activeStart || null).subtract(1, 'month').format('YYYY.MM.DD'),
           endTime: moment(view.activeEnd || null).add(1, 'month').format('YYYY.MM.DD')
         },
-        teamSearchInfo: { bizId: localStorage.getItem('bizId') || null },
         searchScheduleInfo: { origin: this.origin }
       }
+      if (localStorage.getItem('bizId')) {
+        params.teamSearchInfo = { bizId: localStorage.getItem('bizId') }
+      }
       if (this.checkedMembers.length > 0) {
         params.peoples = this.checkedMembers
       }