Skip to content

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

feat(任务处理模块): 搜索栏修改 新增已归档任务

parent 01724e2c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 549 additions and 152 deletions
src/api/task/task.js
View file @ d2d0a05c
......@@ -17,6 +17,14 @@ export function reviewTaskDetail(data) {
})
}
//确认细则变更
export function reviewDetailsConfirm(data) {
return request({
url: '/review/task/inbox/confirm',
method: 'post',
data
})
}
/**
* 细则提交
* @param {*} data
......
src/views/processing/archivedTask/index.vue 0 → 100644
View file @ d2d0a05c
<template>
<page-standard>
<el-form
v-show="showSearch"
ref="queryForm"
:model="queryParams"
size="small"
:inline="true"
>
<el-form-item label="检验依据">
<el-select
v-model="queryParams.ask"
clearable
style="width: 100%"
@change="loadData"
>
<el-option
key="1"
value="1"
label="汽车整车信息安全技术要求"
></el-option>
<el-option key="2" value="2" label="xxxxx软件升级要求"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="status" label="任务编号">
<el-input
v-model="queryParams.deptName"
placeholder="请输入"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="status" label="任务名称">
<el-input
v-model="queryParams.deptName"
placeholder="请输入"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="status" label="车辆型号">
<el-input
v-model="queryParams.deptName"
placeholder="请输入"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="status" label="检验项目">
<el-select
v-model="queryParams.taskStatus"
placeholder="请选择"
clearable
>
<el-option
v-for="dict in dict.type.system_task_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
重置
</el-button>
</el-form-item>
</el-form>
<el-card v-for="(item, index) in tableData" :key="index" class="box-card">
<div class="inspection-standard">
检验依据：GB XXXXX《汽车整车信息安全技术要求》
</div>
<div class="card-cell">
<div class="cell-lable">任务编号</div>
<div class="cell-value">
{{ item.taskNo ? item.taskNo : '---' }}
</div>
</div>
<div class="card-cell">
<div class="cell-lable">任务名称</div>
<div class="cell-value">
<el-link
type="primary"
@click="goNext('/task/task-detail?id=' + item.id)"
>
{{ item.taskName ? item.taskName : '---' }}
</el-link>
</div>
</div>
<div class="card-cell">
<div class="cell-lable">车辆型号</div>
<div class="cell-value" :title="item.taskName ? item.taskName : '---'">
{{ item.taskName ? item.taskName : '---' }}
</div>
</div>
<div class="card-cell" style="width: 300px">
<div class="cell-lable">
<i class="el-icon-timer"></i>
任务周期
</div>
<div class="cell-value">
{{
parseTime(item.taskBeginTime) + ' - ' + parseTime(item.taskEndTime)
}}
</div>
</div>
<div class="card-cell">
<div class="cell-lable">任务组长</div>
<div class="cell-value">
<div>
<i class="el-icon-user"></i>
{{ item.leader ? item.leader : '---' }}
</div>
</div>
</div>
<div class="card-cell">
<div class="cell-lable">归档状态</div>
<div v-if="item.costTime === 0" class="cell-value">未归档</div>
<div v-else class="cell-value green">● 已归档</div>
</div>
<div class="card-buttons">
<el-button
v-if="item.reviewStatus !== 'NONE'"
type="success"
plain
size="mini"
@click="
goNext(
'/processing/systemReview/source-record?id=' +
item.systemReviewTaskId
)
"
>体系审查原始记录</el-button
>
<el-button
v-if="item.carReviewStatus !== 'NONE'"
type="success"
plain
size="mini"
@click="
goNext(
'/processing/carReview/source-record?id=' + item.carReviewTaskId
)
"
>车型审查原始记录</el-button
>
<el-button
v-if="item.carTestStatus !== 'NONE'"
type="success"
plain
size="mini"
@click="
goNext(
'/processing/carReview/source-record?id=' + item.carReviewTaskId
)
"
>车型试验原始记录</el-button
>
<el-button
v-if="item.reviewStatus !== 'NONE'"
type="success"
plain
size="mini"
@click="goNext(item.id)"
>检查报告</el-button
>
<el-button
type="success"
plain
size="mini"
@click="goNext('/processing/retention-file?id=' + item.id)"
>企业留档文件</el-button
>
<el-button
type="success"
plain
size="mini"
@click="goNext('/processing/fileLibrary?id=' + item.id)"
>车企文件库</el-button
>
</div>
</el-card>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.size"
@pagination="loadData"
>
</pagination>
</page-standard>
</template>
<script>
import page from '@/mixins/page'
export default {
dicts: ['system_task_status', 'sys_scene_type', 'task_type'],
mixins: [page],
data() {
return {
listUrl: '/task/findFinish',
showSearch: true,
tableData: []
}
},
watch: {},
methods: {
/* 跳转到问卷详情*/
goNext(url) {
this.$router.push({ path: url })
}
}
}
</script>
<style lang="scss" scoped>
.card-cell {
display: flex;
justify-content: center;
align-items: flex-start;
height: 140px;
color: rgb(153 153 153);
flex-direction: column;
flex-wrap: nowrap;
width: 140px;
}
.card-buttons {
width: 380px;
height: 80px;
margin-top: 20px;
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
.el-button {
margin: 0px;
margin-bottom: 5px;
margin-right: 5px;
width: 120px;
}
}
.box-card {
margin-bottom: 15px;
font-size: 14px;
position: relative;
height: 150px;
.inspection-standard {
position: absolute;
top: 0px;
left: 0px;
background-image: url('~@/assets/svg/standard.svg');
line-height: 30px;
background-repeat: no-repeat;
color: white;
padding-left: 15px;
}
::v-deep .el-card__body {
display: flex;
justify-content: space-between;
}
::v-deep .el-link.is-underline::after {
position: absolute;
right: 0;
bottom: 0;
left: 0;
height: 0;
border-bottom: 1px solid #1890ff;
content: '';
}
.cell-progress {
width: 200px;
}
.cell-lable {
color: #515a6e;
font-size: 13px;
height: 20px;
// margin-bottom: 10px;
}
.cell-value {
display: flex;
flex-flow: column;
align-items: flex-start;
justify-content: center;
min-height: 40px;
}
.cell-value.green {
color: #19be6b;
}
}
</style>
src/views/processing/carReview/review-form/index.vue
View file @ d2d0a05c
......@@ -5,7 +5,9 @@
<!--1-抬头标题-->
<span>查看车型审查表单</span>
<div class="back-btn">
<el-button icon="el-icon-back" @click="handleBack"> 返回 </el-button>
<el-button icon="el-icon-back" @click="$router.back()">
返回
</el-button>
</div>
</div>
<!--2-统计值-->
......@@ -104,11 +106,7 @@
</collapse>
<!--返回按钮-->
<div class="bottom-btn">
<el-button
class="btn"
type="primary"
plain
@click="goToProcessedReview"
<el-button class="btn" type="primary" plain @click="$router.back()"
>返 回
</el-button>
</div>
......@@ -166,13 +164,6 @@ export default {
this.$modal.msgError(res.msg)
}
},
/* 返回跳转*/
goToProcessedReview() {
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
......
src/views/processing/carReview/source-record/index.vue
View file @ d2d0a05c
......@@ -208,7 +208,7 @@
</div>
<!--返回按钮-->
<div class="bottom-btn">
<el-button type="primary" plain @click="$router.go(-1)">
<el-button type="primary" plain @click="$router.back()">
返回
</el-button>
<!-- <el-button type="primary" @click="goToProcessedReview">
......
src/views/processing/carReview/vehicle-type/index.vue
View file @ d2d0a05c
......@@ -213,7 +213,7 @@
</div>
<!--返回按钮-->
<div class="bottom-btn">
<el-button type="primary" plain @click="$router.go(-1)">
<el-button type="primary" plain @click="$router.back()">
返回
</el-button>
<el-button type="primary" @click="goToProcessedReview">
......
src/views/processing/carReview/write-check-form/index.vue
View file @ d2d0a05c
......@@ -143,7 +143,11 @@
<span class="del-scene"> (删除) </span>
</template>
</div>
<el-button class="confirm-button" type="primary" plain
<el-button
class="confirm-button"
type="primary"
plain
@click="confirmDetailChange(taskModel.id)"
>已处理</el-button
>
</div>
......@@ -213,7 +217,8 @@
import {
checkTaskDetail,
reviewDetailsSubmit,
carReviewTaskConfirm
carReviewTaskConfirm,
reviewDetailsConfirm
} from '@/api/task/task'
import sceneView from './components/sceneView.vue'
import companyFile from './components/companyFile.vue'
......@@ -532,6 +537,9 @@ export default {
path: 'processing/unprocessed-review'
})
})
},
confirmDetailChange() {
reviewDetailsConfirm({ detailsId: 0, reviewTaskId: 0 })
}
}
}
......
src/views/processing/unprocessed-review/index.vue
View file @ d2d0a05c
<template>
<page-standard>
<div slot="tab">
<el-form
ref="queryForm"
class="tab-form"
:model="queryParams"
size="small"
:inline="true"
>
<el-form-item label="对应标准">
<el-select
v-model="queryParams.ask"
clearable
style="width: 100%"
@change="loadData"
>
<el-option
key="1"
value="1"
label="汽车整车信息安全技术要求"
></el-option>
<el-option key="2" value="2" label="xxxxx软件升级要求"></el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<el-form
v-show="showSearch"
ref="queryForm"
......@@ -32,27 +7,49 @@
size="small"
:inline="true"
>
<el-form-item prop="status">
<el-form-item label="检验依据">
<el-select
v-model="queryParams.ask"
clearable
style="width: 100%"
@change="loadData"
>
<el-option
key="1"
value="1"
label="汽车整车信息安全技术要求"
></el-option>
<el-option key="2" value="2" label="xxxxx软件升级要求"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="status" label="任务编号">
<el-input
v-model="queryParams.deptName"
placeholder="输入任务编号或名称关键词"
placeholder="请输入"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="time">
<el-date-picker
v-model="queryParams.taskBeginTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="任务开始时间"
>
</el-date-picker>
<el-form-item prop="status" label="任务名称">
<el-input
v-model="queryParams.deptName"
placeholder="请输入"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="status" label="车辆型号">
<el-input
v-model="queryParams.deptName"
placeholder="请输入"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="taskStatus">
<el-form-item prop="status" label="检验项目">
<el-select
v-model="queryParams.taskStatus"
placeholder="子任务状态"
placeholder="请选择"
clearable
>
<el-option
......@@ -80,6 +77,7 @@
<div class="inspection-standard">
检验依据：GB XXXXX《汽车整车信息安全技术要求》
</div>
<div class="card-cell">
<div class="cell-lable">
<i class="el-icon-timer"></i>
......@@ -97,8 +95,11 @@
</div>
<div class="card-cell">
<div class="cell-lable">任务名称</div>
<div class="cell-value" :title="item.taskName ? item.taskName : '---'">
{{ item.taskName ? item.taskName : '---' }}
<el-link type="primary" @click="goNext()">
{{ item.taskName ? item.taskName : '---' }}
</el-link>
</div>
</div>
<div class="card-cell">
......
车联网安全检测平台公开API_V202401.md 0 → 100644
View file @ d2d0a05c
This source diff could not be displayed because it is too large. You can view the blob instead.
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