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

src/views/Platform/bugManage/bugCreate.vue

@@ -264,7 +264,7 @@ export default {
         this.clientTypeEnumList = res.data.clientTypeEnumList
         this.serviceTypeEnumList = res.data.serviceTypeEnumList
       })
-      await taskListCreate({ statusList: [5, 6, 7, 8, 9, 10] }).then(res => { // 获取任务数据 (后期用this.taskStatus)
+      await taskListCreate({}).then(res => { // 获取任务数据 (后期用this.taskStatus)
         this.taskIdStr = res.data
       })
       if (this.$route.query.id) {

src/views/Platform/bugManage/bugUpdate.vue

@@ -337,7 +337,7 @@ export default {
     },
     // 获取任务数据
     taskIdGet() {
-      taskListCreate({ statusList: [5, 6, 7, 8, 9, 10] }).then(res => {
+      taskListCreate({}).then(res => {
         this.taskIdStr = res.data
       })
     },

src/views/projectManage/projectList/projectViewDetails.vue

@@ -314,7 +314,7 @@
               <el-table-column label="测试负责人" min-width="100" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.qaObject === null ? '' : scope.row.qaObject.name }}</template>
               </el-table-column>
-              <el-table-column label="任务进度" min-width="100" align="center">
+              <el-table-column label="任务进度" min-width="150" align="center">
                 <template slot-scope="scope">
                   <el-progress :percentage="Number(scope.row.rate)" color="#409eff" />
                 </template>
@@ -739,7 +739,9 @@ export default {
       title_name: '', // 里程碑title
       formLabelWidth1: '60px',
       project_Milepost: [],
-      get_Milepost_data: {} // 点击原点数据
+      get_Milepost_data: {}, // 点击原点数据
+      condition: '',
+      noRequire: ''
     }
   },
   created() {
@@ -817,7 +819,35 @@ export default {
         this.$router.push({ name: '项目', query: {}})
       })
     },
+    click_name1(e) {
+      this.condition = ''
+      this.condition = e
+      // 需求下任务
+      if (this.noRequire === true) {
+        taskList({
+          projectId: e,
+          noRequire: true,
+          curIndex: this.curIndex,
+          pageSize: this.pageSize
+        }).then(res => {
+          this.all_task = res.data
+          this.total = res.total
+        })
+      }
+      if (this.noRequire === false) {
+        taskList({
+          projectId: e,
+          curIndex: this.curIndex,
+          pageSize: this.pageSize
+        }).then(res => {
+          this.all_task = res.data
+          this.total = res.total
+        })
+      }
+    },
     click_name(e) {
+      this.condition = ''
+      this.condition = e
       // 需求下任务
       taskList({
         requireId: e,
@@ -907,7 +937,6 @@ export default {
               this.dialogFormVisible = false
             })
           } else if (this.title_name === '编辑里程碑') {
-            console.log(milestone, 'ds')
             mileStoneUpdate({ milestone, user }).then(res => {
               this.$message({
                 message: res.msg,
@@ -1038,24 +1067,27 @@ export default {
     },
     get_allTask() {
       // 获取全部任务
+      this.noRequire = false
+      this.condition = Number(this.projectId[1])
       taskList({
         projectId: Number(this.projectId[1]),
-        curIndex: this.curIndex,
+        curIndex: 1,
         pageSize: this.pageSize
       }).then(res => {
         this.all_task = res.data
-        console.log(this.all_task, 'cdscsds')
         this.total = res.total
         this.$refs.all_tasks.style.color = '#409EFF'
         this.$refs.all_tasks_1.style.color = '#000'
         this.$refs.all_tasks_2.style.color = '#000'
       })
     },
-    NoOwnership() {
+    NoOwnership() { // 无归属需求任务
+      this.noRequire = true
+      this.condition = Number(this.projectId[1])
       taskList({
-        taskId: Number(this.projectId[1]),
+        projectId: Number(this.projectId[1]),
         noRequire: true,
-        curIndex: this.curIndex,
+        curIndex: 1,
         pageSize: this.pageSize
       }).then(res => {
         this.all_task = res.data
@@ -1067,6 +1099,7 @@ export default {
     },
     AttributionDemand() {
       // 归属需求任务
+      this.condition = Number(this.projectId[1])
       this.loading = true
       requirementQueryRequirementInfoList({ belongingProject: Number(this.projectId[1]) }).then(res => {
         this.tableData = res.data.list
@@ -1086,11 +1119,11 @@ export default {
     },
     handleSizeChange(size) { //  分页
       this.pageSize = size
-      this.get_list()
+      this.click_name1(this.condition)
     },
     handleCurrentChange(curIndex) { //  分页
       this.curIndex = curIndex
-      this.get_list()
+      this.click_name1(this.condition)
     }
   }
 }

src/views/projectManage/taskList/taskIndex.vue

@@ -111,6 +111,7 @@
           filterable
           remote
           reserve-keyword
+          clearable
           placeholder="负责人"
           :remote-method="remoteMethod"
           :loading="loading"
@@ -131,6 +132,7 @@
           filterable
           remote
           reserve-keyword
+          clearable
           placeholder="参与人"
           :remote-method="remoteMethod"
           :loading="loading"
@@ -151,6 +153,7 @@
           filterable
           remote
           reserve-keyword
+          clearable
           placeholder="创建人"
           :remote-method="remoteMethod"
           :loading="loading"
@@ -345,6 +348,9 @@ export default {
         task.pageSize = this.pageSize
         task.curIndex = this.curIndex
         task.name = this.form_task.name_label
+        task.Participant = e.Participant
+        task.creater = e.creater
+        task.PersonInCharge = e.PersonInCharge
       }
       taskList(task).then(res => {
         this.task_table = res.data