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

# Conflicts:
#	src/views/projectManage/iteration/components/iterationTable.vue
#	src/views/projectManage/projectList/components/scheduleList.vue
#	src/views/projectManage/requirement/components/scheduleList.vue
#	src/views/projectManage/taskList/components/scheduleList.vue

src/styles/PublicStyle/index.scss

@@ -46,6 +46,7 @@
   color: #6AB4FF;
 }
 
+
 .status_color { // 迭代状态样式修改（颜色）
   /deep/ input {
     color: #6AB4FF !important;
@@ -62,20 +63,20 @@
   }
 }
 
-  .status_color1 { // 迭代状态样式修改（颜色）
-    /deep/ input {
-      color: #FF8952;
-       border: 1px solid #FF8952;
-       border-color: #FF8952 !important;
-           font-weight: 900;
-    }
-     /deep/ .el-input__suffix {
-      color: #FF8952 !important;
-      right: 1px;
-    }
-    /deep/ .el-select__caret {
-      color: #FF8952 !important;
-    }
+.status_color1 { // 迭代状态样式修改（颜色）
+      /deep/ input {
+        color: #FF8952 !important;
+        border: 1px solid #FF8952 !important;
+        border-color: #FF8952 !important;
+        font-weight: 900 !important;
+      }
+      /deep/ .el-input__suffix {
+        color: #FF8952 !important;
+        right: 1px !important;
+      }
+      /deep/ .el-select__caret {
+        color: #FF8952 !important;
+      }
   }
 
   .status_color2 { // 迭代状态样式修改（颜色）

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

@@ -176,7 +176,7 @@ export default {
     async listByTask(id) { // 获取排期列表
       const res = await scheduleListByRequire(id)
       if (res.code === 200) {
-        this.scheduleList = res.data.schedulDetailResponses || []
+        this.scheduleList = res.data.scheduleDetailRespons
         this.scheduleDetail = res.data || {}
         this.scheduleList = this.scheduleList.map(item => ({
           ...item,

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

@@ -113,10 +113,8 @@
             v-model="scope.row.status"
             :class="{
               'status_color': scope.row.status === 0,
-              'status_color1': scope.row.status === 1,
-              'status_color3': scope.row.status === 3,
-              'status_color4': scope.row.status === 5,
-              'status_color2': scope.row.status === 9
+              'status_color1': scope.row.status === 10 || scope.row.status === 20 || scope.row.status === 30 || scope.row.status === 40,
+              'status_color2': scope.row.status === 50
             }"
             class="public_botton"
             size="mini"
@@ -215,7 +213,7 @@ export default {
       const listRes = await list
       const listRequire = await requiredList
       const requiredstatus = await requirementEnum
-      this.iterationData = listRes.data.list[0] //
+      this.iterationData = listRes.data.list[0]
       this.RequirementSet = listRequire.data.right.list
       this.requiredArray = requiredstatus.data.requirementStatus
       this.checkAll = this.RequirementSet
@@ -322,7 +320,6 @@ export default {
           _this.RequirementSet.map(item => {
             obj.id.push(item.id)
           })
-          console.log(_this.iterationId, 'cdcscdsc')
           iterationOrder(obj.id, _this.iterationId).then(res => {
             if (res.code === 200) {
               _this.$message.success(res.msg)
@@ -421,5 +418,4 @@ export default {
     font-size: 10px;
   }
 }
-
 </style>

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

@@ -174,7 +174,7 @@ export default {
     async listByTask(id) { // 获取排期列表
       const res = await listByTask(id)
       if (res.code === 200) {
-        this.scheduleList = res.data.schedulDetailResponses || []
+        this.scheduleList = res.data.scheduleDetailRespons
         this.scheduleDetail = res.data || {}
         this.scheduleList = this.scheduleList.map(item => ({
           ...item,

src/views/projectManage/requirement/components/scheduleList.vue

@@ -174,7 +174,7 @@ export default {
     async listByTask(id) { // 获取排期列表
       const res = this.all ? await listByRequire(id) : await listByTask(id)
       if (res.code === 200) {
-        this.scheduleList = res.data.schedulDetailResponses || []
+        this.scheduleList = res.data.scheduleDetailRespons
         this.scheduleDetail = res.data || {}
         this.scheduleList = this.scheduleList.map(item => ({
           ...item,

src/views/projectManage/requirement/requirementDetail.vue

@@ -366,7 +366,7 @@ export default {
       this.lockHide = false // 隐藏排期变更记录
       this.showunlock = true
       this.ScheduId = 0
-      this.taskScheduleList = res1.data.schedulDetailResponses
+      this.taskScheduleList = res1.data.scheduleDetailRespons
       this.isScheduleLocked = res1.data.isScheduleLocked // 锁定状态1锁定0未锁定
       this.$refs.ScheduleEvent.listByTask(this.requirementId)
     },
@@ -374,7 +374,7 @@ export default {
       this.showunlock = false
       this.ScheduId = ele.id
       const res = await scheduleGetHistoryScheduleById(ele.id)
-      this.taskScheduleList = res.data.schedulDetailResponses
+      this.taskScheduleList = res.data.scheduleDetailRespons
       this.BackToTheLatest = true
     },
     changeSchedule() { // 修改锁定状态

src/views/projectManage/taskList/components/scheduleList.vue

@@ -146,7 +146,10 @@ export default {
   watch: {
     id: {
       handler(newV, oldV) {
-        this.listByTask(newV)
+        console.log(newV)
+        this.$nextTick(() => {
+          this.listByTask(newV)
+        })
       },
       immediate: true
     },
@@ -185,8 +188,9 @@ export default {
     // },
     async listByTask(id) { // 获取排期列表
       const res = await listByTask(id)
+
       if (res.code === 200) {
-        this.scheduleList = res.data.schedulDetailResponses || []
+        this.scheduleList = res.data.scheduleDetailRespons
         this.scheduleDetail = res.data || {}
         this.scheduleList = this.scheduleList.map(item => ({
           ...item,

src/views/projectManage/taskList/taskViewDetail.vue

@@ -424,7 +424,7 @@ export default {
       this.showunlock = false
       this.ScheduId = ele.id
       const res = await scheduleGetHistoryScheduleById(ele.id)
-      this.taskScheduleEvent = res.data.schedulDetailResponses
+      this.taskScheduleEvent = res.data.scheduleDetailRespons
       this.BackToTheLatest = false
     },
     clickBackToTheLatest() {

src/views/projectManage/version/components/scheduleList.vue

@@ -174,7 +174,7 @@ export default {
     async listByTask(id) { // 获取排期列表
       const res = await listByTask(id)
       if (res.code === 200) {
-        this.scheduleList = res.data.schedulDetailResponses
+        this.scheduleList = res.data.scheduleDetailRespons
         this.scheduleDetail = res.data || {}
         this.scheduleList = this.scheduleList.map(item => ({
           ...item,

src/views/projectManage/version/components/taskList.vue

@@ -171,6 +171,15 @@ export default {
       selectTaskList: [] // 已选任务的id
     }
   },
+  watch: {
+    'searchForms': {
+      handler: function(newValue, oldValue) {
+        this.searchForms = newValue
+        this.get_allTask()
+      },
+      deep: true
+    }
+  },
   created() {
     this.getTaskStatus()
     this.get_allTask()

src/views/projectManage/version/list/index.vue

@@ -107,7 +107,7 @@
             </el-row>
           </el-tab-pane>
           <el-tab-pane label="任务" name="second">
-            <tasks-list ref="tasklist" :search-forms="searchForm" />
+            <tasks-list ref="tasklist" :search-forms.sync="searchForm" />
           </el-tab-pane>
         </el-tabs>
       </div>