修改状态流转接口

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

@@ -35,7 +35,7 @@
             size="mini"
             @change="changeStatus(scope.row)"
           >
-            <el-option v-for="item in allStatus" :key="item.code" :label="item.msg" :value="item.code" />
+            <el-option v-for="item in scope.row.availableStatusList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
         </template>
       </el-table-column>

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

@@ -80,7 +80,7 @@
             size="mini"
             @change="changeStatus(scope.row)"
           >
-            <el-option v-for="item in allStatus" :key="item.code" :label="item.msg" :value="item.code" />
+            <el-option v-for="item in scope.row.availableStatusList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
         </template>
       </el-table-column>

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

@@ -81,7 +81,7 @@
             size="mini"
             @change="changeStatus(scope.row)"
           >
-            <el-option v-for="item in allStatus" :key="item.code" :label="item.msg" :value="item.code" />
+            <el-option v-for="item in scope.row.availableStatusList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
         </template>
       </el-table-column>

src/views/projectManage/taskList/taskIndex.vue

@@ -15,7 +15,7 @@
       <div class="Layout" style="padding: 5px 0 0 15px">
         <div>
           <el-form :model="form_task" class="flex_start">
-            <div class="Layout" style="padding-left:15px">
+            <div class="Layout">
               <div class="queryName">任务名称</div>
               <el-input v-model="form_task.name" size="small" clearable style="width:77% !important;" placeholder="请输入标题或ID" @change="get_taskList()" />
             </div>
@@ -202,7 +202,7 @@ import {
   memberQueryMemberInfoByIDAPorName,
   configShowRequirementVersionEnum,
   projectListProject,
-  showTaskListEnum
+  configShowTaskStatusEnum
 } from '@/api/taskIndex' // ajax
 import { settingQueryBizModuleList } from '@/api/defectManage'
 import openDialog from '@/views/projectManage/dialog_vue'
@@ -222,7 +222,7 @@ export default {
       pageSize: 15,
       goodName: '更多筛选',
       options: [],
-      daStatus: [],
+      daStatus: [], // 任务状态筛选option
       healthStage: [],
       list: [],
       userInformation: localStorage.getItem('username'),
@@ -365,20 +365,23 @@ export default {
       this.isToOne = false
       this.get_taskList()
     },
-    get_taskSelect() {
+    async get_taskSelect() {
       // 下拉菜单数据
-      configShowTaskEnum().then(res => {
+      const res = await configShowTaskEnum()
+      if (res.code === 200) {
         this.healthStage = res.data.taskStage
         this.noTest = res.data.noTest // 是否免测
         this.taskSource = res.data.taskSource // 归属需求
         this.appClient = res.data.appClient // 涉及客户端
-      })
-      showTaskListEnum().then(res => {
-        this.daStatus = res.data.taskStatus
-      })
-      projectListProject({ bizId: Number(localStorage.getItem('bizId')) }).then(res => {
-        this.projectList = res.data
-      })
+      }
+      const res1 = await configShowTaskStatusEnum(localStorage.getItem('bizId'))
+      if (res1.code === 200) {
+        this.daStatus = res1.data.taskStatus
+      }
+      const res2 = await projectListProject({ bizId: Number(localStorage.getItem('bizId')) })
+      if (res2.code === 200) {
+        this.projectList = res2.data
+      }
     },
     bugDataGet() { // 所属模块
       settingQueryBizModuleList(Number(localStorage.getItem('bizId'))).then(res => {

src/views/projectManage/taskList/taskViewDetail.vue

@@ -25,19 +25,19 @@
               >{{ form_query.name }}</span>
             </el-tooltip>
           </div>
-          <el-button v-show="getStatus.msg === 'Hold'" disabled plain size="mini">Hold</el-button>
-          <el-dropdown v-show="getStatus.msg !== 'Hold'" placement="bottom" @command="updateStatus">
+          <el-button v-show="form_query.status === -2" disabled plain size="mini">Hold</el-button>
+          <el-dropdown v-show="form_query.status !== -2" placement="bottom" @command="updateStatus">
             <el-button size="mini" plainclass="el-dropdown-link drop_down">
-              {{ getStatus.msg }}
+              {{ getStatus.name }}
               <i class="el-icon-arrow-down el-icon--right" />
             </el-button>
             <el-dropdown-menu slot="dropdown" align="center">
               <el-dropdown-item
                 v-for="item in allStatus"
-                :key="item.msg"
-                :command="{status:item.code,label:item.msg}"
+                :key="item.name"
+                :command="{status:item.code,label:item.name}"
                 :disabled="form_query.status === item.code ? true : false"
-              >{{ item.msg }}</el-dropdown-item>
+              >{{ item.name }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -329,7 +329,6 @@ import {
   commentList,
   taskHold,
   taskUnhold,
-  configShowTaskStatusEnum,
   configShowRequirementVersionEnum,
   scheduleGetTaskScheduleHistory
 } from '@/api/taskIndex'
@@ -341,7 +340,6 @@ import textArea from '@/components/input/textArea'
 import drawer from '@/views/projectManage/Drawer'
 import image_url from '@/assets/home_images/home_u.png'
 import createdBug from '@/views/projectManage/bugList/file/createdBug'
-// import normalDialog from '@/components/dialog/normalDialog'
 import openDialog from '@/views/projectManage/dialog_vue'
 import createChildren from './childrenTask/createChildren'
 import childrenList from './childrenTask/childrenList'
@@ -442,7 +440,7 @@ export default {
   },
   computed: {
     getStatus() {
-      return this.allStatus.find(item => item.code === this.form_query.status) || { msg: null }
+      return this.allStatus.find(item => item.code === this.form_query.status) || { name: null }
     }
   },
   created() {
@@ -519,7 +517,6 @@ export default {
         const res = await taskHold(this.taskId, { 'remark': val })
         if (res.code === 200) {
           this.taskGet()
-          this.getTaskStatus()
           this.$refs.timeLine.taskGetWorkFlow()
           this.visible = false
           this.$message({ message: '已修改状态为 Hold', type: 'success', duration: 1000, offset: 150 })
@@ -529,7 +526,8 @@ export default {
         const res = await taskUnhold(this.taskId)
         if (res.code === 200) {
           this.taskGet()
-          this.getTaskStatus()
+          this.allStatus = []
+          this.allStatus.push({ code: -2, msg: 'Hold' })
           this.$refs.timeLine.taskGetWorkFlow()
           this.$message({ message: 'Hold 状态已解除', type: 'success', duration: 1000, offset: 150 })
         }
@@ -562,13 +560,6 @@ export default {
     },
     async getTaskStatus() { // 获取任务状态列表，跟版客户端列表
       const res = await configShowTaskEnum()
-      const res1 = await configShowTaskStatusEnum(localStorage.getItem('bizId'))
-      if (res1.code === 200) {
-        this.allStatus = []
-        this.HoldTask === '解除 Hold' ? this.allStatus.push({ code: -2, msg: 'Hold' }) : ''
-        this.HoldTask === 'Hold 任务' ? this.allStatus = res1.data.taskStatus : ''
-        // res1.data.taskStatus.length > 0 ? this.allStatus = res1.data.taskStatus : this.allStatus.push({ code: -2, msg: 'Hold' })
-      }
       if (res.code === 200) {
         this.taskScheduleEvent = res.data.taskScheduleEvent || []
         this.appClient = res.data.appClient.map(item => {
@@ -583,6 +574,7 @@ export default {
       const res = await taskGet(this.$route.query.id)
       if (res.code === 200) {
         this.form_query = res.data
+        this.allStatus = res.data.availableStatusList
       }
     },
     async getCommentList() { // 获取任务评论

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

@@ -70,7 +70,7 @@
             size="mini"
             @change="changeStatus(scope.row)"
           >
-            <el-option v-for="item in allStatus" :key="item.code" :label="item.msg" :value="item.code" />
+            <el-option v-for="item in scope.row.availableStatusList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
         </template>
       </el-table-column>

src/views/workbench/team/components/needsList.vue

@@ -42,7 +42,7 @@
             size="mini"
             @change="changeStatus(scope.row)"
           >
-            <el-option v-for="item in allStatus" :key="item.code" :label="item.msg" :value="item.code" />
+            <el-option v-for="item in scope.row.availableStatusList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
         </template>
       </el-table-column>

src/views/workbench/team/components/taskList.vue

@@ -74,7 +74,7 @@
             size="mini"
             @change="changeStatus(scope.row)"
           >
-            <el-option v-for="item in allStatus" :key="item.code" :label="item.msg" :value="item.code" />
+            <el-option v-for="item in scope.row.availableStatusList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
         </template>
       </el-table-column>