Commit f54544bc authored by baiyanhao's avatar baiyanhao

检测内容评审 样式细节修改

parent df47b488
...@@ -86,7 +86,7 @@ export const constantRoutes = [ ...@@ -86,7 +86,7 @@ export const constantRoutes = [
}, },
//去评审页面跳转 2024-9-5 16:25:29 //去评审页面跳转 2024-9-5 16:25:29
{ {
path: '/goreview', path: '/review/sceneReview',
component: () => import('@/views/review/sceneReview/index'), component: () => import('@/views/review/sceneReview/index'),
name: 'GoReview', name: 'GoReview',
hidden: true hidden: true
......
...@@ -391,7 +391,7 @@ export default { ...@@ -391,7 +391,7 @@ export default {
/*查看按钮页面跳转 */ /*查看按钮页面跳转 */
handleDetail (row){ handleDetail (row){
this.$router.push({ this.$router.push({
path: `/review/view`, path: `/review/views`,
query: { id: row.id }, query: { id: row.id },
// params:{ }, // params:{ },
}) })
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false" <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleDetails = false" <el-button type="primary" plain @click="dialogVisibleDetails = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
<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 class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -579,10 +579,10 @@ export default { ...@@ -579,10 +579,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false" <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<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 class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -538,10 +538,10 @@ export default { ...@@ -538,10 +538,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false" <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleDetails = false" <el-button type="primary" plain @click="dialogVisibleDetails = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleScene = false" <el-button type="primary" plain @click="dialogVisibleScene = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
<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 class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -674,10 +674,10 @@ export default { ...@@ -674,10 +674,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
</collapse> </collapse>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleUseCase = false" <el-button type="primary" plain @click="dialogVisibleUseCase = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<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 class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -552,10 +552,10 @@ export default { ...@@ -552,10 +552,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
...@@ -412,12 +412,20 @@ export default { ...@@ -412,12 +412,20 @@ export default {
created() { created() {
this.getStandardList() this.getStandardList()
}, },
mounted() {}, mounted() {
},
methods: { methods: {
getStandardList() { getStandardList() {
testInitatereview(this.standardData) testInitatereview(this.standardData)
.then(response => { .then(response => {
this.standardList = response.rows this.standardList = response.rows
this.selected = this.standardList[0].standardNo
console.log(response, '1111') console.log(response, '1111')
}) })
.catch(error => { .catch(error => {
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false" <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<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 class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -530,10 +530,10 @@ ...@@ -530,10 +530,10 @@
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<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 class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -496,10 +496,10 @@ export default { ...@@ -496,10 +496,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false" <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleDetails = false" <el-button type="primary" plain @click="dialogVisibleDetails = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,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="18">
<el-form-item label="审查场景" prop="shenchachangjing" v-model="formModel.shenchachangjing"> <el-form-item label="审查场景" prop="shenchachangjing" v-model="formModel.shenchachangjing">
<el-input <el-input
v-model="formModel.shenchachangjing" v-model="formModel.shenchachangjing"
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-col </el-form-item> </el-col
><el-col :span="10"><p></p></el-col> ><el-col :span="3"><p></p></el-col>
</el-row> </el-row>
<div class="subtitle">评审成员</div> <div class="subtitle">评审成员</div>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
<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 class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,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"
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-col :span="10"><p></p></el-col> <el-col :span="3"><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>
...@@ -585,10 +585,10 @@ export default { ...@@ -585,10 +585,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="success" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<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 class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -509,10 +509,10 @@ export default { ...@@ -509,10 +509,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准条款" prop="biaozhuntiuaokuan"> <el-form-item label="标准条款" prop="biaozhuntiuaokuan">
<el-button type="primary" plain @click="handleReSelect" <el-button type="success" plain @click="handleReSelect"
>重新选择标准条款</el-button >重新选择标准条款</el-button
> >
<div style="display: flex"> <div style="display: flex">
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="create-review-footer"> <div class="create-review-footer">
<el-button type="primary" class="next-button" @click="handleConfirm" <el-button type="success" class="next-button" @click="handleConfirm"
><span ><span
class="el-icon-check" class="el-icon-check"
style="margin-right: 6px" style="margin-right: 6px"
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</collapse> </collapse>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="handleSelectedUseCase()" <el-button type="primary" plain @click="handleSelectedUseCase()"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<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 class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -614,10 +614,10 @@ export default { ...@@ -614,10 +614,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
<el-form-item prop="type"> <el-form-item prop="type">
<el-select <el-select
v-model="queryParams.type" v-model="queryParams.type"
placeholder="标准要求分类" placeholder="检验类型"
clearable clearable
> >
<el-option <el-option
v-for="dict in dict.type.type" v-for="dict in dict.type.scene_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="标准要求分类" label="检验类型"
width="150" width="150"
sortable sortable
align="left" align="left"
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
:formatter="formatOperationSort" :formatter="formatOperationSort"
> >
</el-table-column> </el-table-column>
<el-table-column label="场景内容" width="200" align="left" prop="newText"> <el-table-column label="评审内容" width="200" align="left" prop="newText">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="评审人员" label="评审人员"
...@@ -243,7 +243,7 @@ import { listTest } from '@/api/task/test' ...@@ -243,7 +243,7 @@ import { listTest } from '@/api/task/test'
export default { export default {
name: 'Index', name: 'Index',
mixins: [page], mixins: [page],
dicts: ['review_status', 'review_type', 'type'], dicts: ['review_status', 'review_type', 'scene_type'],
data() { data() {
return { return {
...@@ -276,15 +276,15 @@ export default { ...@@ -276,15 +276,15 @@ export default {
mounted() {}, mounted() {},
methods: { methods: {
gainDictDataList() { gainDictDataList() {
const obj = 'type' const obj = 'scene_type'
const obj1 = 'review_type' const obj1 = 'review_type'
// 获取 review_type 字典数据 // 获取 review_type 字典数据
getDicts('review_type').then(response => { getDicts('review_type').then(response => {
this.reviewTypeList = response.data || [] this.reviewTypeList = response.data || []
}) })
// 获取 type 字典数据 // 获取 scene_type 字典数据
getDicts('type').then(response => { getDicts('scene_type').then(response => {
this.typeList = response.data || [] this.typeList = response.data || []
}) })
}, },
......
...@@ -367,8 +367,11 @@ export default { ...@@ -367,8 +367,11 @@ export default {
/* 去评审按钮页面跳转*/ /* 去评审按钮页面跳转*/
handleReview(row) { handleReview(row) {
this.$router.push({ this.$router.push({
path: `/goreview`, path: `/review/sceneReview`,
query: { id: row.id } query: {
id: row.id,
sort: row.operationSort
}
// params:{ }, // params:{ },
}) })
}, },
......
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