|
|
@@ -77,11 +77,6 @@
|
|
|
></el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
- <template #isuploaded="{ row }">
|
|
|
- <div>
|
|
|
- {{ row.isUploaded === 1 ? '已上传' : '' }}
|
|
|
- </div>
|
|
|
- </template>
|
|
|
<template #filefolder="{ row }">
|
|
|
<div v-if="row.fileFolder">
|
|
|
{{ row.fileFolder.title }}
|
|
|
@@ -234,13 +229,23 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: '文件名称',
|
|
|
- prop: 'fileFolder',
|
|
|
+ prop: 'title',
|
|
|
slot: true
|
|
|
},
|
|
|
{
|
|
|
label: '上传状态',
|
|
|
prop: 'isUploaded',
|
|
|
- slot: true
|
|
|
+ type: 'select',
|
|
|
+ dicData: [
|
|
|
+ {
|
|
|
+ label: '未上传',
|
|
|
+ value: 0
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '已上传',
|
|
|
+ value: 1
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
label: '上传时间',
|
|
|
@@ -293,10 +298,13 @@ export default {
|
|
|
this.data = this.data.map(sub => {
|
|
|
const item = tmp.find(ele => ele.type === sub.dispatchType)
|
|
|
if (item) {
|
|
|
+ const fileFolder = item.fileFolder
|
|
|
+ sub = Object.assign(sub, fileFolder)
|
|
|
sub = Object.assign(sub, item)
|
|
|
}
|
|
|
return sub
|
|
|
})
|
|
|
+ console.log(this.data)
|
|
|
const img = tmp.filter(ele => ele.type === 4)
|
|
|
if (img && img.length > 0) {
|
|
|
img.forEach(i => {
|