From 239ab7dd1df24ec6a45e6bb2322fb8186ce8ac8f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 19:34:53 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/components/ImportModal.jsx | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/components/ImportModal.jsx b/rsf-admin/src/page/components/ImportModal.jsx
index 70f84cf..63c2edf 100644
--- a/rsf-admin/src/page/components/ImportModal.jsx
+++ b/rsf-admin/src/page/components/ImportModal.jsx
@@ -22,7 +22,7 @@
import MatnrList from '../basicInfo/matnr/MatnrList';
import request from '@/utils/request'
-const ImportModal = ({ open, onClose, importTemp, useCodeImport, onceBatch = 10, value, parmas = {} }) => {
+const ImportModal = ({ open, onClose, importTemp, useCodeImport, onceBatch = 10, value, parmas = {}}) => {
const refresh = useRefresh();
const translate = useTranslate();
@@ -57,17 +57,17 @@
}
form.append('file', file);
const { data: { code, data, msg } } = await request.post(`/${value}/import`, form)
-
if (code === 200) {
handleClose()
- } else {
notify(msg);
-
+ refresh()
+ } else {
+ handleClose()
+ notify(msg);
+ refresh()
}
};
-
-
const handleClose = () => {
reset();
@@ -78,6 +78,22 @@
e.preventDefault();
reset();
};
+
+ const downloadTemplate = async (type) => {
+ const res = await request.post(`/${value}/template/download`, {}, {
+ responseType: "blob",
+ })
+ const url = window.URL.createObjectURL(
+ new Blob([res.data], { type: res.headers["content-type"] }),
+ );
+
+ const link = document.createElement("a");
+ link.href = url;
+ link.setAttribute("download", `${value}.xlsx`);
+ document.body.appendChild(link);
+ link.click();
+ link.remove();
+ }
return (
<Dialog open={open} maxWidth="md" fullWidth>
@@ -230,14 +246,7 @@
);
}
{/**涓嬭浇鎵撳嵃妯℃澘锛屼紶鍏ype绫诲瀷锛岃皟鐢ㄤ笅杞芥ā鏉挎帴鍙� */ }
-const downloadTemplate = (type) => {
- // 涓嬭浇鐗╂枡妯℃澘
- if (type != undefined && type == 'matnr') {
- }
- console.log('======>');
- console.log(type);
-}
function millisecondsToTime(ms) {
var seconds = Math.floor((ms / 1000) % 60);
--
Gitblit v1.9.1