订单中心开发

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -90,13 +90,13 @@
       <if test="salesCompanyId !=null and salesCompanyId !=''">
         AND sales_company_id = #{salesCompanyId}
       </if>
-      <if test="salesId !=null">/* 有很多地方要调用准确的数据，需要相等 */
+      <if test="salesId !=null">
         AND sales_id = #{salesId}
       </if>
-      <if test="salesOrderId !=null and salesOrderId !=''">/* 有很多地方要调用准确的数据，需要相等 */
+      <if test="salesOrderId !=null and salesOrderId !=''">
         AND sales_orderId = #{salesOrderId}
       </if>
-      <if test="salesDealCode !=null and salesDealCode !=''"> /* 有很多地方要调用准确的数据，需要相等 */
+      <if test="salesDealCode !=null and salesDealCode !=''">
         AND sales_deal_code = {salesDealCode}
       </if>
       <if test="salesAddressTel !=null and salesAddressTel !=''">
@@ -105,7 +105,7 @@
       <if test="salesAddressName !=null and salesAddressName !=''">
         AND sales_address_name like CONCAT('%',#{salesAddressName},'%')
       </if>
-      <if test="salesBatchId !=null and salesBatchId !=''">/* 有很多地方要调用准确的数据，需要相等 */
+      <if test="salesBatchId !=null and salesBatchId !=''">
         AND sales_batch_id = #{salesBatchId}
       </if>
       <if test="startDate != null and startDate != ''">

watero-rst-web/src/main/webapp/WEB-INF/views/order/bacth/order_batch_list.ftl

@@ -144,6 +144,7 @@
             timeout: 15000,
             success: function(dt) {
                 layer.msg("确认订单成功", {icon: 1, time: 3000});
+                location.reload();
             },
             error: function(xhr, type, errorThrown) {
                 layer.msg("确认订单失败，请重试！", {icon: 5, time: 3000});

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

@@ -77,7 +77,7 @@
             <div class="row cl" id="salesCustomer" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2" style="color: #c00;">
-                    已经选择客诉记录：<span id="salesCustomerIdHtml"></span>
+                    <span id="salesCustomerIdHtml"></span>
                     <input type="hidden" id="salesCustomerId" name="salesCustomerId" value="">
                 </div>
             </div>

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

@@ -84,10 +84,34 @@
                 </div>
             </div>
 
+            <div class="row cl" style="">
+                <label class="form-label col-1 col-sm-1">订单类型：</label>
+                <div class="formControls col-2 col-sm-2" style="">
+                    <span class="select-box">
+                        <select class="select" id="salesOrderStatus" name="salesOrderStatus" >
+                            <option value="1"  <#if !order.salesCustomerId?? >selected = "selected"</#if> >正常订单</option>
+                            <#if admin.adminDept == 3 || admin.adminDept == 1><option value="2"  <#if order.salesCustomerId?? >selected = "selected"</#if>  >售后订单</option></#if>
+                        </select>
+				    </span>
+                </div>
+                <div class="formControls col-2 col-sm-2" id="selectCustomer" style="
+                        <#if admin.adminDept != 3 && admin.adminDept != 1><#if !order.salesCustomerId?? >display: none;</#if></#if>
+                    ">
+                    <input type="button" style="width: 100%;" class="btn btn-primary " onclick="add_customer()" value="选择客诉记录" >
+                </div>
+            </div>
+
+            <div class="row cl" id="salesCustomer" style="<#if admin.adminDept != 3 && admin.adminDept != 1><#if !order.salesCustomerId?? >display: none;</#if></#if>">
+                <label class="form-label col-1 col-sm-1"></label>
+                <div class="formControls col-2 col-sm-2" style="color: #c00;">
+                    <span id="salesCustomerIdHtml">已经选择客诉记录：${order.salesCustomerId}</span>
+                    <input type="hidden" id="salesCustomerId" name="salesCustomerId" value="${order.salesCustomerId}">
+                </div>
+            </div>
 
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">批次编号：</label>
-                <div class="formControls col-3 col-sm-3" style="">
+                <div class="formControls col-2 col-sm-2" style="">
                     <span class="select-box">
                         <select class="select" id="salesBatchId" name="salesBatchId" >
                             <option value="1" >新增批次</option>

watero-rst-web/src/main/webapp/common/js/salesOrder/salesOrder.js

@@ -1,4 +1,7 @@
 
+var allCustomerId = "";
+
+
 /**
  * 打开商品列表
  */
@@ -18,13 +21,19 @@ $(function(){
         var status = $(this).val();
         if(status == 1){    //正常订单
             $("#selectCustomer").hide();
+            $("#salesCustomer").hide();
+            $("#salesCustomerIdHtml").html("");
+            $("#salesCustomerId").val("");
         }else{
             $("#selectCustomer").show();
+            $("#salesCustomer").show();
+            $("#salesCustomerIdHtml").html("未选择客服编号！");
         }
     })
 })
 
 $(function(){
+    var loadIndex = 0;
     $("#form-order-add").Validform({
         tiptype: function (msg, o, cssctl) {
             if (o.type == 3) {//失败
@@ -65,7 +74,7 @@ $(function(){
 
             $("#orderItemString").val(JSON.stringify(orderItemArray));
 
-            var index = layer.load(1, {
+            loadIndex = layer.load(1, {
                 shade: [0.5,'#fff'] //0.1透明度的白色背景
             });
         },
@@ -78,7 +87,9 @@ $(function(){
                         layer.close(index);
                     }
                 });
-                layer.close(index);
+                if(loadIndex != 0 ){
+                    layer.close(loadIndex);
+                }
             }
         }
     });
@@ -101,7 +112,7 @@ function setSelectCustomer(customerId){
         success: function(data){
             if (data.returnCode == 200 && data.returnMsg.customer != null ) {
                 var customer = data.returnMsg.customer;
-                $("#salesCustomerIdHtml").html(customer.customerId);
+                $("#salesCustomerIdHtml").html("已经选择客诉记录："+customer.customerId);
                 $("#salesCustomerId").val(customer.customerId);
             }else{
             }