|
@@ -46,8 +46,8 @@
|
|
|
<el-dropdown-item
|
|
|
v-for="item in demandList"
|
|
|
:key="item.value"
|
|
|
- :command="{ value: item.id, label: item.name, flag: 4 }"
|
|
|
- >{{ item.name }}</el-dropdown-item>
|
|
|
+ :command="{ value: item.code, label: item.msg, flag: 4 }"
|
|
|
+ >{{ item.msg }}</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
<el-dropdown @command="handleCommand">
|
|
@@ -223,18 +223,18 @@
|
|
|
<template slot-scope="scope">{{ scope.row.noTestString }}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="开发负责人" min-width="80" align="center">
|
|
|
- <template slot-scope="scope">{{ scope.row.rdOwner }}</template>
|
|
|
+ <template slot-scope="scope">{{ scope.row.rdObject !== null? scope.row.rdObject.name: '' }}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="测试负责人" min-width="80" align="center">
|
|
|
- <template slot-scope="scope">{{ scope.row.qaOwner }}</template>
|
|
|
+ <template slot-scope="scope">{{ scope.row.qaObject !== null?scope.row.qaObject.name: '' }}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="开发" min-width="80" align="center">
|
|
|
+ <el-table-column label="开发" min-width="80" align="center" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">{{ scope.row.rdList }}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="测试" min-width="100" align="center">
|
|
|
+ <el-table-column label="测试" min-width="100" align="center" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">{{ scope.row.qaList }}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="创建日期" min-width="120" align="center">
|
|
|
+ <el-table-column label="创建日期" min-width="120" align="center" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">{{ scope.row.createTime }}</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -263,7 +263,7 @@ import {
|
|
|
configShowTaskEnum,
|
|
|
settingGetTypeMap,
|
|
|
memberQueryMemberInfoByIDAPorName,
|
|
|
- requirementQueryRequirementInfoList,
|
|
|
+ configShowRequirementVersionEnum,
|
|
|
taskIdAndName,
|
|
|
projectList
|
|
|
} from '@/api/taskIndex' // ajax
|
|
@@ -343,10 +343,10 @@ export default {
|
|
|
// 获取项目(查询)
|
|
|
this.projectList = res.data
|
|
|
})
|
|
|
- requirementQueryRequirementInfoList({ curIndex: 1, pageSize: 15 }).then(
|
|
|
+ configShowRequirementVersionEnum('').then(
|
|
|
res => {
|
|
|
// 获取需求(查询)
|
|
|
- this.demandList = res.data.list
|
|
|
+ this.demandList = res.data.belongingRequire
|
|
|
}
|
|
|
)
|
|
|
},
|
|
@@ -390,13 +390,10 @@ export default {
|
|
|
case 3:
|
|
|
this.form_task.project_label = command.label
|
|
|
this.form_task_number.project = command.value
|
|
|
- requirementQueryRequirementInfoList({
|
|
|
- id: this.form_task_number.project,
|
|
|
- curIndex: 1,
|
|
|
- pageSize: 15
|
|
|
- }).then(res => {
|
|
|
+ console.log(command.value, 'cdcsdcdsc')
|
|
|
+ configShowRequirementVersionEnum(Number(command.value)).then(res => {
|
|
|
// 获取需求(查询)
|
|
|
- this.demandList = res.data.list
|
|
|
+ this.demandList = res.data.belongingRequire
|
|
|
})
|
|
|
break
|
|
|
case 4:
|
|
@@ -526,6 +523,7 @@ export default {
|
|
|
|
|
|
.el-dropdown-menu {
|
|
|
max-height: 300px !important;
|
|
|
- overflow: auto !important;
|
|
|
+ max-width: 20%;
|
|
|
+ overflow-x: auto;
|
|
|
}
|
|
|
</style>
|