Skip to content

C
car-database-web
Commit bf0f5e94 authored by 高滢's avatar 高滢
Browse files
Options

feat(评审): 增删改查

parent b42026e4
Show whitespace changes
Inline Side-by-side
Showing with 217 additions and 401 deletions
src/api/task/test.js
View file @ bf0f5e94
...@@ -53,7 +53,7 @@ export function testType(query) { ...@@ -53,7 +53,7 @@ export function testType(query) {
export function testList(query){ export function testList(query){
return request({ return request({
url: '/system/testCase/getUseCaseList', url: '/system/testCase/getUseCaseListNewNew',
method: 'post', method: 'post',
headers:{ headers:{
'Content-Type': 'application/json', 'Content-Type': 'application/json',
...@@ -178,7 +178,7 @@ export function testScene(query) { ...@@ -178,7 +178,7 @@ export function testScene(query) {
// 发起评审页面 获取用例列表 // 发起评审页面 获取用例列表
export function testUseCaseListAll(query) { export function testUseCaseListAll(query) {
return request({ return request({
url: '/system/testCase/getUseCaseList', url: '/system/testCase/getUseCaseListNewNew',
method: 'post', method: 'post',
headers:{ headers:{
'Content-Type': 'application/json', 'Content-Type': 'application/json',
......
src/views/review/createReview/deleteUseCase/index.vue
View file @ bf0f5e94
...@@ -69,38 +69,53 @@ ...@@ -69,38 +69,53 @@
</div> </div>
</div> </div>
</div> </div>
</span>
<collapse>
</collapse>
<collapse-item v-for="(scenario,index) in item.scenarioUseCases" :key="index" :name="scenario.testScenario">
<span slot="title" style="width: 100%">
<div class="standard-box">
<div class="standard-left">
<div class="standard-title">
<div class="standard">测试场景：</div>
{{ scenario.testScenario}}
</div>
</div>
</div>
</span> </span>
<table <table
class="table" class="table"
v-if="item.useCases && item.useCases.length" v-if="scenario.useCases && scenario.useCases.length"
> >
<tr class="tr"> <tr class="tr">
<th>操作</th> <th>操作</th>
<th>用例编号</th> <th>用例编号</th>
<th>用例描述</th> <th>用例描述</th>
</tr> </tr>
<tr <tr v-for="(useCases, key4) in scenario.useCases">
v-for="(item, key4) in item.useCases"> <td @click="selelctData(item,scenario,useCases)">
<td>
<template > <template >
<div> <div>
<el-radio-group v-model="selectedUseCase"> <el-radio-group v-model="selectedUseCase">
<el-radio <el-radio
:label="item" :label="useCases"
class="hidden-lable">选择 class="hidden-lable">选择
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</template> </template>
</td> </td>
<td>{{ item.customizedID }}</td> <td>{{ useCases.customizedID }}</td>
<td> <td>
{{ item.description }} {{ useCases.description }}
</td> </td>
</tr> </tr>
</table> </table>
</collapse-item> </collapse-item>
</collapse-item>
</collapse> </collapse>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -119,7 +134,7 @@ ...@@ -119,7 +134,7 @@
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="标准要求:" prop="biaozhunyaoqiu"> <el-form-item label="标准要求:" prop="biaozhunyaoqiu">
{{ this.selectedUseCase.customizedID.slice(0,-2) }} {{formModel.biaozhunyaoqiu}}
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -130,7 +145,7 @@ ...@@ -130,7 +145,7 @@
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="用例编号:" prop="yonglibianhao" style="color: red;"> <el-form-item label="用例编号:" prop="yonglibianhao" style="color: red;">
{{ this.selectedUseCase.customizedID }} {{ formModel.yonglibianhao}}
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -142,7 +157,7 @@ ...@@ -142,7 +157,7 @@
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="用例描述:" prop="yonglimiaoshu" style="color: red;"> <el-form-item label="用例描述:" prop="yonglimiaoshu" style="color: red;">
{{ this.selectedUseCase.description }} {{ formModel.yonglimiaoshu}}
</el-form-item> </el-col </el-form-item> </el-col
><el-col :span="3"><p></p></el-col> ><el-col :span="3"><p></p></el-col>
</el-row> </el-row>
...@@ -233,9 +248,11 @@ export default { ...@@ -233,9 +248,11 @@ export default {
props: { props: {
formModel: { formModel: {
type: Object, type: Object,
default: () => { default: () => ({
return {} biaozhunyaoqiu: '',
} yonglibianhao: '',
yonglimiaoshu: ''
})
}, },
pageIndexSec: {} pageIndexSec: {}
}, },
...@@ -261,7 +278,6 @@ export default { ...@@ -261,7 +278,6 @@ export default {
newResDataAdd: { newResDataAdd: {
inspectStandardId: '', inspectStandardId: '',
inspectStandardNo: '', inspectStandardNo: '',
operationSort: '',
chapter: '', chapter: '',
standardId: '', standardId: '',
standard: '', standard: '',
...@@ -303,11 +319,7 @@ export default { ...@@ -303,11 +319,7 @@ export default {
text: '' text: ''
}, },
selectedDetailsSave: null, selectedDetailsSave: null,
selectedUseCase:{ selectedUseCase:{},
id: '',
description: '',
customizedID: '',
},
selectedUseCaseSave:null, selectedUseCaseSave:null,
receivedRequirements: {}, receivedRequirements: {},
receivedkeypoints: {}, receivedkeypoints: {},
...@@ -335,22 +347,13 @@ export default { ...@@ -335,22 +347,13 @@ export default {
tiaokuanfenlei: [ tiaokuanfenlei: [
{ required: true, message: '请选择条款分类', trigger: 'change' } { required: true, message: '请选择条款分类', trigger: 'change' }
], ],
// jianyanleixing: [
// { required: true, message: '请选择标准要求', trigger: 'blur' }
// ],
// yonglibianhao: [
// { required: true, message: '请输入用例编号', trigger: 'blur' }
// ],
shenchaxize: [ shenchaxize: [
{ required: true, message: '请输入审查细则', trigger: 'change' } { required: true, message: '请输入审查细则', trigger: 'change' }
], ],
// yonglimiaoshu: [
// { required: true, message: '请输入用例描述', trigger: 'blur' }
// ]
ceshiyongli: [ ceshiyongli: [
{ validator: (rule, value, callback) => { { validator: (rule, value, callback) => {
if (!this.selectedUseCase) { if (!this.selectedUseCase.id) {
callback(new Error('请选择测试用例')) callback(new Error('请选择测试用例'))
} else { } else {
callback() callback()
...@@ -385,6 +388,18 @@ export default { ...@@ -385,6 +388,18 @@ export default {
this.newResData.type = 'car' this.newResData.type = 'car'
}, },
methods: { methods: {
selelctData(item,scenario,useCases){
this.newResDataAdd.standard = item.requirements
this.newResDataAdd.chapter = item.serialNumber
this.newResDataAdd.standardId = item.id
this.newResDataAdd.keypointId = scenario.id
this.newResDataAdd.keypoint = scenario.testScenario
this.formModel.biaozhunyaoqiu = item.requirements
this.formModel.yonglibianhao = useCases.customizedID
this.formModel.yonglimiaoshu =useCases.description
},
//下拉框 选择检验类型 //下拉框 选择检验类型
handleSelectType(selected) { handleSelectType(selected) {
const selectedItem = this.dict.type.sys_scene_type.find( const selectedItem = this.dict.type.sys_scene_type.find(
...@@ -425,88 +440,25 @@ export default { ...@@ -425,88 +440,25 @@ export default {
//这里newResData有type name inspectstandardNo inspectStandardId //这里newResData有type name inspectstandardNo inspectStandardId
this.dialogVisible = false this.dialogVisible = false
}, },
// 按钮-选择标准要求
handleReSelectRequirements() {
// this.newResData.standardNo = this.pageIndexSec.standardNo
// this.newResData.standardId = this.pageIndexSec.id
// this.newResData.name = this.pageIndexSec.name
//根据 inspectStandardId => standard/findStandardList 的id
// inspectStandardNo => standard/findStandardList 的standardNo
// //operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除
// this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
// this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
// this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
// //这里newResData有type name inspectstandardNo inspectStandardId
testType(this.newResData)
.then(response => {
this.receivedRequirements = response
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
this.newResDataAdd.name = this.pageIndexSec.name
this.dialogVisible = true
})
.catch(error => {
console.log('testType方法出错', error)
})
//弹窗展示ReceivedRequirements内容 并且可以选择更改为哪一条标准要求
},
// 按钮-选择标准要求-选中一条标准要求 // 按钮-选择标准要求-选中一条标准要求
handleSelectStandard(selected) {}, handleSelectStandard(selected) {},
// 选择审查要点弹窗确认 // 选择审查要点弹窗确认
submitKeypoints() { submitKeypoints() {
this.dialogVisibleKeypoints = false this.dialogVisibleKeypoints = false
}, },
// 按钮-选择审查要点
handleReSelectKeypoints() {
console.log(
this.newResDataAdd.standardId,
'要使用的this.newResDataAdd.standardId1'
)
testKeypoint({ standardId: this.newResDataAdd.standardId })
.then(response => {
this.receivedkeypoints = response
//keypointId => /review/scene/change/task/getKeyPointList
//keypoint => /review/scene/change/task/getKeyPointList
this.newResDataAdd.keypointId = this.receivedkeypoints.keypointId
this.newResDataAdd.keypoint = this.receivedkeypoints.keypoint
this.dialogVisibleKeypoints = true
})
.catch(error => {
console.log('testKeypoint方法出错', error)
})
},
// 选择审查细则弹窗确认D // 选择审查细则弹窗确认D
submitDetails() { submitDetails() {
this.dialogVisibleDetails = false this.dialogVisibleDetails = false
},
// 按钮-选择审查细则
handleReSelectDetails() {
testDetails({ keypointId: this.newResDataAdd.keypointId })
.then(response => {
this.receivedDetails = response
//detailsId => /review/scene/change/task/getDetailsList
//details => /review/scene/change/task/getDetailsList
this.newResDataAdd.detailsId = this.receivedDetails.detailsId
this.newResDataAdd.details = this.receivedDetails.details
this.dialogVisibleDetails = true
})
.catch(error => {
console.log('testDetails方法出错', error)
})
//oldText => 不用填直接为默认的‘’就行
//reviewSceneId => 不用填直接默认不给值就行，
}, },
// 按钮-选择测试用例 // 按钮-选择测试用例
handleSelectUseCase() { handleSelectUseCase() {
this.dialogVisibleUseCase = true this.dialogVisibleUseCase = true
testUseCaseListAll({ testUseCaseListAll({
searchFields:{
serialNumber:'',
requirements:''
},
offset: { offset: {
offset: 0, offset: 0,
limit: 9999 limit: 9999
...@@ -524,25 +476,6 @@ export default { ...@@ -524,25 +476,6 @@ export default {
// 按钮-确认发起 // 按钮-确认发起
handleConfirm() { handleConfirm() {
console.log('this.value = ', this.formModel) console.log('this.value = ', this.formModel)
testList({
offset: {
offset: 0,
limit: 100
},
name: this.pageIndexSec.name
}).then(res=>{
let useCase = {}
console.log(res.data.useCases)
forEach(res.data.useCases, item=>{
forEach(item.useCases,cases=>{
if(cases.id == this.selectedUseCase.id){
useCase = item
return
}
})
})
this.newResDataAdd.chapter = useCase.serialNumber
this.newResDataAdd.standard = useCase.requirements
if(this.selectedDetailsSave){ if(this.selectedDetailsSave){
this.newResDataAdd.details = this.selectedDetailsSave.text this.newResDataAdd.details = this.selectedDetailsSave.text
} }
...@@ -553,21 +486,16 @@ export default { ...@@ -553,21 +486,16 @@ export default {
if(this.selectedKeyPointsSave){ if(this.selectedKeyPointsSave){
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
} }
this.newReviewSceneRemark = this.formModel.beizhuxinxi this.newReviewSceneRemark = this.formModel.beizhuxinxi
this.newResDataAdd.reviewUsecaseId = this.selectedUseCase.id
this.newResDataAdd.usecaseId = this.selectedUseCase.customizedID
this.newResDataAdd.newText = this.selectedUseCase.customizedID this.newResDataAdd.newText = this.selectedUseCase.customizedID
this.newResDataAdd.remark = this.newReviewSceneRemark this.newResDataAdd.remark = this.newReviewSceneRemark
this.newResDataAdd.type = 'test' this.newResDataAdd.type = 'test'
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
this.newResDataAdd.usecaseId = this.selectedUseCase.customizedID
this.newResDataAdd.reviewUsecaseId = this.selectedUseCase.id
this.newResDataAdd.usecaseDescribe = this.selectedUseCase.description this.newResDataAdd.usecaseDescribe = this.selectedUseCase.description
console.log(this.newResDataAdd, '提交之前') console.log(this.newResDataAdd, '提交之前')
this.$refs.formItemName.validate(valid =>{ this.$refs.formItemName.validate(valid =>{
if(valid){ if(valid){
...@@ -597,13 +525,6 @@ export default { ...@@ -597,13 +525,6 @@ export default {
// }) // })
} }
}) })
//newText => 由填写的时候赋值
//remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText
// this.newResDataAdd.remark = remark
})
} }
}, },
watch: { watch: {
......
src/views/review/createReview/index.vue
View file @ bf0f5e94
...@@ -426,21 +426,6 @@ export default { ...@@ -426,21 +426,6 @@ export default {
console.error('testInitatereview接口出错', error) console.error('testInitatereview接口出错', error)
}) })
}, },
// vif0 下拉框选择标准
// handleSelectStandard(selected) {
// this.selectedItem = this.standardList.find(
// item => item.id === selected
// )
// if (this.selectedItem) {
// // 将 item.name 赋值给 this.pageIndexSec.name
// this.pageIndexSec.name = this.selectedItem.name
// this.pageIndexSec.inspectStandardId = this.selectedItem.id
// this.pageIndexSec.standardNo = this.selectedItem.standardNo
// } else {
// console.log('赋值给 this.pageIndexSec.name时出现问题')
// }
// },
handleSelectStandard(selected) { handleSelectStandard(selected) {
console.log(selected, "handleSelectStandard selected"); console.log(selected, "handleSelectStandard selected");
......
src/views/review/createReview/newUseCase/index.vue
View file @ bf0f5e94
...@@ -54,38 +54,51 @@ ...@@ -54,38 +54,51 @@
<div> <div>
<!-- 选择标准要求弹窗 --> <!-- 选择标准要求弹窗 -->
<el-dialog title="" :visible.sync="dialogVisible" width="70%"> <el-dialog title="" :visible.sync="dialogVisible" width="70%">
<!-- 表格 -->
<el-table <collapse v-model="activeNames" class="mt10">
:data="tableData" <collapse-item
style="width: 100%" v-for="(item, key3) in tableData"
:key="key3"
:name="item.serialNumber"
>
<span slot="title" style="width: 100%">
<div class="standard-box">
<div class="standard-left">
<div class="standard-title">
<div class="standard">标准要求：</div>
{{ item.serialNumber + item.requirements }}
</div>
</div>
</div>
</span>
<table
class="table"
v-if="item.scenarioUseCases && item.scenarioUseCases.length"
> >
<el-table-column label="选择" width="50"> <tr class="tr">
<template slot-scope="scope"> <th>操作</th>
<th>测试场景</th>
</tr>
<tr v-for="(scenario, key4) in item.scenarioUseCases">
<td @click="selelctData(item)">
<template>
<div>
<el-radio-group v-model="selectedRequirement"> <el-radio-group v-model="selectedRequirement">
<el-radio <el-radio
:label="scope.row" :label="scenario"
class="hidden-lable" class="hidden-lable"
></el-radio> >选择
</el-radio>
</el-radio-group> </el-radio-group>
</div>
</template> </template>
</el-table-column> </td>
<el-table-column prop="serialNumber" label="标准章节" width="100"> <td>{{ scenario.testScenario }}</td>
</el-table-column> </tr>
</table>
<el-table-column prop="requirements" label="标准要求"> </collapse-item>
</el-table-column> </collapse>
<!-- <el-table-column prop="testMethod" label="测试方法">
</el-table-column> -->
<!-- <el-table-column prop="name" label="标准名称">
</el-table-column>
<el-table-column prop="standardNo" label="标准号">
</el-table-column> -->
</el-table>
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" plain @click="dialogVisible = false" <el-button type="primary" plain @click="dialogVisible = false"
>确认</el-button >确认</el-button
...@@ -206,9 +219,15 @@ import { ...@@ -206,9 +219,15 @@ import {
testInitatereviewAdd, testInitatereviewAdd,
testReviewer testReviewer
} from '@/api/task/test' } from '@/api/task/test'
import collapse from "@/components/Collapse/collapse.vue";
import collapseItem from "@/components/Collapse/collapse-item.vue";
export default { export default {
name: 'ReviewData', name: 'ReviewData',
components: {
collapse: collapse,
'collapse-item': collapseItem
},
dicts: ['sys_scene_type'], dicts: ['sys_scene_type'],
props: { props: {
...@@ -222,6 +241,7 @@ export default { ...@@ -222,6 +241,7 @@ export default {
}, },
data() { data() {
return { return {
activeNames: [],
standardId: '', standardId: '',
keypointId: '', keypointId: '',
detailsId: '', detailsId: '',
...@@ -257,12 +277,10 @@ export default { ...@@ -257,12 +277,10 @@ export default {
standardId: '', standardId: '',
standard: '', standard: '',
type: '', type: '',
keypointId: '', keypointId: '',
keypoint: '', keypoint: '',
detailsId: '', detailsId: '',
details: '', details: '',
operationSort: '',
oldText: '', oldText: '',
newText: '', newText: '',
remark: '', remark: '',
...@@ -275,11 +293,7 @@ export default { ...@@ -275,11 +293,7 @@ export default {
}, },
selectedRequirement: { selectedRequirement: {
id: '', id: '',
chapter: '', testScenario:''
text: '',
testMethod: '',
name: '',
standardNo: ''
}, },
selectedRequirementSave: {}, selectedRequirementSave: {},
selectedKeyPoints: { selectedKeyPoints: {
...@@ -311,7 +325,7 @@ export default { ...@@ -311,7 +325,7 @@ export default {
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值 // 检查 selectedRequirement.text 是否有值
if (!this.selectedRequirement.requirements) { if (!this.selectedRequirement.id) {
callback(new Error('请选择标准要求')) callback(new Error('请选择标准要求'))
} else { } else {
callback() callback()
...@@ -385,6 +399,11 @@ export default { ...@@ -385,6 +399,11 @@ export default {
this.newResData.name = this.pageIndexSec.name this.newResData.name = this.pageIndexSec.name
}, },
methods: { methods: {
selelctData(data){
this.newResDataAdd.standardId = data.id
this.newResDataAdd.standard = data.requirements
this.newResDataAdd.chapter = data.serialNumber
},
//下拉框 选择检验类型 //下拉框 选择检验类型
handleSelectType(selected) { handleSelectType(selected) {
const selectedItem = this.dict.type.sys_scene_type.find( const selectedItem = this.dict.type.sys_scene_type.find(
...@@ -411,33 +430,20 @@ export default { ...@@ -411,33 +430,20 @@ export default {
}, },
// 选择标准要求弹窗确认 // 选择标准要求弹窗确认
submitRequirement() { submitRequirement() {
// this.newResData.standardNo = this.pageIndexSec.standardNo
// this.newResData.standardId = this.pageIndexSec.id
// this.newResData.name = this.pageIndexSec.name
//根据 inspectStandardId => standard/findStandardList 的id
// inspectStandardNo => standard/findStandardList 的standardNo
//operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
console.log(this.newResData, '选择标准要求弹窗确认newResData') console.log(this.newResData, '选择标准要求弹窗确认newResData')
console.log(this.newResDataAdd, '选择标准要求弹窗确认newResDataAdd') console.log(this.newResDataAdd, '选择标准要求弹窗确认newResDataAdd')
//这里newResData有type name inspectstandardNo inspectStandardId
this.dialogVisible = false this.dialogVisible = false
}, },
// 按钮-选择标准要求 // 按钮-选择标准要求
handleReSelectRequirements() { handleReSelectRequirements() {
// this.newResData.standardNo = this.pageIndexSec.standardNo
// this.newResData.standardId = this.pageIndexSec.id
// this.newResData.name = this.pageIndexSec.name
//根据 inspectStandardId => standard/findStandardList 的id
// inspectStandardNo => standard/findStandardList 的standardNo
// //operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除
// this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
// this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
// this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
// //这里newResData有type name inspectstandardNo inspectStandardId
testList({ testList({
searchFields:{
serialNumber:'',
requirements:''
},
offset: { offset: {
offset: 0, offset: 0,
limit: 100 limit: 100
...@@ -519,8 +525,8 @@ export default { ...@@ -519,8 +525,8 @@ export default {
this.newResDataAdd.name = this.pageIndexSec.name this.newResDataAdd.name = this.pageIndexSec.name
this.newResDataAdd.usecaseId = this.formModel.yonglibianhao this.newResDataAdd.usecaseId = this.formModel.yonglibianhao
this.newResDataAdd.usecaseDescribe = this.formModel.yonglimiaoshu this.newResDataAdd.usecaseDescribe = this.formModel.yonglimiaoshu
this.newResDataAdd.standard = this.selectedRequirement.requirements this.newResDataAdd.keypointId = this.selectedRequirement.id
this.newResDataAdd.chapter = this.selectedRequirement.serialNumber this.newResDataAdd.keypoint = this.selectedRequirement.testScenario
this.newResDataAdd.reviewUsecaseId = '' this.newResDataAdd.reviewUsecaseId = ''
this.newResDataAdd.type = 'test' this.newResDataAdd.type = 'test'
......
src/views/review/createReview/updateUseCase/index.vue
View file @ bf0f5e94
...@@ -61,10 +61,24 @@ ...@@ -61,10 +61,24 @@
</div> </div>
</div> </div>
</div> </div>
</span>
<collapse>
</collapse>
<collapse-item v-for="(scenario,index) in item.scenarioUseCases" :key="index" :name="scenario.testScenario">
<span slot="title" style="width: 100%">
<div class="standard-box">
<div class="standard-left">
<div class="standard-title">
<div class="standard">测试场景：</div>
{{ scenario.testScenario}}
</div>
</div>
</div>
</span> </span>
<table <table
class="table" class="table"
v-if="item.useCases && item.useCases.length" v-if="scenario.useCases && scenario.useCases.length"
> >
<tr class="tr"> <tr class="tr">
<th>操作</th> <th>操作</th>
...@@ -72,31 +86,32 @@ ...@@ -72,31 +86,32 @@
<th>用例描述</th> <th>用例描述</th>
</tr> </tr>
<tr v-for="(item, key4) in item.useCases"> <tr v-for="(useCases, key4) in scenario.useCases">
<td> <td @click="selelctData(item,scenario,useCases)">
<template > <template >
<div> <div>
<el-radio-group v-model="selectedUseCase"> <el-radio-group v-model="selectedUseCase">
<el-radio <el-radio
:label="item" :label="useCases"
class="hidden-lable">选择 class="hidden-lable">选择
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
</template> </template>
</td> </td>
<td>{{ item.customizedID }}</td> <td>{{ useCases.customizedID }}</td>
<td> <td>
{{ item.description }} {{ useCases.description }}
</td> </td>
</tr> </tr>
</table> </table>
</collapse-item> </collapse-item>
</collapse-item>
</collapse> </collapse>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" plain @click="handleSelectedUseCase()" <el-button type="primary" plain @click="dialogVisibleUseCase = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -278,7 +293,6 @@ export default { ...@@ -278,7 +293,6 @@ export default {
keypoint: '', keypoint: '',
detailsId: '', detailsId: '',
details: '', details: '',
operationSort: '',
oldText: '', oldText: '',
newText: '', newText: '',
remark: '', remark: '',
...@@ -377,24 +391,10 @@ export default { ...@@ -377,24 +391,10 @@ export default {
required: true required: true
} }
], ],
shenchachangjing: [
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedScene.text) {
callback(new Error('请选择审查场景'))
} else {
callback()
}
},
trigger: 'change',
required: true
}
],
ceshiyongli: [ ceshiyongli: [
{ validator: (rule, value, callback) => { { validator: (rule, value, callback) => {
if (!this.selectedUseCase) { if (!this.selectedUseCase.id) {
callback(new Error('请选择测试用例')) callback(new Error('请选择测试用例'))
} else { } else {
callback() callback()
...@@ -444,6 +444,18 @@ export default { ...@@ -444,6 +444,18 @@ export default {
console.log(this.newResData, 'this.newResData 的值2') console.log(this.newResData, 'this.newResData 的值2')
}, },
methods: { methods: {
selelctData(item,scenario,useCases){
this.newResDataAdd.standard = item.requirements
this.newResDataAdd.chapter = item.serialNumber
this.newResDataAdd.standardId = item.id
this.newResDataAdd.keypointId = scenario.id
this.newResDataAdd.keypoint = scenario.testScenario
this.formModel.biaozhunyaoqiu = item.requirements
this.formModel.yonglibianhao = useCases.customizedID
this.formModel.yonglimiaoshu =useCases.description
},
//下拉框 选择检验类型 //下拉框 选择检验类型
handleSelectType(selected) { handleSelectType(selected) {
const selectedItem = this.dict.type.sys_scene_type.find( const selectedItem = this.dict.type.sys_scene_type.find(
...@@ -469,103 +481,25 @@ export default { ...@@ -469,103 +481,25 @@ export default {
console.log('赋值给 this.newResData.type时出现问题') console.log('赋值给 this.newResData.type时出现问题')
} }
}, },
// 选择标准要求弹窗确认
submitRequirement() {
this.newResData.standardNo = this.pageIndexSec.standardNo
this.newResData.standardId = this.pageIndexSec.id
this.newResData.name = this.pageIndexSec.name
//根据 inspectStandardId => standard/findStandardList 的id
// inspectStandardNo => standard/findStandardList 的standardNo
//operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
console.log(this.newResData, '选择标准要求弹窗确认newResData')
console.log(this.newResDataAdd, '选择标准要求弹窗确认newResDataAdd')
//这里newResData有type name inspectstandardNo inspectStandardId
this.dialogVisible = false
},
// 按钮-选择标准要求
handleReSelectRequirements() {
// this.newResData.standardNo = this.pageIndexSec.standardNo
// this.newResData.standardId = this.pageIndexSec.id
// this.newResData.name = this.pageIndexSec.name
//根据 inspectStandardId => standard/findStandardList 的id
// inspectStandardNo => standard/findStandardList 的standardNo
// //operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除
// this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
// this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
// this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
// //这里newResData有type name inspectstandardNo inspectStandardId
testType(this.newResData)
.then(response => {
this.receivedRequirements = response
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
this.dialogVisible = true
})
.catch(error => {
console.log('testType方法出错', error)
})
//弹窗展示ReceivedRequirements内容 并且可以选择更改为哪一条标准要求
},
// 按钮-选择标准要求-选中一条标准要求 // 按钮-选择标准要求-选中一条标准要求
handleSelectStandard(selected) {}, handleSelectStandard(selected) {},
// 选择审查要点弹窗确认 // 选择审查要点弹窗确认
submitKeypoints() { submitKeypoints() {
this.dialogVisibleKeypoints = false this.dialogVisibleKeypoints = false
}, },
// 按钮-选择审查要点
handleReSelectKeypoints() {
console.log(
this.newResDataAdd.standardId,
'要使用的this.newResDataAdd.standardId1'
)
testKeypoint({ standardId: this.newResDataAdd.standardId })
.then(response => {
this.receivedkeypoints = response
//keypointId => /review/scene/change/task/getKeyPointList
//keypoint => /review/scene/change/task/getKeyPointList
this.newResDataAdd.keypointId = this.receivedkeypoints.keypointId
this.newResDataAdd.keypoint = this.receivedkeypoints.keypoint
this.dialogVisibleKeypoints = true
})
.catch(error => {
console.log('testKeypoint方法出错', error)
})
},
// 选择审查细则弹窗确认D // 选择审查细则弹窗确认D
submitDetails() { submitDetails() {
this.dialogVisibleDetails = false this.dialogVisibleDetails = false
}, },
// 按钮-选择审查细则
handleReSelectDetails() {
testDetails({ keypointId: this.newResDataAdd.keypointId })
.then(response => {
this.receivedDetails = response
//detailsId => /review/scene/change/task/getDetailsList
//details => /review/scene/change/task/getDetailsList
this.newResDataAdd.detailsId = this.receivedDetails.detailsId
this.newResDataAdd.details = this.receivedDetails.details
this.dialogVisibleDetails = true
})
.catch(error => {
console.log('testDetails方法出错', error)
})
//oldText => 不用填直接为默认的‘’就行
//reviewSceneId => 不用填直接默认不给值就行，
},
// 按钮-选择测试用例 // 按钮-选择测试用例
handleSelectUseCase() { handleSelectUseCase() {
this.dialogVisibleUseCase = true this.dialogVisibleUseCase = true
testUseCaseListAll({ testUseCaseListAll({
searchFields:{
serialNumber:'',
requirements:''
},
offset: { offset: {
offset: 0, offset: 0,
limit: 9999 limit: 9999
...@@ -580,36 +514,8 @@ export default { ...@@ -580,36 +514,8 @@ export default {
console.log('testUseCase方法出错', error) console.log('testUseCase方法出错', error)
}) })
}, },
// 按钮-确认选择测试用例
handleSelectedUseCase() {
testList({
offset: {
offset: 0,
limit: 100
},
name: this.pageIndexSec.name
}).then(res=>{
let useCase = {}
forEach(res.data.useCases, item=>{
forEach(item.useCases,cases=>{
if(cases.id == this.selectedUseCase.id){
useCase = item
return
}
})
})
this.dialogVisibleUseCase = false
this.useCaseObj = useCase
this.formModel.biaozhunyaoqiu = useCase.serialNumber + useCase.requirements
this.formModel.yonglibianhao = this.selectedUseCase.customizedID
this.formModel.yonglimiaoshu = this.selectedUseCase.description
})
},
// 按钮-确认发起 // 按钮-确认发起
handleConfirm() { handleConfirm() {
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.name = this.pageIndexSec.name this.newResDataAdd.name = this.pageIndexSec.name
if(this.selectedDetailsSave){ if(this.selectedDetailsSave){
this.newResDataAdd.details = this.selectedDetailsSave.text this.newResDataAdd.details = this.selectedDetailsSave.text
...@@ -626,17 +532,15 @@ export default { ...@@ -626,17 +532,15 @@ export default {
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
this.newReviewSceneRemark = this.formModel.beizhuxinxi this.newReviewSceneRemark = this.formModel.beizhuxinxi
this.newResDataAdd.standard = this.formModel.biaozhunyaoqiu
this.newResDataAdd.chapter = this.useCaseObj.serialNumber this.newResDataAdd.usecaseId = this.formModel.yonglibianhao
this.newResDataAdd.standard = this.useCaseObj.requirements
this.newResDataAdd.reviewUsecaseId = this.selectedUseCase.id this.newResDataAdd.reviewUsecaseId = this.selectedUseCase.id
this.newResDataAdd.usecaseDescribe = this.formModel.yonglimiaoshu
this.newResDataAdd.newText = this.formModel.yonglibianhao this.newResDataAdd.newText = this.formModel.yonglibianhao
this.newResDataAdd.remark = this.newReviewSceneRemark this.newResDataAdd.remark = this.newReviewSceneRemark
this.newResDataAdd.type= 'test' this.newResDataAdd.type= 'test'
this.newResDataAdd.usecaseId = this.formModel.yonglibianhao
this.newResDataAdd.usecaseDescribe = this.formModel.yonglimiaoshu
console.log(this.formModel) console.log(this.formModel)
// this.newResDataAdd.reviewUsecaseId = '' // this.newResDataAdd.reviewUsecaseId = ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment