Skip to content

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

fix: 71073 71032 71060

parent 3c61b7b4
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 12 deletions
src/main.js
View file @ 8a8015b0
...@@ -26,7 +26,8 @@ import { ...@@ -26,7 +26,8 @@ import {
addDateRange, addDateRange,
selectDictLabel, selectDictLabel,
selectDictLabels, selectDictLabels,
handleTree handleTree,
isTextOverflowingContainer
} from '@/utils/ruoyi' } from '@/utils/ruoyi'
// 分页组件 // 分页组件
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
...@@ -83,7 +84,7 @@ Vue.prototype.selectDictLabel = selectDictLabel ...@@ -83,7 +84,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download Vue.prototype.download = download
Vue.prototype.handleTree = handleTree Vue.prototype.handleTree = handleTree
Vue.prototype.isTextOverflowingContainer
// 全局组件挂载 // 全局组件挂载
Vue.component('DictTag', DictTag) Vue.component('DictTag', DictTag)
Vue.component('IconPark', IconPark) Vue.component('IconPark', IconPark)
......
src/views/processing/carReview/review-form/index.vue
View file @ 8a8015b0
...@@ -166,6 +166,7 @@ ...@@ -166,6 +166,7 @@
<div v-else>__</div> <div v-else>__</div>
</td> </td>
<el-tooltip <el-tooltip
v-if="reviewDetail.result"
effect="dark" effect="dark"
:content=" :content="
reviewDetail.result reviewDetail.result
...@@ -184,6 +185,15 @@ ...@@ -184,6 +185,15 @@
}} }}
</td> </td>
</el-tooltip> </el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</tr> </tr>
</template> </template>
</template> </template>
......
src/views/processing/carReview/source-record/index.vue
View file @ 8a8015b0
...@@ -226,6 +226,7 @@ ...@@ -226,6 +226,7 @@
<div v-else>__</div> <div v-else>__</div>
</td> </td>
<el-tooltip <el-tooltip
v-if="reviewDetail.result"
effect="dark" effect="dark"
:content=" :content="
reviewDetail.result reviewDetail.result
...@@ -244,6 +245,15 @@ ...@@ -244,6 +245,15 @@
}} }}
</td> </td>
</el-tooltip> </el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</tr> </tr>
</template> </template>
</template> </template>
...@@ -398,16 +408,17 @@ export default { ...@@ -398,16 +408,17 @@ export default {
this.loading = false this.loading = false
if (res.code === 200) { if (res.code === 200) {
this.model = res.data this.model = res.data
await this.getTaskDetail()
if (this.model.carReviewTask.imagesUrl) { if (this.model.carReviewTask.imagesUrl) {
const imgs = this.model.carReviewTask.imagesUrl.split(',') const imgs = this.model.carReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader
this.ruleForm.enterpriseLeader = imgs[0]
? process.env.VUE_APP_IMAGE_API + imgs[0] ? process.env.VUE_APP_IMAGE_API + imgs[0]
: '' : ''
this.ruleForm.inspectionLeader this.ruleForm.inspectionLeader = imgs[1]
? process.env.VUE_APP_IMAGE_API + imgs[1] ? process.env.VUE_APP_IMAGE_API + imgs[1]
: '' : ''
} }
await this.getTaskDetail()
} else { } else {
this.$modal.msgError(res.msg) this.$modal.msgError(res.msg)
} }
......
src/views/processing/carReview/vehicle-type/index.vue
View file @ 8a8015b0
...@@ -208,6 +208,7 @@ ...@@ -208,6 +208,7 @@
<div v-else>__</div> <div v-else>__</div>
</td> </td>
<el-tooltip <el-tooltip
v-if="reviewDetail.result"
effect="dark" effect="dark"
:content=" :content="
reviewDetail.result reviewDetail.result
...@@ -226,6 +227,15 @@ ...@@ -226,6 +227,15 @@
}} }}
</td> </td>
</el-tooltip> </el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</tr> </tr>
</template> </template>
</template> </template>
...@@ -364,10 +374,11 @@ export default { ...@@ -364,10 +374,11 @@ export default {
await this.getTaskDetail() await this.getTaskDetail()
if (this.model.carReviewTask.imagesUrl) { if (this.model.carReviewTask.imagesUrl) {
const imgs = this.model.carReviewTask.imagesUrl.split(',') const imgs = this.model.carReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader
this.ruleForm.enterpriseLeader = imgs[0]
? process.env.VUE_APP_IMAGE_API + imgs[0] ? process.env.VUE_APP_IMAGE_API + imgs[0]
: '' : ''
this.ruleForm.inspectionLeader this.ruleForm.inspectionLeader = imgs[1]
? process.env.VUE_APP_IMAGE_API + imgs[1] ? process.env.VUE_APP_IMAGE_API + imgs[1]
: '' : ''
} }
......
src/views/processing/carReview/write-check-form/components/previewView.vue
View file @ 8a8015b0
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
<div v-else>__</div> <div v-else>__</div>
</td> </td>
<el-tooltip <el-tooltip
v-if="reviewDetail.result"
effect="dark" effect="dark"
:content=" :content="
reviewDetail.result ? reviewDetail.result.userName : '---' reviewDetail.result ? reviewDetail.result.userName : '---'
...@@ -129,6 +130,15 @@ ...@@ -129,6 +130,15 @@
}} }}
</td> </td>
</el-tooltip> </el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</tr> </tr>
</template> </template>
</template> </template>
......
src/views/processing/systemReview/confirm-result/index.vue
View file @ 8a8015b0
...@@ -210,6 +210,7 @@ ...@@ -210,6 +210,7 @@
> >
</td> </td>
<el-tooltip <el-tooltip
v-if="reviewDetail.result"
effect="dark" effect="dark"
:content=" :content="
reviewDetail.result reviewDetail.result
...@@ -228,6 +229,15 @@ ...@@ -228,6 +229,15 @@
}} }}
</td> </td>
</el-tooltip> </el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</tr> </tr>
</template> </template>
</template> </template>
...@@ -361,10 +371,11 @@ export default { ...@@ -361,10 +371,11 @@ export default {
this.model = res.data this.model = res.data
if (this.model.systemReviewTask.imagesUrl) { if (this.model.systemReviewTask.imagesUrl) {
const imgs = this.model.systemReviewTask.imagesUrl.split(',') const imgs = this.model.systemReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader
this.ruleForm.enterpriseLeader = imgs[0]
? process.env.VUE_APP_IMAGE_API + imgs[0] ? process.env.VUE_APP_IMAGE_API + imgs[0]
: '' : ''
this.ruleForm.inspectionLeader this.ruleForm.inspectionLeader = imgs[1]
? process.env.VUE_APP_IMAGE_API + imgs[1] ? process.env.VUE_APP_IMAGE_API + imgs[1]
: '' : ''
} }
......
src/views/processing/systemReview/review-form/index.vue
View file @ 8a8015b0
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
<div v-else>__</div> <div v-else>__</div>
</td> </td>
<el-tooltip <el-tooltip
v-if="reviewDetail.result"
effect="dark" effect="dark"
:content=" :content="
reviewDetail.result reviewDetail.result
...@@ -156,6 +157,15 @@ ...@@ -156,6 +157,15 @@
}} }}
</td> </td>
</el-tooltip> </el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</tr> </tr>
</template> </template>
</template> </template>
......
src/views/processing/systemReview/source-record/index.vue
View file @ 8a8015b0
...@@ -231,6 +231,7 @@ ...@@ -231,6 +231,7 @@
<div v-else>__</div> <div v-else>__</div>
</td> </td>
<el-tooltip <el-tooltip
v-if="reviewDetail.result"
effect="dark" effect="dark"
:content=" :content="
reviewDetail.result reviewDetail.result
...@@ -249,6 +250,15 @@ ...@@ -249,6 +250,15 @@
}} }}
</td> </td>
</el-tooltip> </el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</tr> </tr>
</template> </template>
</template> </template>
...@@ -406,10 +416,10 @@ export default { ...@@ -406,10 +416,10 @@ export default {
this.model = res.data this.model = res.data
if (this.model.systemReviewTask.imagesUrl) { if (this.model.systemReviewTask.imagesUrl) {
const imgs = this.model.systemReviewTask.imagesUrl.split(',') const imgs = this.model.systemReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader this.ruleForm.enterpriseLeader = imgs[0]
? process.env.VUE_APP_IMAGE_API + imgs[0] ? process.env.VUE_APP_IMAGE_API + imgs[0]
: '' : ''
this.ruleForm.inspectionLeader this.ruleForm.inspectionLeader = imgs[1]
? process.env.VUE_APP_IMAGE_API + imgs[1] ? process.env.VUE_APP_IMAGE_API + imgs[1]
: '' : ''
} }
......
src/views/processing/systemReview/write-check-form/components/previewView.vue
View file @ 8a8015b0
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
<div v-else>__</div> <div v-else>__</div>
</td> </td>
<el-tooltip <el-tooltip
v-if="reviewDetail.result"
effect="dark" effect="dark"
:content=" :content="
reviewDetail.result ? reviewDetail.result.userName : '---' reviewDetail.result ? reviewDetail.result.userName : '---'
...@@ -129,6 +130,15 @@ ...@@ -129,6 +130,15 @@
}} }}
</td> </td>
</el-tooltip> </el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</tr> </tr>
</template> </template>
</template> </template>
......
src/views/system/user/profile/index.vue
View file @ 8a8015b0
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="tree" />所属部门 <svg-icon icon-class="tree" />所属部门
<div v-if="user.dept" class="pull-right"> <div v-if="user.dept" class="pull-right">
{{ user.dept.deptName }} / {{ postGroup }} {{ user.dept.deptName || '--' }} / {{ postGroup || '--' }}
</div> </div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
......
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