diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
index 1ea58a7..e0df45a 100644
--- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
@@ -177,7 +177,7 @@
{{ $t('newlyAdded') }}
-
+
{
+ insertArr.push({
+ id: '',
+ uuid: randomUUID(),
+ type: TypeOfClauseItem.IMG.value,
+ itemContent: file.response.result.url,
+ thumbUrl: window._CONFIG.domianURL + '/sys/split/file/getImage?fileName=' + file.response.result.fileName
+ })
+ })
}
+ // if (content.file.response.result && content.file.response.result.url) {
+ // console.log(content.file.response.result.id)
+ // insertArr[0] = {
+ // id: '',
+ // uuid: randomUUID(),
+ // type: TypeOfClauseItem.IMG.value,
+ // itemContent: content.file.response.result.url,
+ // thumbUrl: window._CONFIG.domianURL + '/sys/split/file/getImage?fileName=' + content.file.response.result.fileName
+ // }
+ // }
break
case TypeOfClauseItem.TABLE.value:
insertArr[0] = {
id: '',
+ uuid: randomUUID(),
type: 'TABLE',
itemContent: content[0]
}
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue b/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue
index 7aed97b..6928ff8 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue
@@ -159,8 +159,11 @@ export default {
},
// 上传文件
uploadSuccess (file, data, imgs) {
- this.$emit('ok', TypeOfClauseItem.IMG.value, { file, data, imgs })
- this.visible = false
+ // 所有文件都上传完成再去关闭弹框
+ if (Array.isArray(imgs) && imgs.every(item => item.status === 'done')) {
+ this.$emit('ok', TypeOfClauseItem.IMG.value, { file, data, imgs })
+ this.visible = false
+ }
// this.$emit('addImageOk', file, data, imgs)
},
// 确定增加的类型