Skip to content

W
web
Commit 4a0c90b9 authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

feat(页面细节整理): 车型审查 体系审查模块

parent 1124e0f9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2277 additions and 15 deletions
src/assets/styles/process.scss
View file @ 4a0c90b9
...@@ -19,3 +19,9 @@ ...@@ -19,3 +19,9 @@
margin-bottom: 0; margin-bottom: 0;
} }
} }
.bottom-btn {
text-align: center;
margin-top: 20px;
margin-bottom: 50px;
/* 调整按钮距离底部的距离 */
}
src/views/processing/carReview/source-record/index.vue 0 → 100644
View file @ 4a0c90b9
This diff is collapsed.
src/views/processing/carReview/vehicle-type/index.vue 0 → 100644
View file @ 4a0c90b9
This diff is collapsed.
src/views/processing/confirm-result/index.vue → src/views/processing/systemReview/confirm-result/index.vue
View file @ 4a0c90b9
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<!--1-抬头标题--> <!--1-抬头标题-->
<div class="title-style"> <div class="title-style">
<div class="title-content-style"> <div class="title-content-style">
确认审查结果(所属任务：{{ model.systemReviewTask.name }}) 确认体系审查结果(所属任务：{{ model.systemReviewTask.name }})
</div> </div>
<div class="title-content-style"> <div class="title-content-style">
<el-button type="text" @click="goToProcessedReview">返回</el-button> <el-button type="text" @click="$router.back()">返回</el-button>
</div> </div>
</div> </div>
<!--2-统计值--> <!--2-统计值-->
...@@ -355,7 +355,7 @@ export default { ...@@ -355,7 +355,7 @@ export default {
}, },
goUpdate() { goUpdate() {
this.$router.push({ this.$router.push({
path: '/processing/write-check-form?id=' + this.taskId path: '/processing/systemReview/write-check-form?id=' + this.taskId
}) })
}, },
getRows, getRows,
......
src/views/processing/review-form/index.vue → src/views/processing/systemReview/review-form/index.vue
View file @ 4a0c90b9
...@@ -5,11 +5,8 @@ ...@@ -5,11 +5,8 @@
<div> <div>
<!--1-抬头标题--> <!--1-抬头标题-->
<div class="title-style"> <div class="title-style">
<div v-if="type === '1'" class="title-content-style"> <div class="title-content-style">
查看检查表单(所属任务：{{ model.systemReviewTask.name }}) 查看体系审查表单(所属任务：{{ model.systemReviewTask.name }})
</div>
<div v-if="type === '2'" class="title-content-style">
查看检查表单(所属任务：{{ model.carReviewTask.name }})
</div> </div>
<div class="title-content-style"> <div class="title-content-style">
<a href="/processing/unprocessed-review">返回</a> <a href="/processing/unprocessed-review">返回</a>
...@@ -22,34 +19,21 @@ ...@@ -22,34 +19,21 @@
<el-row :gutter="60"> <el-row :gutter="60">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="任务编号:"> <el-form-item label="任务编号:">
<span>{{ <span>{{ model.systemReviewTask.taskNo }}</span>
type === '1'
? model.systemReviewTask.taskNo
: model.carReviewTask.taskNo
}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="任务名称:"> <el-form-item label="任务名称:">
<span>{{ <span>{{ model.systemReviewTask.name }}</span>
type === '1'
? model.systemReviewTask.name
: model.carReviewTask.name
}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="委托单位:"> <el-form-item label="委托单位:">
<span>{{ <span>{{ model.systemReviewTask.taskInitiatorDep }}</span>
type === '1'
? model.systemReviewTask.taskInitiatorDept
: model.carReviewTask.taskInitiatorDept
}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<template v-if="type === '1'">
<!--审查问卷概要--> <!--审查问卷概要-->
<div class="form-review-questionnaire"> <div class="form-review-questionnaire">
<table class="table" style="width: 100%" border="1"> <table class="table" style="width: 100%" border="1">
...@@ -132,92 +116,8 @@ ...@@ -132,92 +116,8 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</template>
<template v-if="type === '2'">
<!--审查问卷概要-->
<div class="form-review-questionnaire">
<table class="table" style="width: 100%" border="1">
<thead>
<tr>
<th>标准章节</th>
<th>标准要求</th>
<th>审查要点</th>
<th>审查细则</th>
<th>审查结果</th>
<th colspan="2">记录</th>
<th>填写人</th>
</tr>
</thead>
<tbody>
<!-- 循环遍历 arr -->
<template
v-for="(item, index) in model.carReviewTask.standard"
>
<tr :key="'standard-' + index">
<td
align="center"
style="text-align: center"
:rowspan="getRows2(item)"
>
{{ item.chapter }}
</td>
<td align="center" :rowspan="getRows2(item)">
{{ item.text }}
</td>
</tr>
<!-- 循环遍历 keyPointList -->
<template v-for="(i, PointIndex) in item.keyPointList">
<tr :key="'PointIndex-2' + PointIndex + index">
<td align="center" :rowspan="getRows(i)">
{{ i.text }}
</td>
</tr>
<!-- 循环遍历 reviewDetailsList -->
<template
v-for="(v, reviewDetailIndex) in i.reviewDetailsList"
>
<tr
:key="
'reviewDetailIndex-3' +
PointIndex +
reviewDetailIndex +
index
"
>
<td align="center">
{{ v.text }}
</td>
<td align="center" style="text-align: center">
{{
v.result
? v.result.passed === null
? '__'
: v.result.passed === 0
? '不通过'
: '通过'
: '__'
}}
</td>
<td align="center"></td>
<td align="center"></td>
<td align="center" style="text-align: center">
{{
v.result
? v.result.userName
? v.result.userName
: '__'
: '__'
}}
</td>
</tr>
</template>
</template>
</template>
</tbody>
</table>
</div>
</template>
<!--返回按钮--> <!--返回按钮-->
<div class="bottom-btn">
<el-button <el-button
class="btn" class="btn"
type="primary" type="primary"
...@@ -227,12 +127,13 @@ ...@@ -227,12 +127,13 @@
</el-button> </el-button>
</div> </div>
</div> </div>
</div>
</page-standard> </page-standard>
</div> </div>
</template> </template>
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import { reviewTaskDetail, checkTaskDetail } from '@/api/task/task' import { reviewTaskDetail } from '@/api/task/task'
import { getRows, getRows2 } from '@/utils/reviewDetailsTable.js' import { getRows, getRows2 } from '@/utils/reviewDetailsTable.js'
export default { export default {
data() { data() {
...@@ -243,7 +144,6 @@ export default { ...@@ -243,7 +144,6 @@ export default {
reviewSceneChangeTasks: {}, reviewSceneChangeTasks: {},
detailsList: [] detailsList: []
}, },
type: 1,
taskId: 1, taskId: 1,
rules: { rules: {
enterpriseLeader: [ enterpriseLeader: [
...@@ -256,9 +156,6 @@ export default { ...@@ -256,9 +156,6 @@ export default {
} }
}, },
created() { created() {
if (this.$route.query.type) {
this.type = this.$route.query.type
}
if (this.$route.query.id) { if (this.$route.query.id) {
this.taskId = this.$route.query.id this.taskId = this.$route.query.id
} }
...@@ -269,16 +166,10 @@ export default { ...@@ -269,16 +166,10 @@ export default {
* 获取任务详情 * 获取任务详情
*/ */
async getTask() { async getTask() {
let res const res = await reviewTaskDetail({
if (this.type === '1') {
res = await reviewTaskDetail({
taskId: this.taskId taskId: this.taskId
}) })
} else {
res = await checkTaskDetail({
taskId: this.taskId
})
}
if (res.code === 200) { if (res.code === 200) {
this.model = res.data this.model = res.data
} else { } else {
......
src/views/processing/confirm-result/vehicle-type/index.vue → src/views/processing/systemReview/source-record/index.vue
View file @ 4a0c90b9
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
<th>审查要点</th> <th>审查要点</th>
<th>审查细则</th> <th>审查细则</th>
<th>审查结果</th> <th>审查结果</th>
<th colspan="2">记录</th>
<th>填写人</th> <th>填写人</th>
</tr> </tr>
</thead> </thead>
...@@ -165,6 +166,8 @@ ...@@ -165,6 +166,8 @@
: '__' : '__'
}} }}
</td> </td>
<td align="center"></td>
<td align="center"></td>
<td align="center"> <td align="center">
{{ {{
v.result v.result
...@@ -674,7 +677,14 @@ thead { ...@@ -674,7 +677,14 @@ thead {
background-color: #e7e6e6; background-color: #e7e6e6;
} }
th, th {
border: 1px solid black;
padding: 8px;
text-align: center;
width: 300px;
height: 100%;
}
td { td {
border: 1px solid black; border: 1px solid black;
padding: 8px; padding: 8px;
......
src/views/processing/unprocessed-review/index.vue
View file @ 4a0c90b9
...@@ -417,6 +417,7 @@ export default { ...@@ -417,6 +417,7 @@ 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].reviewStatus = 'SIGNED'
res.rows[0].carReviewStatus = 'FINISH' res.rows[0].carReviewStatus = 'FINISH'
this.tableData = res.rows this.tableData = res.rows
this.total = res.total this.total = res.total
...@@ -569,24 +570,24 @@ export default { ...@@ -569,24 +570,24 @@ export default {
// 查看体系审查检查表单 // 查看体系审查检查表单
case 'NEW': case 'NEW':
this.$router.push({ this.$router.push({
path: '/processing/review-form?type=1&id=' + id path: '/processing/systemReview/review-form?id=' + id
}) })
break break
// 体系审查填写审查问卷 // 体系审查填写审查问卷
case 'PENDING': case 'PENDING':
this.$router.push({ this.$router.push({
path: '/processing/write-check-form?id=' + id path: '/processing/systemReview/write-check-form?id=' + id
}) })
break break
// 确认体系审查检查表单 // 确认体系审查检查表单
case 'CONFIRM': case 'SIGNED':
this.$router.push({ this.$router.push({
path: '/processing/confirm-result?type=1&id=' + id path: '/processing/systemReview/confirm-result?id=' + id
}) })
break break
case 'FINISH': case 'FINISH':
this.$router.push({ this.$router.push({
path: '/processing/confirm-result?type=2&id=' + id path: '/processing/systemReview/source-record?id=' + id
}) })
break break
} }
...@@ -607,7 +608,7 @@ export default { ...@@ -607,7 +608,7 @@ export default {
}) })
break break
// 确认测试结果 // 确认测试结果
case 'CONFIRM': case 'SIGNED':
this.$router.push({ this.$router.push({
path: '/processing/vehicle-type' path: '/processing/vehicle-type'
}) })
...@@ -620,25 +621,25 @@ export default { ...@@ -620,25 +621,25 @@ export default {
// 查看车型检查表单 // 查看车型检查表单
case 'NEW': case 'NEW':
this.$router.push({ this.$router.push({
path: '/processing/review-form?type=2&id=' + id path: '/processing/carReview/review-form?id=' + id
}) })
break break
// 填写车型检查表单 // 填写车型检查表单
case 'PENDING': case 'PENDING':
this.$router.push({ this.$router.push({
path: '/processing/type-check-form?id=' + id path: '/processing/carReview/write-check-form?id=' + id
}) })
break break
// 确认车型检验结果 // 确认车型检验结果
case 'CONFIRM': case 'SIGNED':
this.$router.push({ this.$router.push({
path: '/processing/vehicle-type?type=1&id=' + id path: '/processing/carReview/vehicle-type?id=' + id
}) })
break break
// 查看车型审查记录 // 查看车型审查记录
case 'FINISH': case 'FINISH':
this.$router.push({ this.$router.push({
path: '/processing/vehicle-type?type=2&id=' + id path: '/processing/carReview/source-record?id=' + id
}) })
} }
}, },
......
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