|
|
@@ -20,9 +20,9 @@
|
|
|
<form action="${path}/admin/await_send/listAwaitSendOrder" method="POST" id="search-form">
|
|
|
<select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 31px;width: 150px">-->
|
|
|
<option value="">发货状态</option>
|
|
|
- <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 1>selected="selected"</#if></#if> value="1">待发货</option>
|
|
|
+ <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 0>selected="selected"</#if></#if> value="0">待发货</option>
|
|
|
<option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 11>selected="selected"</#if></#if> value="11">已通知配货</option>
|
|
|
- <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 2>selected="selected"</#if></#if> value="2">已发货</option>
|
|
|
+ <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 1>selected="selected"</#if></#if> value="1">已发货</option>
|
|
|
</select>
|
|
|
|
|
|
<input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.salesOrderId)!}" placeholder="订单编号" id="salesOrderId" name="salesOrderId">
|
|
|
@@ -107,7 +107,7 @@
|
|
|
<span style="color: red;">通知配货</span>
|
|
|
<#elseif o.salesShippingStatus == 1>
|
|
|
<p>已发货(${(o.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!"暂无发货时间"})</p>
|
|
|
- <p class="label radius"><a href="#">${(o.salesPostFirm)!}-${(o.salesPostNum)!}</a></p>
|
|
|
+ <p class="label radius"><a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${(o.salesPostNum)!}&billName=${(o.salesPostFirm)!}',300,400);">${(o.salesPostFirm)!}-${(o.salesPostNum)!}</a></p>
|
|
|
</#if>
|
|
|
</td>
|
|
|
<#--<td>${(o.salesUserRemark)!}</td>-->
|
|
|
@@ -185,6 +185,11 @@
|
|
|
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+ /*查看物流*/
|
|
|
+ function openLogistics(title, url, w, h) {
|
|
|
+ layer_show(title,url,w,h);
|
|
|
+ }
|
|
|
</script>
|
|
|
</body>
|
|
|
</html>
|
