Commit 01724e2c authored by jiaxu.yan's avatar jiaxu.yan

feat(任务处理模块): 车型审查 页面修改

parent 1ec14399
...@@ -52,27 +52,42 @@ ...@@ -52,27 +52,42 @@
margin: 0 10px; margin: 0 10px;
} }
} }
.message-list{ .message-list {
display:flex; display: flex;
flex-wrap:wrap; flex-wrap: wrap;
display: -webkit-flex; /* Safari */ display: -webkit-flex; /* Safari */
padding: 1.5rem 4rem 1rem 4rem; padding: 1.5rem 4rem 1rem 4rem;
.message-box{ .message-box {
flex: 1; flex: 1;
display: flex; display: flex;
// //
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
.icon{ .icon {
font-size: 60px; font-size: 60px;
} }
.message-detail{ .message-detail {
display: flex; display: flex;
margin-left: 10px; margin-left: 10px;
align-items:flex-start; align-items: flex-start;
justify-content: flex-start; justify-content: flex-start;
flex-flow: column; flex-flow: column;
} }
} }
} }
.app-container {
padding: 20px;
}
.custom-card {
::v-deep.el-card__header {
background-color: #f9f9f9;
}
}
.back-btn {
margin-left: 10px;
float: right;
}
.main-content-style {
padding: 0rem 2rem 0rem 2rem;
}
<template> <template>
<!--查看检查表单--> <div class="app-container">
<div> <el-card class="custom-card">
<page-standard> <div slot="header" class="clearfix">
<div>
<!--1-抬头标题--> <!--1-抬头标题-->
<div class="title-style"> <span>查看车型审查表单</span>
<div class="title-content-style">查看车型审查表单</div> <div class="back-btn">
<div class="title-content-style"> <el-button icon="el-icon-back" @click="handleBack"> 返回 </el-button>
<a href="/processing/unprocessed-review">返回</a>
</div> </div>
</div> </div>
<!--2-统计值--> <!--2-统计值-->
...@@ -33,7 +31,6 @@ ...@@ -33,7 +31,6 @@
</span> </span>
</el-col> </el-col>
</el-row> </el-row>
<div class="control-btns"> <div class="control-btns">
<div class="control-btn" @click="openAll()"> <div class="control-btn" @click="openAll()">
<i class="iconfont icon-xiangxiazhankai-yuankuang"></i> <i class="iconfont icon-xiangxiazhankai-yuankuang"></i>
...@@ -47,7 +44,7 @@ ...@@ -47,7 +44,7 @@
<!--审查问卷概要--> <!--审查问卷概要-->
<collapse v-model="activeNames"> <collapse v-model="activeNames">
<collapse-item <collapse-item
v-for="(item, key) in model.systemReviewTask.standard" v-for="(item, key) in model.carReviewTask.standard"
:key="key" :key="key"
:name="item.chapter" :name="item.chapter"
> >
...@@ -105,7 +102,6 @@ ...@@ -105,7 +102,6 @@
</table> </table>
</collapse-item> </collapse-item>
</collapse> </collapse>
<!--返回按钮--> <!--返回按钮-->
<div class="bottom-btn"> <div class="bottom-btn">
<el-button <el-button
...@@ -117,8 +113,7 @@ ...@@ -117,8 +113,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
</div> </el-card>
</page-standard>
</div> </div>
</template> </template>
<!--js逻辑--> <!--js逻辑-->
...@@ -139,6 +134,7 @@ export default { ...@@ -139,6 +134,7 @@ export default {
detailsList: [] detailsList: []
}, },
taskId: 1, taskId: 1,
activeNames: [],
rules: { rules: {
enterpriseLeader: [ enterpriseLeader: [
{ required: true, message: '请输入车企负责人', trigger: 'blur' } { required: true, message: '请输入车企负责人', trigger: 'blur' }
...@@ -149,11 +145,12 @@ export default { ...@@ -149,11 +145,12 @@ export default {
} }
} }
}, },
created() { async created() {
if (this.$route.query.id) { if (this.$route.query.id) {
this.taskId = this.$route.query.id this.taskId = this.$route.query.id
} }
this.getTask() await this.getTask()
this.openAll()
}, },
methods: { methods: {
/** /**
...@@ -172,11 +169,21 @@ export default { ...@@ -172,11 +169,21 @@ export default {
/* 返回跳转*/ /* 返回跳转*/
goToProcessedReview() { goToProcessedReview() {
this.$router.push('/processing/unprocessed-review') this.$router.push('/processing/unprocessed-review')
},
handleBack() {
this.$router.push('/processing/unprocessed-review')
},
openAll() {
this.activeNames = this.model.carReviewTask.standard.map(i => {
return i.chapter
})
},
closeAll() {
this.activeNames = []
} }
} }
} }
</script> </script>
<!--样式--> <!--样式-->
<style scoped lang="scss"> <style scoped lang="scss">
/* 标题样式 */ /* 标题样式 */
...@@ -184,61 +191,27 @@ export default { ...@@ -184,61 +191,27 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding-right: 2rem; padding: 0 2rem;
width: 100%; width: 100%;
height: 3.5rem; height: 3.5rem;
background-color: #f9f9f9; background-color: #f9f9f9;
} }
/* 标题文字样式 */
.title-content-style {
margin-left: 1.5rem;
font-size: 1rem;
font-weight: bold;
color: #666666;
}
::v-deep .el-card__body { ::v-deep .el-card__body {
padding: unset !important; padding: unset !important;
} }
/* 主体内容布局 */ .control-btns {
.main-content-style {
display: flex;
flex-direction: column;
width: 100%;
.btn {
margin: 0 8rem 8rem 4rem;
width: 5rem;
}
.main-statistics {
display: flex; display: flex;
margin: 0 65px; align-items: center;
justify-content: space-between; justify-content: flex-start;
margin-bottom: 40px;
.statistics-card {
width: 320px;
height: 120px;
background: #5ad8a6;
border-radius: 10px;
display: flex;
justify-content: space-between;
padding: 30px;
.card-left {
color: #f3f3f3;
font-size: 20px;
font-weight: bold;
}
.card-right { .control-btn {
::v-deep.iconfont { color: #ff9900;
font-size: 50px; font-size: 14px;
} margin-right: 10px;
} cursor: pointer;
}
} }
} }
...@@ -246,85 +219,30 @@ export default { ...@@ -246,85 +219,30 @@ export default {
margin-top: 3rem; margin-top: 3rem;
} }
/* 任务编号,名称,单位样式 */
.task {
padding: 3rem 0 1rem 6rem;
::v-deep .el-form-item--medium .el-form-item__label {
font-size: 1.25rem;
font-weight: bold;
color: #999999;
}
::v-deep .el-form-item--medium .el-form-item__content {
font-size: 1.25rem;
color: #767676;
}
}
::v-deep .el-col-8 {
margin-right: 13rem;
margin-left: unset !important;
padding-left: unset !important;
width: unset !important;
}
/* 审查文件表格样式(最外层) */
.form-review-questionnaire {
padding: 2.5rem 4rem 1rem;
width: 100%;
height: max-content;
.title-display {
display: flex;
justify-content: flex-start;
align-items: center;
.title-i {
margin-right: 1rem;
width: 0.625rem;
height: 1.625rem;
background-color: #409eff;
}
.title-content {
font-size: 1rem;
font-weight: bold;
color: #409eff;
}
}
::v-deep .el-table--border {
width: unset !important;
}
.table {
border-collapse: collapse;
th {
text-align: center;
}
}
}
/* 表格样式 */
table { table {
margin-top: 20px; margin-top: 20px;
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 100%;
} }
/* 表格样式 */
thead { thead {
background-color: #e7e6e6; background-color: #e7e6e6;
} }
/* 表格样式 */ th {
th, border: 1px solid #f4f4f4;
td {
padding: 8px; padding: 8px;
text-align: left;
width: 300px; width: 300px;
height: 100%; height: 100%;
border: 1px solid black; color: #2b85e4;
}
td {
border: 1px solid #f4f4f4;
padding: 8px;
text-align: left; text-align: left;
width: 300px;
height: 100%;
} }
</style> </style>
...@@ -11,6 +11,26 @@ ...@@ -11,6 +11,26 @@
</div> </div>
</div> </div>
<div class="main-content"> <div class="main-content">
<el-row :gutter="60" class="task">
<el-col :span="8">
<span class="task-label">任务编号:</span>
<span class="task-content">
{{ model.carReviewTask.taskNo }}
</span>
</el-col>
<el-col :span="8">
<span class="task-label">任务名称:</span>
<span class="task-content">
{{ model.carReviewTask.name }}
</span>
</el-col>
<el-col :span="8">
<span class="task-label">委托单位:</span>
<span class="task-content">
{{ model.carReviewTask.taskInitiatorDep }}
</span>
</el-col>
</el-row>
<div class="prompt-message"> <div class="prompt-message">
<span <span
>问卷填写情况:共{{ model.detailsList.length }}条审查细则,已完成{{ >问卷填写情况:共{{ model.detailsList.length }}条审查细则,已完成{{
......
<template> <template>
<page-standard> <page-standard>
<div slot="tab">车企文件库</div> <div slot="tab">车企文件库管理</div>
<el-form ref="queryForm" :model="queryParams" size="small" :inline="true"> <el-form ref="queryForm" :model="queryParams" size="small" :inline="true">
<el-form-item prop="status"> <el-form-item prop="status">
<el-input <el-input
......
<template> <template>
<!--查看审查问卷页面--> <!--查看审查问卷页面-->
<div> <div class="app-container">
<page-standard> <el-card class="custom-card">
<div> <div slot="header" class="clearfix">
<!--1-抬头标题--> <span>确认体系审查结果</span>
<div class="title-style"> <div class="back-btn">
<div class="title-content-style"> <el-button icon="el-icon-back" @click="$router.back()">
确认体系审查结果(所属任务:{{ model.systemReviewTask.name }}) 返回
</div> </el-button>
<div class="title-content-style">
<el-button type="text" @click="$router.back()">返回</el-button>
</div> </div>
</div> </div>
<!--2-统计值--> <!--2-统计值-->
...@@ -237,20 +235,16 @@ ...@@ -237,20 +235,16 @@
<i class="el-icon-warning"></i> <i class="el-icon-warning"></i>
<div>表单内容发生变更</div> <div>表单内容发生变更</div>
<div>审查场景有3条变更,需要修改表单填写内容</div> <div>审查场景有3条变更,需要修改表单填写内容</div>
<el-button type="primary" @click="goUpdate()" <el-button type="primary" @click="goUpdate()">去修改表格</el-button>
>去修改表格</el-button
>
</div>
</div> </div>
</div> </div>
</div> </div>
</page-standard> </el-card>
</div> </div>
</template> </template>
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import { reviewTaskDetail, taskSubmit } from '@/api/task/task' import { reviewTaskDetail, taskSubmit } from '@/api/task/task'
import { getRows, getRows2 } from '@/utils/reviewDetailsTable.js'
import collapse from '@/components/Collapse/collapse' import collapse from '@/components/Collapse/collapse'
import collapseItem from '@/components/Collapse/collapse-item' import collapseItem from '@/components/Collapse/collapse-item'
export default { export default {
......
<template> <template>
<!--查看检查表单--> <!--查看检查表单-->
<div> <div class="app-container">
<page-standard> <el-card class="custom-card">
<div> <div slot="header" class="clearfix">
<!--1-抬头标题--> <!--1-抬头标题-->
<div class="title-style"> <span>查看体系审查表单</span>
<div class="title-content-style">查看体系审查表单</div> <div class="back-btn">
<div class="title-content-style"> <el-button icon="el-icon-back" @click="handleBack"> 返回 </el-button>
<a href="/processing/unprocessed-review">返回</a>
</div> </div>
</div> </div>
<!--2-统计值--> <!--2-统计值-->
...@@ -115,8 +114,7 @@ ...@@ -115,8 +114,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
</div> </el-card>
</page-standard>
</div> </div>
</template> </template>
<!--js逻辑--> <!--js逻辑-->
...@@ -165,6 +163,9 @@ export default { ...@@ -165,6 +163,9 @@ export default {
closeAll() { closeAll() {
this.activeNames = [] this.activeNames = []
}, },
handleBack() {
this.$router.push('/processing/unprocessed-review')
},
/** /**
* 获取任务详情 * 获取任务详情
*/ */
...@@ -195,64 +196,16 @@ export default { ...@@ -195,64 +196,16 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding-right: 2rem; padding: 0 2rem;
width: 100%; width: 100%;
height: 3.5rem; height: 3.5rem;
background-color: #f9f9f9; background-color: #f9f9f9;
} }
/* 标题文字样式 */
.title-content-style {
margin-left: 1.5rem;
font-size: 1rem;
font-weight: bold;
color: #666666;
}
::v-deep .el-card__body { ::v-deep .el-card__body {
padding: unset !important; padding: unset !important;
} }
/* 主体内容布局 */
.main-content-style {
display: flex;
flex-direction: column;
margin: 3rem 6rem;
.btn {
margin: 0 8rem 8rem 4rem;
width: 5rem;
}
.main-statistics {
display: flex;
margin: 0 65px;
justify-content: space-between;
.statistics-card {
width: 320px;
height: 120px;
background: #5ad8a6;
border-radius: 10px;
display: flex;
justify-content: space-between;
padding: 30px;
.card-left {
color: #f3f3f3;
font-size: 20px;
font-weight: bold;
}
.card-right {
::v-deep.iconfont {
font-size: 50px;
}
}
}
}
}
.control-btns { .control-btns {
display: flex; display: flex;
align-items: center; align-items: center;
......
<template> <template>
<!--查看审查问卷页面--> <!--查看审查问卷页面-->
<div>
<page-standard> <div class="app-container">
<div> <el-card class="custom-card">
<!--1-抬头标题--> <div slot="header" class="clearfix">
<div class="title-style"> <span>体系审查原始记录</span>
<div class="title-content-style">体系审查原始记录</div> <div class="back-btn">
<div class="title-content-style"> <el-button icon="el-icon-back" @click="$router.back()">
<el-button type="text" @click="goToProcessedReview">返回</el-button> 返回
</el-button>
</div> </div>
</div> </div>
<!--2-统计值--> <!--2-统计值-->
...@@ -230,14 +231,11 @@ ...@@ -230,14 +231,11 @@
<i class="el-icon-warning"></i> <i class="el-icon-warning"></i>
<div>表单内容发生变更</div> <div>表单内容发生变更</div>
<div>审查场景有3条变更,需要修改表单填写内容</div> <div>审查场景有3条变更,需要修改表单填写内容</div>
<el-button type="primary" @click="goUpdate()" <el-button type="primary" @click="goUpdate()">去修改表格</el-button>
>去修改表格</el-button
>
</div>
</div> </div>
</div> </div>
</div> </div>
</page-standard> </el-card>
</div> </div>
</template> </template>
<!--js逻辑--> <!--js逻辑-->
...@@ -297,139 +295,14 @@ export default { ...@@ -297,139 +295,14 @@ export default {
{ required: true, message: '请输入检验负责人', trigger: 'blur' } { required: true, message: '请输入检验负责人', trigger: 'blur' }
] ]
}, },
tableData: [
{
id: '12987122',
name: '王小虎',
amount1: '234',
amount2: '3.2',
amount3: 10
},
{
id: '12987123',
name: '王小虎',
amount1: '165',
amount2: '4.43',
amount3: 12
},
{
id: '12987124',
name: '王小虎',
amount1: '324',
amount2: '1.9',
amount3: 9
},
{
id: '12987125',
name: '王小虎',
amount1: '621',
amount2: '2.2',
amount3: 17
},
{
id: '12987126',
name: '王小虎',
amount1: '539',
amount2: '4.1',
amount3: 15
},
{
id: '12987123',
name: '王小虎',
amount1: '165',
amount2: '4.43',
amount3: 12
},
{
id: '12987124',
name: '王小虎',
amount1: '324',
amount2: '1.9',
amount3: 9
},
{
id: '12987125',
name: '王小虎',
amount1: '621',
amount2: '2.2',
amount3: 17
},
{
id: '12987126',
name: '王小虎',
amount1: '539',
amount2: '4.1',
amount3: 15
},
{
id: '12987123',
name: '王小虎',
amount1: '165',
amount2: '4.43',
amount3: 12
},
{
id: '12987124',
name: '王小虎',
amount1: '324',
amount2: '1.9',
amount3: 9
},
{
id: '12987125',
name: '王小虎',
amount1: '621',
amount2: '2.2',
amount3: 17
},
{
id: '12987126',
name: '王小虎',
amount1: '539',
amount2: '4.1',
amount3: 15
},
{
id: '12987123',
name: '王小虎',
amount1: '165',
amount2: '4.43',
amount3: 12
},
{
id: '12987124',
name: '王小虎',
amount1: '324',
amount2: '1.9',
amount3: 9
},
{
id: '12987125',
name: '王小虎',
amount1: '621',
amount2: '2.2',
amount3: 17
},
{
id: '12987126',
name: '王小虎',
amount1: '539',
amount2: '4.1',
amount3: 15
}
],
taskId: '', taskId: '',
activeNames: [], activeNames: []
type: ''
} }
}, },
async mounted() { async mounted() {
if (this.$route.query.id) { if (this.$route.query.id) {
this.taskId = this.$route.query.id this.taskId = this.$route.query.id
} }
if (this.$route.query.type) {
this.type = this.$route.query.type
}
await this.getTask() await this.getTask()
this.openAll() this.openAll()
}, },
......
...@@ -535,24 +535,16 @@ export default { ...@@ -535,24 +535,16 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.app-container { .back-btn {
padding: 20px;
.custom-card {
::v-deep.el-card__header {
background-color: #f9f9f9;
}
.back-btn {
margin-left: 10px; margin-left: 10px;
float: right; float: right;
} }
.other-btn { .other-btn {
float: right; float: right;
} }
.main-content { .main-content {
min-height: 550px; min-height: 550px;
.prompt-message { .prompt-message {
...@@ -669,13 +661,11 @@ export default { ...@@ -669,13 +661,11 @@ export default {
} }
} }
} }
} }
.bottom-btn { .bottom-btn {
display: flex; display: flex;
justify-content: center; justify-content: center;
}
}
} }
.label-btn { .label-btn {
......
...@@ -293,14 +293,14 @@ ...@@ -293,14 +293,14 @@
title="任务详情" title="任务详情"
@click="goDetail(item.id)" @click="goDetail(item.id)"
></el-button> ></el-button>
<el-button <!-- <el-button
type="warning" type="warning"
icon="el-icon-s-promotion" icon="el-icon-s-promotion"
size="mini" size="mini"
circle circle
title="移交任务" title="移交任务"
@click="openTaskDialog" @click="openTaskDialog"
></el-button> ></el-button> -->
<!-- <el-button <!-- <el-button
type="success" type="success"
icon="el-icon-s-management" icon="el-icon-s-management"
...@@ -420,7 +420,8 @@ export default { ...@@ -420,7 +420,8 @@ export default {
// .then(res => { // .then(res => {
// if (res.code === 200) { // if (res.code === 200) {
// console.log(res.rows) // console.log(res.rows)
// res.rows[0].carReviewStatus = 'NEW' // res.rows[0].carReviewStatus = 'FINISH'
// res.rows[0].reviewStatus = 'FINISH'
// this.tableData = res.rows // this.tableData = res.rows
// this.total = res.total // this.total = res.total
// } // }
......
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