diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue index 932952954..39224b978 100644 --- a/src/views/modules/base/smartImport/cpts/completeTask.vue +++ b/src/views/modules/base/smartImport/cpts/completeTask.vue @@ -44,7 +44,7 @@ { - console.log("res-up", res); - if (res.data.code == 0) { const { fileName, url } = res.data.data; this.createdFileName = fileName; @@ -357,7 +355,7 @@ export default { .catch((err) => { console.log("失败", err); file.onError(); //上传失败的文件会从文件列表中删除 - // this.$message.error("导入失败"); + this.dataListLoading = false; }); this.$refs.upload.clearFiles(); }, diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue index 60e561b46..1a5fe1402 100644 --- a/src/views/modules/base/smartImport/cpts/executeTask.vue +++ b/src/views/modules/base/smartImport/cpts/executeTask.vue @@ -124,8 +124,7 @@ export default { pageNo:1, pageSize:20, total:0, - tableType:null - + tableType:null, }; }, props: { @@ -201,6 +200,7 @@ export default { async handelClickLook(type) { this.showTable = true; this.tableType = type; + this.pageNo = 1; this.getTable() }, async getTable(){ diff --git a/src/views/modules/base/smartImport/cpts/smartImportInfo.vue b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue index 24d0f44de..cfea89b20 100644 --- a/src/views/modules/base/smartImport/cpts/smartImportInfo.vue +++ b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue @@ -2,75 +2,103 @@
- - - - + + +
-
- - - +
+ + +