Skip to content

W
web
Commit b39fd189 authored by 盖献康's avatar 盖献康
Browse files
Options

Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into developer/gaixiankang

parents 14ef50f8 6faac5d3
Hide whitespace changes
Inline Side-by-side
Showing with 467 additions and 390 deletions
src/assets/styles/process.scss
View file @ b39fd189
...@@ -717,3 +717,7 @@ ...@@ -717,3 +717,7 @@
.el-progress{ .el-progress{
display: flex; display: flex;
} }
.empty-message{
text-align: center;
margin: 0 10px;
}
src/views/index.vue
View file @ b39fd189
...@@ -186,7 +186,10 @@ ...@@ -186,7 +186,10 @@
{{ item.standard }} {{ item.standard }}
</div> </div>
</div> </div>
<AverageTest :value="item.value"></AverageTest> <AverageTest
v-if="averageTestShow"
:value="item.value"
></AverageTest>
<div <div
style="color: #606266; font-size: 16px; text-align: center" style="color: #606266; font-size: 16px; text-align: center"
> >
...@@ -248,6 +251,7 @@ export default { ...@@ -248,6 +251,7 @@ export default {
}, },
data() { data() {
return { return {
averageTestShow: false,
averageTestList: [ averageTestList: [
{ {
name: '汽车信息安全管理体系要求', name: '汽车信息安全管理体系要求',
...@@ -279,6 +283,11 @@ export default { ...@@ -279,6 +283,11 @@ export default {
] ]
} }
}, },
created() {
this.$nextTick(() => {
this.averageTestShow = true
})
},
methods: { methods: {
format(percentage) { format(percentage) {
return (percentage = `${percentage}个`) return (percentage = `${percentage}个`)
......
src/views/processing/carReview/vehicle-type/index.vue
View file @ b39fd189
...@@ -289,6 +289,7 @@ ...@@ -289,6 +289,7 @@
返回 返回
</footer-button> </footer-button>
<footer-button <footer-button
v-if="model.carReviewTask.leaderId == userId"
type="primary" type="primary"
icon="hard-disk-one" icon="hard-disk-one"
@click="goToProcessedReview" @click="goToProcessedReview"
...@@ -306,6 +307,7 @@ import { checkTaskDetail, carTaskSubmit, getBySubtaskId } from '@/api/task/task' ...@@ -306,6 +307,7 @@ import { checkTaskDetail, carTaskSubmit, getBySubtaskId } from '@/api/task/task'
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'
import routerMixins from '@/mixins/router' import routerMixins from '@/mixins/router'
import { mapGetters } from 'vuex'
export default { export default {
components: { components: {
collapse: collapse, collapse: collapse,
...@@ -366,6 +368,9 @@ export default { ...@@ -366,6 +368,9 @@ export default {
loading: false loading: false
} }
}, },
computed: {
...mapGetters(['userId'])
},
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
......
src/views/processing/carReview/write-check-form/index.vue
View file @ b39fd189
...@@ -65,199 +65,207 @@ ...@@ -65,199 +65,207 @@
<div class="checked-noUse"> <div class="checked-noUse">
<el-checkbox v-model="checked">仅显示未完成页面</el-checkbox> <el-checkbox v-model="checked">仅显示未完成页面</el-checkbox>
</div> </div>
<div class="btn-tool"> <div v-if="detailsList.length">
<!-- 左边按钮 --> <div class="btn-tool">
<div class="btn" @click="scrollLeft"> <!-- 左边按钮 -->
<icon-park type="left" theme="outline" size="32" fill="#999999" /> <div class="btn" @click="scrollLeft">
</div> <icon-park
<!-- 中间列表 --> type="left"
<div id="list-box" class="center-content"> theme="outline"
<div id="btn-list" class="list"> size="32"
<div v-for="(item, index) in detailsList" :key="index"> fill="#999999"
<div />
class="no-select-circle" </div>
:class="{ <!-- 中间列表 -->
'select-circle': index === activeModel, <div id="list-box" class="center-content">
'exclamation-point': item.warn <div id="btn-list" class="list">
}" <div v-for="(item, index) in detailsList" :key="index">
@click="changeStep(index)" <div
> class="no-select-circle"
<svg-icon :class="{
v-show="item.result && item.result.passed !== null" 'select-circle': index === activeModel,
width="20px" 'exclamation-point': item.warn
height="20px" }"
class="tick-class" @click="changeStep(index)"
icon-class="tag_xuanzhong" >
></svg-icon> <svg-icon
v-show="item.result && item.result.passed !== null"
width="20px"
height="20px"
class="tick-class"
icon-class="tag_xuanzhong"
></svg-icon>
<span class="inner-text">{{ item.order }}</span> <span class="inner-text">{{ item.order }}</span>
</div>
</div> </div>
</div> </div>
</div> </div>
<!-- 右边按钮 -->
<div class="btn" @click="scrollRight">
<icon-park
type="right"
theme="outline"
size="32"
fill="#999999"
/>
</div>
</div> </div>
<!-- 右边按钮 --> <div v-if="detailsList.length" class="form-box">
<div class="btn" @click="scrollRight"> <el-form
<icon-park ref="form"
type="right" class="right-content"
theme="outline" :model="form"
size="32" label-suffix="："
fill="#999999" :rules="rules"
/>
</div>
</div>
<div v-if="detailsList.length" class="form-box">
<el-form
ref="form"
class="right-content"
:model="form"
label-suffix="："
:rules="rules"
>
<el-form-item class="right-content-item" label="标准章节">
<span>{{ taskModel.chapter }}</span>
</el-form-item>
<el-form-item class="right-content-item" label="标准要求">
<span>{{ taskModel.standardText }}</span>
</el-form-item>
<el-form-item class="right-content-item" label="审查要点">
<span>{{ taskModel.reviewKeypointText }}</span>
</el-form-item>
<el-form-item class="right-content-item" label="审查细则">
<div class="scene-content">
<el-tooltip
effect="dark"
content="查看场景"
placement="bottom-start"
>
<svg-icon
v-if="!taskModel.warn"
class="scene-button"
width="30px"
height="30px"
icon-class="tag_tuijian"
@click.native="sceneView(taskModel.reviewSceneList)"
></svg-icon>
</el-tooltip>
<span>{{ taskModel.text }}</span>
</div>
</el-form-item>
<el-form-item
v-if="taskModel.warn"
class="right-content-item"
:label="'符合场景'"
> >
<div class="scene-add-button" @click="handleAddScene"> <el-form-item class="right-content-item" label="标准章节">
<el-tooltip <span>{{ taskModel.chapter }}</span>
effect="dark" </el-form-item>
content="新增场景" <el-form-item class="right-content-item" label="标准要求">
placement="bottom-start" <span>{{ taskModel.standardText }}</span>
> </el-form-item>
<icon-park <el-form-item class="right-content-item" label="审查要点">
type="add-one" <span>{{ taskModel.reviewKeypointText }}</span>
theme="filled" </el-form-item>
size="20" <el-form-item class="right-content-item" label="审查细则">
fill="#1a6fd7" <div class="scene-content">
/> <el-tooltip
</el-tooltip> effect="dark"
</div> content="查看场景"
<div class="match-scene"> placement="bottom-start"
<div
v-for="(scene, key) in taskModel.reviewSceneList"
:key="key"
>
<template
v-if="scene.operation && scene.operation === 'DELETE'"
> >
<del> <svg-icon
{{ scene.text }} v-if="!taskModel.warn"
</del> class="scene-button"
</template> width="30px"
<template v-else> height="30px"
{{ scene.text }} icon-class="tag_tuijian"
</template> @click.native="sceneView(taskModel.reviewSceneList)"
></svg-icon>
</el-tooltip>
<template <span>{{ taskModel.text }}</span>
v-if="scene.operation && scene.operation === 'ADD'" </div>
> </el-form-item>
<span class="add-scene"> (新增) </span> <el-form-item
</template> v-if="taskModel.warn"
<template class="right-content-item"
v-if="scene.operation && scene.operation === 'DELETE'" :label="'符合场景'"
>
<div class="scene-add-button" @click="handleAddScene">
<el-tooltip
effect="dark"
content="新增场景"
placement="bottom-start"
> >
<span class="del-scene"> (删除) </span> <icon-park
</template> type="add-one"
theme="filled"
size="20"
fill="#1a6fd7"
/>
</el-tooltip>
</div> </div>
<el-button <div class="match-scene">
class="confirm-button" <div
type="primary" v-for="(scene, key) in taskModel.reviewSceneList"
plain :key="key"
@click="confirmDetailChange()" >
>已处理</el-button <template
> v-if="scene.operation && scene.operation === 'DELETE'"
</div>
</el-form-item>
<el-form-item
class="right-content-item passed"
label="审查结果"
prop="passed"
>
<el-radio-group v-model="form.passed">
<el-radio :label="1">符合</el-radio>
<el-radio :label="0">不符合</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="right-content-item" label="相关记录">
<el-row>
<el-col :span="8">
<div>
<el-form-item
prop="fileName"
label-suffix=" "
label="文件名称"
> >
<el-autocomplete <del>
v-model="form.fileName" {{ scene.text }}
style="width: 100%" </del>
:fetch-suggestions="querySearch" </template>
placeholder="请输入文件名称" <template v-else>
@select="querySelect" {{ scene.text }}
></el-autocomplete> </template>
</el-form-item>
</div> <template
</el-col> v-if="scene.operation && scene.operation === 'ADD'"
<el-col :span="8" :offset="1"> >
<div> <span class="add-scene"> (新增) </span>
<el-form-item </template>
prop="catalogue" <template
label-suffix=" " v-if="scene.operation && scene.operation === 'DELETE'"
label="章节条目或范围"
> >
<el-input <span class="del-scene"> (删除) </span>
v-model="form.catalogue" </template>
placeholder="请输入具体章节条目或范围"
/>
</el-form-item>
</div> </div>
</el-col> <el-button
</el-row> class="confirm-button"
<!-- //车企文件信息 --> type="primary"
</el-form-item> plain
<company-file @click="confirmDetailChange()"
v-show="formManger.show" >已处理</el-button
style="margin-left: 125px" >
:enterprise-name="model.carReviewTask.enterpriseName" </div>
:file-name="form.fileName" </el-form-item>
@fileNameUpdate=" <el-form-item
name => { class="right-content-item passed"
form.fileName = name label="审查结果"
} prop="passed"
" >
@handleUpdate="handleFileUpdate" <el-radio-group v-model="form.passed">
@handleSave="handleFileSave" <el-radio :label="1">符合</el-radio>
></company-file> <el-radio :label="0">不符合</el-radio>
</el-form> </el-radio-group>
</el-form-item>
<el-form-item class="right-content-item" label="相关记录">
<el-row>
<el-col :span="8">
<div>
<el-form-item
prop="fileName"
label-suffix=" "
label="文件名称"
>
<el-autocomplete
v-model="form.fileName"
style="width: 100%"
:fetch-suggestions="querySearch"
placeholder="请输入文件名称"
@select="querySelect"
></el-autocomplete>
</el-form-item>
</div>
</el-col>
<el-col :span="8" :offset="1">
<div>
<el-form-item
prop="catalogue"
label-suffix=" "
label="章节条目或范围"
>
<el-input
v-model="form.catalogue"
placeholder="请输入具体章节条目或范围"
/>
</el-form-item>
</div>
</el-col>
</el-row>
<!-- //车企文件信息 -->
</el-form-item>
<company-file
v-show="formManger.show"
style="margin-left: 125px"
:enterprise-name="model.carReviewTask.enterpriseName"
:file-name="form.fileName"
@fileNameUpdate="
name => {
form.fileName = name
}
"
@handleUpdate="handleFileUpdate"
@handleSave="handleFileSave"
></company-file>
</el-form>
</div>
</div> </div>
<div v-else class="empty-message">-暂无未完成条目-</div>
</div> </div>
<div class="bottom-btn"> <div class="bottom-btn">
<footer-button <footer-button
...@@ -682,14 +690,23 @@ export default { ...@@ -682,14 +690,23 @@ export default {
}) })
}, },
/** /**
*确认体系审查 *确认车型审查
*/ */
submitFrom() { submitFrom() {
carReviewTaskConfirm({ this.$modal
taskId: this.taskId .confirm('是否确认提交表单，提交后不可修改', {
}).then(res => { type: 'warning',
this.$router.go(-1) title: '提示',
}) closeOnClickModal: false
})
.then(async () => {
carReviewTaskConfirm({
taskId: this.taskId
}).then(res => {
this.$router.go(-1)
})
})
.catch(() => {})
}, },
/** /**
*确认细则内容变更 *确认细则内容变更
......
src/views/processing/systemReview/confirm-result/index.vue
View file @ b39fd189
...@@ -269,6 +269,7 @@ ...@@ -269,6 +269,7 @@
返回 返回
</footer-button> </footer-button>
<footer-button <footer-button
v-if="model.systemReviewTask.leaderId == userId"
type="primary" type="primary"
icon="hard-disk-one" icon="hard-disk-one"
@click="goToProcessedReview" @click="goToProcessedReview"
...@@ -286,6 +287,7 @@ import { reviewTaskDetail, taskSubmit, getBySubtaskId } from '@/api/task/task' ...@@ -286,6 +287,7 @@ import { reviewTaskDetail, taskSubmit, getBySubtaskId } from '@/api/task/task'
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'
import routerMixins from '@/mixins/router' import routerMixins from '@/mixins/router'
import { mapGetters } from 'vuex'
export default { export default {
components: { components: {
collapse: collapse, collapse: collapse,
...@@ -320,6 +322,9 @@ export default { ...@@ -320,6 +322,9 @@ export default {
loading: false loading: false
} }
}, },
computed: {
...mapGetters(['userId'])
},
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
......
src/views/processing/systemReview/write-check-form/index.vue
View file @ b39fd189
...@@ -70,204 +70,212 @@ ...@@ -70,204 +70,212 @@
<div class="checked-noUse"> <div class="checked-noUse">
<el-checkbox v-model="checked">仅显示未完成页面</el-checkbox> <el-checkbox v-model="checked">仅显示未完成页面</el-checkbox>
</div> </div>
<div class="btn-tool"> <div v-if="detailsList.length">
<!-- 左边按钮 --> <div class="btn-tool">
<div class="btn" @click="scrollLeft"> <!-- 左边按钮 -->
<icon-park type="left" theme="outline" size="32" fill="#999999" /> <div class="btn" @click="scrollLeft">
</div> <icon-park
<!-- 中间列表 --> type="left"
<div id="list-box" class="center-content"> theme="outline"
<div id="btn-list" class="list"> size="32"
<div v-for="(item, index) in detailsList" :key="index"> fill="#999999"
<div />
class="no-select-circle" </div>
:class="{ <!-- 中间列表 -->
'select-circle': index === activeModel, <div id="list-box" class="center-content">
'exclamation-point': item.warn <div id="btn-list" class="list">
}" <div v-for="(item, index) in detailsList" :key="index">
@click="changeStep(index)" <div
> class="no-select-circle"
<svg-icon :class="{
v-show="item.result && item.result.passed !== null" 'select-circle': index === activeModel,
width="20px" 'exclamation-point': item.warn
height="20px" }"
class="tick-class" @click="changeStep(index)"
icon-class="tag_xuanzhong" >
></svg-icon> <svg-icon
<span class="inner-text">{{ item.order }}</span> v-show="item.result && item.result.passed !== null"
width="20px"
height="20px"
class="tick-class"
icon-class="tag_xuanzhong"
></svg-icon>
<span class="inner-text">{{ item.order }}</span>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <!-- 右边按钮 -->
<!-- 右边按钮 --> <div class="btn" @click="scrollRight">
<div class="btn" @click="scrollRight"> <icon-park
<icon-park type="right"
type="right" theme="outline"
theme="outline" size="32"
size="32" fill="#999999"
fill="#999999" />
/> <!-- <svg-icon
<!-- <svg-icon
width="32px" width="32px"
height="32px" height="32px"
class="icon-item" class="icon-item"
icon-class="tag_right" icon-class="tag_right"
></svg-icon> --> ></svg-icon> -->
</div>
</div> </div>
</div> <div v-if="detailsList.length" class="form-box">
<div v-if="detailsList.length" class="form-box"> <el-form
<el-form ref="form"
ref="form" class="right-content"
class="right-content" :model="form"
:model="form" label-suffix="："
label-suffix="：" :rules="rules"
:rules="rules"
>
<el-form-item class="right-content-item" label="标准章节">
<span>{{ taskModel.chapter }}</span>
</el-form-item>
<el-form-item class="right-content-item" label="标准要求">
<span>{{ taskModel.standardText }}</span>
</el-form-item>
<el-form-item class="right-content-item" label="审查要点">
<span>{{ taskModel.reviewKeypointText }}</span>
</el-form-item>
<el-form-item class="right-content-item" label="审查细则">
<div class="scene-content">
<el-tooltip
effect="dark"
content="查看场景"
placement="bottom-start"
>
<svg-icon
v-if="!taskModel.warn"
class="scene-button"
width="30px"
height="30px"
icon-class="tag_tuijian"
@click.native="sceneView(taskModel.reviewSceneList)"
></svg-icon>
</el-tooltip>
<span>{{ taskModel.text }}</span>
</div>
</el-form-item>
<el-form-item
v-if="taskModel.warn"
class="right-content-item"
:label="'符合场景'"
> >
<div class="scene-add-button" @click="handleAddScene"> <el-form-item class="right-content-item" label="标准章节">
<el-tooltip <span>{{ taskModel.chapter }}</span>
effect="dark" </el-form-item>
content="新增场景" <el-form-item class="right-content-item" label="标准要求">
placement="bottom-start" <span>{{ taskModel.standardText }}</span>
> </el-form-item>
<icon-park <el-form-item class="right-content-item" label="审查要点">
type="add-one" <span>{{ taskModel.reviewKeypointText }}</span>
theme="filled" </el-form-item>
size="20" <el-form-item class="right-content-item" label="审查细则">
fill="#1a6fd7" <div class="scene-content">
/> <el-tooltip
</el-tooltip> effect="dark"
</div> content="查看场景"
<div class="match-scene"> placement="bottom-start"
<div
v-for="(scene, key) in taskModel.reviewSceneList"
:key="key"
>
<template
v-if="scene.operation && scene.operation === 'DELETE'"
> >
<del> <svg-icon
{{ scene.text }} v-if="!taskModel.warn"
</del> class="scene-button"
</template> width="30px"
<template v-else> height="30px"
{{ scene.text }} icon-class="tag_tuijian"
</template> @click.native="sceneView(taskModel.reviewSceneList)"
></svg-icon>
</el-tooltip>
<template <span>{{ taskModel.text }}</span>
v-if="scene.operation && scene.operation === 'ADD'" </div>
> </el-form-item>
<span class="add-scene"> (新增) </span> <el-form-item
</template> v-if="taskModel.warn"
<template class="right-content-item"
v-if="scene.operation && scene.operation === 'DELETE'" :label="'符合场景'"
>
<div class="scene-add-button" @click="handleAddScene">
<el-tooltip
effect="dark"
content="新增场景"
placement="bottom-start"
> >
<span class="del-scene"> (删除) </span> <icon-park
</template> type="add-one"
theme="filled"
size="20"
fill="#1a6fd7"
/>
</el-tooltip>
</div> </div>
<el-button <div class="match-scene">
class="confirm-button" <div
type="primary" v-for="(scene, key) in taskModel.reviewSceneList"
plain :key="key"
@click="confirmDetailChange()" >
>已处理</el-button <template
> v-if="scene.operation && scene.operation === 'DELETE'"
</div>
</el-form-item>
<el-form-item
class="right-content-item passed"
label="审查结果"
prop="passed"
>
<el-radio-group v-model="form.passed">
<el-radio :label="1">符合</el-radio>
<el-radio :label="0">不符合</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="right-content-item" label="相关记录">
<el-row>
<el-col :span="8">
<div>
<el-form-item
prop="fileName"
label-suffix=" "
label="文件名称"
> >
<el-autocomplete <del>
v-model="form.fileName" {{ scene.text }}
style="width: 100%" </del>
:fetch-suggestions="querySearch" </template>
placeholder="请输入文件名称" <template v-else>
@select="querySelect" {{ scene.text }}
></el-autocomplete> </template>
</el-form-item>
</div> <template
</el-col> v-if="scene.operation && scene.operation === 'ADD'"
<el-col :span="8" :offset="1"> >
<div> <span class="add-scene"> (新增) </span>
<el-form-item </template>
prop="catalogue" <template
label-suffix=" " v-if="scene.operation && scene.operation === 'DELETE'"
label="章节条目或范围"
> >
<el-input <span class="del-scene"> (删除) </span>
v-model="form.catalogue" </template>
placeholder="请输入具体章节条目或范围"
/>
</el-form-item>
</div> </div>
</el-col> <el-button
</el-row> class="confirm-button"
<!-- //车企文件信息 --> type="primary"
</el-form-item> plain
<company-file @click="confirmDetailChange()"
v-show="formManger.show" >已处理</el-button
style="margin-left: 125px" >
:enterprise-name="model.systemReviewTask.enterpriseName" </div>
:file-name="form.fileName" </el-form-item>
@fileNameUpdate=" <el-form-item
name => { class="right-content-item passed"
form.fileName = name label="审查结果"
} prop="passed"
" >
@handleUpdate="handleFileUpdate" <el-radio-group v-model="form.passed">
@handleSave="handleFileSave" <el-radio :label="1">符合</el-radio>
></company-file> <el-radio :label="0">不符合</el-radio>
</el-form> </el-radio-group>
</el-form-item>
<el-form-item class="right-content-item" label="相关记录">
<el-row>
<el-col :span="8">
<div>
<el-form-item
prop="fileName"
label-suffix=" "
label="文件名称"
>
<el-autocomplete
v-model="form.fileName"
style="width: 100%"
:fetch-suggestions="querySearch"
placeholder="请输入文件名称"
@select="querySelect"
></el-autocomplete>
</el-form-item>
</div>
</el-col>
<el-col :span="8" :offset="1">
<div>
<el-form-item
prop="catalogue"
label-suffix=" "
label="章节条目或范围"
>
<el-input
v-model="form.catalogue"
placeholder="请输入具体章节条目或范围"
/>
</el-form-item>
</div>
</el-col>
</el-row>
<!-- //车企文件信息 -->
</el-form-item>
<company-file
v-show="formManger.show"
style="margin-left: 125px"
:enterprise-name="model.systemReviewTask.enterpriseName"
:file-name="form.fileName"
@fileNameUpdate="
name => {
form.fileName = name
}
"
@handleUpdate="handleFileUpdate"
@handleSave="handleFileSave"
></company-file>
</el-form>
</div>
</div> </div>
<div v-else class="empty-message">-暂无未完成条目-</div>
</div> </div>
<div class="bottom-btn"> <div class="bottom-btn">
<footer-button <footer-button
...@@ -700,14 +708,23 @@ export default { ...@@ -700,14 +708,23 @@ export default {
*确认体系审查 *确认体系审查
*/ */
submitFrom() { submitFrom() {
reviewTaskConfirm({ this.$modal
taskId: this.taskId .confirm('是否确认提交表单，提交后不可修改', {
}).then(res => { type: 'warning',
this.$modal.msgSuccess('确认提交成功') title: '提示',
this.$router.push({ closeOnClickModal: false
path: '/processing/unprocessed-review'
}) })
}) .then(async () => {
reviewTaskConfirm({
taskId: this.taskId
}).then(res => {
this.$modal.msgSuccess('确认提交成功')
this.$router.push({
path: '/processing/unprocessed-review'
})
})
})
.catch(() => {})
}, },
confirmDetailChange() { confirmDetailChange() {
reviewDetailsConfirm({ reviewDetailsConfirm({
......
src/views/processing/unprocessed-review/index.vue
View file @ b39fd189
...@@ -434,7 +434,6 @@ export default { ...@@ -434,7 +434,6 @@ export default {
* @param item 对象 * @param item 对象
*/ */
handleRetentionFile(item) { handleRetentionFile(item) {
console.log(item)
this.$router.push({ this.$router.push({
path: '/processing/retention-file?id=' + item.id path: '/processing/retention-file?id=' + item.id
}) })
...@@ -457,19 +456,27 @@ export default { ...@@ -457,19 +456,27 @@ export default {
* @param {} type 单项数据 * @param {} type 单项数据
*/ */
async startTask(item) { async startTask(item) {
const res = await reviewTaskStart({ this.$modal
id: item.id .confirm('是否确认开始？', {
}) type: 'warning',
if (res.code === 200) { title: '提示',
this.loadData() closeOnClickModal: false
} else { })
if (res.msg) { .then(async () => {
this.$message.error(res.msg) const res = await reviewTaskStart({
} id: item.id
} })
if (res.code === 200) {
this.loadData()
} else {
if (res.msg) {
this.$message.error(res.msg)
}
}
})
.catch(() => {})
}, },
goDetail(id) { goDetail(id) {
console.log(111)
this.$router.push({ this.$router.push({
path: '/task/task-detail?id=' + id path: '/task/task-detail?id=' + id
}) })
......
src/views/setting/sample/taskDetails/index.vue
View file @ b39fd189
...@@ -670,7 +670,7 @@ ...@@ -670,7 +670,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="blueCard"> <div class="blueCard">
<div> <div style="width: 100%">
<div class="title">送样者</div> <div class="title">送样者</div>
<div class="content"> <div class="content">
{{ item.sampleSender ? item.sampleSender : '-' }} {{ item.sampleSender ? item.sampleSender : '-' }}
...@@ -682,7 +682,7 @@ ...@@ -682,7 +682,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<div class="greenCard"> <div class="greenCard">
<div> <div style="width: 100%">
<div class="title">车辆识别码</div> <div class="title">车辆识别码</div>
<div class="content"> <div class="content">
{{ {{
...@@ -706,7 +706,7 @@ ...@@ -706,7 +706,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="blueCard"> <div class="blueCard">
<div> <div style="width: 100%">
<div class="title">生产企业</div> <div class="title">生产企业</div>
<div class="content"> <div class="content">
{{ {{
...@@ -811,7 +811,7 @@ ...@@ -811,7 +811,7 @@
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="blueCard"> <div class="blueCard">
<div> <div style="width: 100%">
<div class="title">生产企业</div> <div class="title">生产企业</div>
<div class="content"> <div class="content">
{{ {{
...@@ -1032,6 +1032,7 @@ export default { ...@@ -1032,6 +1032,7 @@ export default {
height: 70px; height: 70px;
background: rgba(19, 190, 36, 0.1); background: rgba(19, 190, 36, 0.1);
border-radius: 8px; border-radius: 8px;
width: 100%;
.title { .title {
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
...@@ -1044,6 +1045,9 @@ export default { ...@@ -1044,6 +1045,9 @@ export default {
font-weight: 700; font-weight: 700;
color: #13be24; color: #13be24;
text-align: center; text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
} }
.yellowCard { .yellowCard {
...@@ -1053,6 +1057,7 @@ export default { ...@@ -1053,6 +1057,7 @@ export default {
height: 70px; height: 70px;
background: rgba(249, 171, 56, 0.1); background: rgba(249, 171, 56, 0.1);
border-radius: 8px; border-radius: 8px;
width: 100%;
.title { .title {
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
...@@ -1065,6 +1070,9 @@ export default { ...@@ -1065,6 +1070,9 @@ export default {
font-weight: 700; font-weight: 700;
color: #f9ab38; color: #f9ab38;
text-align: center; text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
} }
.blueCard { .blueCard {
...@@ -1074,6 +1082,7 @@ export default { ...@@ -1074,6 +1082,7 @@ export default {
height: 70px; height: 70px;
background: rgba(26, 111, 215, 0.1); background: rgba(26, 111, 215, 0.1);
border-radius: 8px; border-radius: 8px;
width: 100%;
.title { .title {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
...@@ -1086,6 +1095,9 @@ export default { ...@@ -1086,6 +1095,9 @@ export default {
font-weight: 700; font-weight: 700;
color: #1a6fd7; color: #1a6fd7;
text-align: center; text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
} }
} }
......
src/views/system/menu/index.vue
View file @ b39fd189
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
v-model="queryParams.status" v-model="queryParams.status"
placeholder="菜单状态" placeholder="菜单状态"
clearable clearable
@change="$forceUpdate()"
> >
<el-option <el-option
v-for="dict in dict.type.sys_normal_disable" v-for="dict in dict.type.sys_normal_disable"
...@@ -493,7 +494,7 @@ export default { ...@@ -493,7 +494,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm('queryForm') this.queryParams = {}
this.handleQuery() this.handleQuery()
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
......
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