Skip to content

C
car-database-web
Commit c642570f authored by baiyanhao's avatar baiyanhao
Browse files
Options

评审管理-各个表单细节修改

parent 028a3763
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 564 additions and 477 deletions
src/api/task/test.js
View file @ c642570f
...@@ -165,7 +165,7 @@ export function testScene(query) { ...@@ -165,7 +165,7 @@ export function testScene(query) {
// 发起评审页面 获取用例列表 // 发起评审页面 获取用例列表
export function testUseCaseListAll(query) { export function testUseCaseListAll(query) {
return request({ return request({
url: '/review/scene/change/task/getUseCaseListAll', url: '/system/testCase/getUseCaseList',
method: 'post', method: 'post',
headers:{ headers:{
'Content-Type': 'application/json', 'Content-Type': 'application/json',
......
src/views/review/createReview/deleteReviewDetails/index.vue
View file @ c642570f
...@@ -53,20 +53,20 @@ ...@@ -53,20 +53,20 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="chapter" label="章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="要求描述"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<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>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> </el-table-column> -->
<el-table-column label="选择"> <el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedRequirement"> <el-radio-group v-model="selectedRequirement">
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
:data="this.receivedkeypoints.data" :data="this.receivedkeypoints.data"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="id" label="要点编号" width="100"> <!-- <el-table-column prop="id" label="要点编号" width="100">
</el-table-column> </el-table-column> -->
<el-table-column prop="text" label="要点描述"> <el-table-column prop="text" label="要点描述">
</el-table-column> </el-table-column>
...@@ -218,12 +218,17 @@ ...@@ -218,12 +218,17 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
<div 评审人员:
v-for="(reviewer, index) in this.receivedReviewer" <div class="review-members">
:key="index" <span
style="margin-bottom: 10px" v-for="(reviewer, index) in receivedReviewer"
> :key="index"
{{ reviewer.dept.deptName }}:{{ reviewer.dept.leader }} class="review-member-text"
>
{{ reviewer.nickName }} ({{ reviewer.dept.deptName }})
<span v-if="index !== receivedReviewer.length - 1">,</span>
<!-- 如果不是最后一个，加逗号 -->
</span>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -526,17 +531,23 @@ export default { ...@@ -526,17 +531,23 @@ export default {
console.log(this.newResDataAdd,'提交之前') console.log(this.newResDataAdd,'提交之前')
testInitatereviewAdd(this.newResDataAdd) testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if(aa){ if (aa) {
alert('提交成功') this.$message.success('提交成功 页面将在5秒后跳转')
this.$router.push({path: '/review/createReview'}); this.timer = setTimeout(() => {
}else{ this.$router.push({ path: '/review/initiatedReview' })
alert('提交失败') }, 5000)
} } else {
}) this.$message({
.catch(error => { message: '提交失败',
console.log('testInitatereviewAdd方法出错', error) type: 'error'
}) })
}
})
.catch(error => {
console.log('testInitatereviewAdd方法出错', error)
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
...@@ -593,16 +604,26 @@ export default { ...@@ -593,16 +604,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 {
display: flex;
flex-wrap: wrap; /* 可选，允许自动换行 */
gap: 10px; /* 控制每个 span 之间的间距 */
.review-member-text {
display: inline-block; /* 或者使用 inline */
margin-right: 10px; /* 设定各个 span 之间的间距 */
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 @ c642570f
...@@ -53,20 +53,20 @@ ...@@ -53,20 +53,20 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="chapter" label="章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="要求描述"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<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>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> </el-table-column> -->
<el-table-column label="选择"> <el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedRequirement"> <el-radio-group v-model="selectedRequirement">
...@@ -109,8 +109,7 @@ ...@@ -109,8 +109,7 @@
:data="this.receivedkeypoints.data" :data="this.receivedkeypoints.data"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="id" label="要点编号" width="100">
</el-table-column>
<el-table-column prop="text" label="要点描述"> <el-table-column prop="text" label="要点描述">
</el-table-column> </el-table-column>
...@@ -163,12 +162,17 @@ ...@@ -163,12 +162,17 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
<div 评审人员:
v-for="(reviewer, index) in this.receivedReviewer" <div class="review-members">
:key="index" <span
style="margin-bottom: 10px" v-for="(reviewer, index) in receivedReviewer"
> :key="index"
{{ reviewer.dept.deptName }}:{{ reviewer.dept.leader }} class="review-member-text"
>
{{ reviewer.nickName }} ({{ reviewer.dept.deptName }})
<span v-if="index !== receivedReviewer.length - 1">,</span>
<!-- 如果不是最后一个，加逗号 -->
</span>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -472,17 +476,23 @@ export default { ...@@ -472,17 +476,23 @@ export default {
console.log(this.newResDataAdd.inspectStandardId, '提交之前') console.log(this.newResDataAdd.inspectStandardId, '提交之前')
testInitatereviewAdd(this.newResDataAdd) testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if(aa){ if (aa) {
alert('提交成功') this.$message.success('提交成功 页面将在5秒后跳转')
this.$router.push({path: '/review/createReview'}); this.timer = setTimeout(() => {
}else{ this.$router.push({ path: '/review/initiatedReview' })
alert('提交失败') }, 5000)
} } else {
}) this.$message({
.catch(error => { message: '提交失败',
console.log('testInitatereviewAdd方法出错', error) type: 'error'
}) })
}
})
.catch(error => {
console.log('testInitatereviewAdd方法出错', error)
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
...@@ -539,16 +549,26 @@ export default { ...@@ -539,16 +549,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 {
display: flex;
flex-wrap: wrap; /* 可选，允许自动换行 */
gap: 10px; /* 控制每个 span 之间的间距 */
.review-member-text {
display: inline-block; /* 或者使用 inline */
margin-right: 10px; /* 设定各个 span 之间的间距 */
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/deleteReviewScene/index.vue
View file @ c642570f
...@@ -53,20 +53,20 @@ ...@@ -53,20 +53,20 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="chapter" label="章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="要求描述"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<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>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> </el-table-column> -->
<el-table-column label="选择"> <el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedRequirement"> <el-radio-group v-model="selectedRequirement">
...@@ -255,12 +255,17 @@ ...@@ -255,12 +255,17 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
<div 评审人员:
v-for="(reviewer, index) in this.receivedReviewer" <div class="review-members">
:key="index" <span
style="margin-bottom: 10px" v-for="(reviewer, index) in receivedReviewer"
> :key="index"
{{ reviewer.dept.deptName }}:{{ reviewer.dept.leader }} class="review-member-text"
>
{{ reviewer.nickName }} ({{ reviewer.dept.deptName }})
<span v-if="index !== receivedReviewer.length - 1">,</span>
<!-- 如果不是最后一个，加逗号 -->
</span>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -584,17 +589,23 @@ export default { ...@@ -584,17 +589,23 @@ export default {
console.log(this.newResDataAdd, '提交之前') console.log(this.newResDataAdd, '提交之前')
testInitatereviewAdd(this.newResDataAdd) testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if(aa){ if (aa) {
alert('提交成功') this.$message.success('提交成功 页面将在5秒后跳转')
this.$router.push({path: '/review/createReview'}); this.timer = setTimeout(() => {
}else{ this.$router.push({ path: '/review/initiatedReview' })
alert('提交失败') }, 5000)
} } else {
}) this.$message({
.catch(error => { message: '提交失败',
console.log('testInitatereviewAdd方法出错', error) type: 'error'
}) })
}
})
.catch(error => {
console.log('testInitatereviewAdd方法出错', error)
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
...@@ -656,16 +667,26 @@ export default { ...@@ -656,16 +667,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 {
display: flex;
flex-wrap: wrap; /* 可选，允许自动换行 */
gap: 10px; /* 控制每个 span 之间的间距 */
.review-member-text {
display: inline-block; /* 或者使用 inline */
margin-right: 10px; /* 设定各个 span 之间的间距 */
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 @ c642570f
...@@ -53,20 +53,20 @@ ...@@ -53,20 +53,20 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="chapter" label="章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="要求描述"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<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>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> </el-table-column> -->
<el-table-column label="选择"> <el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedRequirement"> <el-radio-group v-model="selectedRequirement">
...@@ -91,35 +91,35 @@ ...@@ -91,35 +91,35 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label="标准要求:" prop="biaozhunyaoqiu"> <el-form-item label="标准要求:" prop="biaozhunyaoqiu">
{{ 标准要求 }} {{ 标准要求 }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label="用例编号:" prop="yonglibianhao" style="color: red;"> <el-form-item label="用例编号:" prop="yonglibianhao" style="color: red;">
{{用例编号}} {{ 用例编号 }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label="用例描述:" prop="yonglimiaoshu" style="color: red;"> <el-form-item label="用例描述:" prop="yonglimiaoshu" style="color: red;">
{{ 用例描述 }} {{ 用例描述 }}
</el-form-item> </el-col </el-form-item> </el-col
><el-col :span="8"><p></p></el-col> ><el-col :span="3"><p></p></el-col>
</el-row> </el-row>
<div class="subtitle">评审成员</div> <div class="subtitle">评审成员</div>
...@@ -128,12 +128,17 @@ ...@@ -128,12 +128,17 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
<div 评审人员:
v-for="(reviewer, index) in this.receivedReviewer" <div class="review-members">
:key="index" <span
style="margin-bottom: 10px" v-for="(reviewer, index) in receivedReviewer"
> :key="index"
{{ reviewer.dept.deptName }}:{{ reviewer.dept.leader }} class="review-member-text"
>
{{ reviewer.nickName }} ({{ reviewer.dept.deptName }})
<span v-if="index !== receivedReviewer.length - 1">,</span>
<!-- 如果不是最后一个，加逗号 -->
</span>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -143,7 +148,7 @@ ...@@ -143,7 +148,7 @@
<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="8"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<el-input <el-input
v-model="formModel.beizhuxinxi" v-model="formModel.beizhuxinxi"
...@@ -156,7 +161,6 @@ ...@@ -156,7 +161,6 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-col :span="10"><p></p></el-col>
</el-col> </el-col>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
...@@ -273,9 +277,9 @@ export default { ...@@ -273,9 +277,9 @@ export default {
tiaokuanfenlei: [ tiaokuanfenlei: [
{ required: true, message: '请选择条款分类', trigger: 'blur' } { required: true, message: '请选择条款分类', trigger: 'blur' }
], ],
jianyanleixing: [ // jianyanleixing: [
{ required: true, message: '请选择标准条款', trigger: 'blur' } // { required: true, message: '请选择标准条款', trigger: 'blur' }
], // ],
// yonglibianhao: [ // yonglibianhao: [
// { required: true, message: '请输入用例编号', trigger: 'blur' } // { required: true, message: '请输入用例编号', trigger: 'blur' }
// ], // ],
...@@ -453,14 +457,20 @@ export default { ...@@ -453,14 +457,20 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
alert('提交成功') this.$message.success('提交成功 页面将在5秒后跳转')
this.$router.push({ path: '/review/createReview' }) this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
} else { } else {
alert('提交失败') this.$message({
message: '提交失败',
type: 'error'
})
} }
}) })
.catch(error => { .catch(error => {
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
...@@ -518,16 +528,26 @@ export default { ...@@ -518,16 +528,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 {
display: flex;
flex-wrap: wrap; /* 可选，允许自动换行 */
gap: 10px; /* 控制每个 span 之间的间距 */
.review-member-text {
display: inline-block; /* 或者使用 inline */
margin-right: 10px; /* 设定各个 span 之间的间距 */
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/index.vue
View file @ c642570f
...@@ -3,7 +3,24 @@ ...@@ -3,7 +3,24 @@
<div slot="tab"> <div slot="tab">
<el-row class="vif0"> <el-row class="vif0">
<el-col :span="3"> <el-col :span="3">
<el-form
</el-col>
<el-col :span="21">
<div v-if="pageIndex === 0" class="create-review-content">
<div class="center-tip">
<el-image
:src="require('@/assets/images/createReview/xuanzepinshen.png')"
style="width: 150px; height: 150px"
></el-image>
<div
class="center-tip-text"
style="font-size: 24px; font-weight: 800"
>
请选择要发起的评审类型
</div>
<div style="font-size: 18px">只能选择一种类型</div>
</div>
<el-form
v-if="pageIndex === 0" v-if="pageIndex === 0"
ref="queryForm" ref="queryForm"
class="tab-form" class="tab-form"
...@@ -11,7 +28,10 @@ ...@@ -11,7 +28,10 @@
size="small" size="small"
:inline="true" :inline="true"
> >
<el-form-item label="选择标准" v-bind="standardList"> <el-form-item label="选择标准" v-bind="standardList"
:style=" { margin: '30px',
'margin-left': '-100px',
}">
<el-select <el-select
placeholder="请选择标准" placeholder="请选择标准"
v-model="selected" v-model="selected"
...@@ -29,23 +49,14 @@ ...@@ -29,23 +49,14 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col> <div class="bg-transparent">
<el-col :span="21"> <p :style="{ color:'transparent',
<div v-if="pageIndex === 0" class="create-review-content"> UserSelect: 'none',
<div class="center-tip"> }">sss</p>
<el-image
:src="require('@/assets/images/createReview/xuanzepinshen.png')" </div>
style="width: 150px; height: 150px"
></el-image>
<div
class="center-tip-text"
style="font-size: 24px; font-weight: 800"
>
请选择要发起的评审类型
</div>
<div style="font-size: 18px">只能选择一种类型</div>
</div>
<div <div
v-for="(reviewType, typeIndex) in dict.type.create_review_type" v-for="(reviewType, typeIndex) in dict.type.create_review_type"
:key="reviewType.value" :key="reviewType.value"
...@@ -331,6 +342,8 @@ import DeleteUseCase from './deleteUseCase' ...@@ -331,6 +342,8 @@ import DeleteUseCase from './deleteUseCase'
import UpdateUseCase from './updateUseCase' import UpdateUseCase from './updateUseCase'
import { testInitatereview } from '@/api/task/test' import { testInitatereview } from '@/api/task/test'
import { color } from 'echarts'
import UserSelect from 'autoprefixer/lib/hacks/user-select'
export default { export default {
name: 'CreateReview', name: 'CreateReview',
...@@ -572,7 +585,10 @@ export default { ...@@ -572,7 +585,10 @@ export default {
}else if ( }else if (
this.selected === '' this.selected === ''
){ ){
alert('请选择标准') this.$message({
message: '请选择标准再进行下一步操作',
type: 'error'
})
} }
} }
} }
......
src/views/review/createReview/newReviewDetails/index.vue
View file @ c642570f
...@@ -53,20 +53,20 @@ ...@@ -53,20 +53,20 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="chapter" label="章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="要求描述"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<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>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> </el-table-column> -->
<el-table-column label="选择"> <el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedRequirement"> <el-radio-group v-model="selectedRequirement">
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
:data="this.receivedkeypoints.data" :data="this.receivedkeypoints.data"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="id" label="要点编号" width="100"> <!-- <el-table-column prop="id" label="要点编号" width="100">
</el-table-column> </el-table-column> -->
<el-table-column prop="text" label="要点描述"> <el-table-column prop="text" label="要点描述">
</el-table-column> </el-table-column>
...@@ -181,12 +181,17 @@ ...@@ -181,12 +181,17 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
<div 评审人员:
v-for="(reviewer, index) in this.receivedReviewer" <div class="review-members">
:key="index" <span
style="margin-bottom: 10px" v-for="(reviewer, index) in receivedReviewer"
> :key="index"
{{ reviewer.dept.deptName }}:{{ reviewer.dept.leader }} class="review-member-text"
>
{{ reviewer.nickName }} ({{ reviewer.dept.deptName }})
<span v-if="index !== receivedReviewer.length - 1">,</span>
<!-- 如果不是最后一个，加逗号 -->
</span>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -488,17 +493,23 @@ ...@@ -488,17 +493,23 @@
console.log(this.newResDataAdd,'提交之前') console.log(this.newResDataAdd,'提交之前')
testInitatereviewAdd(this.newResDataAdd) testInitatereviewAdd(this.newResDataAdd)
.then(response => { .then(response => {
const aa = response const aa = response
if(aa){ if (aa) {
alert('提交成功') this.$message.success('提交成功 页面将在5秒后跳转')
this.$router.push({path: '/review/createReview'}); this.timer = setTimeout(() => {
}else{ this.$router.push({ path: '/review/initiatedReview' })
alert('提交失败') }, 5000)
} } else {
}) this.$message({
.catch(error => { message: '提交失败',
console.log('testInitatereviewAdd方法出错', error) type: 'error'
}) })
}
})
.catch(error => {
console.log('testInitatereviewAdd方法出错', error)
})
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
// this.newResDataAdd.newText = newText // this.newResDataAdd.newText = newText
...@@ -555,16 +566,26 @@ ...@@ -555,16 +566,26 @@
} }
} }
.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 {
display: flex;
flex-wrap: wrap; /* 可选，允许自动换行 */
gap: 10px; /* 控制每个 span 之间的间距 */
.review-member-text {
display: inline-block; /* 或者使用 inline */
margin-right: 10px; /* 设定各个 span 之间的间距 */
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/newReviewKeypoints/index.vue
View file @ c642570f
...@@ -54,20 +54,20 @@ ...@@ -54,20 +54,20 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="chapter" label="章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="要求描述"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<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>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> </el-table-column> -->
<el-table-column label="选择"> <el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedRequirement"> <el-radio-group v-model="selectedRequirement">
...@@ -134,18 +134,17 @@ ...@@ -134,18 +134,17 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员:<div 评审人员:
v-for="(reviewer, index) in this.receivedReviewer" <div class="review-members">
:key="index"
style="margin-bottom: 10px ;
display: flex;
position: relative;
flex-flow: row ;
"
>
<span <span
style="position: absolute;" v-for="(reviewer, index) in receivedReviewer"
>{{ reviewer.nickName }}({{ reviewer.dept.deptName }})</span> :key="index"
class="review-member-text"
>
{{ reviewer.nickName }} ({{ reviewer.dept.deptName }})
<span v-if="index !== receivedReviewer.length - 1">,</span>
<!-- 如果不是最后一个，加逗号 -->
</span>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -308,6 +307,9 @@ export default { ...@@ -308,6 +307,9 @@ export default {
} }
} }
}, },
beforeDestroy() {
clearTimeout(this.timer)
},
mounted() { mounted() {
console.log('selected vif3 this.pageIndexSec = ', this.pageIndexSec) console.log('selected vif3 this.pageIndexSec = ', this.pageIndexSec)
this.newResDataAdd.chapter = this.pageIndexSec this.newResDataAdd.chapter = this.pageIndexSec
...@@ -318,9 +320,9 @@ export default { ...@@ -318,9 +320,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: {
// 表单提交验证 // 表单提交验证
...@@ -467,14 +469,20 @@ export default { ...@@ -467,14 +469,20 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
alert('提交成功') this.$message.success('提交成功 页面将在5秒后跳转')
this.$router.push({ path: '/review/createReview' }) this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
} else { } else {
alert('提交失败') this.$message({
message: '提交失败',
type: 'error'
})
} }
}) })
.catch(error => { .catch(error => {
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
...@@ -531,17 +539,7 @@ export default { ...@@ -531,17 +539,7 @@ export default {
width: 150px; width: 150px;
} }
} }
.assessor-text {
background: #f5f5f5;
border: 1px solid #d9d9d9;
border-radius: 4px;
padding: 7px 10px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
text-align: left;
color: #606266;
line-height: 16px;
}
::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)
...@@ -559,4 +557,25 @@ export default { ...@@ -559,4 +557,25 @@ export default {
overflow: hidden; overflow: hidden;
} }
} }
.assessor-text {
background: #f5f5f5;
border: 1px solid #d9d9d9;
border-radius: 4px;
padding: 7px 10px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
text-align: left;
color: #606266;
line-height: 16px;
.review-member {
display: flex;
flex-wrap: wrap; /* 可选，允许自动换行 */
gap: 10px; /* 控制每个 span 之间的间距 */
.review-member-text {
display: inline-block; /* 或者使用 inline */
margin-right: 10px; /* 设定各个 span 之间的间距 */
width: 200px;
}
}
}
</style> </style>
src/views/review/createReview/newReviewScene/index.vue
View file @ c642570f
...@@ -54,20 +54,20 @@ ...@@ -54,20 +54,20 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="chapter" label="章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="要求描述"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<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>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> </el-table-column> -->
<el-table-column label="选择"> <el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedRequirement"> <el-radio-group v-model="selectedRequirement">
...@@ -110,8 +110,8 @@ ...@@ -110,8 +110,8 @@
:data="this.receivedkeypoints.data" :data="this.receivedkeypoints.data"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="id" label="要点编号" width="100"> <!-- <el-table-column prop="id" label="要点编号" width="100">
</el-table-column> </el-table-column> -->
<el-table-column prop="text" label="要点描述"> <el-table-column prop="text" label="要点描述">
</el-table-column> </el-table-column>
...@@ -220,25 +220,16 @@ ...@@ -220,25 +220,16 @@
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员: 评审人员:
<div <div class="review-members">
v-for="(reviewer, index) in this.receivedReviewer" <span
:key="index" v-for="(reviewer, index) in receivedReviewer"
style=" :key="index"
margin-bottom: 30px; class="review-member-text"
display: flex;
position: relative;
flex-flow: row;
"
>
<p
style="
display: inline-block;
white-space: normal;
word-wrap: break-word;
"
> >
{{ reviewer.nickName }} ({{ reviewer.dept.deptName }}) {{ reviewer.nickName }} ({{ reviewer.dept.deptName }})
</p> <span v-if="index !== receivedReviewer.length - 1">,</span>
<!-- 如果不是最后一个，加逗号 -->
</span>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -552,14 +543,20 @@ export default { ...@@ -552,14 +543,20 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
alert('提交成功') this.$message.success('提交成功 页面将在5秒后跳转')
this.$router.push({ path: '/review/createReview' }) this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
} else { } else {
alert('提交失败') this.$message({
message: '提交失败',
type: 'error'
})
} }
}) })
.catch(error => { .catch(error => {
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
...@@ -617,16 +614,26 @@ export default { ...@@ -617,16 +614,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 {
display: flex;
flex-wrap: wrap; /* 可选，允许自动换行 */
gap: 10px; /* 控制每个 span 之间的间距 */
.review-member-text {
display: inline-block; /* 或者使用 inline */
margin-right: 10px; /* 设定各个 span 之间的间距 */
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/newUseCase/index.vue
View file @ c642570f
...@@ -51,20 +51,20 @@ ...@@ -51,20 +51,20 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="chapter" label="章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="要求描述"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<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>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> </el-table-column> -->
<el-table-column label="选择"> <el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedRequirement"> <el-radio-group v-model="selectedRequirement">
...@@ -127,12 +127,17 @@ ...@@ -127,12 +127,17 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
<div 评审人员:
v-for="(reviewer, index) in this.receivedReviewer" <div class="review-members">
:key="index" <span
style="margin-bottom: 10px" v-for="(reviewer, index) in receivedReviewer"
> :key="index"
{{ reviewer.dept.deptName }}:{{ reviewer.dept.leader }} class="review-member-text"
>
{{ reviewer.nickName }} ({{ reviewer.dept.deptName }})
<span v-if="index !== receivedReviewer.length - 1">,</span>
<!-- 如果不是最后一个，加逗号 -->
</span>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -182,7 +187,7 @@ import { ...@@ -182,7 +187,7 @@ import {
testInitatereviewAdd, testInitatereviewAdd,
testReviewer testReviewer
} from '@/api/task/test' } from '@/api/task/test'
import { stringify } from 'postcss'; import { stringify } from 'postcss'
export default { export default {
name: 'ReviewData', name: 'ReviewData',
...@@ -283,9 +288,9 @@ export default { ...@@ -283,9 +288,9 @@ export default {
tiaokuanfenlei: [ tiaokuanfenlei: [
{ required: true, message: '请选择条款分类', trigger: 'blur' } { required: true, message: '请选择条款分类', trigger: 'blur' }
], ],
biaozhuntiuaokuan: [ // biaozhuntiuaokuan: [
{ required: true, message: '请选择标准条款', trigger: 'blur' } // { required: true, message: '请选择标准条款', trigger: 'blur' }
], // ],
yonglibianhao: [ yonglibianhao: [
{ required: true, message: '请输入用例编号', trigger: 'blur' } { required: true, message: '请输入用例编号', trigger: 'blur' }
], ],
...@@ -366,7 +371,6 @@ export default { ...@@ -366,7 +371,6 @@ export default {
handleReSelectRequirements() { handleReSelectRequirements() {
this.stringifyNewResDataUse = JSON.stringify(this.newResDataUse) this.stringifyNewResDataUse = JSON.stringify(this.newResDataUse)
testTypeUse(this.stringifyNewResDataUse) testTypeUse(this.stringifyNewResDataUse)
.then(response => { .then(response => {
this.receivedRequirements = response this.receivedRequirements = response
...@@ -454,14 +458,20 @@ export default { ...@@ -454,14 +458,20 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
alert('提交成功') this.$message.success('提交成功 页面将在5秒后跳转')
this.$router.push({ path: '/review/createReview' }) this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
} else { } else {
alert('提交失败') this.$message({
message: '提交失败',
type: 'error'
})
} }
}) })
.catch(error => { .catch(error => {
console.log('testInitatereviewAdd方法出错', error) console.log('testInitatereviewAdd方法出错', error)
}) })
//newText => 由填写的时候赋值 //newText => 由填写的时候赋值
//remark => 由填写的时候赋值 //remark => 由填写的时候赋值
...@@ -532,6 +542,16 @@ export default { ...@@ -532,6 +542,16 @@ export default {
text-align: left; text-align: left;
color: #606266; color: #606266;
line-height: 16px; line-height: 16px;
.review-member {
display: flex;
flex-wrap: wrap; /* 可选，允许自动换行 */
gap: 10px; /* 控制每个 span 之间的间距 */
.review-member-text {
display: inline-block; /* 或者使用 inline */
margin-right: 10px; /* 设定各个 span 之间的间距 */
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,
......
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