wangziqian 4 rokov pred
rodič
commit
1903080fd1

+ 10 - 0
src/views/projectManage/projectList/components/modifySchedule.vue

@@ -417,6 +417,16 @@ export default {
       if (res.code === 200) {
         this.taskTotal = res.total
         this.tasksByOptions = this.tasksByOptions.concat(res.data)
+        const allTaskIsEmptyList = this.tasksByOptions.filter(item => item.taskInfoList.length === 0)
+        if (allTaskIsEmptyList.length === this.tasksByOptions.length) {
+          this.tasksByOptions = this.tasksByOptions.map((item, index) => {
+            return {
+              ...item,
+              taskInfoList: [{ taskId: '该需求下无任务', isScheduleLocked: 1, id: index }]
+            }
+          })
+        }
+        console.log(this.tasksByOptions)
         if (this.taskTotal <= this.tasksByOptions.length) this.loadMore = false// 全部数据已加载完成
       }
       this.loading = false

+ 5 - 0
src/views/workbench/components/createDialog.vue

@@ -170,6 +170,11 @@ export default {
     padding-left: 32px;
     align-items: center;
   }
+  .select-calendar {
+    .select-icon {
+      background-color: #61D3B8;
+    }
+  }
   .select-schedule:hover{
     color:rgb(64, 158, 255);
     background-color: #EDEDED;

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

@@ -506,7 +506,7 @@ export default {
         res.data = res.data.sort((a, b) => a.id - b.id)
         let num = 0
         this.calendarEvents = res.data.map((item, index) => {
-          // const title = item.origin ? '日程' : '排期'
+          const title = item.origin ? '日程' : '排期'
           let require = ''
           if (item.requireList && item.requireList.length > 0) {
             require = `所属需求:${item.requireList.map(item => item.name).join(',')}`
@@ -518,7 +518,7 @@ export default {
           }
           return {
             id: item.id,
-            title: `【${item.peopleObject.name}】 ${item.name} ${item.desc ? ':' + item.desc : ''}; ${item.origin ? '' : require}`,
+            title: `${title}【${item.peopleObject.name}】 ${item.name} ${item.desc ? ':' + item.desc : ''}; ${item.origin ? '' : require}`,
             start: moment(item.startTime).toDate(),
             end: moment(item.endTime).add(1, 'day').toDate(),
             detailData: item,

+ 11 - 4
src/views/workbench/team/index.vue

@@ -53,6 +53,7 @@
         </el-tabs>
         <search-section
           v-show="activeSchedule === '1'"
+          ref="search-section"
           :value.sync="filtrate"
           :search-form="searchForm"
           style="margin: 0 30px;"
@@ -372,14 +373,20 @@ export default {
       this.searchForm.teamId = e
       const res = this.searchEnum.teams.find(item => item.teamId === e)
       this.teamName = res.teamName
-      this.queryTeamMember()
+      if (this.$refs['search-section']) {
+        this.$refs['search-section'].queryTeamMember()
+      }
       this.handleClick()
     },
     handleBizId(e) { // 业务线变动
       this.searchForm.bizId = e
       const res = this.searchEnum.businesslines.find(item => item.code === e)
       this.bizName = res.name
-      this.queryTeamMember()
+      localStorage.setItem('bizId', res.code)
+      localStorage.setItem('bizName', res.name)
+      if (this.$refs['search-section']) {
+        this.$refs['search-section'].queryTeamMember()
+      }
       this.handleClick()
     },
     showSchedule(e) { // 查看日程详情
@@ -519,7 +526,7 @@ export default {
       if (res.code === 200) {
         this.calendarEvents = res.data.map((item, index) => {
           const colorObj = this.mapMemberColor.get(item.peopleObject.idap)
-          // const title = item.origin ? '日程' : '排期'
+          const title = item.origin ? '日程' : '排期'
           let require = ''
           if (item.requireList && item.requireList.length > 0) {
             require = `所属需求:${item.requireList.map(item => item.name).join(',')}`
@@ -528,7 +535,7 @@ export default {
           }
           return {
             id: item.id,
-            title: `【${item.peopleObject.name}】${item.name} ${item.desc ? ':' + item.desc : ''}; ${item.origin ? '' : require}`,
+            title: `${title}【${item.peopleObject.name}】${item.name} ${item.desc ? ':' + item.desc : ''}; ${item.origin ? '' : require}`,
             start: moment(item.startTime).toDate(),
             end: moment(item.endTime).add(1, 'day').toDate(),
             detailData: item,