qinzhipeng_v@didiglobal.com vor 4 Jahren
Ursprung
Commit
48e3218dfc

+ 9 - 1
src/api/projectViewDetails.js

@@ -58,7 +58,15 @@ export function scheduleGet(id) {
 // 任务状态更新
 export function taskUpdate(data) {
   return request({
-    url: TeamManagement + `/task/update`,
+    url: TeamManagement + `/task/updateTaskStatus`,
+    method: 'post',
+    data
+  })
+}
+// 任务状态更新
+export function taskUpdates(data) {
+  return request({
+    url: TeamManagement + `/task/updateTaskStatus`,
     method: 'post',
     data
   })

+ 6 - 4
src/views/projectManage/components/demand.vue

@@ -98,7 +98,9 @@
                   <div v-if="taskDataList.length > 0" class="synchronization">以下任务与该望岳任务也关联,排期将一并同步,请知悉!</div>
                   <div v-for="(item, index) in taskDataList" :key="index" class="Layout_space_between involveApp-top-bottom">
                     <span class="item-detail">{{ item.taskId }}</span>
-                    <span class="item-details">{{ item.name }}</span>
+                    <el-tooltip class="item" effect="dark" :content="item.name" placement="top">
+                      <span class="item-details">{{ item.name.substring(0,12) + '...' }}</span>
+                    </el-tooltip>
                     <span class="item-detail">{{ item.moduleInfoName }}</span>
                   </div>
                   <div align="right" style="margin-top:20px;">
@@ -163,6 +165,7 @@ import scheduleList from '@/views/projectManage/components/scheduleList.vue'
 import '@/styles/PublicStyle/index.scss' // 通用css
 import { configShowTaskStatusEnum } from '@/api/taskIndex'
 import { taskUpdate } from '@/api/taskIndex'
+import { taskUpdates } from '@/api/projectViewDetails'
 import { memberQueryMemberInfoByIDAPorName } from '@/api/projectIndex'
 import schedule from '@/views/projectManage/schedule' // 排期锁定弹窗
 import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改(已上线/已提测/已准出)
@@ -273,7 +276,7 @@ export default {
       }
     },
 
-    async configShowTaskStatusEnum() {
+    async configShowTaskStatusEnum() { // 获取任务下拉数据
       const res = await configShowTaskStatusEnum(localStorage.getItem('bizId'))
       if (res.code === 200) {
         this.allStatus = res.data.taskStatus
@@ -319,7 +322,7 @@ export default {
           id: ''
         }
         const taskInfoDO = e
-        const resTask = await taskUpdate({ taskInfoDO, user })
+        const resTask = await taskUpdates({ taskInfoDO, user })
         if (resTask.code === 200) {
           this.listByTask(this.requirementId)
           this.$message({ message: '修改成功', type: 'success', offset: 150 })
@@ -377,7 +380,6 @@ export default {
     },
     async changeTaskName(val, value, key) { // 修改taskname
       if (value) {
-        console.log(val, value)
         key === 1 ? val.rdOwner = value.idap : ''
         key === 2 ? val.qaOwner = value.idap : ''
       }

+ 16 - 6
src/views/projectManage/requirement/requirementDetail.vue

@@ -387,6 +387,7 @@ Vue.use(VueClipboard)
 import {
   getRequirementById,
   updateRequirementStatus,
+  updateRequirement,
   deleteRequirement,
   showRequirementEnum,
   projectListProject,
@@ -599,7 +600,7 @@ export default {
     setChangeArea() {
       this.$refs.form_query.validate((valid) => {
         if (valid) {
-          this.changeArea()
+          this.changeArea(1)
         } else {
           this.$message({ message: '还有必填项未填写', type: 'error', duration: 1000, offset: 150 })
         }
@@ -618,11 +619,20 @@ export default {
         requirementInfo.referredClientType = requirementInfo.referredClientType.join()
       }
       requirementInfo.status = this.statusValue
-      const res = await updateRequirementStatus(requirementInfo)
-      if (res.code === 200) {
-        this.dialogStatusVisible = false
-        this.getRequirementById()
-        this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
+      if (e === 1) {
+        const res = await updateRequirementStatus(requirementInfo)
+        if (res.code === 200) {
+          this.dialogStatusVisible = false
+          this.getRequirementById()
+          this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
+        }
+      } else {
+        const res = await updateRequirement(requirementInfo)
+        if (res.code === 200) {
+          this.dialogStatusVisible = false
+          this.getRequirementById()
+          this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
+        }
       }
       this.getRequirementById()
     },

+ 2 - 1
src/views/projectManage/taskList/dialog/taskDialog.vue

@@ -23,7 +23,8 @@
 </template>
 
 <script>
-import { taskUpdate, taskGet } from '@/api/taskIndex' // 更新状态接口
+import { taskGet } from '@/api/taskIndex' // 更新状态接口
+import { taskUpdate } from '@/api/projectViewDetails'
 import '@/styles/PublicStyle/index.scss'
 export default {
   name: 'TemplateDialog',

+ 2 - 2
src/views/projectManage/taskList/taskViewDetail.vue

@@ -379,7 +379,7 @@ import {
   configShowRequirementVersionEnum,
   scheduleGetTaskScheduleHistory
 } from '@/api/taskIndex'
-import { listByTask } from '@/api/projectViewDetails'
+import { listByTask, taskUpdates } from '@/api/projectViewDetails'
 import { projectListProject, scheduleGetHistoryScheduleById, taskListAvailableDpmTask, taskSetTaskRelated, taskDeleteRelationship } from '@/api/requirement.js'
 import searchPeople from '@/components/select/searchPeople'
 import textArea from '@/components/input/textArea'
@@ -689,7 +689,7 @@ export default {
         }
         const taskInfoDO = this.form_query
         taskInfoDO.status = e.status
-        const resTask = await taskUpdate({ taskInfoDO, user })
+        const resTask = await taskUpdates({ taskInfoDO, user })
         if (resTask.code === 200) {
           this.$refs.timeLine.taskGetWorkFlow()
           this.$refs.record.operationLogTask()