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
Hide whitespace changes
Inline Side-by-side
Showing with 873 additions and 326 deletions
src/views/review/createReview/deleteReviewDetails/index.vue
View file @ 991445cd
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<div class="review-data"> <div class="review-data">
<el-form <el-form
:model="formModel" :model="formModel"
ref="formItemName"
:rules="formRules" :rules="formRules"
label-width="200px" label-width="200px"
label-position="top" label-position="top"
...@@ -10,19 +11,19 @@ ...@@ -10,19 +11,19 @@
class="standard-text" class="standard-text"
style="margin-top: 20px; font-size: 24px; font-weight: bold" style="margin-top: 20px; font-size: 24px; font-weight: bold"
> >
检验标准：{{this.pageIndexSec.standardNo}} 检验标准：{{ this.pageIndexSec.standardNo }}
</div> </div>
<div class="subtitle">评审对象</div> <div class="subtitle">评审对象</div>
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item label="检验类型" prop="jianyanleixing">
<el-select <el-select
form-rules="biaozhuntiuaokuan" form-rules="jianyanleixing"
v-model="formModel.tiaokuanfenlei" v-model="formModel.jianyanleixing"
style="width: 421px" style="width: 421px"
clearable clearable
@change="handleSelectType(formModel.tiaokuanfenlei)" @change="handleSelectType(formModel.jianyanleixing)"
> >
<el-option <el-option
v-for="dict in dict.type.sys_scene_type" v-for="dict in dict.type.sys_scene_type"
...@@ -38,8 +39,9 @@ ...@@ -38,8 +39,9 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
{{ selectedRequirement.chapter }} {{ selectedRequirement.chapter }}
...@@ -61,7 +63,7 @@ ...@@ -61,7 +63,7 @@
<el-table-column prop="testMethod" label="测试方法"> <el-table-column prop="testMethod" label="测试方法">
</el-table-column> </el-table-column>
<!-- <!--
<el-table-column prop="name" label="标准名称"> <el-table-column prop="name" label="标准名称">
</el-table-column> </el-table-column>
...@@ -93,7 +95,7 @@ ...@@ -93,7 +95,7 @@
<el-row> <el-row>
<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="shenchayaodian"> <el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
<el-button type="primary" plain @click="handleReSelectKeypoints" <el-button type="primary" plain @click="handleReSelectKeypoints"
>选择审查要点</el-button >选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span> ><span>{{ selectedKeyPoints.text }}</span>
...@@ -141,7 +143,7 @@ ...@@ -141,7 +143,7 @@
<el-row> <el-row>
<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="shenchaxize"> <el-form-item label="审查细则" prop="shenchaxize" v-model="formModel.shenchaxize">
<el-button type="primary" plain @click="handleReSelectDetails" <el-button type="primary" plain @click="handleReSelectDetails"
>选择审查细则</el-button >选择审查细则</el-button
><span>{{ selectedDetails.text }}</span> ><span>{{ selectedDetails.text }}</span>
...@@ -193,7 +195,7 @@ ...@@ -193,7 +195,7 @@
</el-col> </el-col>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
<!-- <!--
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -242,7 +244,6 @@ ...@@ -242,7 +244,6 @@
<el-form-item label=""> <el-form-item label="">
<el-input <el-input
v-model="formModel.beizhuxinxi" v-model="formModel.beizhuxinxi"
type="textarea" type="textarea"
placeholder="请输入备注信息" placeholder="请输入备注信息"
maxlength="100" maxlength="100"
...@@ -327,9 +328,9 @@ export default { ...@@ -327,9 +328,9 @@ export default {
reviewSceneId: '', reviewSceneId: '',
reviewStandardId: '', reviewStandardId: '',
usecaseId:'', usecaseId: '',
usecaseDescribe:'', usecaseDescribe: '',
reviewUsecaseId:'', reviewUsecaseId: ''
}, },
selectedRequirement: { selectedRequirement: {
id: '', id: '',
...@@ -355,30 +356,62 @@ export default { ...@@ -355,30 +356,62 @@ export default {
receivedRequirements: {}, receivedRequirements: {},
receivedkeypoints: {}, receivedkeypoints: {},
receivedDetails: {}, receivedDetails: {},
receivedReviewer:{}, receivedReviewer: {},
dialogVisible: false, dialogVisible: false,
dialogVisibleKeypoints: false, dialogVisibleKeypoints: false,
dialogVisibleDetails: false, dialogVisibleDetails: false,
newReviewSceneText:'', newReviewSceneText: '',
newReviewSceneRemark:'', newReviewSceneRemark: '',
formRules: { formRules: {
tiaokuanfenlei: [ jianyanleixing: [
{ required: true, message: '请选择条款分类', trigger: 'blur' } { required: true, message: '请选择检验类型', trigger: 'change' }
], ],
biaozhuntiuaokuan: [ 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
}
], ],
shenchayaodian: [ 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: [ 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: [ shenchachangjing: [
{ required: true, message: '请输入审查场景', trigger: 'blur' } { required: true, message: '请填写审查场景', trigger: 'change' }
] ]
}, }
} }
}, },
mounted() { mounted() {
...@@ -391,9 +424,9 @@ export default { ...@@ -391,9 +424,9 @@ export default {
.catch(error => { .catch(error => {
console.log('testReviewer方法出错', error) console.log('testReviewer方法出错', error)
}) })
this.newResData.standardNo = this.pageIndexSec.standardNo this.newResData.standardNo = this.pageIndexSec.standardNo
this.newResData.standardId = this.pageIndexSec.id this.newResData.standardId = this.pageIndexSec.id
this.newResData.name = this.pageIndexSec.name this.newResData.name = this.pageIndexSec.name
}, },
methods: { methods: {
//下拉框 选择检验类型 //下拉框 选择检验类型
...@@ -515,39 +548,57 @@ export default { ...@@ -515,39 +548,57 @@ export default {
// 按钮-确认发起 // 按钮-确认发起
handleConfirm() { handleConfirm() {
console.log('this.value = ', this.formModel) console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter if (this.selectedRequirementSave) {
this.newResDataAdd.standard = this.selectedRequirementSave.name this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.details = this.selectedDetailsSave.text this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.detailsId = this.selectedDetailsSave.id this.formModel.biaozhunyaoqiu = this.selectedRequirementSave.text
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.newReviewSceneRemark = this.formModel.beizhuxinxi
if (this.selectedDetailsSave) {
this.newResDataAdd.newText = this.selectedDetailsSave.text this.newResDataAdd.newText = this.selectedDetailsSave.text
}
this.newResDataAdd.remark = this.newReviewSceneRemark this.newResDataAdd.remark = this.newReviewSceneRemark
console.log(this.newResDataAdd,'提交之前') console.log(this.newResDataAdd, '提交之前')
testInitatereviewAdd(this.newResDataAdd) this.$refs.formItemName.validate(valid => {
.then(response => { if (valid) {
const aa = response testInitatereviewAdd(this.newResDataAdd)
if (aa) { .then(response => {
this.$message.success('提交成功 页面将在5秒后跳转') const aa = response
this.timer = setTimeout(() => { if (aa) {
this.$router.push({ path: '/review/initiatedReview' }) this.$message.success('提交成功 页面将在5秒后跳转')
}, 5000) this.timer = setTimeout(() => {
} else { this.$router.push({ path: '/review/initiatedReview' })
this.$message({ }, 5000)
message: '提交失败', } else {
type: 'error' this.$message({
message: '提交失败',
type: 'error'
})
}
}) })
} .catch(error => {
}) console.log('testInitatereviewAdd方法出错', error)
.catch(error => { })
console.log('testInitatereviewAdd方法出错', error) } else {
this.$message({
message: '提交失败,请填写所有必填项目',
type: 'error'
})
}
})
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
...@@ -604,26 +655,26 @@ export default { ...@@ -604,26 +655,26 @@ export default {
} }
} }
.assessor-text { .assessor-text {
background: #f5f5f5; background: #f5f5f5;
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
border-radius: 4px; border-radius: 4px;
padding: 7px 10px; padding: 7px 10px;
font-family: Microsoft YaHei, Microsoft YaHei-400; font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400; font-weight: 400;
text-align: left; text-align: left;
color: #606266; color: #606266;
line-height: 16px; line-height: 16px;
.review-member { .review-member {
display: flex; display: flex;
flex-wrap: wrap; /* 可选，允许自动换行 */ flex-wrap: wrap; /* 可选，允许自动换行 */
gap: 10px; /* 控制每个 span 之间的间距 */ gap: 10px; /* 控制每个 span 之间的间距 */
.review-member-text { .review-member-text {
display: inline-block; /* 或者使用 inline */ display: inline-block; /* 或者使用 inline */
margin-right: 10px; /* 设定各个 span 之间的间距 */ margin-right: 10px; /* 设定各个 span 之间的间距 */
width: 200px; width: 200px;
}
} }
} }
}
::v-deep.el-form-item.is-required:not(.is-no-asterisk) ::v-deep.el-form-item.is-required:not(.is-no-asterisk)
> .el-form-item__label:before, > .el-form-item__label:before,
.el-form-item.is-required:not(.is-no-asterisk) .el-form-item.is-required:not(.is-no-asterisk)
......
src/views/review/createReview/deleteReviewKeypoints/index.vue
View file @ 991445cd
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<el-form <el-form
:model="formModel" :model="formModel"
:rules="formRules" :rules="formRules"
ref="formItemName"
label-width="200px" label-width="200px"
label-position="top" label-position="top"
> >
...@@ -16,13 +17,13 @@ ...@@ -16,13 +17,13 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
<el-select <el-select
form-rules="biaozhuntiuaokuan" form-rules="jianyanleixing"
v-model="formModel.tiaokuanfenlei" v-model="formModel.jianyanleixing"
style="width: 421px" style="width: 421px"
clearable clearable
@change="handleSelectType(formModel.tiaokuanfenlei)" @change="handleSelectType(formModel.jianyanleixing)"
> >
<el-option <el-option
v-for="dict in dict.type.sys_scene_type" v-for="dict in dict.type.sys_scene_type"
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
...@@ -93,7 +94,7 @@ ...@@ -93,7 +94,7 @@
<el-row> <el-row>
<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="shenchayaodian"> <el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
<el-button type="primary" plain @click="handleReSelectKeypoints" <el-button type="primary" plain @click="handleReSelectKeypoints"
>选择审查要点</el-button >选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span> ><span>{{ selectedKeyPoints.text }}</span>
...@@ -307,20 +308,53 @@ export default { ...@@ -307,20 +308,53 @@ export default {
newReviewKeypointText:'', newReviewKeypointText:'',
newReviewDetailText:'', newReviewDetailText:'',
formRules: { formRules: {
tiaokuanfenlei: [ jianyanleixing: [
{ required: true, message: '请选择条款分类', trigger: 'blur' } { required: true, message: '请选择检验类型', trigger: 'change' }
], ],
biaozhuntiuaokuan: [ 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
}
], ],
shenchayaodian: [ 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: [ 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: [ shenchachangjing: [
{ required: true, message: '请输入审查场景', trigger: 'blur' } { required: true, message: '请填写审查场景', trigger: 'change' }
] ]
} }
} }
...@@ -462,6 +496,7 @@ export default { ...@@ -462,6 +496,7 @@ export default {
console.log('this.value = ', this.formModel) console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.details = this.newReviewDetailText this.newResDataAdd.details = this.newReviewDetailText
...@@ -472,9 +507,14 @@ export default { ...@@ -472,9 +507,14 @@ export default {
this.newResDataAdd.remark = this.newReviewSceneRemark this.newResDataAdd.remark = this.newReviewSceneRemark
// this.newResDataAdd.inspectStandardId = this.pageIndexSec.id // 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, '提交之前') console.log(this.newResDataAdd.inspectStandardId, '提交之前')
testInitatereviewAdd(this.newResDataAdd) this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
...@@ -493,6 +533,14 @@ export default { ...@@ -493,6 +533,14 @@ export default {
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
......
src/views/review/createReview/deleteReviewScene/index.vue
View file @ 991445cd
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<el-form <el-form
:model="formModel" :model="formModel"
:rules="formRules" :rules="formRules"
ref="formItemName"
label-width="200px" label-width="200px"
label-position="top" label-position="top"
> >
...@@ -16,13 +17,17 @@ ...@@ -16,13 +17,17 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item
label="检验类型"
prop="jianyanleixing"
v-model="formModel.jianyanleixing"
>
<el-select <el-select
form-rules="biaozhuntiuaokuan" form-rules="jianyanleixing"
v-model="formModel.tiaokuanfenlei" v-model="formModel.jianyanleixing"
style="width: 421px" style="width: 421px"
clearable clearable
@change="handleSelectType(formModel.tiaokuanfenlei)" @change="handleSelectType(formModel.jianyanleixing)"
> >
<el-option <el-option
v-for="dict in dict.type.sys_scene_type" v-for="dict in dict.type.sys_scene_type"
...@@ -38,7 +43,11 @@ ...@@ -38,7 +43,11 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item
label="标准要求"
prop="biaozhunyaoqiu"
v-model="formModel.biaozhunyaoqiu"
>
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
...@@ -93,7 +102,11 @@ ...@@ -93,7 +102,11 @@
<el-row> <el-row>
<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="shenchayaodian"> <el-form-item
label="审查要点"
prop="shenchayaodian"
v-model="formModel.shenchayaodian"
>
<el-button type="primary" plain @click="handleReSelectKeypoints" <el-button type="primary" plain @click="handleReSelectKeypoints"
>选择审查要点</el-button >选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span> ><span>{{ selectedKeyPoints.text }}</span>
...@@ -141,7 +154,11 @@ ...@@ -141,7 +154,11 @@
<el-row> <el-row>
<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="shenchaxize"> <el-form-item
label="审查细则"
prop="shenchaxize"
v-model="formModel.shenchaxize"
>
<el-button type="primary" plain @click="handleReSelectDetails" <el-button type="primary" plain @click="handleReSelectDetails"
>选择审查细则</el-button >选择审查细则</el-button
><span>{{ selectedDetails.text }}</span> ><span>{{ selectedDetails.text }}</span>
...@@ -197,7 +214,11 @@ ...@@ -197,7 +214,11 @@
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="审查场景" prop="shenchachangjing"> <el-form-item
label="审查场景"
prop="shenchachangjing"
v-model="formModel.shenchachangjing"
>
<el-button type="primary" plain @click="handleReSelectScene" <el-button type="primary" plain @click="handleReSelectScene"
>选择审查场景</el-button >选择审查场景</el-button
><span>{{ selectedScene.text }}</span> ><span>{{ selectedScene.text }}</span>
...@@ -313,6 +334,7 @@ import { ...@@ -313,6 +334,7 @@ import {
testScene, testScene,
testReviewer testReviewer
} from '@/api/task/test' } from '@/api/task/test'
// import dialogVue from '../../../processing/checkFileLibrary/components/dialog.vue' // import dialogVue from '../../../processing/checkFileLibrary/components/dialog.vue'
export default { export default {
...@@ -365,9 +387,9 @@ export default { ...@@ -365,9 +387,9 @@ export default {
reviewSceneId: '', reviewSceneId: '',
reviewStandardId: '', reviewStandardId: '',
usecaseId:'', usecaseId: '',
usecaseDescribe:'', usecaseDescribe: '',
reviewUsecaseId:'', reviewUsecaseId: ''
}, },
selectedRequirement: { selectedRequirement: {
id: '', id: '',
...@@ -400,7 +422,7 @@ export default { ...@@ -400,7 +422,7 @@ export default {
receivedkeypoints: {}, receivedkeypoints: {},
receivedDetails: {}, receivedDetails: {},
receivedScene: {}, receivedScene: {},
receivedReviewer:{}, receivedReviewer: {},
dialogVisible: false, dialogVisible: false,
dialogVisibleKeypoints: false, dialogVisibleKeypoints: false,
dialogVisibleDetails: false, dialogVisibleDetails: false,
...@@ -408,20 +430,64 @@ export default { ...@@ -408,20 +430,64 @@ export default {
newReviewSceneText: '', newReviewSceneText: '',
newReviewSceneRemark: '', newReviewSceneRemark: '',
formRules: { formRules: {
tiaokuanfenlei: [ jianyanleixing: [
{ required: true, message: '请选择条款分类', trigger: 'blur' } { required: true, message: '请选择检验类型', trigger: 'change' }
], ],
biaozhuntiuaokuan: [ 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
}
], ],
shenchayaodian: [ 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: [ 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: [ shenchachangjing: [
{ required: true, message: '请输入审查场景', trigger: 'blur' } {
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedScene.text) {
callback(new Error('请选择审查场景'))
} else {
callback()
}
},
trigger: 'change',
required: true
}
] ]
} }
} }
...@@ -436,9 +502,9 @@ export default { ...@@ -436,9 +502,9 @@ export default {
.catch(error => { .catch(error => {
console.log('testReviewer方法出错', error) console.log('testReviewer方法出错', error)
}) })
this.newResData.standardNo = this.pageIndexSec.standardNo this.newResData.standardNo = this.pageIndexSec.standardNo
this.newResData.standardId = this.pageIndexSec.id this.newResData.standardId = this.pageIndexSec.id
this.newResData.name = this.pageIndexSec.name this.newResData.name = this.pageIndexSec.name
}, },
methods: { methods: {
//下拉框 选择检验类型 //下拉框 选择检验类型
...@@ -575,37 +641,57 @@ export default { ...@@ -575,37 +641,57 @@ export default {
console.log('this.value = ', this.formModel) console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.details = this.selectedDetailsSave.text if (this.selectedDetailsSave) {
this.newResDataAdd.detailsId = this.selectedDetailsSave.id this.newResDataAdd.details = this.selectedDetailsSave.text
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.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.newReviewSceneRemark = this.formModel.beizhuxinxi
if (this.selectedScene) {
this.newResDataAdd.newText = this.newReviewSceneText this.newResDataAdd.newText =
this.selectedScene.text
}
this.newResDataAdd.remark = this.newReviewSceneRemark this.newResDataAdd.remark = this.newReviewSceneRemark
if (this.selectedSceneSave) {
this.newResDataAdd.reviewSceneId = this.selectedSceneSave.id this.newResDataAdd.reviewSceneId = this.selectedSceneSave.id
}
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
console.log(this.newResDataAdd, '提交之前') console.log(this.newResDataAdd, '提交之前')
testInitatereviewAdd(this.newResDataAdd) this.$refs.formItemName.validate(valid => {
.then(response => { if (valid) {
const aa = response testInitatereviewAdd(this.newResDataAdd)
if (aa) { .then(response => {
this.$message.success('提交成功 页面将在5秒后跳转') const aa = response
this.timer = setTimeout(() => { if (aa) {
this.$router.push({ path: '/review/initiatedReview' }) this.$message.success('提交成功 页面将在5秒后跳转')
}, 5000) this.timer = setTimeout(() => {
} else { this.$router.push({ path: '/review/initiatedReview' })
this.$message({ }, 5000)
message: '提交失败', } else {
type: 'error' this.$message({
message: '提交失败',
type: 'error'
})
}
}) })
} .catch(error => {
}) console.log('testInitatereviewAdd方法出错', error)
.catch(error => { })
console.log('testInitatereviewAdd方法出错', error) } else {
this.$message({
}) message: '提交失败,请填写所有必填项目',
type: 'error'
})
}
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
...@@ -667,26 +753,26 @@ export default { ...@@ -667,26 +753,26 @@ export default {
} }
} }
.assessor-text { .assessor-text {
background: #f5f5f5; background: #f5f5f5;
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
border-radius: 4px; border-radius: 4px;
padding: 7px 10px; padding: 7px 10px;
font-family: Microsoft YaHei, Microsoft YaHei-400; font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400; font-weight: 400;
text-align: left; text-align: left;
color: #606266; color: #606266;
line-height: 16px; line-height: 16px;
.review-member { .review-member {
display: flex; display: flex;
flex-wrap: wrap; /* 可选，允许自动换行 */ flex-wrap: wrap; /* 可选，允许自动换行 */
gap: 10px; /* 控制每个 span 之间的间距 */ gap: 10px; /* 控制每个 span 之间的间距 */
.review-member-text { .review-member-text {
display: inline-block; /* 或者使用 inline */ display: inline-block; /* 或者使用 inline */
margin-right: 10px; /* 设定各个 span 之间的间距 */ margin-right: 10px; /* 设定各个 span 之间的间距 */
width: 200px; width: 200px;
}
} }
} }
}
::v-deep.el-form-item.is-required:not(.is-no-asterisk) ::v-deep.el-form-item.is-required:not(.is-no-asterisk)
> .el-form-item__label:before, > .el-form-item__label:before,
.el-form-item.is-required:not(.is-no-asterisk) .el-form-item.is-required:not(.is-no-asterisk)
......
src/views/review/createReview/deleteUseCase/index.vue
View file @ 991445cd
...@@ -17,18 +17,21 @@ ...@@ -17,18 +17,21 @@
<el-row> <el-row>
<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="jianyanleixing"> <el-form-item label="检验类型" prop="jianyanleixing" >
<el-select <el-select
form-rules="jianyanleixing" form-rules="jianyanleixing"
v-model="formModel.tiaokuanfenlei" v-model="formModel.jianyanleixing"
style="width: 421px" style="width: 421px"
clearable clearable
disabled disabled
@change="handleSelectType(formModel.jianyanleixing)"
placeholder="车型检验" placeholder="车型检验"
@change="handleSelectType(formModel.tiaokuanfenlei)"
> >
<el-option <el-option
:value = '车型检验' v-for="dict in dict.type.sys_scene_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -38,50 +41,70 @@ ...@@ -38,50 +41,70 @@
<el-row> <el-row>
<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="ceshiyongli"> <el-form-item label="测试用例" prop="ceshiyongli" v-model="formModel.ceshiyongli">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button type="primary" plain @click="handleSelectUseCase"
>选择测试用例</el-button >选择测试用例</el-button
><span> ><span>
{{ selectedRequirement.chapter }} </span
{{ selectedRequirement.text }}</span
> >
<div> <div>
<!-- 选择标准要求弹窗 --> <!-- 选择测试用例弹窗 -->
<el-dialog title="" :visible.sync="dialogVisible" width="70%"> <el-dialog
<!-- 表格 --> title=""
<el-table :visible.sync="dialogVisibleUseCase"
:data="this.receivedRequirements.rows" width="70%"
style="width: 100%" ><!-- 循环生成表格 表格内循环展示数据 -->
> <collapse v-model="activeNames" class="mt10">
<el-table-column prop="chapter" label="标准章节" width="100"> <collapse-item
</el-table-column> v-for="(item, key3) in receivedUseCase.useCases"
:key="key3"
<el-table-column prop="text" label="标准要求"> :name="item.serialNumber"
</el-table-column> >
<span slot="title" style="width: 100%">
<el-table-column prop="testMethod" label="测试方法"> <div class="standard-box">
</el-table-column> <div class="standard-left">
<div class="standard-title">
<!-- <el-table-column prop="name" label="标准名称"> <div class="standard">标准要求：</div>
</el-table-column> {{ item.serialNumber + item.requirements }}
</div>
<el-table-column prop="standardNo" label="标准号"> </div>
</el-table-column> --> </div>
<el-table-column label="选择"> </span>
<template slot-scope="scope"> <table
<el-radio-group v-model="selectedRequirement"> class="table"
<el-radio v-if="item.useCases && item.useCases.length"
:label="scope.row" >
class="hidden-lable" <tr class="tr">
></el-radio> <th>用例编号</th>
</el-radio-group> <th>用例描述</th>
</template> <th>操作</th>
</el-table-column> </tr>
</el-table> <tr v-for="(item, key4) in item.useCases">
<td>{{ item.customizedID }}</td>
<td>
{{ item.description }}
</td>
<td>
<template >
<div>
<el-radio-group v-model="selectedUseCase">
<el-radio
:label="item"
class="hidden-lable">选择
</el-radio>
</el-radio-group>
</div>
</template>
</td>
</tr>
</table>
</collapse-item>
</collapse>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button @click="dialogVisibleUseCase = false"
>确认</el-button
>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -94,7 +117,7 @@ ...@@ -94,7 +117,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) }}
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -105,7 +128,7 @@ ...@@ -105,7 +128,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 }}
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -117,7 +140,7 @@ ...@@ -117,7 +140,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 }}
</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>
...@@ -186,10 +209,18 @@ import { ...@@ -186,10 +209,18 @@ import {
testDetails, testDetails,
testInitatereviewAdd, testInitatereviewAdd,
testReviewer, testReviewer,
testUseCase testUseCase,
testUseCaseListAll
} from '@/api/task/test' } from '@/api/task/test'
import collapse from '@/components/Collapse/collapse'
import collapseItem from '@/components/Collapse/collapse-item'
import { slice } from 'lodash';
export default { export default {
components: {
collapse: collapse,
'collapse-item': collapseItem
},
name: 'ReviewData', name: 'ReviewData',
dicts: ['sys_scene_type'], dicts: ['sys_scene_type'],
...@@ -204,6 +235,7 @@ export default { ...@@ -204,6 +235,7 @@ export default {
}, },
data() { data() {
return { return {
activeNames: [],
standardId: '', standardId: '',
keypointId: '', keypointId: '',
detailsId: '', detailsId: '',
...@@ -264,18 +296,37 @@ export default { ...@@ -264,18 +296,37 @@ export default {
text: '' text: ''
}, },
selectedDetailsSave: null, selectedDetailsSave: null,
selectedUseCase:{
id: '',
description: '',
customizedID: '',
},
selectedUseCaseSave:null,
receivedRequirements: {}, receivedRequirements: {},
receivedkeypoints: {}, receivedkeypoints: {},
receivedDetails: {}, receivedDetails: {},
receivedReviewer: {}, receivedReviewer: {},
receivedUseCase: {
standardId: null,
standardNo: '',
useCaseResponseDTOList: [
{
id: 0,
usecaseId: '',
usecaseDescribe: '',
reviewStandardId: 0
}
]
},
dialogVisible: false, dialogVisible: false,
dialogVisibleKeypoints: false, dialogVisibleKeypoints: false,
dialogVisibleDetails: false, dialogVisibleDetails: false,
dialogVisibleUseCase: false,
newReviewSceneText: '', newReviewSceneText: '',
newReviewSceneRemark: '', newReviewSceneRemark: '',
formRules: { formRules: {
tiaokuanfenlei: [ tiaokuanfenlei: [
{ required: true, message: '请选择条款分类', trigger: 'blur' } { required: true, message: '请选择条款分类', trigger: 'change' }
], ],
// jianyanleixing: [ // jianyanleixing: [
// { required: true, message: '请选择标准条款', trigger: 'blur' } // { required: true, message: '请选择标准条款', trigger: 'blur' }
...@@ -284,18 +335,28 @@ export default { ...@@ -284,18 +335,28 @@ export default {
// { required: true, message: '请输入用例编号', trigger: 'blur' } // { required: true, message: '请输入用例编号', trigger: 'blur' }
// ], // ],
shenchaxize: [ shenchaxize: [
{ required: true, message: '请输入审查细则', trigger: 'blur' } { required: true, message: '请输入审查细则', trigger: 'change' }
], ],
// yonglimiaoshu: [ // yonglimiaoshu: [
// { required: true, message: '请输入用例描述', trigger: 'blur' } // { required: true, message: '请输入用例描述', trigger: 'blur' }
// ] // ]
ceshiyongli: [ ceshiyongli: [
{ required: true, message: '请选择测试用例', trigger: 'blur' } { validator: (rule, value, callback) => {
if (!this.selectedUseCase) {
callback(new Error('请选择测试用例'))
} else {
callback()
}
},
trigger: 'change',
required: true }
] ]
}, },
formItemName: { formItemName: {
biaozhunyaoqiu: '', tiaokuanfenlei:'',
biaozhuntiaokuan: '', // biaozhunyaoqiu: '',
// biaozhuntiaokuan: '',
// yonglibianhao: '', // yonglibianhao: '',
shenchaxize: '', shenchaxize: '',
ceshiyongli:'', ceshiyongli:'',
...@@ -432,28 +493,60 @@ export default { ...@@ -432,28 +493,60 @@ export default {
//oldText => 不用填直接为默认的‘’就行 //oldText => 不用填直接为默认的‘’就行
//reviewSceneId => 不用填直接默认不给值就行， //reviewSceneId => 不用填直接默认不给值就行，
},
// 按钮-选择测试用例
handleSelectUseCase() {
this.dialogVisibleUseCase = true
testUseCaseListAll({
offset: {
offset: 0,
limit: 9999
},
name: this.pageIndexSec.name
})
.then(res => {
this.receivedUseCase = res.data
return
})
.catch(error => {
console.log('testUseCase方法出错', error)
})
}, },
// 按钮-确认发起 // 按钮-确认发起
handleConfirm() { handleConfirm() {
console.log('this.value = ', this.formModel) console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.details = this.selectedDetailsSave.text if(this.selectedDetailsSave){
this.newResDataAdd.detailsId = this.selectedDetailsSave.id this.newResDataAdd.details = this.selectedDetailsSave.text
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.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.newReviewSceneRemark = this.formModel.beizhuxinxi
this.newResDataAdd.newText = this.formModel.yonglibianhao this.newResDataAdd.newText = this.selectedUseCase.customizedID
this.newResDataAdd.remark = this.newReviewSceneRemark this.newResDataAdd.remark = this.newReviewSceneRemark
this.newResDataAdd.type = 'car' this.newResDataAdd.type = 'car'
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.usecaseId = this.formModel.yonglibianhao this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.usecaseDescribe = this.formModel.yonglimiaoshu this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
this.newResDataAdd.reviewUsecaseId = ''
this.newResDataAdd.usecaseId = ''
this.newResDataAdd.usecaseDescribe = this.selectedUseCase.description
this.newResDataAdd.reviewUsecaseId = ''
console.log(this.newResDataAdd, '提交之前') console.log(this.newResDataAdd, '提交之前')
testInitatereviewAdd(this.newResDataAdd) this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
...@@ -472,6 +565,14 @@ export default { ...@@ -472,6 +565,14 @@ export default {
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
...@@ -502,6 +603,10 @@ export default { ...@@ -502,6 +603,10 @@ export default {
this.selectedDetailsSave = newVal this.selectedDetailsSave = newVal
console.log('selectedDetailsSave 的新值:', this.selectedDetailsSave) console.log('selectedDetailsSave 的新值:', this.selectedDetailsSave)
this.newResDataAdd.detailsId = this.selectedDetailsSave.id this.newResDataAdd.detailsId = this.selectedDetailsSave.id
},
selectedUseCase(newVal){
this.selectedUseCaseSave = newVal
console.log('selectedUseCase的新值:',this.selectedUseCaseSave)
} }
} }
} }
......
src/views/review/createReview/index.vue
View file @ 991445cd
...@@ -340,7 +340,6 @@ import DeleteScene from './deleteReviewScene' ...@@ -340,7 +340,6 @@ import DeleteScene from './deleteReviewScene'
import UseCase from './newUseCase' import UseCase from './newUseCase'
import DeleteUseCase from './deleteUseCase' import DeleteUseCase from './deleteUseCase'
import UpdateUseCase from './updateUseCase' import UpdateUseCase from './updateUseCase'
import { testInitatereview } from '@/api/task/test' import { testInitatereview } from '@/api/task/test'
export default { export default {
...@@ -376,7 +375,10 @@ export default { ...@@ -376,7 +375,10 @@ export default {
formModel: { formModel: {
ask: '1', ask: '1',
reviewType: '0', reviewType: '0',
reviewSubtype: '0' reviewSubtype: '0',
biaozhunyaoqiu: '',
yonglibianhao: '',
yonglimiaoshu: ''
// pageNum: 1, // pageNum: 1,
// pageSize: 10, // pageSize: 10,
// standardNo: '', // standardNo: '',
......
src/views/review/createReview/newReviewDetails/index.vue
View file @ 991445cd
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<el-form <el-form
:model="formModel" :model="formModel"
:rules="formRules" :rules="formRules"
ref="formItemName"
label-width="200px" label-width="200px"
label-position="top" label-position="top"
> >
...@@ -16,13 +17,13 @@ ...@@ -16,13 +17,13 @@
<el-row> <el-row>
<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="jianyanleixing" v-model="formModel.jianyanleixing">
<el-select <el-select
form-rules="biaozhunyaoqiu" form-rules="jianyanleixing"
v-model="formModel.biaozhunyaoqiu" v-model="formModel.jianyanleixing"
style="width: 421px" style="width: 421px"
clearable clearable
@change="handleSelectType(formModel.biaozhunyaoqiu)" @change="handleSelectType(formModel.jianyanleixing)"
> >
<el-option <el-option
v-for="dict in dict.type.sys_scene_type" v-for="dict in dict.type.sys_scene_type"
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
...@@ -325,17 +326,42 @@ ...@@ -325,17 +326,42 @@
newReviewSceneText:'', newReviewSceneText:'',
newReviewSceneRemark:'', newReviewSceneRemark:'',
formRules: { formRules: {
biaozhunyaoqiu: [ jianyanleixing: [
{ required: true, message: '请选择检验类型', trigger: 'blur' } { 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: [ biaozhuntiuaokuan: [
{ required: true, message: '请选择标准要求', trigger: 'blur' } { required: true, message: '请选择标准要求', trigger: 'change' }
],
shenchayaodian: [
{ required: true, message: '请输入审查要点', trigger: 'blur' }
], ],
shenchaxize: [ shenchaxize: [
{ required: true, message: '请输入审查细则', trigger: 'blur' } { required: true, message: '请输入审查细则', trigger: 'change' }
], ],
// shenchachangjing: [ // shenchachangjing: [
// { required: true, message: '请输入审查场景', trigger: 'blur' } // { required: true, message: '请输入审查场景', trigger: 'blur' }
...@@ -480,18 +506,25 @@ ...@@ -480,18 +506,25 @@
console.log('this.value = ', this.formModel) console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name this.newResDataAdd.standard = this.selectedRequirementSave.name
if(this.selectedKeyPointsSave){
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
}
this.newResDataAdd.newText = this.formModel.shenchaxize this.newResDataAdd.newText = this.formModel.shenchaxize
this.newReviewSceneRemark = this.formModel.beizhuxinxi this.newReviewSceneRemark = this.formModel.beizhuxinxi
this.newResDataAdd.details = this.formModel.shenchaxize this.newResDataAdd.details = this.formModel.shenchaxize
this.newResDataAdd.remark = this.newReviewSceneRemark this.newResDataAdd.remark = this.newReviewSceneRemark
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id if(this.pageIndexSec){
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
}
console.log(this.newResDataAdd,'提交之前') console.log(this.newResDataAdd,'提交之前')
testInitatereviewAdd(this.newResDataAdd) this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
...@@ -510,6 +543,14 @@ ...@@ -510,6 +543,14 @@
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
......
src/views/review/createReview/newReviewKeypoints/index.vue
View file @ 991445cd
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
<el-row> <el-row>
<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="jianyanleixing">
<el-select <el-select
form-rules="biaozhunyaoqiu" form-rules="jianyanleixing"
v-model="formModel.biaozhunyaoqiu" v-model="formModel.jianyanleixing"
style="width: 421px" style="width: 421px"
clearable clearable
@change="handleSelectType(formModel.biaozhunyaoqiu)" @change="handleSelectType(formModel.jianyanleixing)"
> >
<el-option <el-option
v-for="dict in dict.type.sys_scene_type" v-for="dict in dict.type.sys_scene_type"
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<el-row> <el-row>
<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="biaozhuntiaokuan"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
...@@ -289,17 +289,42 @@ export default { ...@@ -289,17 +289,42 @@ export default {
shenchachangjing: '' shenchachangjing: ''
}, },
formRules: { formRules: {
jianyanleixing: [
{ required: true, message: '请选择检验类型', trigger: 'change' }
],
biaozhunyaoqiu: [ 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: [ biaozhuntiaokuan: [
{ required: true, message: '请选择标准要求', trigger: 'blur' } { required: true, message: '请选择标准要求', trigger: 'blur' }
], ],
shenchayaodian: [ shenchayaodian: [
{ required: true, message: '请输入审查要点', trigger: 'blur' } {
message:'请填写审查要点',
trigger: 'change',
required: true
}
], ],
shenchaxize: [ shenchaxize: [
{ required: true, message: '请输入审查细则', trigger: 'blur' } {
message:'请填写审查细则',
trigger: 'change',
required: true
}
],
shenchachangjing: [
{ required: true, message: '请输入审查场景', trigger: 'change' }
] ]
// shenchachangjing: [ // shenchachangjing: [
// { required: true, message: '请输入审查场景', trigger: 'blur' } // { required: true, message: '请输入审查场景', trigger: 'blur' }
...@@ -465,7 +490,9 @@ export default { ...@@ -465,7 +490,9 @@ export default {
// this.newResDataAdd.inspectStandardId = this.pageIndexSec.id // this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
console.log(this.newResDataAdd.inspectStandardId, '提交之前') console.log(this.newResDataAdd.inspectStandardId, '提交之前')
testInitatereviewAdd(this.newResDataAdd) this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
...@@ -484,6 +511,14 @@ export default { ...@@ -484,6 +511,14 @@ export default {
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
......
src/views/review/createReview/newReviewScene/index.vue
View file @ 991445cd
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
<el-select <el-select
form-rules="biaozhuntiuaokuan" form-rules="jianyanleixing"
v-model="formModel.tiaokuanfenlei" v-model="formModel.jianyanleixing"
style="width: 421px" style="width: 421px"
clearable clearable
@change="handleSelectType(formModel.tiaokuanfenlei)" @change="handleSelectType(formModel.jianyanleixing)"
> >
<el-option <el-option
v-for="dict in dict.type.sys_scene_type" v-for="dict in dict.type.sys_scene_type"
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<el-row> <el-row>
<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="shenchayaodian"> <el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
<el-button type="primary" plain @click="handleReSelectKeypoints" <el-button type="primary" plain @click="handleReSelectKeypoints"
>选择审查要点</el-button >选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span> ><span>{{ selectedKeyPoints.text }}</span>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<el-row> <el-row>
<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="shenchaxize"> <el-form-item label="审查细则" prop="shenchaxize" v-model="formModel.shenchaxize">
<el-button type="primary" plain @click="handleReSelectDetails" <el-button type="primary" plain @click="handleReSelectDetails"
>选择审查细则</el-button >选择审查细则</el-button
><span>{{ selectedDetails.text }}</span> ><span>{{ selectedDetails.text }}</span>
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="审查场景" prop="shenchachangjing"> <el-form-item label="审查场景" prop="shenchachangjing" v-model="formModel.shenchachangjing">
<el-input <el-input
v-model="formModel.shenchachangjing" v-model="formModel.shenchachangjing"
type="textarea" type="textarea"
...@@ -366,20 +366,53 @@ export default { ...@@ -366,20 +366,53 @@ export default {
newReviewSceneText: '', newReviewSceneText: '',
newReviewSceneRemark: '', newReviewSceneRemark: '',
formRules: { formRules: {
tiaokuanfenlei: [ jianyanleixing: [
{ required: true, message: '请选择条款分类', trigger: 'blur' } { required: true, message: '请选择检验类型', trigger: 'change' }
], ],
biaozhuntiuaokuan: [ 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
}
], ],
shenchayaodian: [ 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: [ 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: [ shenchachangjing: [
{ required: true, message: '请输入审查场景', trigger: 'blur' } { required: true, message: '请填写审查场景', trigger: 'change' }
] ]
}, },
formItemName: { formItemName: {
...@@ -529,17 +562,24 @@ export default { ...@@ -529,17 +562,24 @@ export default {
console.log('this.value = ', this.formModel) console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.details = this.selectedDetailsSave.text if(this.selectedDetailsSave){
this.newResDataAdd.detailsId = this.selectedDetailsSave.id this.newResDataAdd.details = this.selectedDetailsSave.text
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.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.newReviewSceneRemark = this.formModel.beizhuxinxi
this.newResDataAdd.newText = this.formModel.shenchachangjing this.newResDataAdd.newText = this.formModel.shenchachangjing
this.newResDataAdd.remark = this.newReviewSceneRemark this.newResDataAdd.remark = this.newReviewSceneRemark
console.log(this.newResDataAdd, '提交之前') console.log(this.newResDataAdd, '提交之前')
testInitatereviewAdd(this.newResDataAdd) this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
...@@ -558,6 +598,13 @@ export default { ...@@ -558,6 +598,13 @@ export default {
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
......
src/views/review/createReview/newUseCase/index.vue
View file @ 991445cd
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
<el-select <el-select
form-rules="biaozhuntiuaokuan" form-rules="jianyanleixing"
v-model="formModel.tiaokuanfenlei" v-model="formModel.jianyanleixing"
style="width: 421px" style="width: 421px"
clearable clearable
disabled disabled
placeholder="车型检验" placeholder="车型检验"
@change="handleSelectType(formModel.tiaokuanfenlei)" @change="handleSelectType(formModel.jianyanleixing)"
> >
<el-option :value="'test'" /> <el-option :value="'test'" />
</el-select> </el-select>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button type="primary" plain @click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="用例编号" prop="yonglibianhao"> <el-form-item label="用例编号" prop="yonglibianhao" v-model="formModel.yonglibianhao">
<el-input <el-input
v-model="formModel.yonglibianhao" v-model="formModel.yonglibianhao"
placeholder="请输入用例编号" placeholder="请输入用例编号"
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="用例描述" prop="yonglimiaoshu"> <el-form-item label="用例描述" prop="yonglimiaoshu" v-model="formModel.yonglimiaoshu">
<el-input <el-input
v-model="formModel.yonglimiaoshu" v-model="formModel.yonglimiaoshu"
type="textarea" type="textarea"
...@@ -181,13 +181,12 @@ ...@@ -181,13 +181,12 @@
<script> <script>
import { import {
testTypeUse, testType,
testKeypoint, testKeypoint,
testDetails, testDetails,
testInitatereviewAdd, testInitatereviewAdd,
testReviewer testReviewer
} from '@/api/task/test' } from '@/api/task/test'
import { stringify } from 'postcss'
export default { export default {
name: 'ReviewData', name: 'ReviewData',
...@@ -285,21 +284,61 @@ export default { ...@@ -285,21 +284,61 @@ export default {
newReviewSceneText: '', newReviewSceneText: '',
newReviewSceneRemark: '', newReviewSceneRemark: '',
formRules: { formRules: {
tiaokuanfenlei: [ // jianyanleixing: [
{ required: true, message: '请选择条款分类', trigger: 'blur' } // { required: true, message: '请选择检验类型', trigger: 'change' }
],
// biaozhuntiuaokuan: [
// { required: true, message: '请选择标准条款', trigger: 'blur' }
// ], // ],
yonglibianhao: [ 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
}
],
shenchayaodian: [
{
validator: (rule, value, callback) => {
// 检查 selectedRequirement.text 是否有值
if (!this.selectedKeyPoints.text) {
callback(new Error('请选择审查要点'));
} else {
callback();
}
},
trigger: 'change',
required: true
}
], ],
shenchaxize: [ 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: [ yonglimiaoshu:[
{ required: true, message: '请输入用例描述', trigger: 'blur' } { required: true, message: '请填写用例描述', trigger: 'change' }
] ]
}, },
formItemName: { formItemName: {
biaozhunyaoqiu: '', biaozhunyaoqiu: '',
...@@ -369,9 +408,18 @@ export default { ...@@ -369,9 +408,18 @@ export default {
}, },
// 按钮-选择标准要求 // 按钮-选择标准要求
handleReSelectRequirements() { 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 => { .then(response => {
this.receivedRequirements = response this.receivedRequirements = response
...@@ -382,7 +430,7 @@ export default { ...@@ -382,7 +430,7 @@ export default {
this.dialogVisible = true this.dialogVisible = true
}) })
.catch(error => { .catch(error => {
console.log('testTypeUse方法出错', error) console.log('testType方法出错', error)
}) })
//弹窗展示ReceivedRequirements内容 并且可以选择更改为哪一条标准要求 //弹窗展示ReceivedRequirements内容 并且可以选择更改为哪一条标准要求
}, },
...@@ -454,7 +502,9 @@ export default { ...@@ -454,7 +502,9 @@ export default {
this.newResDataAdd.type = 'car' this.newResDataAdd.type = 'car'
console.log(this.newResDataAdd, '提交之前') console.log(this.newResDataAdd, '提交之前')
testInitatereviewAdd(this.newResDataAdd) this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
...@@ -473,6 +523,13 @@ export default { ...@@ -473,6 +523,13 @@ export default {
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
......
src/views/review/createReview/updateUseCase/index.vue
View file @ 991445cd
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
<el-row> <el-row>
<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="biaozhuntiuaokuan"> <el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
<el-input <el-input
form-rules="biaozhuntiuaokuan" form-rules="jianyanleixing"
v-model="formModel.tiaokuanfenlei" v-model="formModel.jianyanleixing"
style="width: 421px" style="width: 421px"
clearable clearable
disabled disabled
placeholder="车型检验" placeholder="车型检验"
@change="handleSelectType(formModel.tiaokuanfenlei)" @change="handleSelectType(formModel.jianyanleixing)"
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<el-row> <el-row>
<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="ceshiyongli"> <el-form-item label="测试用例" prop="ceshiyongli" v-model="formModel.ceshiyongli">
<el-button type="primary" plain @click="handleSelectUseCase" <el-button type="primary" plain @click="handleSelectUseCase"
>选择测试用例</el-button >选择测试用例</el-button
><span> </span> ><span> </span>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</collapse> </collapse>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleUseCase = false" <el-button @click="handleSelectedUseCase()"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<el-row> <el-row>
<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" >
<el-input <el-input
v-model="formModel.biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu"
placeholder="选择测试用例后显示" placeholder="选择测试用例后显示"
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<el-row> <el-row>
<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"> <el-form-item label="用例编号" prop="yonglibianhao" >
<el-input <el-input
v-model="formModel.yonglibianhao" v-model="formModel.yonglibianhao"
placeholder="请输入用例编号" placeholder="请输入用例编号"
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<el-row> <el-row>
<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"> <el-form-item label="用例描述" prop="yonglimiaoshu" >
<el-input <el-input
v-model="formModel.yonglimiaoshu" v-model="formModel.yonglimiaoshu"
type="textarea" type="textarea"
...@@ -146,8 +146,7 @@ ...@@ -146,8 +146,7 @@
show-word-limit show-word-limit
:autosize="{ minRows: 6, maxRows: 12 }" :autosize="{ minRows: 6, maxRows: 12 }"
resize="none" resize="none"
> ></el-input>
</el-input>
</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>
...@@ -232,9 +231,11 @@ export default { ...@@ -232,9 +231,11 @@ export default {
props: { props: {
formModel: { formModel: {
type: Object, type: Object,
default: () => { default: () => ({
return {} biaozhunyaoqiu: '',
} yonglibianhao: '',
yonglimiaoshu: ''
})
}, },
pageIndexSec: {} pageIndexSec: {}
}, },
...@@ -326,36 +327,85 @@ export default { ...@@ -326,36 +327,85 @@ export default {
dialogVisibleUseCase: false, dialogVisibleUseCase: false,
newReviewSceneText: '', newReviewSceneText: '',
newReviewSceneRemark: '', newReviewSceneRemark: '',
formRules: { formRules: {
tiaokuanfenlei: [ // jianyanleixing: [
{ required: true, message: '请选择条款分类', trigger: 'blur' } // { required: true, message: '请选择检验类型', trigger: 'change' }
], // ],
biaozhuntiuaokuan: [ biaozhunyaoqiu: [
{ required: true, message: '请选择标准条款', trigger: 'blur' } {
message:'请输入标准要求',
trigger: 'change',
required: true
}
], ],
yonglibianhao: [ 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
}
], ],
// biaozhunyaoqiu: [
// {
// required: true,
// message: '选择测试用例后即可显示标准要求',
// trigger: 'blur'
// }
// ],
shenchaxize: [ 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: [ shenchachangjing: [
{ required: true, message: '请输入用例描述', trigger: 'blur' } {
] 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: { formItemName: {
biaozhunyaoqiu: '', biaozhunyaoqiu: '',
biaozhuntiaokuan: '', biaozhuntiaokuan: '',
yonglibianhao: '', yonglibianhao: '',
shenchaxize: '', shenchaxize: '',
biaozhunyaoqiu: '',
// shenchachangjing: '', // shenchachangjing: '',
yonglimiaoshu: '' yonglimiaoshu: ''
}, },
...@@ -393,6 +443,7 @@ export default { ...@@ -393,6 +443,7 @@ export default {
// 将 item.type 赋值给 this.newResData.type // 将 item.type 赋值给 this.newResData.type
this.newResData.type = selectedItem.value this.newResData.type = selectedItem.value
this.newResDataAdd.type = selectedItem.value this.newResDataAdd.type = selectedItem.value
if (this.newResData.type === '1') { if (this.newResData.type === '1') {
this.newResData.type = 'system' this.newResData.type = 'system'
this.newResDataAdd.type = 'system' this.newResDataAdd.type = 'system'
...@@ -519,28 +570,45 @@ export default { ...@@ -519,28 +570,45 @@ export default {
console.log('testUseCase方法出错', error) 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() { handleConfirm() {
console.log('this.value = ', this.formModel) console.log('this.value = ', this.formModel)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name this.newResDataAdd.standard = this.selectedRequirementSave.name
this.newResDataAdd.details = this.selectedDetailsSave.text if(this.selectedDetailsSave){
this.newResDataAdd.detailsId = this.selectedDetailsSave.id this.newResDataAdd.details = this.selectedDetailsSave.text
this.newResDataAdd.keypoint = this.selectedKeyPointsSave.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.newReviewSceneRemark = this.formModel.beizhuxinxi
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= 'car'
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.reviewUsecaseId = '' // this.newResDataAdd.reviewUsecaseId = ''
console.log(this.newResDataAdd, '提交之前') console.log(this.newResDataAdd, '提交之前')
testInitatereviewAdd(this.newResDataAdd) this.$refs.formItemName.validate(valid =>{
if(valid){
testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
...@@ -559,6 +627,13 @@ export default { ...@@ -559,6 +627,13 @@ export default {
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
}else{
this.$message({
message:'提交失败,请填写所有必填项目',
type:'error'
})
}
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // 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