|
@@ -14,6 +14,19 @@
|
|
|
<nav class="breadcrumb"><i class="Hui-iconfont"></i> 首页 <span class="c-gray en">></span> 订单管理 <span class="c-gray en">></span> 文件内容转换 <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont"></i></a></nav>
|
|
|
<div class="page-container">
|
|
|
<input type="hidden" id="productUrl" value="${productUrl}">
|
|
|
+
|
|
|
+ <div style="color: #e00;">注意:请上传待发货的订单信息,系统只处理待发货的订单信息。</div>
|
|
|
+
|
|
|
+ <div style="margin-top: 10px;margin-bottom: 10px;">
|
|
|
+ 批次编号:
|
|
|
+ <select class="my-select" name="order_batch" id="order_batch" matchSelect="订单编号|订单号|交易号|序号" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <option value="1" >新增批次</option>
|
|
|
+ <#list orderBatchs as orderBatch>
|
|
|
+ <option value="${orderBatch.batchId}" >${orderBatch.batchId}</option>
|
|
|
+ </#list>
|
|
|
+ </select>
|
|
|
+ </div>
|
|
|
+
|
|
|
<table class="table table-border table-bordered table-bg">
|
|
|
<thead>
|
|
|
<tr class="text-c">
|
|
@@ -25,7 +38,7 @@
|
|
|
<tr class="text-c">
|
|
|
<td width="55">平台订单编号</td>
|
|
|
<td style="text-align: left;">
|
|
|
- <select class="my-select" name="addr-platformOrders" id="addr-platformOrders" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <select class="my-select" name="addr-platformOrders" id="addr-platformOrders" matchSelect="订单编号|订单号|交易号|序号" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
<#list heads as head>
|
|
|
<option value="${head}" >${head}</option>
|
|
|
</#list>
|
|
@@ -35,7 +48,7 @@
|
|
|
<tr class="text-c">
|
|
|
<td width="55">收货人姓名</td>
|
|
|
<td style="text-align: left;">
|
|
|
- <select class="my-select" name="addr-name" id="addr-name" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <select class="my-select" name="addr-name" id="addr-name" matchSelect="收件人|收货人|客户姓名" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
<#list heads as head>
|
|
|
<option value="${head}" >${head}</option>
|
|
|
</#list>
|
|
@@ -45,7 +58,7 @@
|
|
|
<tr class="text-c">
|
|
|
<td width="55">收货人电话</td>
|
|
|
<td style="text-align: left;">
|
|
|
- <select class="my-select" name="addr-tel" id="addr-tel" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <select class="my-select" name="addr-tel" id="addr-tel" matchSelect="收件人手机|收件人电话|收货人手机|收货人电话|手机|电话|联系方式|联系电话" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
<#list heads as head>
|
|
|
<option value="${head}" >${head}</option>
|
|
|
</#list>
|
|
@@ -72,7 +85,7 @@
|
|
|
<div>
|
|
|
<div class="addr-pcd" style="float: left;">
|
|
|
省:
|
|
|
- <select class="my-select " name="addr-info" id="addr-province" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <select class="my-select " name="addr-info" id="addr-province" matchSelect="省" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
<#list heads as head>
|
|
|
<option value="${head}" >${head}</option>
|
|
|
</#list>
|
|
@@ -81,7 +94,7 @@
|
|
|
|
|
|
<div class="addr-pcd" style="float: left;">
|
|
|
市:
|
|
|
- <select class="my-select " name="addr-info" id="addr-city" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <select class="my-select " name="addr-info" id="addr-city" matchSelect="市" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
<#list heads as head>
|
|
|
<option value="${head}" >${head}</option>
|
|
|
</#list>
|
|
@@ -90,7 +103,7 @@
|
|
|
|
|
|
<div class="addr-pcd" style="float: left;">
|
|
|
区:
|
|
|
- <select class="my-select " name="addr-info" id="addr-district" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <select class="my-select " name="addr-info" id="addr-district" matchSelect="区|县" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
<#list heads as head>
|
|
|
<option value="${head}" >${head}</option>
|
|
|
</#list>
|
|
@@ -99,7 +112,7 @@
|
|
|
|
|
|
<div style="float: left;">
|
|
|
地址详情:
|
|
|
- <select class="my-select" name="addr-info" id="addr-addressInfo" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <select class="my-select" name="addr-info" id="addr-addressInfo" matchSelect="收货人地址|收件人地址|详细地址|收货地址|收件地址|客户地址" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
<#list heads as head>
|
|
|
<option value="${head}" >${head}</option>
|
|
|
</#list>
|
|
@@ -112,7 +125,7 @@
|
|
|
<tr class="text-c">
|
|
|
<td width="55">产品名称</td>
|
|
|
<td style="text-align: left;">
|
|
|
- <select class="my-select" name="product-name" id="product-name" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <select class="my-select" name="product-name" id="product-name" matchSelect="网店品名|商品名称|产品名称|货品名称|商品信息|商品选项" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
<#list heads as head>
|
|
|
<option value="${head}" >${head}</option>
|
|
|
</#list>
|
|
@@ -122,7 +135,7 @@
|
|
|
<tr class="text-c">
|
|
|
<td width="55">购买产品数量</td>
|
|
|
<td style="text-align: left;">
|
|
|
- <select class="my-select" name="product-shop-num" id="product-shop-num" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <select class="my-select" name="product-shop-num" id="product-shop-num" matchSelect="下单数量|订货数量|数量" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
<#list heads as head>
|
|
|
<option value="${head}" >${head}</option>
|
|
|
</#list>
|
|
@@ -132,7 +145,7 @@
|
|
|
<tr class="text-c">
|
|
|
<td width="55">备注</td>
|
|
|
<td style="text-align: left;">
|
|
|
- <select class="my-select" name="product-remark" id="product-remark" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <select class="my-select" name="product-remark" id="product-remark" matchSelect="备注|店铺|订单来源" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
<#list heads as head>
|
|
|
<option value="${head}" >${head}</option>
|
|
|
</#list>
|
|
@@ -142,22 +155,59 @@
|
|
|
<tr class="text-c">
|
|
|
<td width="55">物流方式</td>
|
|
|
<td style="text-align: left;">
|
|
|
- <label><input type="radio" value="ems" checked="checked" class="product-post-type" name="product-post-type"/>EMS</label>
|
|
|
- <label><input type="radio" value="sto" class="product-post-type" name="product-post-type"/>申通</label>
|
|
|
+ <div class="formControls col-10 col-sm-10 skin-minimal customerSourceType_text_all" style="width: 100%;">
|
|
|
+ <div class="radio-box">
|
|
|
+ <input type="radio" id="post-type-1" name="product-post-type" value="ems" checked >
|
|
|
+ <label for="post-type-1" style="height: 30px; line-height: 30px;">EMS</label>
|
|
|
+ </div>
|
|
|
+ <div class="radio-box">
|
|
|
+ <input type="radio" id="post-type-2" name="product-post-type" value="sto" >
|
|
|
+ <label for="post-type-2" style="height: 30px; line-height: 30px;">申通</label>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr class="text-c">
|
|
|
<td width="55">选择仓库</td>
|
|
|
<td style="text-align: left;">
|
|
|
- <label>
|
|
|
- <select class="my-select" name="shop-id" id="shop-id" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
- <#if listStoreInfo?? && (listStoreInfo?size > 0) >
|
|
|
- <#list listStoreInfo as info>
|
|
|
- <option value="${info.storeEfast!''}" >${info.storeName!''}</option>
|
|
|
- </#list>
|
|
|
- </#if>
|
|
|
- </select>
|
|
|
- </label>
|
|
|
+ <div style="width: 290px;">
|
|
|
+ <div class="formControls col-10 col-sm-10 skin-minimal customerSourceType_text_all" style="width: 100%;">
|
|
|
+ <div class="radio-box">
|
|
|
+ <input type="radio" id="store-1" name="store" value="1" checked>
|
|
|
+ <label for="store-1" style="height: 30px; line-height: 30px;">无店铺信息</label>
|
|
|
+ </div>
|
|
|
+ <div class="radio-box">
|
|
|
+ <input type="radio" id="store-2" name="store" value="2" >
|
|
|
+ <label for="store-2" style="height: 30px; line-height: 30px;">有店铺信息</label>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div id="store-select-1" style="width: 100%;float: left;">
|
|
|
+ <label>
|
|
|
+ <select class="my-select" name="shop-id" id="shop-id" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <#if listStoreInfo?? && (listStoreInfo?size > 0) >
|
|
|
+ <#list listStoreInfo as info>
|
|
|
+ <option value="${info.storeId!''}" >${info.storeName!''}</option>
|
|
|
+ </#list>
|
|
|
+ </#if>
|
|
|
+ </select>
|
|
|
+ </label>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div id="store-select-2" style="display: none">
|
|
|
+ <div>
|
|
|
+ <select class="my-select" name="order_store_info" id="order_store_info" matchSelect="店铺|订单来源" style="height: 30px;width: 180px;margin: 0px;">
|
|
|
+ <#list heads as head>
|
|
|
+ <option value="${head}" >${head}</option>
|
|
|
+ </#list>
|
|
|
+ </select>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <table style="border: 1px solid #ccc;margin-top: 20px;" id="selectStore">
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
+
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr class="text-c">
|
|
@@ -208,7 +258,7 @@
|
|
|
<th width="80">产品名称</th>
|
|
|
<th width="30">购买数量</th>
|
|
|
<th width="30">备注</th>
|
|
|
- <#--<th width="80">推送状态</th>-->
|
|
|
+ <th width="80">导入状态</th>
|
|
|
</tr>
|
|
|
</thead>
|
|
|
<tbody id="send_tbody">
|
|
@@ -254,6 +304,29 @@
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+ /*监听仓库信息*/
|
|
|
+ $("[name='store']").on('ifChecked', function(event){
|
|
|
+ if($(this).val() == 1){ //无店铺信息
|
|
|
+ $("#store-select-1").show();
|
|
|
+ $("#store-select-2").hide();
|
|
|
+ }else{
|
|
|
+ $("#store-select-1").hide();
|
|
|
+ $("#store-select-2").show();
|
|
|
+
|
|
|
+ var orderStoreInfo = $("#order_store_info").val();
|
|
|
+ getStore(orderStoreInfo);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ /*监听选择店铺*/
|
|
|
+ $("#order_store_info").change(function (){
|
|
|
+ var orderStoreInfo = $("#order_store_info").val();
|
|
|
+ getStore(orderStoreInfo);
|
|
|
+ })
|
|
|
+
|
|
|
+ /*初始化选中选项*/
|
|
|
+ initSelect();
|
|
|
+
|
|
|
/*初始化单选框样式*/
|
|
|
$('.skin-minimal input').iCheck({
|
|
|
checkboxClass: 'icheckbox-blue',
|
|
@@ -261,15 +334,61 @@
|
|
|
increaseArea: '20%'
|
|
|
});
|
|
|
})
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 初始化选中选项
|
|
|
+ * */
|
|
|
+ function initSelect() {
|
|
|
+ $("select").each(function(){
|
|
|
+ var currentSelect = $(this);
|
|
|
+ var matchSelect = $(this).attr("matchSelect");
|
|
|
+ var wFlag = 0, wValue=null; wNode=null;
|
|
|
+ if(matchSelect != null && matchSelect != null && typeof(matchSelect) != 'undefined'){
|
|
|
+ var matchs = matchSelect.split("|");
|
|
|
+ $(this).find("option").each(function(){
|
|
|
+ var temValue = null;
|
|
|
+ var temFlag = 0;
|
|
|
+ var currentOption = $(this);
|
|
|
+ for(var i=0;i<matchs.length; i++){
|
|
|
+ var flag = 0, cuValue = null;
|
|
|
+ var ma = matchs[i];
|
|
|
+ if(currentOption.text().indexOf(ma) > -1){
|
|
|
+ flag++;
|
|
|
+ cuValue = $(this).val();
|
|
|
+ if(currentOption.text().trim.length == ma.trim.length){
|
|
|
+ flag++;
|
|
|
+ if(currentOption.text().trim == ma.trim){
|
|
|
+ flag++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(flag > temFlag){
|
|
|
+ temFlag = flag;
|
|
|
+ temValue = cuValue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(temFlag > 0 && temFlag > wFlag){
|
|
|
+ wValue = temValue;
|
|
|
+ wFlag = temFlag
|
|
|
+ }
|
|
|
+ })
|
|
|
+ currentSelect.val(wValue);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
|
|
|
// 对话框 - 推送结果
|
|
|
function modaldemo(){
|
|
|
- $("#modal-demo").modal("show")
|
|
|
+ $("#modal-demo").modal("show");
|
|
|
}
|
|
|
|
|
|
// 获取对应Excel中对应的 我们系统的69码
|
|
|
function subToExcel() {
|
|
|
+ var index = layer.load(1, {
|
|
|
+ shade: [0.5,'#fff'] //0.1透明度的白色背景
|
|
|
+ });
|
|
|
+
|
|
|
var productName = $("#product-name").val();
|
|
|
$.post(root_path + "/admin/order/get_producttype_colors",{"productName":productName, "productUrl":$("#productUrl").val()},function(result){
|
|
|
if (result.returnCode != 200) {
|
|
@@ -277,21 +396,87 @@
|
|
|
} else {
|
|
|
$("#tbody").html("");
|
|
|
for (var i = 0; i < result.returnMsg.values.length; i++) {
|
|
|
- var temp = '<tr class="text-c"><td>' + result.returnMsg.values[i] + '</td><td>';
|
|
|
- for (var j = 0; j < result.returnMsg.colors.length; j++) {
|
|
|
- temp = temp + '<label><input checked class="productmap" type="radio" name="color_'+ i + '" value="' + result.returnMsg.colors[j].colorBar + '_' + result.returnMsg.values[i] + '"/>'
|
|
|
- + result.returnMsg.colors[j].colorName + '(' + result.returnMsg.colors[j].colorBar + ')</label>';
|
|
|
+ var temp = '<tr class="text-c" ><td style="width: 50px;">' + result.returnMsg.values[i] + '</td><td>';
|
|
|
+ temp += '<table class="table table-border table-bordered table-bg">';
|
|
|
+
|
|
|
+ for (var j = 0; j < result.returnMsg.colors.length; j=j+6) {
|
|
|
+ temp += '<tr >';
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"><label style="font-size: 12px;"><input checked class="productmap" type="radio" name="color_'+ i + '" value="' + result.returnMsg.colors[j].colorBar + '_' + result.returnMsg.values[i] + '"/>' + result.returnMsg.colors[j].productName + '-' + result.returnMsg.colors[j].colorName + '(' + result.returnMsg.colors[j].colorBar + ')</label></td>';
|
|
|
+ if( typeof (result.returnMsg.colors[j+1]) != 'undefined'){
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"><label style="font-size: 12px;"><input checked class="productmap" type="radio" name="color_'+ i + '" value="' + result.returnMsg.colors[j+1].colorBar + '_' + result.returnMsg.values[i] + '"/>' + result.returnMsg.colors[j+1].productName + '-' + result.returnMsg.colors[j+1].colorName + '(' + result.returnMsg.colors[j+1].colorBar + ')</label></td>';
|
|
|
+ }else{
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"></td>';
|
|
|
+ }
|
|
|
+ if( typeof (result.returnMsg.colors[j+2]) != 'undefined') {
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"><label style="font-size: 12px;"><input checked class="productmap" type="radio" name="color_'+ i + '" value="' + result.returnMsg.colors[j+2].colorBar + '_' + result.returnMsg.values[i] + '"/>' + result.returnMsg.colors[j+2].productName + '-' + result.returnMsg.colors[j+2].colorName + '(' + result.returnMsg.colors[j+2].colorBar + ')</label></td>';
|
|
|
+ }else{
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"></td>';
|
|
|
+ }
|
|
|
+ if( typeof (result.returnMsg.colors[j+3]) != 'undefined') {
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"><label style="font-size: 12px;"><input checked class="productmap" type="radio" name="color_'+ i + '" value="' + result.returnMsg.colors[j+3].colorBar + '_' + result.returnMsg.values[i] + '"/>' + result.returnMsg.colors[j+3].productName + '-' + result.returnMsg.colors[j+3].colorName + '(' + result.returnMsg.colors[j+3].colorBar + ')</label></td>';
|
|
|
+ }else{
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"></td>';
|
|
|
+ }
|
|
|
+ if( typeof (result.returnMsg.colors[j+4]) != 'undefined') {
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"><label style="font-size: 12px;"><input checked class="productmap" type="radio" name="color_'+ i + '" value="' + result.returnMsg.colors[j+4].colorBar + '_' + result.returnMsg.values[i] + '"/>' + result.returnMsg.colors[j+4].productName + '-' + result.returnMsg.colors[j+4].colorName + '(' + result.returnMsg.colors[j+4].colorBar + ')</label></td>';
|
|
|
+ }else{
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"></td>';
|
|
|
+ }
|
|
|
+
|
|
|
+ if( typeof (result.returnMsg.colors[j+5]) != 'undefined') {
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"><label style="font-size: 12px;"><input checked class="productmap" type="radio" name="color_'+ i + '" value="' + result.returnMsg.colors[j+5].colorBar + '_' + result.returnMsg.values[i] + '"/>' + result.returnMsg.colors[j+5].productName + '-' + result.returnMsg.colors[j+5].colorName + '(' + result.returnMsg.colors[j+5].colorBar + ')</label></td>';
|
|
|
+ }else{
|
|
|
+ temp = temp + '<td style="text-align: left;padding: 3px;"></td>';
|
|
|
+ }
|
|
|
+ temp += '</tr>';
|
|
|
}
|
|
|
+ temp += '</table>';
|
|
|
temp = temp + '</td></tr>';
|
|
|
$("#tbody").append(temp);
|
|
|
}
|
|
|
}
|
|
|
+ layer.close(index);
|
|
|
});
|
|
|
$("#showProduct").show();
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ function getStore(orderStoreInfo) {
|
|
|
+ var index = layer.load(1, {
|
|
|
+ shade: [0.5,'#fff'] //0.1透明度的白色背景
|
|
|
+ });
|
|
|
+ $.post(root_path + "/admin/order/get_producttype_store",{"orderStoreInfo":orderStoreInfo, "productUrl":$("#productUrl").val()},function(result){
|
|
|
+ if (result.returnCode != 200) {
|
|
|
+ layer.msg('加载失败,请重试!',{icon: 5,time:3000});
|
|
|
+ } else {
|
|
|
+ $("#selectStore").html("");
|
|
|
+ var temp;
|
|
|
+ for (var i = 0; i < result.returnMsg.values.length; i++) {
|
|
|
+ temp += '<tr class="text-c">'
|
|
|
+ + '<td style=" width: 265px;">' + result.returnMsg.values[i] + '</td>'
|
|
|
+ + '<td style="text-align: left;">'
|
|
|
+ + '<label>'
|
|
|
+ + '<select class="my-select order_store_select" name="" id="" style="height: 30px;width: 180px;margin: 0px;">';
|
|
|
+ for (var j = 0; j < result.returnMsg.stores.length; j++) {
|
|
|
+ temp += '<option value="' + result.returnMsg.values[i] + '_' + result.returnMsg.stores[j].storeId + '" >' + result.returnMsg.stores[j].storeName + '</option>'
|
|
|
+ }
|
|
|
+ temp += '</select></label>'
|
|
|
+ + '</td>'
|
|
|
+ + '</tr>';
|
|
|
+ }
|
|
|
+ $("#selectStore").html(temp);
|
|
|
+ }
|
|
|
+ layer.close(index);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
// 提交
|
|
|
function sub() {
|
|
|
+ var index = layer.load(1, {
|
|
|
+ shade: [0.5,'#fff'] //0.1透明度的白色背景
|
|
|
+ });
|
|
|
+
|
|
|
+ var orderBatch = $("#order_batch").val();
|
|
|
|
|
|
var map = $(".productmap:checked"); // 第三方平台的产品信息和Efast的产品信息管理数据 id-name
|
|
|
var mapArray = new Array();
|
|
@@ -299,44 +484,40 @@
|
|
|
mapArray[i] = map[i].value;
|
|
|
}
|
|
|
|
|
|
- var platformOrders = $(".addr-platformOrders:checked"); // 订单编号
|
|
|
+ var platformOrders = $("#addr-platformOrders").val(); // 订单编号
|
|
|
var platformOrdersArray = new Array();
|
|
|
- for (var i = 0; i < platformOrders.length; i++) {
|
|
|
- platformOrdersArray[i] = platformOrders[i].value;
|
|
|
- }
|
|
|
+ platformOrdersArray[0] = platformOrders;
|
|
|
var platformOrdersName = platformOrdersArray[0];
|
|
|
|
|
|
- var name = $(".addr-name:checked"); // 用户名称列
|
|
|
+ var name = $("#addr-name").val(); // 用户名称列
|
|
|
var nameArray = new Array();
|
|
|
- for (var i = 0; i < name.length; i++) {
|
|
|
- nameArray[i] = name[i].value;
|
|
|
- }
|
|
|
+ nameArray[0] = name;
|
|
|
|
|
|
- var tel = $(".addr-tel:checked"); // 用户电话列
|
|
|
+ var tel = $("#addr-tel").val(); // 用户电话列
|
|
|
var telArray = new Array();
|
|
|
- for (var i = 0; i < tel.length; i++) {
|
|
|
- telArray[i] = tel[i].value;
|
|
|
- }
|
|
|
+ telArray[0] = tel;
|
|
|
|
|
|
- var info = $(".addr-info:checked"); // 用户收货地址列(可能多个组合)
|
|
|
+ /*获取地区信息*/
|
|
|
+ var cityInfo = $("[name='cityInfo']:checked").val();
|
|
|
var infoArray = new Array();
|
|
|
- for (var i = 0; i < info.length; i++) {
|
|
|
- infoArray[i] = info[i].value;
|
|
|
+ if(cityInfo == 1){ //有省市区信息
|
|
|
+ infoArray[0] = $("#addr-province").val();
|
|
|
+ infoArray[1] = $("#addr-city").val();
|
|
|
+ infoArray[2] = $("#addr-district").val();
|
|
|
+ infoArray[3] = $("#addr-addressInfo").val();
|
|
|
+ }else{
|
|
|
+ infoArray[0] = $("#addr-addressInfo").val();
|
|
|
}
|
|
|
|
|
|
- var productShopNum = $(".product-shop-num:checked");// 销售数量
|
|
|
+ var productShopNum = $("#product-shop-num").val(); // 销售数量
|
|
|
var numArray = new Array();
|
|
|
- for (var i = 0; i < productShopNum.length; i++) {
|
|
|
- numArray[i] = productShopNum[i].value;
|
|
|
- }
|
|
|
+ numArray[0] = productShopNum;
|
|
|
|
|
|
- var orderRemark = $(".product-remark:checked");// 备注
|
|
|
+ var orderRemark = $("#product-remark").val(); // 备注
|
|
|
var remarkArray = new Array();
|
|
|
- for (var i = 0; i < orderRemark.length; i++) {
|
|
|
- remarkArray[i] = orderRemark[i].value;
|
|
|
- }
|
|
|
+ remarkArray[0] = orderRemark;
|
|
|
|
|
|
- var productName = $(".product-name:checked");
|
|
|
+ var productName = $("#product-name").val();
|
|
|
|
|
|
if(platformOrdersName == nameArray[0] ){
|
|
|
layer.msg('订单编号不能与收货人姓名列重复!',{icon: 5,time:3000});
|
|
@@ -357,19 +538,40 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /*是否有多个店铺*/
|
|
|
+ var isOtherStore = $("[name='store']:checked").val();
|
|
|
+ var shopId = $("#shop-id").val()
|
|
|
+ var storeArray = new Array();
|
|
|
+ if(isOtherStore == 2){
|
|
|
+ $(".order_store_select").each(function(){
|
|
|
+ storeArray.push($(this).val());
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ storeArray.push(shopId);
|
|
|
+ }
|
|
|
+
|
|
|
+ /*Excel中的店铺名称*/
|
|
|
+ var orderStoreInfoSt = $("#order_store_info").val();
|
|
|
+
|
|
|
+ /*快递公司*/
|
|
|
+ var postType = $("[name='product-post-type']:checked").val();
|
|
|
+
|
|
|
// 对应好Excel和系统需要的数据以后,准备推送Efast
|
|
|
$.post(root_path + "/admin/order/toobj_sendefast",{
|
|
|
"filePath":$("#productUrl").val(),
|
|
|
"map":mapArray,
|
|
|
"platformOrder" : platformOrdersArray,
|
|
|
"name":nameArray,
|
|
|
- "productName":productName.val(),
|
|
|
+ "productName":productName,
|
|
|
"tel":telArray,
|
|
|
"info":infoArray,
|
|
|
- "postType":$(".product-post-type").val(),
|
|
|
- "shopId":$("#shop-id").val(),
|
|
|
+ "postType":postType,
|
|
|
+ "isOtherStore":isOtherStore,
|
|
|
+ "orderStoreInfoSt":orderStoreInfoSt,
|
|
|
+ "storeArray":storeArray,
|
|
|
"num":numArray,
|
|
|
- "remark":remarkArray
|
|
|
+ "remark":remarkArray,
|
|
|
+ "orderBatch":orderBatch
|
|
|
},function(result){
|
|
|
if (result.returnCode != 200) {
|
|
|
layer.msg('加载失败,请重试,请确认选择内容对应无误!',{icon: 5,time:3000});
|
|
@@ -399,7 +601,7 @@
|
|
|
'<td style="' + style + '">' + order.orderProductName + '</td>'+
|
|
|
'<td style="' + style + '">' + order.orderNum + '</td>'+
|
|
|
'<td style="' + style + '">' + order.orderRemark + '</td>'+
|
|
|
- /*'<td style="' + style + '">' + order.returnMsg + '</td>'+*/
|
|
|
+ '<td style="' + style + '">' + convertUndefinedToEmpty(order.returnMsg) + '</td>'+
|
|
|
'</tr>');
|
|
|
}
|
|
|
error_path = result.returnMsg.errorPath;
|
|
@@ -410,6 +612,7 @@
|
|
|
var fileName = result.returnMsg.fileName;
|
|
|
download_order_id_path = fileName;
|
|
|
}
|
|
|
+ layer.close(index);
|
|
|
});
|
|
|
}
|
|
|
|