任务需求状态流转

src/api/requirement.js

@@ -180,3 +180,45 @@ export function scheduleDownLoadByRequireId(id) {
     method: 'get'
   })
 }
+
+// 获取需求操作历史记录
+export function operationLogRequire(id) {
+  return request({
+    url: requestIp + `/operationLog/require?requireId=${id}`,
+    method: 'get'
+  })
+}
+
+// 获取需求工作流
+export function requirementGetWorkFlow(id) {
+  return request({
+    url: requestIp + `/requirement/getWorkFlow?id=${id}`,
+    method: 'get'
+  })
+}
+
+// hold需求接口
+export function requirementHold(id, data) {
+  return request({
+    url: requestIp + `/requirement/hold?id=${id}`,
+    method: 'post',
+    data
+  })
+}
+
+// 解hold需求接口
+export function requirementUnhold(id) {
+  return request({
+    url: requestIp + `/requirement/unhold?id=${id}`,
+    method: 'post',
+    id
+  })
+}
+
+// 获取需求状态
+export function configShowRequireStatusEnum(id) {
+  return request({
+    url: requestIp + `/config/showRequireStatusEnum?bizId=${id}`,
+    method: 'get'
+  })
+}

src/api/taskIndex.js

@@ -233,3 +233,37 @@ export function operationLogTask(id) {
     method: 'get'
   })
 }
+
+// 获取任务工作流
+export function taskGetWorkFlow(id) {
+  return request({
+    url: TeamManagement + `/task/getWorkFlow?id=${id}`,
+    method: 'get'
+  })
+}
+
+// hold
+export function taskHold(id, data) {
+  return request({
+    url: TeamManagement + `/task/hold?id=${id}`,
+    method: 'post',
+    data
+  })
+}
+
+// 解hold
+export function taskUnhold(id, data) {
+  return request({
+    url: TeamManagement + `/task/unhold?id=${id}`,
+    method: 'post',
+    data
+  })
+}
+
+// 获取任务状态
+export function configShowTaskStatusEnum(id) {
+  return request({
+    url: TeamManagement + `/config/showTaskStatusEnum?bizId=${id}`,
+    method: 'get'
+  })
+}

src/views/projectManage/components/record.vue

@@ -24,6 +24,7 @@
 <script>
 import '@/styles/PublicStyle/index.scss'
 import { operationLogTask } from '@/api/taskIndex'
+import { operationLogRequire } from '@/api/requirement.js'
 export default {
   props: {
     id: { type: [Number, String], default: null },
@@ -39,8 +40,14 @@ export default {
   },
   methods: {
     async operationLogTask() {
-      const res = await operationLogTask(this.id)
-      this.changeRecord = res.data
+      if (this.name === '任务') {
+        const res = await operationLogTask(this.id)
+        this.changeRecord = res.data
+      }
+      if (this.name === '需求') {
+        const res = await operationLogRequire(this.id)
+        this.changeRecord = res.data
+      }
     }
   }
 }

src/views/projectManage/components/timeLine.vue

@@ -3,16 +3,46 @@
     <swiper ref="mySwiper" class="swiper-wrapper timeline" :options="options">
       <swiper-slide v-for="(item,index) in steps" :key="index" class="swiper-slide">
         <div class="line" />
-        <div class="center circle2"><div class="circle-in center" /></div>
+        <div
+          class="center circle"
+          :class="{
+            'circle2': item.createTime !== null && item.createTime !== '今天',
+            'circle3': item.createTime === '今天' && item.statusName !== 'HOLD' && item.statusName !== 'UNHOLD',
+            'circle4': item.createTime === null,
+            'circle5': item.statusName === 'HOLD' || item.statusName === 'UNHOLD'
+          }"
+        >
+          <el-tooltip v-if="item.id === -2 " class="item" effect="dark" :content="'Hold原因:' + item.remark" placement="top">
+            <div
+              :class="{
+                'circle-in': item.createTime !== null && item.createTime !== '今天',
+                'circle-is': item.createTime === '今天',
+                'circle-iq': item.createTime === null,
+                'circle-ia': item.statusName === 'HOLD' || item.statusName === 'UNHOLD'
+              }"
+              class="circle-of center"
+            />
+          </el-tooltip>
+          <div
+            v-else
+            :class="{
+              'circle-in': item.createTime !== null && item.createTime !== '今天',
+              'circle-is': item.createTime === '今天',
+              'circle-iq': item.createTime === null,
+              'circle-ia': item.statusName === 'HOLD' || item.statusName === 'UNHOLD'
+            }"
+            class="circle-of center"
+          />
+        </div>
         <div :class="[index%2==0?'point1':'point2']" />
         <div class="content3">
-          {{ '3天' }}
+          {{ item.timeSpan }}
         </div>
         <div class="content1">
-          {{ item.dateLabel }}
+          {{ item.createTime }}
         </div>
         <div class="content2">
-          {{ item.title }}
+          {{ item.statusName }}
         </div>
       </swiper-slide>
     </swiper>
@@ -22,7 +52,8 @@
 <script>
 import { Swiper, SwiperSlide, directive } from 'vue-awesome-swiper'
 import 'swiper/css/swiper.css'
-
+import { taskGetWorkFlow } from '@/api/taskIndex'
+import { requirementGetWorkFlow } from '@/api/requirement.js'
 export default {
   components: {
     Swiper,
@@ -32,23 +63,12 @@ export default {
     swiper: directive
   },
   props: {
-    steps: {
-      type: Array,
-      default() {
-        return [
-          { dateLabel: '2020.01.20', title: '技术准入' },
-          { dateLabel: '2020.01.24', title: '技术评审' },
-          { dateLabel: '2020.01.30', title: '已排期' },
-          { dateLabel: '2020.02.2', title: '开发中' },
-          { dateLabel: '2020.02.20', title: 'Hold' },
-          { dateLabel: '2020.02.25', title: '解除Hold' },
-          { dateLabel: '2020.02.31', title: '已提测' }
-        ]
-      }
-    }
+    id: { type: [Number, String], default: null },
+    name: { type: String, default: null }
   },
   data() {
     return {
+      steps: [],
       options: {
         pagination: {
           el: '.swiper-pagination'
@@ -64,10 +84,19 @@ export default {
     }
   },
   created() {
-    this.steps.forEach(item => {
-      const list = item.dateLabel.split(' ')
-      item.dateLabel = list[0]
-    })
+    this.taskGetWorkFlow()
+  },
+  methods: {
+    async taskGetWorkFlow() {
+      if (this.name === '任务') {
+        const res = await taskGetWorkFlow(this.id)
+        this.steps = res.data.workFlowNodeList
+      }
+      if (this.name === '需求') {
+        const res = await requirementGetWorkFlow(this.id)
+        this.steps = res.data.workFlowNodeList
+      }
+    }
   }
 }
 </script>
@@ -101,7 +130,7 @@ export default {
     top: 50%;
     transform: translate(-50%,-50%);
   }
-  .circle2 {
+  .circle {
     position: absolute;
   }
   .circle2::after{
@@ -113,15 +142,60 @@ export default {
     bottom: -16px;
     transform: translate(-50%,33px);
   }
-  .circle-in {
+  .circle3::after{
+    content: '';
+    display:none;
+    position: absolute;
+    height: 50px;
+    border: 1px solid rgba(1,86,165,1);
+    left: 50%;
+    bottom: -16px;
+    transform: translate(-50%,33px);
+  }
+  .circle4::after{
+    content: '';
+    position: absolute;
+    height: 50px;
+    border:1px solid rgba(153,153,153,1);
+    left: 50%;
+    bottom: -16px;
+    transform: translate(-50%,33px);
+  }
+  .circle5::after{
+    content: '';
+    position: absolute;
+    height: 50px;
+    border:1px solid rgba(214,0,0,1);
+    left: 50%;
+    bottom: -16px;
+    transform: translate(-50%,33px);
+  }
+
+  .circle-of {
     position: absolute;
     border-radius: 50%;
     width: 12px;
     height: 12px;
+    z-index: 99;
+  }
+
+  .circle-in {
     background: rgba(24,144,255,1);
     border: 1px solid rgba(1,86,165,1);
-    z-index: 99;
   }
+  .circle-is {
+    background:rgba(126,211,33,1);
+    border:1px solid rgba(85,163,0,1);
+  }
+  .circle-iq {
+    background:rgba(153,153,153,1);
+    border:1px solid rgba(153,153,153,1);
+  }
+  .circle-ia {
+    background:rgba(245,108,108,1);
+    border:1px solid rgba(214,0,0,1);
+  }
+
    .content1,.content2 {
     width: 100%;
     font-size: 12px;
@@ -135,7 +209,7 @@ export default {
     font-size: 10px;
     color: rgba(97,175,255,1);
     position: absolute;
-    left: 100%;
+    left: 0%;
     top: 58px;
     transform: translateX(-50%);
   }

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

@@ -64,7 +64,7 @@
 </template>
 <script>
 import { requirementQueryRequirementInfoList } from '@/api/projectIndex'
-import { showRequirementEnum, updateRequirementStatus } from '@/api/requirement'
+import { configShowRequireStatusEnum, updateRequirementStatus } from '@/api/requirement'
 import extraUrgent from '@/assets/extraUrgent.png'
 export default {
   data() {
@@ -80,10 +80,15 @@ export default {
   },
   methods: {
     async getTaskStatus() { // 获取需求的所有状态
-      const res = await showRequirementEnum()
-      if (res.code === 200) {
-        this.allStatus = res.data.requirementStatus
+      const res1 = await configShowRequireStatusEnum(localStorage.getItem('bizId'))
+      if (res1.code === 200) {
+        this.allStatus = []
+        this.allStatus = res1.data.requirementStatus
       }
+      // const res = await showRequirementEnum()
+      // if (res.code === 200) {
+      //   this.allStatus = res.data.requirementStatus
+      // }
     },
     async getNeedsList() {
       const res = await requirementQueryRequirementInfoList({ belongingProject: this.$route.query.id })

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

@@ -124,7 +124,7 @@ import DailyReport from '@/views/Platform/presentation/Templates/DailyReport' //
 import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
 import { taskList } from '@/api/projectIndex'
 import { taskUpdate } from '@/api/projectViewDetails'
-import { configShowTaskEnum } from '@/api/taskIndex'
+import { configShowTaskEnum, configShowTaskStatusEnum } from '@/api/taskIndex'
 import scheduleList from './scheduleList'
 import modifySchedule from './modifySchedule'
 import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改（已上线/已提测/已准出）
@@ -182,9 +182,12 @@ export default {
     async getTaskStatus() { // 获取任务状态列表
       const res = await configShowTaskEnum()
       if (res.code === 200) {
-        this.allStatus = res.data.taskStatus
         this.taskScheduleEvent = res.data.taskScheduleEvent || []
       }
+      const res1 = await configShowTaskStatusEnum(localStorage.getItem('bizId'))
+      if (res1.code === 200) {
+        this.allStatus = res1.data.taskStatus
+      }
     },
     changeCheck(val) {
       if (val) {

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

@@ -121,7 +121,7 @@ import DailyReport from '@/views/Platform/presentation/Templates/DailyReport' //
 import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
 import { taskList } from '@/api/projectIndex'
 import { taskUpdate } from '@/api/projectViewDetails'
-import { configShowTaskEnum } from '@/api/taskIndex'
+import { configShowTaskEnum, configShowTaskStatusEnum } from '@/api/taskIndex'
 import scheduleList from './scheduleList'
 import modifySchedule from './modifySchedule'
 import '@/styles/PublicStyle/index.scss'
@@ -176,9 +176,12 @@ export default {
     async getTaskStatus() { // 获取任务状态列表
       const res = await configShowTaskEnum()
       if (res.code === 200) {
-        this.allStatus = res.data.taskStatus
         this.taskScheduleEvent = res.data.taskScheduleEvent || []
       }
+      const res1 = await configShowTaskStatusEnum(localStorage.getItem('bizId'))
+      if (res1.code === 200) {
+        this.allStatus = res1.data.taskStatus
+      }
     },
     changeCheck(val) {
       if (val) {

src/views/projectManage/requirement/requirementDetail.vue

@@ -14,7 +14,8 @@
               >{{ form_query.name }}</span>
             </el-tooltip>
           </div>
-          <el-dropdown 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 }}
               <i class="el-icon-arrow-down el-icon--right" />
@@ -53,7 +54,7 @@
           <i class="el-icon-delete icon-delete" @click="deleteVisible = true" />
         </div>
       </el-header>
-      <el-container>
+      <el-container v-show="activeName === '1'">
         <section class="main-section">
           <div class="Layout_space_between">
             <div class="el-main-title">
@@ -71,16 +72,17 @@
                 v-model="textarea2"
                 type="textarea"
                 rows="5"
+                style="width:300px"
                 placeholder="请输入Hold原因（选填）"
               />
               <div style="text-align: right; margin-top: 10px;">
                 <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-                <el-button type="primary" size="mini" @click="visible = false">确定</el-button>
+                <el-button type="primary" size="mini" @click="requirementHold(textarea2)">确定</el-button>
               </div>
-              <el-button slot="reference" class="el-btn-size" size="mini" @click="visible = !visible">Hold 任务</el-button>
+              <el-button slot="reference" class="el-btn-size" size="mini" @click="changeBtn">{{ form_query.status === -2 ? HoldTask = '解除 Hold' : HoldTask = 'Hold 任务' }}</el-button>
             </el-popover>
           </div>
-          <timeLine />
+          <timeLine :id="requirementId" ref="timeLine1" :name="'需求'" />
         </section>
       </el-container>
       <!-- 概览 -->
@@ -102,7 +104,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="PM：">
-                <search-people :value.sync="form_query.pm.idap" :clearable="false" @change="changeArea" />
+                <search-people :value.sync="form_query.pm" :clearable="false" @change="changeArea" />
               </el-form-item>
             </el-form>
             <el-form :inline="true" :model="form_query" class="demo-form-inline" label-position="right" label-width="100px">
@@ -219,7 +221,7 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="变更记录" name="second">
-              <record />
+              <record :id="requirementId" :name="'需求'" />
             </el-tab-pane>
           </el-tabs>
 
@@ -303,6 +305,9 @@ import {
   getCommentList,
   addComment,
   listByRequire,
+  requirementHold,
+  requirementUnhold,
+  configShowRequireStatusEnum,
   scheduleGetRequireScheduleHistory,
   scheduleGetHistoryScheduleById
 } from '@/api/requirement.js'
@@ -355,6 +360,7 @@ export default {
       urgent: urgent,
       showunlock: true,
       textarea2: '',
+      HoldTask: '',
       optionName: 'first',
       visible: false, // Hold任务
       ScheduId: '', // 排期ID
@@ -468,14 +474,48 @@ export default {
       this.iterationList.unshift({ id: -1, name: '无' })
     },
     async showRequirementEnum() { // 获取需求状态列表，优先级列表，需求来源
+      const res1 = await configShowRequireStatusEnum(localStorage.getItem('bizId'))
+      if (res1.code === 200) {
+        this.statusList = []
+        this.statusList = res1.data.requirementStatus
+      }
       const res = await showRequirementEnum()
       if (res.code === 200) {
-        this.statusList = res.data.requirementStatus
         this.priorityList = res.data.priority
         this.sourceTypeList = res.data.sourceType
         this.appClient = res.data.appClient
       }
     },
+    changeBtn() {
+      if (this.HoldTask === 'Hold 任务') {
+        this.visible = !this.visible
+        this.textarea2 = ''
+      }
+      if (this.HoldTask === '解除 Hold') {
+        this.requirementHold()
+      }
+    },
+    async requirementHold(val) { // 锁定Hold
+      if (this.HoldTask === 'Hold 任务') {
+        const res = await requirementHold(this.requirementId, { 'remark': val })
+        if (res.code === 200) {
+          this.getRequirementById()
+          this.showRequirementEnum()
+          this.$refs.timeLine1.taskGetWorkFlow()
+          this.visible = false
+          this.$message({ message: '已修改状态为 Hold', type: 'success', duration: 1000, offset: 150 })
+        }
+      }
+      if (this.HoldTask === '解除 Hold') {
+        const res = await requirementUnhold(this.requirementId)
+        if (res.code === 200) {
+          this.getRequirementById()
+          this.showRequirementEnum()
+          this.$refs.timeLine1.taskGetWorkFlow()
+          this.$message({ message: 'Hold 状态已解除', type: 'success', duration: 1000, offset: 150 })
+        }
+      }
+    },
     async getTaskStatus() { // 获取排期类型
       const res = await configShowTaskEnum()
       if (res.code === 200) {
@@ -702,9 +742,3 @@ export default {
 }
 </style>
 
-<style>
-.el-popper[x-placement^=bottom] {
-    margin: 12px 10px 0 0;
-    width: 300px;
-}
-</style>

src/views/projectManage/taskList/taskViewDetail.vue

@@ -25,7 +25,8 @@
               >{{ form_query.name }}</span>
             </el-tooltip>
           </div>
-          <el-dropdown placement="bottom" @command="updateStatus">
+          <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 size="mini" plainclass="el-dropdown-link drop_down">
               {{ getStatus.msg }}
               <i class="el-icon-arrow-down el-icon--right" />
@@ -35,7 +36,7 @@
                 v-for="item in allStatus"
                 :key="item.msg"
                 :command="{status:item.code,label:item.msg}"
-                :disabled="form_query.status === item.code? true: false"
+                :disabled="form_query.status === item.code ? true : false"
               >{{ item.msg }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -68,7 +69,7 @@
           <i class="el-icon-delete icon-delete" @click="deleteVisible = true" />
         </div>
       </el-header>
-      <el-container>
+      <el-container v-show="activeName === '1'">
         <section class="main-section">
           <div class="Layout_space_between">
             <div class="el-main-title">
@@ -77,7 +78,7 @@
             </div>
             <el-popover
               v-model="visible"
-              placement="bottom-start"
+              placement="bottom-end"
               width="300px"
               :visible-arrow="false"
               trigger="manual"
@@ -86,16 +87,17 @@
                 v-model="textarea2"
                 type="textarea"
                 rows="5"
+                style="width:300px"
                 placeholder="请输入Hold原因（选填）"
               />
               <div style="text-align: right; margin-top: 10px;">
                 <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-                <el-button type="primary" size="mini" @click="visible = false">确定</el-button>
+                <el-button type="primary" size="mini" @click="taskHold(textarea2)">确定</el-button>
               </div>
-              <el-button slot="reference" class="el-btn-size" size="mini" @click="visible = !visible">Hold 任务</el-button>
+              <el-button slot="reference" class="el-btn-size" size="mini" @click="changeBtn">{{ form_query.status === -2 ? HoldTask = '解除 Hold' : HoldTask = 'Hold 任务' }}</el-button>
             </el-popover>
           </div>
-          <timeLine />
+          <timeLine :id="taskId" ref="timeLine" :name="'任务'" />
         </section>
       </el-container>
       <!-- 概览 -->
@@ -325,6 +327,9 @@ import {
   taskUpdate,
   commentCreate,
   commentList,
+  taskHold,
+  taskUnhold,
+  configShowTaskStatusEnum,
   configShowRequirementVersionEnum,
   scheduleGetTaskScheduleHistory
 } from '@/api/taskIndex'
@@ -391,6 +396,7 @@ export default {
     return {
       tabPosition: 'first',
       textarea2: '',
+      HoldTask: '',
       visible: false, // Hold任务
       showunlock: true,
       ScheduId: '', // 排期ID
@@ -497,6 +503,38 @@ export default {
         this.scheduleVisble = true
       }
     },
+
+    changeBtn() {
+      if (this.HoldTask === 'Hold 任务') {
+        this.visible = !this.visible
+        this.textarea2 = ''
+      }
+      if (this.HoldTask === '解除 Hold') {
+        this.taskHold()
+      }
+    },
+
+    async taskHold(val) { // 锁定Hold
+      if (this.HoldTask === 'Hold 任务') {
+        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 })
+        }
+      }
+      if (this.HoldTask === '解除 Hold') {
+        const res = await taskUnhold(this.taskId)
+        if (res.code === 200) {
+          this.taskGet()
+          this.getTaskStatus()
+          this.$refs.timeLine.taskGetWorkFlow()
+          this.$message({ message: 'Hold 状态已解除', type: 'success', duration: 1000, offset: 150 })
+        }
+      }
+    },
     async changeArea(e) { // area修改
       const taskInfoDO = _.cloneDeep(this.form_query)
       const user = {
@@ -524,8 +562,14 @@ 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.allStatus = res.data.taskStatus
         this.taskScheduleEvent = res.data.taskScheduleEvent || []
         this.appClient = res.data.appClient.map(item => {
           return {
@@ -829,7 +873,7 @@ export default {
 </style>
 
 <style>
-.el-popper[x-placement^=bottom] {
+ .el-main-title .el-popper[x-placement^=bottom] {
     margin: 12px 10px 0 0;
     width: 300px;
 }

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

@@ -128,7 +128,7 @@ import TestReport from '@/views/Platform/presentation/Templates/TestReport' //
 import DailyReport from '@/views/Platform/presentation/Templates/DailyReport' // 日报
 import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
 import { taskUpdate } from '@/api/projectViewDetails'
-import { configShowTaskEnum } from '@/api/taskIndex'
+import { configShowTaskEnum, configShowTaskStatusEnum } from '@/api/taskIndex'
 import scheduleList from './scheduleList'
 import modifySchedule from './modifySchedule'
 import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改（已上线/已提测/已准出）
@@ -208,9 +208,12 @@ export default {
     async getTaskStatus() { // 获取任务状态列表
       const res = await configShowTaskEnum()
       if (res.code === 200) {
-        this.allStatus = res.data.taskStatus
         this.taskScheduleEvent = res.data.taskScheduleEvent || []
       }
+      const res1 = await configShowTaskStatusEnum(localStorage.getItem('bizId'))
+      if (res1.code === 200) {
+        this.allStatus = res1.data.taskStatus
+      }
     },
     changeCheck(val) {
       if (val) {

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

@@ -74,7 +74,7 @@ import {
   requirementSelfList,
   requirementTeamList
 } from '@/api/workSchedule'
-import { showRequirementEnum, updateRequirementStatus } from '@/api/requirement'
+import { configShowRequireStatusEnum, updateRequirementStatus } from '@/api/requirement'
 import extraUrgent from '@/assets/extraUrgent.png'
 export default {
   props: {
@@ -139,10 +139,15 @@ export default {
       this.getNeedsList()
     },
     async getTaskStatus() { // 获取需求的所有状态
-      const res = await showRequirementEnum()
-      if (res.code === 200) {
-        this.allStatus = res.data.requirementStatus
+      const res1 = await configShowRequireStatusEnum(localStorage.getItem('bizId'))
+      if (res1.code === 200) {
+        this.allStatus = []
+        this.allStatus = res1.data.requirementStatus
       }
+      // const res = await showRequirementEnum()
+      // if (res.code === 200) {
+      //   this.allStatus = res.data.requirementStatus
+      // }
     },
     async getNeedsList() { // 获取需求列表
       const params = {

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

@@ -127,7 +127,7 @@ import DailyReport from '@/views/Platform/presentation/Templates/DailyReport' //
 import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
 import { taskSelfList, taskTeamList } from '@/api/workSchedule'
 import { taskUpdate } from '@/api/projectViewDetails'
-import { configShowTaskEnum } from '@/api/taskIndex'
+import { configShowTaskEnum, configShowTaskStatusEnum } from '@/api/taskIndex'
 import modifySchedule from '@/views/projectManage/projectList/components/modifySchedule'
 import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改（已上线/已提测/已准出）
 export default {
@@ -235,9 +235,12 @@ export default {
     async getTaskStatus() { // 获取任务状态列表
       const res = await configShowTaskEnum()
       if (res.code === 200) {
-        this.allStatus = res.data.taskStatus
         this.taskScheduleEvent = res.data.taskScheduleEvent || []
       }
+      const res1 = await configShowTaskStatusEnum(localStorage.getItem('bizId'))
+      if (res1.code === 200) {
+        this.allStatus = res1.data.taskStatus
+      }
     },
     changeCheck(val) {
       if (val) {