修改客户信息

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_custome_list.ftl

@@ -28,7 +28,7 @@
     <div class="text-c">
         <form action="" id="customer_condition" method="post">
             <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="客诉编号" id="customerId" name="customerId">
-            <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="姓名" id="customerName" name="customerName">
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="姓名/昵称" id="customerName" name="customerName">
             <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="手机号码" id="customerTel" name="customerTel">
             <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                 <option value="">处理结果</option>

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

@@ -60,7 +60,7 @@
             <#--<th width="40">客户备注</th>-->
             <th width="40">后台备注</th>
             <th width="40">下单时间</th>
-            <th width="50">操作</th>
+            <th width="60">操作</th>
         </tr>
         </thead>
         <tbody>
@@ -137,14 +137,14 @@
                 <td>${(o.salesCreateTime?string("yyyy-MM-dd"))!}</td>
                 <td class="td-manage">
                     <#if o.salesShippingStatus == 11>
-                        <a title="打单发货" href="javascript:window.location.href='${path}/admin/await_send/printOrderUI?orderId=${o.salesId}'" class="ml-5" style="text-decoration:none">打单发货</a>
+                        <a title="打单发货" href="javascript:window.location.href='${path}/admin/await_send/printOrderUI?orderId=${o.salesId}'" class="ml-5" style="text-decoration:none;display:inline">打单发货</a><br>
                     <#else>
-                        <a title="重新打单" href="javascript:re_print_order('${(o.salesOrderId)!}')" class="ml-5" style="text-decoration:none">重新打单</a>
+                        <a title="重新打单" href="javascript:re_print_order('${(o.salesOrderId)!}')" class="ml-5" style="text-decoration:none;display:inline">重新打单</a><br>
                     </#if>
                 <#if o.salesShippingStatus == 11>
-                    <a style="text-decoration:none;" href="javascript:void(0);" title="手动发货"onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${o.salesId}','570','450');">
+                    <a style="text-decoration:none;display:inline" href="javascript:void(0);" title="手动发货"onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${o.salesId}','570','450');">
                         手动发货
-                    </a>
+                    </a><br>
                 </#if>
                 </td>
             </tr>