diff --git a/src/assets/scss/pages/smartImport.scss b/src/assets/scss/pages/smartImport.scss index 55563c016..ab75a4236 100644 --- a/src/assets/scss/pages/smartImport.scss +++ b/src/assets/scss/pages/smartImport.scss @@ -32,6 +32,13 @@ align-items: center; .el-upload__text{ color: #c5c9d1; + width: 100%; + } + /deep/ .el-upload { + width: 100%; + .el-upload-dragger{ + width: 100%; + } } } } diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue index fdc34df62..932952954 100644 --- a/src/views/modules/base/smartImport/cpts/completeTask.vue +++ b/src/views/modules/base/smartImport/cpts/completeTask.vue @@ -2,8 +2,15 @@
- +

导入完成

+ 返回任务列表

@@ -18,6 +25,70 @@

数据导入明细

+ + + {{ this.importSuccessNum || "--" }}条数据已导入。查看 + + + + + {{ this.importFailNum || "--" }}条问题数据导入失败。查看 + + + 下载结果说明 + + + + + + + + + + + + 取 消 + 确 定 + +
- - \ No newline at end of file diff --git a/src/views/modules/base/smartImport/cpts/smartImportDetail.vue b/src/views/modules/base/smartImport/cpts/smartImportDetail.vue deleted file mode 100644 index 75baf8593..000000000 --- a/src/views/modules/base/smartImport/cpts/smartImportDetail.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/modules/base/smartImport/cpts/smartImportInfo.vue b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue index a864362ac..24d0f44de 100644 --- a/src/views/modules/base/smartImport/cpts/smartImportInfo.vue +++ b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue @@ -1,39 +1,88 @@ - - + \ No newline at end of file diff --git a/src/views/modules/base/smartImport/index.vue b/src/views/modules/base/smartImport/index.vue index a283664ad..81fa5930a 100644 --- a/src/views/modules/base/smartImport/index.vue +++ b/src/views/modules/base/smartImport/index.vue @@ -41,7 +41,7 @@ - + @@ -121,8 +121,11 @@ export default { dicts: { import_status:[], resident_category_import:[], - }, //字典对象 + + fileCode:null, + taskId:null, + processStatus:null, }; }, computed: { @@ -184,13 +187,17 @@ export default { }, // 查看详情触发事件 async handleDetail(row) { - this.pageType = "detail"; + this.pageType = "add"; + const {taskId,fileCode,processStatus} = row; + this.taskId = taskId; + this.fileCode = fileCode; + this.processStatus = processStatus; }, // 新增弹出框组件取消事件 handleClose() { this.pageType = "list"; - + this.processStatus = null; }, // 新增弹出框组件确定事件 handleOk(type) { @@ -229,7 +236,7 @@ export default { // 获取列表 async getTableData() { this.tableLoading = true; - const url = "/commonservice/import-task/page"; + const url = "/commonservice/import-task/pageList"; const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { pageSize,