~jiangyouyao/beauty-erp.git

			@@ -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);

			@@ -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>

	zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/templates/logisticsImport.xls	patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/templates/logisticsImport.xlsx	patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html	9 ●●●●● patch \| view \| raw \| blame \| history