Commit 03b9be21 authored by jiaxu.yan's avatar jiaxu.yan

fix: 70780 70777 70766

parent 6e1beeb5
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
.standard-result { .standard-result {
color: #303133; color: #303133;
font-weight: bold; font-weight: bold;
width: 120px; width: 160px;
} }
} }
.i-icon { .i-icon {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
}" }"
> >
<logo v-if="showLogo" :collapse="isCollapse" /> <logo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper"> <el-scrollbar :class="settings.sideTheme" style="padding-bottom: 30px;" wrap-class="scrollbar-wrapper">
<el-menu <el-menu
:default-active="activeMenu" :default-active="activeMenu"
:collapse="isCollapse" :collapse="isCollapse"
......
...@@ -215,7 +215,8 @@ ...@@ -215,7 +215,8 @@
<div v-if="reviewDetail.result"> <div v-if="reviewDetail.result">
<div v-if="reviewDetail.result.fileList"> <div v-if="reviewDetail.result.fileList">
<template v-for="i in reviewDetail.result.fileList"> <template v-for="i in reviewDetail.result.fileList">
{{ i.fileName }}{{ i.catalogue }} {{ i.fileName ? `《${i.fileName}》` : '__' }}
{{ i.catalogue }}
</template> </template>
</div> </div>
<div v-if="reviewDetail.result.comment"> <div v-if="reviewDetail.result.comment">
......
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
<div v-if="reviewDetail.result"> <div v-if="reviewDetail.result">
<div v-if="reviewDetail.result.fileList"> <div v-if="reviewDetail.result.fileList">
<template v-for="i in reviewDetail.result.fileList"> <template v-for="i in reviewDetail.result.fileList">
{{ i.fileName }}{{ i.catalogue }} {{ i.fileName ? `《${i.fileName}》` : '__' }}
{{ i.catalogue }}
</template> </template>
</div> </div>
<div v-if="reviewDetail.result.comment"> <div v-if="reviewDetail.result.comment">
......
...@@ -127,13 +127,15 @@ ...@@ -127,13 +127,15 @@
:rules="rules" :rules="rules"
> >
<el-form-item class="right-content-item" label="标准章节"> <el-form-item class="right-content-item" label="标准章节">
<span>{{ taskModel.chapter }}</span> <div style="display: flex">{{ taskModel.chapter }}</div>
</el-form-item> </el-form-item>
<el-form-item class="right-content-item" label="标准要求"> <el-form-item class="right-content-item" label="标准要求">
<span>{{ taskModel.standardText }}</span> <div style="display: flex">{{ taskModel.standardText }}</div>
</el-form-item> </el-form-item>
<el-form-item class="right-content-item" label="审查要点"> <el-form-item class="right-content-item" label="审查要点">
<span>{{ taskModel.reviewKeypointText }}</span> <div style="display: flex">
{{ taskModel.reviewKeypointText }}
</div>
</el-form-item> </el-form-item>
<el-form-item class="right-content-item" label="审查细则"> <el-form-item class="right-content-item" label="审查细则">
<div class="scene-content"> <div class="scene-content">
...@@ -749,20 +751,24 @@ export default { ...@@ -749,20 +751,24 @@ export default {
*确认车型审查 *确认车型审查
*/ */
submitFrom() { submitFrom() {
this.$modal this.$refs.form.validate(valid => {
.confirm('是否确认提交表单,提交后不可修改', { if (valid) {
type: 'warning', this.$modal
title: '提示', .confirm('是否确认提交表单,提交后不可修改', {
closeOnClickModal: false type: 'warning',
}) title: '提示',
.then(async () => { closeOnClickModal: false
carReviewTaskConfirm({ })
taskId: this.taskId .then(async () => {
}).then(res => { carReviewTaskConfirm({
this.$router.go(-1) taskId: this.taskId
}) }).then(res => {
}) this.$router.go(-1)
.catch(() => {}) })
})
.catch(() => {})
}
})
}, },
/** /**
*确认细则内容变更 *确认细则内容变更
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<span slot="title" style="width: 100%"> <span slot="title" style="width: 100%">
<div class="standard-box"> <div class="standard-box">
<div class="standard-left"> <div class="standard-left">
<div class="standard">标准</div> <div class="standard">标准要求:</div>
<div class="standard-title"> <div class="standard-title">
{{ item.chapter + item.text }} {{ item.chapter + item.text }}
</div> </div>
...@@ -177,6 +177,11 @@ ...@@ -177,6 +177,11 @@
</collapse> </collapse>
</div> </div>
</div> </div>
<div class="dialog-button">
<el-button size="mini" @click="dialogManger.dialogVisible = false"
>关 闭</el-button
>
</div>
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
...@@ -242,6 +247,15 @@ export default { ...@@ -242,6 +247,15 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.dialog-button {
position: fixed;
bottom: 0px;
background: #ffffff;
right: 0;
padding: 20px;
text-align: end;
}
.form-review-questionnaire { .form-review-questionnaire {
padding: 0 38px; padding: 0 38px;
} }
......
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
sortable sortable
min-width="210" min-width="210"
prop="enterpriseName" prop="enterpriseName"
show-overflow-tooltip
align="left" align="left"
> >
</el-table-column> </el-table-column>
...@@ -82,6 +83,7 @@ ...@@ -82,6 +83,7 @@
prop="fileName" prop="fileName"
label="文件名称" label="文件名称"
min-width="220" min-width="220"
show-overflow-tooltip
align="left" align="left"
> >
</el-table-column> </el-table-column>
...@@ -89,6 +91,7 @@ ...@@ -89,6 +91,7 @@
prop="version" prop="version"
label="文件版本" label="文件版本"
min-width="100" min-width="100"
show-overflow-tooltip
align="left" align="left"
> >
</el-table-column> </el-table-column>
...@@ -121,6 +124,7 @@ ...@@ -121,6 +124,7 @@
prop="storage" prop="storage"
label="存储位置" label="存储位置"
min-width="210" min-width="210"
show-overflow-tooltip
align="left" align="left"
> >
</el-table-column> </el-table-column>
...@@ -128,6 +132,7 @@ ...@@ -128,6 +132,7 @@
prop="identifyNumber" prop="identifyNumber"
label="文件识别号" label="文件识别号"
min-width="170" min-width="170"
show-overflow-tooltip
align="left" align="left"
> >
</el-table-column> </el-table-column>
...@@ -139,11 +144,13 @@ ...@@ -139,11 +144,13 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-image <el-image
v-if="scope.row.photo"
style="width: 36px; height: 36px" style="width: 36px; height: 36px"
:src="baseUrl + scope.row.photo" :src="baseUrl + scope.row.photo"
:preview-src-list="[baseUrl + scope.row.photo]" :preview-src-list="[baseUrl + scope.row.photo]"
> >
</el-image> </el-image>
<div v-else>__</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
...@@ -146,11 +146,13 @@ ...@@ -146,11 +146,13 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-image <el-image
v-if="scope.row.photo"
style="width: 36px; height: 36px" style="width: 36px; height: 36px"
:src="baseUrl + scope.row.photo" :src="baseUrl + scope.row.photo"
:preview-src-list="[baseUrl + scope.row.photo]" :preview-src-list="[baseUrl + scope.row.photo]"
> >
</el-image> </el-image>
<div v-else>__</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
...@@ -220,7 +220,8 @@ ...@@ -220,7 +220,8 @@
<div v-if="reviewDetail.result"> <div v-if="reviewDetail.result">
<div v-if="reviewDetail.result.fileList"> <div v-if="reviewDetail.result.fileList">
<template v-for="i in reviewDetail.result.fileList"> <template v-for="i in reviewDetail.result.fileList">
{{ i.fileName }}{{ i.catalogue }} {{ i.fileName ? `《${i.fileName}》` : '__' }}
{{ i.catalogue }}
</template> </template>
</div> </div>
<div v-if="reviewDetail.result.comment"> <div v-if="reviewDetail.result.comment">
......
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
<div v-if="reviewDetail.result"> <div v-if="reviewDetail.result">
<div v-if="reviewDetail.result.fileList"> <div v-if="reviewDetail.result.fileList">
<template v-for="i in reviewDetail.result.fileList"> <template v-for="i in reviewDetail.result.fileList">
{{ i.fileName }}{{ i.catalogue }} {{ i.fileName ? `《${i.fileName}》` : '__' }}
{{ i.catalogue }}
</template> </template>
</div> </div>
<div v-if="reviewDetail.result.comment"> <div v-if="reviewDetail.result.comment">
......
...@@ -783,23 +783,24 @@ export default { ...@@ -783,23 +783,24 @@ export default {
*确认体系审查 *确认体系审查
*/ */
submitFrom() { submitFrom() {
this.$modal this.$refs.form.validate(valid => {
.confirm('是否确认提交表单,提交后不可修改', { if (valid) {
type: 'warning', this.$modal
title: '提示', .confirm('是否确认提交表单,提交后不可修改', {
closeOnClickModal: false type: 'warning',
}) title: '提示',
.then(async () => { closeOnClickModal: false
reviewTaskConfirm({
taskId: this.taskId
}).then(res => {
this.$modal.msgSuccess('确认提交成功')
this.$router.push({
path: '/processing/unprocessed-review'
}) })
}) .then(async () => {
}) reviewTaskConfirm({
.catch(() => {}) taskId: this.taskId
}).then(res => {
this.$router.go(-1)
})
})
.catch(() => {})
}
})
}, },
confirmDetailChange() { confirmDetailChange() {
reviewDetailsConfirm({ reviewDetailsConfirm({
......
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