|
@@ -16,8 +16,21 @@
|
|
|
.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
|
|
|
.table-bg thead th{background-color: #e2f6ff;}
|
|
|
.update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
|
|
|
- .my-order{left: 0px;cursor:pointer; position: absolute;border-bottom: 1px solid rgb(255, 255, 255);float: left;width: 110px;height: 36px;}
|
|
|
-
|
|
|
+ .my-order{border: 1px solid #50a2ea;
|
|
|
+ padding: 1px 25px;
|
|
|
+ height: 36px;
|
|
|
+ background-color: #fff;
|
|
|
+ color: #50a2ea;}
|
|
|
+ .my-select {
|
|
|
+ border: 1px solid rgba(0,0,0,.1);
|
|
|
+ padding: 6px 50px 6px 15px;
|
|
|
+ height: 34px;
|
|
|
+ -webkit-appearance: none;
|
|
|
+ appearance: none;
|
|
|
+ background: url(/common/images/pts/select-11.png) right center no-repeat;
|
|
|
+ background-size: auto 100%;
|
|
|
+ }
|
|
|
+ .label-default{background-color: #e6e6e6; color: #50a2ea;}
|
|
|
.radio-box input[type=radio]{position: relative;-webkit-appearance: none;appearance: none;cursor: pointer;width: 17px;height: 17px;border: 1px solid #333;border-radius: 50%;}
|
|
|
.radio-box input[type=radio]:focus {outline: none;}
|
|
|
.radio-box input[type=radio]:checked{background: #fff;}
|
|
@@ -26,9 +39,9 @@
|
|
|
</head>
|
|
|
<body>
|
|
|
<nav class="breadcrumb"><i class="Hui-iconfont"></i> 首页
|
|
|
- <span class="c-gray en">></span> 订单管理
|
|
|
- <span class="c-gray en">></span> 订单列表
|
|
|
- <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont"></i></a>
|
|
|
+ <span class="c-gray en">/</span> 订单管理
|
|
|
+ <span class="c-gray en">/</span> 订单列表
|
|
|
+ <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont"></i></a>
|
|
|
</nav>
|
|
|
|
|
|
<!-- 录入订单 -->
|
|
@@ -42,28 +55,28 @@
|
|
|
<button type="button" style="height: 30px;top: 60px;display: none;" class="my-btn-search my-order" id="addOrderExcel" onclick="upFiles();">Excel导入</button>
|
|
|
</div>
|
|
|
|
|
|
- <div style="width: 90%;text-align: left;margin-left: 10%;">
|
|
|
+ <div style="width: 90%;margin-left: 10%;">
|
|
|
<#if identity != 2>
|
|
|
- <select class="select" name="salesIsDownload" id="salesIsDownload" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
|
|
|
+ <select class="my-select" name="salesIsDownload" id="salesIsDownload" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
|
|
|
<option value ="">导出状态</option>
|
|
|
<option value ="2" <#if salesOrder.salesIsDownload??><#if salesOrder.salesIsDownload == 2 >selected="selected"</#if></#if>>已导出</option>
|
|
|
<option value ="1" <#if salesOrder.salesIsDownload??><#if salesOrder.salesIsDownload == 1 >selected="selected"</#if></#if>>未导出</option>
|
|
|
</select>
|
|
|
</#if>
|
|
|
- <select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
|
|
|
+ <select class="my-select" name="salesShippingStatus" id="salesShippingStatus" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
|
|
|
<option value ="">发货状态</option>
|
|
|
<option value ="0" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 0 >selected="selected"</#if></#if>>未发货</option>
|
|
|
<option value ="11" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 11 >selected="selected"</#if></#if>>已通知配货</option>
|
|
|
<option value ="1" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 1 >selected="selected"</#if></#if>>已打单</option>
|
|
|
</select>
|
|
|
|
|
|
- <select class="select" name="salesDeliver" id="salesDeliver" style="height: 31px;width: 120px;margin: 0px;margin-bottom: 10px;">
|
|
|
+ <select class="my-select" name="salesDeliver" id="salesDeliver" style="height: 31px;width: 120px;margin: 0px;margin-bottom: 10px;">
|
|
|
<option value ="">出库状态</option>
|
|
|
<option <#if (salesOrder.salesDeliver)??><#if salesOrder.salesDeliver == 1>selected="selected"</#if></#if> value ="1" >未出库</option>
|
|
|
<option <#if (salesOrder.salesDeliver)??><#if salesOrder.salesDeliver == 2>selected="selected"</#if></#if> value ="2" >已出库</option>
|
|
|
</select>
|
|
|
|
|
|
- <select class="select" name="salesStatus" id="salesStatus" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
|
|
|
+ <select class="my-select" name="salesStatus" id="salesStatus" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
|
|
|
<option value ="">订单状态</option>
|
|
|
<option value ="0" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 0 >selected="selected"</#if></#if>>未确认</option>
|
|
|
<option value ="1" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 1 >selected="selected"</#if></#if>>确认</option>
|
|
@@ -71,7 +84,7 @@
|
|
|
<option value ="3" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 3 >selected="selected"</#if></#if>>作废</option>
|
|
|
</select>
|
|
|
|
|
|
- <select class="select" name="salesStoreId" id="salesStoreId" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;"">
|
|
|
+ <select class="my-select" name="salesStoreId" id="salesStoreId" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;"">
|
|
|
<option value="">店铺</option>
|
|
|
<#if listStoreInfo?? && (listStoreInfo?size > 0) >
|
|
|
<#list listStoreInfo as info>
|
|
@@ -79,14 +92,14 @@
|
|
|
</#list>
|
|
|
</#if>
|
|
|
</select>
|
|
|
- <select class="select" name="colorId" id="colorId" style="height: 31px;width: 150px">
|
|
|
+ <select class="my-select" name="colorId" id="colorId" style="height: 31px;width: 150px">
|
|
|
<option value="">产品名称(颜色)</option>
|
|
|
<#list productColorList as productColor>
|
|
|
<option <#if (salesOrder.colorId)??><#if salesOrder.colorId == productColor.colorId>selected="selected"</#if></#if> value="${productColor.colorId}">${productColor.productName}(${productColor.colorName})</option>
|
|
|
</#list>
|
|
|
</select>
|
|
|
|
|
|
- <select class="select" name="salesPostFirm" id="salesPostFirm" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;"">
|
|
|
+ <select class="my-select" name="salesPostFirm" id="salesPostFirm" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;"">
|
|
|
<option value="">快递公司</option>
|
|
|
<#if logisticsInfoList?? && (logisticsInfoList?size > 0) >
|
|
|
<#list logisticsInfoList as logisticsInfo>
|
|
@@ -99,18 +112,18 @@
|
|
|
|
|
|
</div>
|
|
|
<#--Efast add end-->
|
|
|
- <div style="width: 90%;text-align: left;margin-left: 10%;">
|
|
|
- <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesOrderId!}" placeholder="订单号" name="salesOrderId" id="salesOrderId">
|
|
|
- <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesDealCode!}" placeholder="交易号" name="salesDealCode" id="salesDealCode">
|
|
|
- <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesBatchId!}" placeholder="订单批次号" name="salesBatchId" id="salesBatchId">
|
|
|
-
|
|
|
- <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesPostNum!}" placeholder="快递单号" name="salesPostNum" id="salesPostNum">
|
|
|
- <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">
|
|
|
- <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="收货人电话" name="salesAddressTel" id="salesAddressTel">
|
|
|
+ <div style="width: 90%;margin-left: 10%;">
|
|
|
+ <input type="text" class="my-input trim_input" style="margin-top: -3px;text-indent: 1em;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesOrderId!}" placeholder="订单号" name="salesOrderId" id="salesOrderId">
|
|
|
+ <input type="text" class="my-input trim_input" style="margin-top: -3px;text-indent: 1em;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesDealCode!}" placeholder="交易号" name="salesDealCode" id="salesDealCode">
|
|
|
+ <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesBatchId!}" placeholder="订单批次号" name="salesBatchId" id="salesBatchId">
|
|
|
+
|
|
|
+ <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesPostNum!}" placeholder="快递单号" name="salesPostNum" id="salesPostNum">
|
|
|
+ <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">
|
|
|
+ <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="收货人电话" name="salesAddressTel" id="salesAddressTel">
|
|
|
<#--<input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.itemProductName!}" placeholder="产品" name="itemProductName" id="itemProductName">-->
|
|
|
- <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressInfo!}" placeholder="收货人地址" name="salesAddressInfo" id="salesAddressInfo">
|
|
|
- <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 30px;" id="">搜索</button>
|
|
|
- <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 30px;" id="order_excel">下载Efast格式订单</button>
|
|
|
+ <input type="text" class="my-input trim_input" style="margin-top: -3px;width:118px;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressInfo!}" placeholder="收货人地址" name="salesAddressInfo" id="salesAddressInfo">
|
|
|
+ <button type="submit" class="btn" style="border: 1px solid #50a2ea;background-color: #fff; color: #50a2ea;-webkit-transform:translateY(-5%);height: 30px;" id="">搜索</button>
|
|
|
+ <button type="button" class="btn" style="border: 1px solid #50a2ea;background-color: #fff; color: #50a2ea;-webkit-transform:translateY(-5%);height: 30px;" id="order_excel">下载Efast格式订单</button>
|
|
|
<#--<button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 30px;" id="send_sms" onclick="sendEms();">发送售后短信</button>-->
|
|
|
</div>
|
|
|
</form>
|
|
@@ -207,7 +220,7 @@
|
|
|
<td style="text-align: left;">
|
|
|
<#if order.salesOrderItemList ??>
|
|
|
<#list order.salesOrderItemList as d>
|
|
|
- <span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span>
|
|
|
+ <span class="label label-default radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span>
|
|
|
</#list>
|
|
|
</#if>
|
|
|
</td>
|
|
@@ -215,43 +228,43 @@
|
|
|
${(order.salesCreateTime?string("yy-MM-dd"))!''}</br>
|
|
|
${(order.salesCreateTime?string("HH:mm:ss"))!''}
|
|
|
</td>
|
|
|
- <td class="operating_td">
|
|
|
+ <td class="operating_td" style="min-width: 100px;">
|
|
|
<a class="confirm_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="确认订单" alt="确认订单" onclick="confirm_one(${order.salesId!''})">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
<a class="edit_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="修改订单" alt="修改订单" onclick="sales_order_update(${order.salesId!''})">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
<a class="allocation_logistics_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="分配物流" onclick="distribution_express(${order.salesId!''})">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
|
|
|
<a class="split_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="拆分订单" onclick="split_order(${order.salesId!''})">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
|
|
|
<a class="notice_distribution_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="通知配货" onclick="chooseWarehouse(${order.salesId})">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
<a class="manual_ship_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="手动发货" onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${order.salesId}','570','450');">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
<a class="order_details_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="订单详情" alt="订单详情" onclick="sales_order_detail(${order.salesId!''})">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
<a class="invalid_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="作废订单" onclick="invalidation_order(${order.salesId!''})">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
<a class="del_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="删除订单" onclick="delSalesOrder(${order.salesId!''})">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
<a style="text-decoration:none" href="javascript:;" title="修改备注"
|
|
|
onclick="distribution_postFirm('修改备注','${path}/admin/salesOrder/to_update_order_remark?salesId=${order.salesId!''}','570','450');">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
<a style="text-decoration:none" href="javascript:;" title="更正订单"
|
|
|
onclick="acorrect_order(${order.salesId!''});">
|
|
|
- <i class="Hui-iconfont"></i>
|
|
|
+ <i class="Hui-iconfont" style="font-size: 20px;"></i>
|
|
|
</a>
|
|
|
<#if order.procTypeId??>
|
|
|
<#if order.procTypeId != '3'>
|
|
@@ -283,11 +296,11 @@
|
|
|
|
|
|
<#if identity != 2>
|
|
|
<div style="float: left;margin-top: 20px;">
|
|
|
- <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="confirmOrder()">确认订单</button>
|
|
|
- <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="distribution_express(null)">分配物流</button>
|
|
|
- <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="chooseWarehouse(null)">通知配货</button>
|
|
|
- <button type="button" onClick="upFiles2();" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;">上传发货信息</button>
|
|
|
- <button onClick="downloadOrderPage();" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" type="button" title="下载订单">下载订单</button>
|
|
|
+ <button type="button" class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="confirmOrder()">确认订单</button>
|
|
|
+ <button type="button" class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="distribution_express(null)">分配物流</button>
|
|
|
+ <button type="button" class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="chooseWarehouse(null)">通知配货</button>
|
|
|
+ <button type="button" onClick="upFiles2();" class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 35px;">上传发货信息</button>
|
|
|
+ <button onClick="downloadOrderPage();" class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 35px;" type="button" title="下载订单">下载订单</button>
|
|
|
</div>
|
|
|
</#if>
|
|
|
</div>
|