Skip to content

C
car-database-web
Commit 991445cd authored by zhang's avatar zhang
Browse files
Options

Merge branch 'master' of http://gitlab.91isoft.com:90/car-database/car-database-web

parents 8439cd9c ccf3444c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 873 additions and 326 deletions
src/views/review/createReview/deleteReviewKeypoints/index.vue
View file @ 991445cd
......@@ -3,6 +3,7 @@
<el-form
:model="formModel"
:rules="formRules"
ref="formItemName"
label-width="200px"
label-position="top"
>
......@@ -16,13 +17,13 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="检验类型" prop="biaozhuntiuaokuan">
<el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
<el-select
form-rules="biaozhuntiuaokuan"
v-model="formModel.tiaokuanfenlei"
form-rules="jianyanleixing"
v-model="formModel.jianyanleixing"
style="width: 421px"
clearable
@change="handleSelectType(formModel.tiaokuanfenlei)"
@change="handleSelectType(formModel.jianyanleixing)"
>
<el-option
v-for="dict in dict.type.sys_scene_type"
......@@ -38,7 +39,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="标准要求" prop="biaozhuntiuaokuan">
<el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button
><span>
......@@ -93,7 +94,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="审查要点" prop="shenchayaodian">
<el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
<el-button type="primary" plain @click="handleReSelectKeypoints"
>选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span>
......@@ -307,20 +308,53 @@ export default {
newReviewKeypointText:'',
newReviewDetailText:'',
formRules: {
tiaokuanfenlei: [
{ required: true, message: '请选择条款分类', trigger: 'blur' }
jianyanleixing: [
{ required: true, message: '请选择检验类型', trigger: 'change' }
],
biaozhuntiuaokuan: [
{ required: true, message: '请选择标准条款', trigger: 'blur' }
biaozhunyaoqiu: [
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedRequirement.text) {
callback(new Error('请选择标准要求'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
shenchayaodian: [
{ required: true, message: '请输入审查要点', trigger: 'blur' }
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedKeyPoints.text) {
callback(new Error('请选择审查要点'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
shenchaxize: [
{ required: true, message: '请输入审查细则', trigger: 'blur' }
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedDetails.text) {
callback(new Error('请选择审查细则'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
shenchachangjing: [
{ required: true, message: '请输入审查场景', trigger: 'blur' }
{ required: true, message: '请填写审查场景', trigger: 'change' }
]
}
}
......@@ -462,6 +496,7 @@ export default {
console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.details = this.newReviewDetailText
......@@ -472,9 +507,14 @@ export default {
this.newResDataAdd.remark = this.newReviewSceneRemark
// this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
if(this.selectedKeyPointsSave){
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
}
console.log(this.newResDataAdd.inspectStandardId, '提交之前')
testInitatereviewAdd(this.newResDataAdd)
this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => {
const aa = response
if (aa) {
......@@ -493,6 +533,14 @@ export default {
console.log('testInitatereviewAdd方法出错', error)
})
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值
//remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText
......
src/views/review/createReview/index.vue
View file @ 991445cd
......@@ -340,7 +340,6 @@ import DeleteScene from './deleteReviewScene'
import UseCase from './newUseCase'
import DeleteUseCase from './deleteUseCase'
import UpdateUseCase from './updateUseCase'
import { testInitatereview } from '@/api/task/test'
export default {
......@@ -376,7 +375,10 @@ export default {
formModel: {
ask: '1',
reviewType: '0',
reviewSubtype: '0'
reviewSubtype: '0',
biaozhunyaoqiu: '',
yonglibianhao: '',
yonglimiaoshu: ''
// pageNum: 1,
// pageSize: 10,
// standardNo: '',
......
src/views/review/createReview/newReviewDetails/index.vue
View file @ 991445cd
......@@ -3,6 +3,7 @@
<el-form
:model="formModel"
:rules="formRules"
ref="formItemName"
label-width="200px"
label-position="top"
>
......@@ -16,13 +17,13 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="检验类型" prop="biaozhunyaoqiu">
<el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
<el-select
form-rules="biaozhunyaoqiu"
v-model="formModel.biaozhunyaoqiu"
form-rules="jianyanleixing"
v-model="formModel.jianyanleixing"
style="width: 421px"
clearable
@change="handleSelectType(formModel.biaozhunyaoqiu)"
@change="handleSelectType(formModel.jianyanleixing)"
>
<el-option
v-for="dict in dict.type.sys_scene_type"
......@@ -38,7 +39,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="标准要求" prop="biaozhuntiuaokuan">
<el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button
><span>
......@@ -325,17 +326,42 @@
newReviewSceneText:'',
newReviewSceneRemark:'',
formRules: {
biaozhunyaoqiu: [
{ required: true, message: '请选择检验类型', trigger: 'blur' }
],
jianyanleixing: [
{ required: true, message: '请选择检验类型', trigger: 'change' }
],
biaozhunyaoqiu: [
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedRequirement.text) {
callback(new Error('请选择标准要求'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
shenchayaodian: [
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedKeyPoints.text) {
callback(new Error('请选择审查要点'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
biaozhuntiuaokuan: [
{ required: true, message: '请选择标准要求', trigger: 'blur' }
],
shenchayaodian: [
{ required: true, message: '请输入审查要点', trigger: 'blur' }
{ required: true, message: '请选择标准要求', trigger: 'change' }
],
shenchaxize: [
{ required: true, message: '请输入审查细则', trigger: 'blur' }
{ required: true, message: '请输入审查细则', trigger: 'change' }
],
// shenchachangjing: [
// { required: true, message: '请输入审查场景', trigger: 'blur' }
......@@ -480,18 +506,25 @@
console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
if(this.selectedKeyPointsSave){
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
}
this.newResDataAdd.newText = this.formModel.shenchaxize
this.newReviewSceneRemark = this.formModel.beizhuxinxi
this.newResDataAdd.details = this.formModel.shenchaxize
this.newResDataAdd.remark = this.newReviewSceneRemark
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
if(this.pageIndexSec){
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
}
console.log(this.newResDataAdd,'提交之前')
testInitatereviewAdd(this.newResDataAdd)
this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => {
const aa = response
if (aa) {
......@@ -510,6 +543,14 @@
console.log('testInitatereviewAdd方法出错', error)
})
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值
//remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText
......
src/views/review/createReview/newReviewKeypoints/index.vue
View file @ 991445cd
......@@ -17,13 +17,13 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="检验类型" prop="biaozhunyaoqiu">
<el-form-item label="检验类型" prop="jianyanleixing">
<el-select
form-rules="biaozhunyaoqiu"
v-model="formModel.biaozhunyaoqiu"
form-rules="jianyanleixing"
v-model="formModel.jianyanleixing"
style="width: 421px"
clearable
@change="handleSelectType(formModel.biaozhunyaoqiu)"
@change="handleSelectType(formModel.jianyanleixing)"
>
<el-option
v-for="dict in dict.type.sys_scene_type"
......@@ -39,7 +39,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="标准要求" prop="biaozhuntiaokuan">
<el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button
><span>
......@@ -289,17 +289,42 @@ export default {
shenchachangjing: ''
},
formRules: {
jianyanleixing: [
{ required: true, message: '请选择检验类型', trigger: 'change' }
],
biaozhunyaoqiu: [
{ required: true, message: '请选择检验类型', trigger: 'blur' }
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedRequirement.text) {
callback(new Error('请选择标准要求'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
biaozhuntiaokuan: [
{ required: true, message: '请选择标准要求', trigger: 'blur' }
],
shenchayaodian: [
{ required: true, message: '请输入审查要点', trigger: 'blur' }
{
message:'请填写审查要点',
trigger: 'change',
required: true
}
],
shenchaxize: [
{ required: true, message: '请输入审查细则', trigger: 'blur' }
{
message:'请填写审查细则',
trigger: 'change',
required: true
}
],
shenchachangjing: [
{ required: true, message: '请输入审查场景', trigger: 'change' }
]
// shenchachangjing: [
// { required: true, message: '请输入审查场景', trigger: 'blur' }
......@@ -465,7 +490,9 @@ export default {
// this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
console.log(this.newResDataAdd.inspectStandardId, '提交之前')
testInitatereviewAdd(this.newResDataAdd)
this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => {
const aa = response
if (aa) {
......@@ -484,6 +511,14 @@ export default {
console.log('testInitatereviewAdd方法出错', error)
})
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值
//remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText
......
src/views/review/createReview/newReviewScene/index.vue
View file @ 991445cd
......@@ -17,13 +17,13 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="检验类型" prop="biaozhuntiuaokuan">
<el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
<el-select
form-rules="biaozhuntiuaokuan"
v-model="formModel.tiaokuanfenlei"
form-rules="jianyanleixing"
v-model="formModel.jianyanleixing"
style="width: 421px"
clearable
@change="handleSelectType(formModel.tiaokuanfenlei)"
@change="handleSelectType(formModel.jianyanleixing)"
>
<el-option
v-for="dict in dict.type.sys_scene_type"
......@@ -39,7 +39,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="标准要求" prop="biaozhuntiuaokuan">
<el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button
><span>
......@@ -94,7 +94,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="审查要点" prop="shenchayaodian">
<el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
<el-button type="primary" plain @click="handleReSelectKeypoints"
>选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span>
......@@ -142,7 +142,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="审查细则" prop="shenchaxize">
<el-form-item label="审查细则" prop="shenchaxize" v-model="formModel.shenchaxize">
<el-button type="primary" plain @click="handleReSelectDetails"
>选择审查细则</el-button
><span>{{ selectedDetails.text }}</span>
......@@ -198,7 +198,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="8">
<el-form-item label="审查场景" prop="shenchachangjing">
<el-form-item label="审查场景" prop="shenchachangjing" v-model="formModel.shenchachangjing">
<el-input
v-model="formModel.shenchachangjing"
type="textarea"
......@@ -366,20 +366,53 @@ export default {
newReviewSceneText: '',
newReviewSceneRemark: '',
formRules: {
tiaokuanfenlei: [
{ required: true, message: '请选择条款分类', trigger: 'blur' }
jianyanleixing: [
{ required: true, message: '请选择检验类型', trigger: 'change' }
],
biaozhuntiuaokuan: [
{ required: true, message: '请选择标准条款', trigger: 'blur' }
biaozhunyaoqiu: [
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedRequirement.text) {
callback(new Error('请选择标准要求'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
shenchayaodian: [
{ required: true, message: '请输入审查要点', trigger: 'blur' }
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedKeyPoints.text) {
callback(new Error('请选择审查要点'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
shenchaxize: [
{ required: true, message: '请输入审查细则', trigger: 'blur' }
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedDetails.text) {
callback(new Error('请选择审查细则'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
shenchachangjing: [
{ required: true, message: '请输入审查场景', trigger: 'blur' }
{ required: true, message: '请填写审查场景', trigger: 'change' }
]
},
formItemName: {
......@@ -529,17 +562,24 @@ export default {
console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.details = this.selectedDetailsSave.text
this.newResDataAdd.detailsId = this.selectedDetailsSave.id
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
if(this.selectedDetailsSave){
this.newResDataAdd.details = this.selectedDetailsSave.text
}
if(this.selectedDetailsSave){
this.newResDataAdd.detailsId = this.selectedDetailsSave.id
}
if(this.selectedKeyPointsSave){
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
}
this.newReviewSceneRemark = this.formModel.beizhuxinxi
this.newResDataAdd.newText = this.formModel.shenchachangjing
this.newResDataAdd.remark = this.newReviewSceneRemark
console.log(this.newResDataAdd, '提交之前')
testInitatereviewAdd(this.newResDataAdd)
this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => {
const aa = response
if (aa) {
......@@ -558,6 +598,13 @@ export default {
console.log('testInitatereviewAdd方法出错', error)
})
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值
//remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText
......
src/views/review/createReview/newUseCase/index.vue
View file @ 991445cd
......@@ -17,15 +17,15 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="检验类型" prop="biaozhuntiuaokuan">
<el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
<el-select
form-rules="biaozhuntiuaokuan"
v-model="formModel.tiaokuanfenlei"
form-rules="jianyanleixing"
v-model="formModel.jianyanleixing"
style="width: 421px"
clearable
disabled
placeholder="车型检验"
@change="handleSelectType(formModel.tiaokuanfenlei)"
@change="handleSelectType(formModel.jianyanleixing)"
>
<el-option :value="'test'" />
</el-select>
......@@ -36,7 +36,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="标准要求" prop="biaozhuntiuaokuan">
<el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button
><span>
......@@ -91,7 +91,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="8">
<el-form-item label="用例编号" prop="yonglibianhao">
<el-form-item label="用例编号" prop="yonglibianhao" v-model="formModel.yonglibianhao">
<el-input
v-model="formModel.yonglibianhao"
placeholder="请输入用例编号"
......@@ -106,7 +106,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="8">
<el-form-item label="用例描述" prop="yonglimiaoshu">
<el-form-item label="用例描述" prop="yonglimiaoshu" v-model="formModel.yonglimiaoshu">
<el-input
v-model="formModel.yonglimiaoshu"
type="textarea"
......@@ -181,13 +181,12 @@
<script>
import {
testTypeUse,
testType,
testKeypoint,
testDetails,
testInitatereviewAdd,
testReviewer
} from '@/api/task/test'
import { stringify } from 'postcss'
export default {
name: 'ReviewData',
......@@ -285,21 +284,61 @@ export default {
newReviewSceneText: '',
newReviewSceneRemark: '',
formRules: {
tiaokuanfenlei: [
{ required: true, message: '请选择条款分类', trigger: 'blur' }
],
// biaozhuntiuaokuan: [
// { required: true, message: '请选择标准条款', trigger: 'blur' }
// jianyanleixing: [
// { required: true, message: '请选择检验类型', trigger: 'change' }
// ],
yonglibianhao: [
{ required: true, message: '请输入用例编号', trigger: 'blur' }
biaozhunyaoqiu: [
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedRequirement.text) {
callback(new Error('请选择标准要求'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
shenchayaodian: [
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedKeyPoints.text) {
callback(new Error('请选择审查要点'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
shenchaxize: [
{ required: true, message: '请输入审查细则', trigger: 'blur' }
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedDetails.text) {
callback(new Error('请选择审查细则'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
],
shenchachangjing: [
{ required: true, message: '请填写审查场景', trigger: 'change' }
],
yonglibianhao:[
{ required: true, message: '请填写用例编号', trigger: 'change' }
],
yonglimiaoshu: [
{ required: true, message: '请输入用例描述', trigger: 'blur' }
yonglimiaoshu:[
{ required: true, message: '请填写用例描述', trigger: 'change' }
]
},
formItemName: {
biaozhunyaoqiu: '',
......@@ -369,9 +408,18 @@ export default {
},
// 按钮-选择标准要求
handleReSelectRequirements() {
this.stringifyNewResDataUse = JSON.stringify(this.newResDataUse)
// 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
testTypeUse(this.stringifyNewResDataUse)
testType(this.newResData)
.then(response => {
this.receivedRequirements = response
......@@ -382,7 +430,7 @@ export default {
this.dialogVisible = true
})
.catch(error => {
console.log('testTypeUse方法出错', error)
console.log('testType方法出错', error)
})
//弹窗展示ReceivedRequirements内容 并且可以选择更改为哪一条标准要求
},
......@@ -454,7 +502,9 @@ export default {
this.newResDataAdd.type = 'car'
console.log(this.newResDataAdd, '提交之前')
testInitatereviewAdd(this.newResDataAdd)
this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => {
const aa = response
if (aa) {
......@@ -473,6 +523,13 @@ export default {
console.log('testInitatereviewAdd方法出错', error)
})
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值
//remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText
......
src/views/review/createReview/updateUseCase/index.vue
View file @ 991445cd
......@@ -17,15 +17,15 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="检验类型" prop="biaozhuntiuaokuan">
<el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
<el-input
form-rules="biaozhuntiuaokuan"
v-model="formModel.tiaokuanfenlei"
form-rules="jianyanleixing"
v-model="formModel.jianyanleixing"
style="width: 421px"
clearable
disabled
placeholder="车型检验"
@change="handleSelectType(formModel.tiaokuanfenlei)"
@change="handleSelectType(formModel.jianyanleixing)"
>
</el-input>
</el-form-item>
......@@ -35,7 +35,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="测试用例" prop="ceshiyongli">
<el-form-item label="测试用例" prop="ceshiyongli" v-model="formModel.ceshiyongli">
<el-button type="primary" plain @click="handleSelectUseCase"
>选择测试用例</el-button
><span> </span>
......@@ -94,7 +94,7 @@
</collapse>
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleUseCase = false"
<el-button @click="handleSelectedUseCase()"
>确认</el-button
>
</div>
......@@ -107,7 +107,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="标准要求" prop="biaozhunyaoqiu">
<el-form-item label="标准要求" prop="biaozhunyaoqiu" >
<el-input
v-model="formModel.biaozhunyaoqiu"
placeholder="选择测试用例后显示"
......@@ -122,7 +122,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="用例编号" prop="yonglibianhao">
<el-form-item label="用例编号" prop="yonglibianhao" >
<el-input
v-model="formModel.yonglibianhao"
placeholder="请输入用例编号"
......@@ -137,7 +137,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="18">
<el-form-item label="用例描述" prop="yonglimiaoshu">
<el-form-item label="用例描述" prop="yonglimiaoshu" >
<el-input
v-model="formModel.yonglimiaoshu"
type="textarea"
......@@ -146,8 +146,7 @@
show-word-limit
:autosize="{ minRows: 6, maxRows: 12 }"
resize="none"
>
</el-input>
></el-input>
</el-form-item> </el-col
><el-col :span="3"><p></p></el-col>
</el-row>
......@@ -232,9 +231,11 @@ export default {
props: {
formModel: {
type: Object,
default: () => {
return {}
}
default: () => ({
biaozhunyaoqiu: '',
yonglibianhao: '',
yonglimiaoshu: ''
})
},
pageIndexSec: {}
},
......@@ -326,36 +327,85 @@ export default {
dialogVisibleUseCase: false,
newReviewSceneText: '',
newReviewSceneRemark: '',
formRules: {
tiaokuanfenlei: [
{ required: true, message: '请选择条款分类', trigger: 'blur' }
],
biaozhuntiuaokuan: [
{ required: true, message: '请选择标准条款', trigger: 'blur' }
// jianyanleixing: [
// { required: true, message: '请选择检验类型', trigger: 'change' }
// ],
biaozhunyaoqiu: [
{
message:'请输入标准要求',
trigger: 'change',
required: true
}
],
yonglibianhao: [
{ required: true, message: '请输入用例编号', trigger: 'blur' }
shenchayaodian: [
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedKeyPoints.text) {
callback(new Error('请选择审查要点'))
} else {
callback()
}
},
trigger: 'change',
required: true
}
],
// biaozhunyaoqiu: [
// {
// required: true,
// message: '选择测试用例后即可显示标准要求',
// trigger: 'blur'
// }
// ],
shenchaxize: [
{ required: true, message: '请输入审查细则', trigger: 'blur' }
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedDetails.text) {
callback(new Error('请选择审查细则'))
} else {
callback()
}
},
trigger: 'change',
required: true
}
],
yonglimiaoshu: [
{ required: true, message: '请输入用例描述', trigger: 'blur' }
]
shenchachangjing: [
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedScene.text) {
callback(new Error('请选择审查场景'))
} else {
callback()
}
},
trigger: 'change',
required: true
}
],
ceshiyongli: [
{ validator: (rule, value, callback) => {
if (!this.selectedUseCase) {
callback(new Error('请选择测试用例'))
} else {
callback()
}
},
trigger: 'change',
required: true }
],
yonglibianhao:[
{ required: true, message: '请输入用例编号', trigger: 'change' }
],
yonglimiaoshu:[
{ required: true, message: '请输入用例描述', trigger: 'change' }
],
},
formItemName: {
biaozhunyaoqiu: '',
biaozhuntiaokuan: '',
yonglibianhao: '',
shenchaxize: '',
biaozhunyaoqiu: '',
// shenchachangjing: '',
yonglimiaoshu: ''
},
......@@ -393,6 +443,7 @@ export default {
// 将 item.type 赋值给 this.newResData.type
this.newResData.type = selectedItem.value
this.newResDataAdd.type = selectedItem.value
if (this.newResData.type === '1') {
this.newResData.type = 'system'
this.newResDataAdd.type = 'system'
......@@ -519,28 +570,45 @@ export default {
console.log('testUseCase方法出错', error)
})
},
// 按钮-操作
// 按钮-确认选择测试用例
handleSelectedUseCase() {
this.dialogVisibleUseCase = false
this.formModel.biaozhunyaoqiu = this.pageIndexSec.name
this.formModel.yonglibianhao = this.selectedUseCase.customizedID
this.formModel.yonglimiaoshu = this.selectedUseCase.description
},
// 按钮-确认发起
handleConfirm() {
console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.details = this.selectedDetailsSave.text
this.newResDataAdd.detailsId = this.selectedDetailsSave.id
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
if(this.selectedDetailsSave){
this.newResDataAdd.details = this.selectedDetailsSave.text
}
if(this.selectedDetailsSave){
this.newResDataAdd.detailsId = this.selectedDetailsSave.id
}
if(this.selectedKeyPointsSave){
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
}
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
this.newReviewSceneRemark = this.formModel.beizhuxinxi
this.newResDataAdd.newText = this.formModel.yonglibianhao
this.newResDataAdd.remark = this.newReviewSceneRemark
this.newResDataAdd.type= 'car'
this.newResDataAdd.usecaseId = this.formModel.yonglibianhao
this.newResDataAdd.usecaseDescribe = this.formModel.yonglimiaoshu
// this.newResDataAdd.reviewUsecaseId = ''
console.log(this.newResDataAdd, '提交之前')
testInitatereviewAdd(this.newResDataAdd)
this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => {
const aa = response
if (aa) {
......@@ -559,6 +627,13 @@ export default {
console.log('testInitatereviewAdd方法出错', error)
})
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值
//remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText
......
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