Merge remote-tracking branch 'origin/http_test' into http_test

src/views/projectManage/projectList/components/modifySchedule.vue

@@ -313,7 +313,7 @@ export default {
         this.SchedulShow = true
         this.tips = { text: '请先设置好参与人员和排期时间再进行排期检查！', icon: 'el-icon-warning', col: '#FAAD14' }
       } else {
-        sortFocheckConflictrTask({ peopleList: this.form.peopleList, dayList: this.form.dayList }).then(res => {
+        sortFocheckConflictrTask({ taskId: this.form.taskList[0], peopleList: this.form.peopleList, dayList: this.form.dayList }).then(res => {
           if (res.code === 200) {
             res.data && res.data[0] ? this.tips = { text: '排期提醒！参与人员在设置的排期时间内同时存在如下排期（此排期仅供参考）。', icon: 'el-icon-warning', col: '#FAAD14' } : this.tips = { text: '排期提醒！参与人员在设置的排期时间不存在其他的排期。', icon: 'el-icon-info', col: '#409EFF' }
             this.ScheduleTip = res.data

src/views/projectManage/projectList/components/scheduledMember.vue

@@ -12,12 +12,12 @@
             <div class="projected-type">
               类型：<span>{{ i.scheduleName }}</span>
               时间：<span style="min-width: 200px;">{{ i.startDateStr }} - {{ i.endDateStr }}</span>
-              任务：<span class="projected-hover" style="min-width: 10px;margin-right:0;" @click="jump({ bizId: i.bizId, taskId: i.taskId })">{{ i.taskName }}</span>
-              <!-- 任务：<span v-for="(s, num) in i.tasks" :key="s.taskId" style="min-width: 10px;margin-right:0;">
-                  <span class="projected-hover" style="margin-right:0;" @click="jump(s)">
+              <!-- 任务：<span class="projected-hover" style="min-width: 10px;margin-right:0;" @click="jump({ bizId: i.bizId, taskId: i.taskId })">{{ i.taskName }}</span> -->
+              任务：<span v-for="(s, num) in i.tasks" :key="num" style="min-width: 10px;margin-right:0;">
+                  <span class="projected-hover" style="margin-right:0;" @click="jump({ bizId: s.bizId, taskId: s.id })">
                     {{ s.name }}<b v-if="num < i.tasks.length - 1">，</b>
                   </span>
-                </span> -->
+                </span>
             </div>
           </span>
         </el-col>