Commit ae4db68d authored by jiaxu.yan's avatar jiaxu.yan

fix: 70384

parent 96b3deb6
...@@ -18,6 +18,7 @@ import './permission' // permission control ...@@ -18,6 +18,7 @@ import './permission' // permission control
import { getDicts } from '@/api/system/dict/data' import { getDicts } from '@/api/system/dict/data'
import { getConfigKey } from '@/api/system/config' import { getConfigKey } from '@/api/system/config'
import { import {
getDictData,
parseTime, parseTime,
resetForm, resetForm,
addDateRange, addDateRange,
...@@ -73,6 +74,7 @@ import { IconPark } from '@icon-park/vue/es/all'; ...@@ -73,6 +74,7 @@ import { IconPark } from '@icon-park/vue/es/all';
Vue.prototype.getDicts = getDicts Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey Vue.prototype.getConfigKey = getConfigKey
Vue.prototype.parseTime = parseTime Vue.prototype.parseTime = parseTime
Vue.prototype.getDictData = getDictData
Vue.prototype.resetForm = resetForm Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.selectDictLabel = selectDictLabel
......
...@@ -3,6 +3,19 @@ ...@@ -3,6 +3,19 @@
* Copyright (c) 2019 ruoyi * Copyright (c) 2019 ruoyi
*/ */
/**
* 获取字典
* @param {*} options
* @param {*} value
*/
export function getDictData(options, value) {
const item = options.filter(v => v.value === value)
if (item.length > 0) {
return item[0].label
} else {
return null
}
}
// 日期格式化 // 日期格式化
export function parseTime(time, pattern) { export function parseTime(time, pattern) {
if (arguments.length === 0 || !time) { if (arguments.length === 0 || !time) {
...@@ -61,8 +74,8 @@ export function addDateRange(params, dateRange, propName) { ...@@ -61,8 +74,8 @@ export function addDateRange(params, dateRange, propName) {
let search = params let search = params
search.params = search.params =
typeof search.params === 'object' && typeof search.params === 'object' &&
search.params !== null && search.params !== null &&
!Array.isArray(search.params) !Array.isArray(search.params)
? search.params ? search.params
: {} : {}
dateRange = Array.isArray(dateRange) ? dateRange : [] dateRange = Array.isArray(dateRange) ? dateRange : []
......
...@@ -24,6 +24,17 @@ ...@@ -24,6 +24,17 @@
{{ model.carReviewTask.taskInitiatorDept }} {{ model.carReviewTask.taskInitiatorDept }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">任务状态:</span>
<span class="task-content">
{{
getDictData(
dict.type.test_cartype_type,
model.carReviewTask.taskStatus
)
}}
</span>
</div>
</div> </div>
<!--审查问卷概要--> <!--审查问卷概要-->
...@@ -147,6 +158,7 @@ export default { ...@@ -147,6 +158,7 @@ export default {
collapse: collapse, collapse: collapse,
'collapse-item': collapseItem 'collapse-item': collapseItem
}, },
dicts: ['test_cartype_type'],
data() { data() {
return { return {
model: { model: {
......
...@@ -25,6 +25,17 @@ ...@@ -25,6 +25,17 @@
{{ model.carReviewTask.taskInitiatorDept }} {{ model.carReviewTask.taskInitiatorDept }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">任务状态:</span>
<span class="task-content">
{{
getDictData(
dict.type.test_cartype_type,
model.carReviewTask.taskStatus
)
}}
</span>
</div>
</div> </div>
<div class="task-body"> <div class="task-body">
<!--card统计值--> <!--card统计值-->
...@@ -281,6 +292,7 @@ export default { ...@@ -281,6 +292,7 @@ export default {
collapse: collapse, collapse: collapse,
'collapse-item': collapseItem 'collapse-item': collapseItem
}, },
dicts: ['test_cartype_type'],
data() { data() {
return { return {
isShow: true, isShow: true,
......
...@@ -25,6 +25,17 @@ ...@@ -25,6 +25,17 @@
{{ model.carReviewTask.taskInitiatorDept }} {{ model.carReviewTask.taskInitiatorDept }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">任务状态:</span>
<span class="task-content">
{{
getDictData(
dict.type.test_cartype_type,
model.carReviewTask.taskStatus
)
}}
</span>
</div>
</div> </div>
<div class="task-body"> <div class="task-body">
<!--card统计值--> <!--card统计值-->
...@@ -298,6 +309,7 @@ export default { ...@@ -298,6 +309,7 @@ export default {
collapse: collapse, collapse: collapse,
'collapse-item': collapseItem 'collapse-item': collapseItem
}, },
dicts: ['test_cartype_type'],
data() { data() {
return { return {
isShow: true, isShow: true,
......
...@@ -34,6 +34,17 @@ ...@@ -34,6 +34,17 @@
{{ model.carReviewTask.taskInitiatorDept }} {{ model.carReviewTask.taskInitiatorDept }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">任务状态:</span>
<span class="task-content">
{{
getDictData(
dict.type.test_cartype_type,
model.carReviewTask.taskStatus
)
}}
</span>
</div>
</div> </div>
<div class="prompt-message"> <div class="prompt-message">
<i class="icon el-icon-info"></i> <i class="icon el-icon-info"></i>
...@@ -278,6 +289,7 @@ export default { ...@@ -278,6 +289,7 @@ export default {
'scene-view': sceneView, 'scene-view': sceneView,
'company-file': companyFile 'company-file': companyFile
}, },
dicts: ['test_cartype_type'],
data() { data() {
return { return {
sceneManger: { sceneManger: {
......
...@@ -215,19 +215,6 @@ export default { ...@@ -215,19 +215,6 @@ export default {
this.queryParams.taskId = this.$route.query.id this.queryParams.taskId = this.$route.query.id
}, },
methods: { methods: {
/**
* 获取字典
* @param {*} options
* @param {*} value
*/
getDictData(options, value) {
const item = options.filter(v => v.value === value)
if (item.length > 0) {
return item[0].label
} else {
return null
}
},
handleUpdate(id) { handleUpdate(id) {
this.dialogManger.dialogVisible = true this.dialogManger.dialogVisible = true
this.dialogManger.dialogEditId = id this.dialogManger.dialogEditId = id
......
...@@ -25,6 +25,17 @@ ...@@ -25,6 +25,17 @@
{{ model.systemReviewTask.taskInitiatorDept }} {{ model.systemReviewTask.taskInitiatorDept }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">委托单位:</span>
<span class="task-content">
{{
getDictData(
dict.type.system_review_test,
model.systemReviewTask.taskStatus
)
}}
</span>
</div>
</div> </div>
<div class="task-body"> <div class="task-body">
<!--card统计值--> <!--card统计值-->
...@@ -269,6 +280,7 @@ export default { ...@@ -269,6 +280,7 @@ export default {
collapse: collapse, collapse: collapse,
'collapse-item': collapseItem 'collapse-item': collapseItem
}, },
dicts: ['system_review_test'],
data() { data() {
return { return {
isShow: 1, isShow: 1,
......
...@@ -24,6 +24,17 @@ ...@@ -24,6 +24,17 @@
{{ model.systemReviewTask.taskInitiatorDept }} {{ model.systemReviewTask.taskInitiatorDept }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">委托单位:</span>
<span class="task-content">
{{
getDictData(
dict.type.system_review_test,
model.systemReviewTask.taskStatus
)
}}
</span>
</div>
</div> </div>
<!--审查问卷概要--> <!--审查问卷概要-->
...@@ -146,6 +157,7 @@ export default { ...@@ -146,6 +157,7 @@ export default {
collapse: collapse, collapse: collapse,
'collapse-item': collapseItem 'collapse-item': collapseItem
}, },
dicts: ['system_review_test'],
data() { data() {
return { return {
isShow: 1, isShow: 1,
......
...@@ -25,6 +25,17 @@ ...@@ -25,6 +25,17 @@
{{ model.systemReviewTask.taskInitiatorDept }} {{ model.systemReviewTask.taskInitiatorDept }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">委托单位:</span>
<span class="task-content">
{{
getDictData(
dict.type.system_review_test,
model.systemReviewTask.taskStatus
)
}}
</span>
</div>
</div> </div>
<div class="task-body"> <div class="task-body">
<!--card统计值--> <!--card统计值-->
...@@ -313,6 +324,7 @@ export default { ...@@ -313,6 +324,7 @@ export default {
collapse: collapse, collapse: collapse,
'collapse-item': collapseItem 'collapse-item': collapseItem
}, },
dicts: ['system_review_test'],
data() { data() {
return { return {
isShow: 1, isShow: 1,
......
...@@ -34,6 +34,17 @@ ...@@ -34,6 +34,17 @@
{{ model.systemReviewTask.taskInitiatorDept }} {{ model.systemReviewTask.taskInitiatorDept }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">委托单位:</span>
<span class="task-content">
{{
getDictData(
dict.type.system_review_test,
model.systemReviewTask.taskStatus
)
}}
</span>
</div>
</div> </div>
<div class="prompt-message"> <div class="prompt-message">
<i class="icon el-icon-info"></i> <i class="icon el-icon-info"></i>
...@@ -284,6 +295,7 @@ export default { ...@@ -284,6 +295,7 @@ export default {
'scene-view': sceneView, 'scene-view': sceneView,
'company-file': companyFile 'company-file': companyFile
}, },
dicts: ['system_review_test'],
data() { data() {
return { return {
sceneManger: { sceneManger: {
......
...@@ -623,19 +623,6 @@ export default { ...@@ -623,19 +623,6 @@ export default {
break break
} }
}, },
/**
* 获取字典
* @param {*} options
* @param {*} value
*/
getDictData(options, value) {
const item = options.filter(v => v.value === value)
if (item.length > 0) {
return item[0].label
} else {
return null
}
},
/* 跳转到问卷详情*/ /* 跳转到问卷详情*/
goNext(url) { goNext(url) {
this.$router.push({ path: url }) this.$router.push({ path: url })
......
...@@ -774,14 +774,6 @@ export default { ...@@ -774,14 +774,6 @@ export default {
}) })
break break
} }
},
getDictData(options, value) {
const item = options.filter(v => v.value === value)
if (item.length > 0) {
return item[0].label
} else {
return null
}
} }
} }
} }
......
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