新增商城订单编号展示

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -146,7 +146,7 @@
             <div style="width: 90%;margin-left: 10%;">
                 <#--<input type="text" class="my-input trim_input"  style="margin-top: -3px;text-indent: 1em;width:8.9%;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:8.9%;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;text-indent: 1em;width:8.9%;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesExOrderId!}" placeholder="第三方订单号" name="salesExOrderId" id="salesExOrderId">
+                <input type="text" class="my-input trim_input"  style="margin-top: -3px;text-indent: 1em;width:8.9%;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesExOrderId!}" placeholder="商城编号" name="salesExOrderId" id="salesExOrderId">
 
                 <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:8.9%;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesBatchId!}" placeholder="订单批次号" name="salesBatchId" id="salesBatchId">
 
@@ -168,11 +168,14 @@
         <table class="table table-border table-bg table-bordered">
             <thead>
             <tr class="text-c">
-                <th width="16"><input type="checkbox" ></th>
-                <th width="50">订单类型</th>
+                <th width="13"><input type="checkbox" ></th>
+                <th width="30">类型</th>
                 <th width="60">交易号</th>
-                <th width="72">批次号</th>
-                <th width="72">下单管理员</th>
+                <#--<#if admin.adminDept==1 ||  admin.adminDept==2>-->
+                    <th width="69">商城编号</th>
+                <#--</#if>-->
+                <th width="68">批次号</th>
+                <th width="40">录入人</th>
                 <th width="75">姓名/电话</th>
                 <th width="100">收货地址</th>
                 <th width="50">是否打单</th>
@@ -182,7 +185,7 @@
                 <th width="50">用户备注</th>
                 <th width="50">产品</th>
                 <th width="65">创建时间</th>
-                <th width="50">操作</th>
+                <th width="80">操作</th>
             </tr>
             </thead>
             <tbody>
@@ -212,6 +215,10 @@
                         </#if>
                         ${order.salesDealCode!''}
                     </td>
+                    <#--<#if admin.adminDept==1 ||  admin.adminDept==2>-->
+                        <td>${order.salesExOrderId!''}</td>
+                    <#--</#if>-->
+
                     <td>${order.salesBatchId!''}</td>
                     <td>${order.salesAdminName!''}</td>
                     <td>${order.salesAddressName!''}${order.salesAddressTel!''}</td>
@@ -293,7 +300,7 @@
                         ${(order.salesCreateTime?string("yy-MM-dd"))!''}</br>
                         ${(order.salesCreateTime?string("HH:mm:ss"))!''}
                     </td>
-                    <td class="operating_td" style="min-width: 100px;">
+                    <td class="operating_td" style="">
                         <#if order.salesWarrantyStatus?? && order.salesWarrantyStatus != 0>
                             <#if order.salesProcessRefund?? && order.salesProcessRefund == 0>
                                 <a style="text-decoration:none" href="javascript:;" title="确认退款信息"