Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into wangzi_dev

src/components/picker/SelDatePicker.vue

@@ -27,9 +27,6 @@
         <div v-if="holiday.find(item=>item === current.format('YYYY.MM.DD'))" class="is-rang-picker-holiday">休</div>
       </div>
     </template>
-    <template slot="renderExtraFooter">
-      <span>footer</span>
-    </template>
   </a-range-picker>
 </template>
 <script>
@@ -38,6 +35,7 @@ import moment from 'moment'
 import 'moment/locale/zh-cn'
 import locale from 'ant-design-vue/es/date-picker/locale/zh_CN'
 import { getHolidayDayInfo } from '@/api/projectViewDetails'
+import 'ant-design-vue/dist/antd.css'
 export default {
   props: {
     startEnd: {

src/views/projectManage/iteration/components/iterationTable.vue

@@ -90,6 +90,7 @@ import 'moment/locale/zh-cn'
 import { scheduleListByRequire } from '@/api/iteration.js'
 import { scheduleDelete, sortForTask } from '@/api/projectViewDetails'
 import modifySchedule from './modifySchedule'
+// import 'ant-design-vue/dist/antd.css'
 export default {
   components: {
     modifySchedule

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

@@ -60,7 +60,8 @@ const _ = require('lodash')
 import searchPeople from '@/components/select/searchPeople'
 import normalDialog from '@/components/dialog/normalDialog'
 import selDatePicker from '@/components/picker/SelDatePicker'
-import { taskList } from '@/api/projectIndex'
+// import { taskList } from '@/api/projectIndex'
+import { getTaskByRequireId } from '@/api/requirement'
 import { taskList as allTaskList, configShowTaskEnum } from '@/api/taskIndex'
 import { getSeprateDayInfo, scheduleCreate, scheduleGet, scheduleUpdate } from '@/api/projectViewDetails'
 export default {
@@ -169,9 +170,9 @@ export default {
         this.taskScheduleEvent = resEnum.data.taskScheduleEvent
       }
     },
-    async getNowTask() { // 获取当前项目下任务
-      const res = await taskList({
-        projectId: this.$route.query.id
+    async getNowTask() { // 获取当前需求下任务
+      const res = await getTaskByRequireId({
+        id: this.$route.query.id
       })
       if (res.code === 200) {
         this.tasksOptions = res.data