Browse Source

优化排期

qinzhipeng_v@didiglobal.com 4 years ago
parent
commit
d6b7109f1d

+ 20 - 12
src/views/projectManage/projectList/components/scheduledMember.vue

@@ -9,7 +9,16 @@
           <el-col :span="4"> <span class="projected-title">{{ item.key }}</span></el-col>
           <el-col :span="4"> <span class="projected-title">{{ item.key }}</span></el-col>
           <el-col :span="20">
           <el-col :span="20">
             <span v-for="(i, k) in item.data" :key="k" style="margin-bottom: 5px;">
             <span v-for="(i, k) in item.data" :key="k" style="margin-bottom: 5px;">
-              <div class="projected-type">类型:<span>{{ i.scheduleName }}</span> 时间:<span style="min-width: 200px;">{{ i.startDateStr }} - {{ i.endDateStr }}</span> 任务:<span>{{ i.taskName }}</span></div>
+              <div class="projected-type">
+                类型:<span>{{ i.scheduleName }}</span>
+                时间:<span style="min-width: 200px;">{{ i.startDateStr }} - {{ i.endDateStr }}</span>
+                任务:<span v-for="(s, num) in i.tasks" :key="s.taskId">
+                    <span class="projected-hover" @click="jump(s)">
+                      {{ s.name }}
+                      <span v-if="num < (s.length - 1)">,</span>
+                    </span>
+                  </span>
+              </div>
             </span>
             </span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -18,23 +27,18 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import { EncryptId } from '@/utils/crypto-js.js'
 export default {
 export default {
   props: {
   props: {
     data: { type: Array, default: null },
     data: { type: Array, default: null },
     tips: { type: Object, default: null }
     tips: { type: Object, default: null }
   },
   },
-  data() {
-    return {
-      member: []
+  methods: {
+    jump(data) {
+      const bizId_id = EncryptId(`${data.bizId}_${data.taskId}`)
+      const newTab = this.$router.resolve({ name: '任务详情', query: { bizId_id: bizId_id, page: '1' }})
+      window.open(newTab.href, '_blank')
     }
     }
-  },
-  watch: {
-    data: {
-      handler(newV) {
-        console.log(newV, '就这个')
-      }
-    },
-    deep: true
   }
   }
 }
 }
 </script>
 </script>
@@ -70,5 +74,9 @@ export default {
       min-width: 60px;
       min-width: 60px;
     }
     }
   }
   }
+  .projected-hover:hover {
+    color: #409EFF;
+    cursor: pointer;
+  }
 }
 }
 </style>
 </style>

+ 2 - 1
src/views/workbench/components/listView.vue

@@ -272,7 +272,8 @@ export default {
         data.searchScheduleInfo = {
         data.searchScheduleInfo = {
           origin: this.filtrate.origin, // 来源,任务或日程
           origin: this.filtrate.origin, // 来源,任务或日程
           scheduleTypeList: this.filtrate.scheduleTypeList, // 任务排期类型,新加的字段,
           scheduleTypeList: this.filtrate.scheduleTypeList, // 任务排期类型,新加的字段,
-          selfScheduleTypeList: this.filtrate.selfScheduleTypeList // 日程类型,新加的字段
+          selfScheduleTypeList: this.filtrate.selfScheduleTypeList, // 日程类型,新加的字段
+          priorityList: this.filtrate.priorityList
         }
         }
         const res = await queryWorkList(data)
         const res = await queryWorkList(data)
         if (res.code === 200) {
         if (res.code === 200) {

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

@@ -528,7 +528,8 @@ export default {
         searchScheduleInfo: {
         searchScheduleInfo: {
           origin: this.filtrate.origin,
           origin: this.filtrate.origin,
           scheduleTypeList: this.filtrate.scheduleTypeList,
           scheduleTypeList: this.filtrate.scheduleTypeList,
-          selfScheduleTypeList: this.filtrate.selfScheduleTypeList
+          selfScheduleTypeList: this.filtrate.selfScheduleTypeList,
+          priorityList: this.filtrate.priorityList
         }
         }
       }
       }
       const res = await queryWorkListByTime(params)
       const res = await queryWorkListByTime(params)