diff --git a/src/views/demo/layer/BatchProcessingModal/ImportComponent/index.vue b/src/views/demo/layer/BatchProcessingModal/ImportComponent/index.vue index 62ef68b..e4f2fb7 100644 --- a/src/views/demo/layer/BatchProcessingModal/ImportComponent/index.vue +++ b/src/views/demo/layer/BatchProcessingModal/ImportComponent/index.vue @@ -51,12 +51,30 @@ :destroyOnClose="true" style="top: 50px" > - + + + + @@ -64,6 +82,7 @@ import { ref, h, defineProps, defineEmits } from "vue" import { PlusOutlined } from '@ant-design/icons-vue'; import MergeSourceModal from './MergeSourceModal/index.vue' +import ShowErrorDataModal from '@/views/demo/layer/BatchProcessingModal/ShowErrorDataModal/index.vue' import { UploadShape1, Upload, UploadExcelInsert } from '@/api/demo/BatchProcessingModal' import { message } from "ant-design-vue"; import axios from 'axios'; @@ -75,8 +94,10 @@ const props = defineProps(['tableName','tableColumn']) const emits = defineEmits(['changeBatchProcessingModal']) const procedure = ref(0) const mergeSourceModal = ref(false) +const errorDataModal = ref(false) const nowData = ref([]) const originData = ref([]) +const errorData = ref([]) const uploadPercent = ref(0); const progresStatus = ref('') const showProgress = ref(false) @@ -87,6 +108,9 @@ const submit = () => { const closemergeSourceModal = () => { mergeSourceModal.value = false } +const closeErrorDataModal = () => { + errorDataModal.value = false +} const beforeUpload = (file) => { showProgress.value = true fileName.value = file.name @@ -124,8 +148,7 @@ const customRequest = async (file) => { tableName: props.tableName, zipFilePath: filePath, }); - - handleUploadResult(result.result); + handleUploadResult(result); } else { handleUploadResult(resData.result); } @@ -140,12 +163,21 @@ const customRequest = async (file) => { } } const handleUploadResult = (result: any) => { + let error = 0 + if(result.errorData && result.errorData.length > 0){ + errorData.value = result.errorData + errorDataModal.value = true + message.warning('部分数据上传失败请查看'); + error++ + } if (result.nowData && result.nowData.length > 0) { nowData.value = result.nowData; originData.value = result.originData; mergeSourceModal.value = true; - } else { - message.success('导入成功'); + error++ + } + if(error == 0){ + message.success('导入成功') } }; diff --git a/src/views/demo/layer/BatchProcessingModal/ShowErrorDataModal/index.vue b/src/views/demo/layer/BatchProcessingModal/ShowErrorDataModal/index.vue new file mode 100644 index 0000000..e92c06d --- /dev/null +++ b/src/views/demo/layer/BatchProcessingModal/ShowErrorDataModal/index.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/views/demo/layer/BatchProcessingModal/UpdateComponent/index.vue b/src/views/demo/layer/BatchProcessingModal/UpdateComponent/index.vue index 101613d..cdb0822 100644 --- a/src/views/demo/layer/BatchProcessingModal/UpdateComponent/index.vue +++ b/src/views/demo/layer/BatchProcessingModal/UpdateComponent/index.vue @@ -40,6 +40,24 @@ 替换原数据 + + +