From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html b/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html
index c19f9d2..a1ea86c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html
@@ -98,15 +98,16 @@
layer.closeAll('loading');
console.log(data)
if (data.status == "200") {
- layer.open({
- title: '导入快递单',
- content: data.info
- });
+ parent.layer.close(parent.layer.getFrameIndex(window.name));
+ parent.myGrid.serchData();
} else {
layer.open({
title: '导入快递单,部分失败',
content: data.info
});
+ var url = basePath + "/admin/shopOrder/exportLogisticsImportExcel";
+ window.open(url);
+ parent.myGrid.serchData();
}
$("#showFileName").val('');
var file = $("#chanceUploadId");
@@ -117,7 +118,7 @@
function download() {
- window.location.href= "https://xcshop.csxuncong.com/templates/logisticsImport.xlsx";
+ window.location.href=basePath + "/uploadfile/image/logisticsImport.xls";
}
</script>
</body>
--
Gitblit v1.9.1