From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 7ad2f92..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: '导入快递单',
+ title: '导入快递单,部分失败',
content: data.info
});
+ var url = basePath + "/admin/shopOrder/exportLogisticsImportExcel";
+ window.open(url);
+ parent.myGrid.serchData();
}
$("#showFileName").val('');
var file = $("#chanceUploadId");
@@ -117,8 +118,7 @@
function download() {
- //window.location.href= "https://xcshop.csxuncong.com/uploadefile/image/logisticsImport.xls";
- window.location.href= "http://xcshop.csxuncong.com/uploadfile/image/logisticsImport.xls";
+ window.location.href=basePath + "/uploadfile/image/logisticsImport.xls";
}
</script>
</body>
--
Gitblit v1.9.1