Skip to content

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

feat(任务处理): 签字确认完善,优化菜单栏

parent 017424f0
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 58 deletions
.cspell/custom-words.txt
View file @ 0441bc92
......@@ -84,6 +84,7 @@ wendang
Wendangdialog
wenjanku
wscn
wuqianzi
xiaoxi
xuanzhong
yunlanwenjian
public/favicon.ico
View replaced file @ 017424f0 View file @ 0441bc92
public/favicon.ico

5.53 KB | W: | H:

public/favicon.ico

15 KB | W: | H:

public/favicon.ico
public/favicon.ico
public/favicon.ico
public/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
public/index.html
View file @ 0441bc92
......@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<!-- <link href="https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" rel="stylesheet"> -->
<script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_31435_35.a442e2b4ccf79c65839893f9276ba5b4.js"></script>
<script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_31435_45.895dadadb277cdfd9a395ce51c41d6a1.js"></script>
<title><%= webpackConfig.name %></title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>
......
src/assets/logo/logo.png
View replaced file @ 017424f0 View file @ 0441bc92
src/assets/logo/logo.png

5.53 KB | W: | H:

src/assets/logo/logo.png

6.64 KB | W: | H:

src/assets/logo/logo.png
src/assets/logo/logo.png
src/assets/logo/logo.png
src/assets/logo/logo.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/styles/process.scss
View file @ 0441bc92
......@@ -508,6 +508,18 @@
border: 1px solid #ebebeb;
width: 100%;
height: 348px;
display: flex;
flex-flow: column;
align-items: center;
justify-content: center;
.img-text{
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
text-align: center;
color: #969696;
line-height: 32px;
}
}
}
}
......
src/layout/components/Sidebar/Logo.vue
View file @ 0441bc92
......@@ -13,8 +13,8 @@
class="sidebar-logo-link"
to="/"
>
<!-- <img v-if="logo" :src="logo" class="sidebar-logo" />
<h1
<!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
<!-- <h1
v-else
class="sidebar-title"
:style="{
......@@ -22,10 +22,11 @@
}"
>
{{ title }}
</h1> -->
</h1> -->
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
<div class="menu-title">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1
class="sidebar-title"
:style="{
......@@ -34,6 +35,7 @@
>
{{ title }}
</h1>
</div>
</router-link>
</transition>
</div>
......@@ -69,6 +71,12 @@ export default {
</script>
<style lang="scss" scoped>
.menu-title{
display: flex;
flex-flow: column;
align-items: center;
justify-content: center;
}
.sidebarLogoFade-enter-active {
transition: opacity 1.5s;
}
......@@ -92,10 +100,9 @@ export default {
width: 100%;
& .sidebar-logo {
width: 32px;
height: 32px;
vertical-align: middle;
margin-right: 12px;
margin: 12px 0;
}
& .sidebar-title {
......@@ -103,7 +110,7 @@ export default {
margin: 0;
color: #fff;
font-weight: 600;
line-height: 80px;
// line-height: 80px;
font-size: 18px;
font-weight: bold;
font-family: Microsoft YaHei;
......@@ -113,7 +120,7 @@ export default {
&.collapse {
.sidebar-logo {
margin-right: 0px;
width: 60px;
}
}
}
......
src/views/processing/carReview/source-record/index.vue
View file @ 0441bc92
......@@ -187,7 +187,13 @@
<div v-else>__</div>
</td>
<td align="center">
<div v-if="reviewDetail.result">
<div
v-if="
reviewDetail.result &&
reviewDetail.result.enterpriseName
"
>
《{{ reviewDetail.result.enterpriseName }}》
{{ reviewDetail.result.catalogue }}
</div>
<div v-else>__</div>
......@@ -218,11 +224,27 @@
<div class="img-display">
<div class="img-item">
<div class="img-label">车企负责人</div>
<img class="img" src="@/assets/images/questionnaire/sign1.png" />
<img
v-if="ruleForm.enterpriseLeader"
class="img"
:src="ruleForm.enterpriseLeader"
/>
<div v-else class="img">
<iconpark-icon name="wuqianzi" size="120"></iconpark-icon>
<div class="img-text">暂无签字</div>
</div>
</div>
<div class="img-item">
<div class="img-label">检验负责人</div>
<img class="img" src="@/assets/images/questionnaire/sign2.png" />
<img
v-if="ruleForm.inspectionLeader"
class="img"
:src="ruleForm.inspectionLeader"
/>
<div v-else class="img">
<iconpark-icon name="wuqianzi" size="120"></iconpark-icon>
<div class="img-text">暂无签字</div>
</div>
</div>
</div>
</div>
......@@ -329,6 +351,15 @@ export default {
this.loading = false
if (res.code === 200) {
this.model = res.data
if (this.model.carReviewTask.imagesUrl) {
const imgs = this.model.carReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader
? process.env.VUE_APP_IMAGE_API + imgs[0]
: ''
this.ruleForm.inspectionLeader
? process.env.VUE_APP_IMAGE_API + imgs[1]
: ''
}
} else {
this.$modal.msgError(res.msg)
}
......
src/views/processing/carReview/vehicle-type/index.vue
View file @ 0441bc92
......@@ -234,11 +234,27 @@
<div class="img-display">
<div class="img-item">
<div class="img-label">车企负责人</div>
<img class="img" src="@/assets/images/questionnaire/sign1.png" />
<img
v-if="ruleForm.enterpriseLeader"
class="img"
:src="ruleForm.enterpriseLeader"
/>
<div v-else class="img">
<iconpark-icon name="wuqianzi" size="120"></iconpark-icon>
<div class="img-text">暂无签字</div>
</div>
</div>
<div class="img-item">
<div class="img-label">检验负责人</div>
<img class="img" src="@/assets/images/questionnaire/sign2.png" />
<img
v-if="ruleForm.inspectionLeader"
class="img"
:src="ruleForm.inspectionLeader"
/>
<div v-else class="img">
<iconpark-icon name="wuqianzi" size="120"></iconpark-icon>
<div class="img-text">暂无签字</div>
</div>
</div>
</div>
</div>
......@@ -344,12 +360,29 @@ export default {
this.loading = false
if (res.code === 200) {
this.model = res.data
if (this.model.carReviewTask.imagesUrl) {
const imgs = this.model.carReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader
? process.env.VUE_APP_IMAGE_API + imgs[0]
: ''
this.ruleForm.inspectionLeader
? process.env.VUE_APP_IMAGE_API + imgs[1]
: ''
}
} else {
this.$modal.msgError(res.msg)
}
},
/* 返回跳转*/
goToProcessedReview() {
if (!this.ruleForm.enterpriseLeader) {
this.$message.error('请车企负责人签字')
return
}
if (!this.ruleForm.inspectionLeader) {
this.$message.error('请检验负责人签字')
return
}
this.ruleForm.taskId = this.taskId
const formData = {
imagesUrl: [
......
src/views/processing/carReview/write-check-form/components/previewView.vue
View file @ 0441bc92
......@@ -93,7 +93,13 @@
<div v-else>__</div>
</td>
<td align="center">
<div v-if="reviewDetail.result">
<div
v-if="
reviewDetail.result &&
reviewDetail.result.enterpriseName
"
>
《{{ reviewDetail.result.enterpriseName }}》
{{ reviewDetail.result.catalogue }}
</div>
<div v-else>__</div>
......
src/views/processing/carReview/write-check-form/index.vue
View file @ 0441bc92
......@@ -543,7 +543,7 @@ export default {
passed: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id,
taskId: this.taskId,
fileName: '',
fileName: this.taskModel.result.enterpriseName,
catalogue: this.taskModel.result.catalogue,
reviewEnterpriseArchiveId:
this.taskModel.result.reviewEnterpriseArchiveId
......@@ -552,21 +552,11 @@ export default {
passed: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id,
taskId: this.taskId,
fileName: '',
fileName: this.taskModel.result.enterpriseName,
catalogue: this.taskModel.result.catalogue,
reviewEnterpriseArchiveId:
this.taskModel.result.reviewEnterpriseArchiveId
}
if (this.taskModel.result.reviewEnterpriseArchiveId) {
this.fileModel.fetch(
this.taskModel.result.reviewEnterpriseArchiveId,
{},
() => {
this.oldForm.fileName = this.fileModel.fileName
this.form.fileName = this.fileModel.fileName
}
)
}
} else {
this.form = {
passed: '',
......
src/views/processing/systemReview/confirm-result/index.vue
View file @ 0441bc92
......@@ -205,11 +205,27 @@
<div class="img-display">
<div class="img-item">
<div class="img-label">车企负责人</div>
<img class="img" src="@/assets/images/questionnaire/sign1.png" />
<img
v-if="ruleForm.enterpriseLeader"
class="img"
:src="ruleForm.enterpriseLeader"
/>
<div v-else class="img">
<iconpark-icon name="wuqianzi" size="120"></iconpark-icon>
<div class="img-text">暂无签字</div>
</div>
</div>
<div class="img-item">
<div class="img-label">检验负责人</div>
<img class="img" src="@/assets/images/questionnaire/sign2.png" />
<img
v-if="ruleForm.inspectionLeader"
class="img"
:src="ruleForm.inspectionLeader"
/>
<div v-else class="img">
<iconpark-icon name="wuqianzi" size="120"></iconpark-icon>
<div class="img-text">暂无签字</div>
</div>
</div>
</div>
</div>
......@@ -254,8 +270,8 @@ export default {
},
columns: [],
ruleForm: {
enterpriseLeader: 'test',
inspectionLeader: 'test'
enterpriseLeader: '',
inspectionLeader: ''
},
rules: {
enterpriseLeader: [
......@@ -289,12 +305,29 @@ export default {
this.loading = false
if (res.code === 200) {
this.model = res.data
if (this.model.carReviewTask.imagesUrl) {
const imgs = this.model.carReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader
? process.env.VUE_APP_IMAGE_API + imgs[0]
: ''
this.ruleForm.inspectionLeader
? process.env.VUE_APP_IMAGE_API + imgs[1]
: ''
}
} else {
this.$modal.msgError(res.msg)
}
},
/* 返回跳转*/
goToProcessedReview() {
if (!this.ruleForm.enterpriseLeader) {
this.$message.error('请车企负责人签字')
return
}
if (!this.ruleForm.inspectionLeader) {
this.$message.error('请检验负责人签字')
return
}
this.ruleForm.taskId = this.taskId
const formData = {
imagesUrl: [
......
src/views/processing/systemReview/source-record/index.vue
View file @ 0441bc92
......@@ -187,7 +187,13 @@
<div v-else>__</div>
</td>
<td align="center">
<div v-if="reviewDetail.result">
<div
v-if="
reviewDetail.result &&
reviewDetail.result.enterpriseName
"
>
《{{ reviewDetail.result.enterpriseName }}》
{{ reviewDetail.result.catalogue }}
</div>
<div v-else>__</div>
......@@ -250,11 +256,27 @@
<div class="img-display">
<div class="img-item">
<div class="img-label">车企负责人</div>
<img class="img" src="@/assets/images/questionnaire/sign1.png" />
<img
v-if="ruleForm.enterpriseLeader"
class="img"
:src="ruleForm.enterpriseLeader"
/>
<div v-else class="img">
<iconpark-icon name="wuqianzi" size="120"></iconpark-icon>
<div class="img-text">暂无签字</div>
</div>
</div>
<div class="img-item">
<div class="img-label">检验负责人</div>
<img class="img" src="@/assets/images/questionnaire/sign2.png" />
<img
v-if="ruleForm.inspectionLeader"
class="img"
:src="ruleForm.inspectionLeader"
/>
<div v-else class="img">
<iconpark-icon name="wuqianzi" size="120"></iconpark-icon>
<div class="img-text">暂无签字</div>
</div>
</div>
</div>
</div>
......@@ -328,6 +350,15 @@ export default {
this.loading = false
if (res.code === 200) {
this.model = res.data
if (this.model.carReviewTask.imagesUrl) {
const imgs = this.model.carReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader
? process.env.VUE_APP_IMAGE_API + imgs[0]
: ''
this.ruleForm.inspectionLeader
? process.env.VUE_APP_IMAGE_API + imgs[1]
: ''
}
} else {
this.$modal.msgError(res.msg)
}
......
src/views/processing/systemReview/write-check-form/components/previewView.vue
View file @ 0441bc92
......@@ -93,7 +93,13 @@
<div v-else>__</div>
</td>
<td align="center">
<div v-if="reviewDetail.result">
<div
v-if="
reviewDetail.result &&
reviewDetail.result.enterpriseName
"
>
《{{ reviewDetail.result.enterpriseName }}》
{{ reviewDetail.result.catalogue }}
</div>
<div v-else>__</div>
......
src/views/processing/systemReview/write-check-form/index.vue
View file @ 0441bc92
......@@ -552,7 +552,7 @@ export default {
passed: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id,
taskId: this.taskId,
fileName: '',
fileName: this.taskModel.result.enterpriseName,
catalogue: this.taskModel.result.catalogue,
reviewEnterpriseArchiveId:
this.taskModel.result.reviewEnterpriseArchiveId
......@@ -561,21 +561,11 @@ export default {
passed: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id,
taskId: this.taskId,
fileName: '',
fileName: this.taskModel.result.enterpriseName,
catalogue: this.taskModel.result.catalogue,
reviewEnterpriseArchiveId:
this.taskModel.result.reviewEnterpriseArchiveId
}
if (this.taskModel.result.reviewEnterpriseArchiveId) {
this.fileModel.fetch(
this.taskModel.result.reviewEnterpriseArchiveId,
{},
() => {
this.oldForm.fileName = this.fileModel.fileName
this.form.fileName = this.fileModel.fileName
}
)
}
} else {
this.form = {
passed: '',
......
src/views/task/on/index.vue
View file @ 0441bc92
......@@ -649,17 +649,10 @@ export default {
* @param {} item 单项数据
* @param {} type 单项数据
*/
async startTask(item, type) {
let res
if (type === 1) {
res = await reviewTaskStart({
taskId: item.systemReviewTaskId
})
} else {
res = await reviewCarTaskStart({
taskId: item.carReviewTaskId
})
}
async startTask(item) {
const res = await reviewTaskStart({
id: item.id
})
if (res.code === 200) {
this.loadData()
} else {
......
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