diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 08202586..7c5b9bb0 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -271,8 +271,7 @@ }, // 导入数据 importExcel: function(formId) { - var currentId = $.common.isEmpty(formId) ? 'importForm' : formId; - $.form.reset(currentId); + var currentId = $.common.isEmpty(formId) ? 'importTpl' : formId; layer.open({ type: 1, area: ['400px', '230px'], @@ -281,7 +280,7 @@ maxmin: true, shade: 0.3, title: '导入' + $.table._option.modalName + '数据', - content: $('#' + currentId), + content: $('#' + currentId).html(), btn: [' 导入', ' 取消'], // 弹层外区域关闭 shadeClose: true, diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/table.html b/ruoyi-admin/src/main/resources/templates/demo/operate/table.html index aff8c139..92690b76 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/operate/table.html +++ b/ruoyi-admin/src/main/resources/templates/demo/operate/table.html @@ -108,7 +108,8 @@ -