From 1412ccc85568bfc6ff14ab4de3012c610b3e7852 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 13 Apr 2021 21:05:45 +0800
Subject: [PATCH] 20210413 后台订单管理修改
---
/dev/null | 0
zq-erp/src/main/resources/static/templates/logisticsImport.xls | 0
zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html | 9 ++++-----
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
index a26663e..7d133fd 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
@@ -111,7 +111,7 @@
infoRemind = infoRemind + logisticsImportVo.getRemark()+";";
}
ajaxResult = AjaxResult.buildSuccessInstance(infoRemind);
- ajaxResult.setStatus(AjaxResult.STATUS_SUCCESS);
+ ajaxResult.setStatus(AjaxResult.STATUS_FAIL);
}else{
ajaxResult = AjaxResult.buildSuccessInstance("导入成功");
ajaxResult.setStatus(AjaxResult.STATUS_SUCCESS);
diff --git a/zq-erp/src/main/resources/static/templates/logisticsImport.xls b/zq-erp/src/main/resources/static/templates/logisticsImport.xls
new file mode 100644
index 0000000..4e7e566
--- /dev/null
+++ b/zq-erp/src/main/resources/static/templates/logisticsImport.xls
Binary files differ
diff --git a/zq-erp/src/main/resources/static/templates/logisticsImport.xlsx b/zq-erp/src/main/resources/static/templates/logisticsImport.xlsx
deleted file mode 100644
index f14dabd..0000000
--- a/zq-erp/src/main/resources/static/templates/logisticsImport.xlsx
+++ /dev/null
Binary files differ
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..a9eee0b 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,14 @@
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
});
+ parent.myGrid.serchData();
}
$("#showFileName").val('');
var file = $("#chanceUploadId");
@@ -117,7 +116,7 @@
function download() {
- window.location.href= "https://xcshop.csxuncong.com/templates/logisticsImport.xlsx";
+ window.location.href= "https://xcshop.csxuncong.com/templates/logisticsImport.xls";
}
</script>
</body>
--
Gitblit v1.9.1