wangxiaoming 7 vuotta sitten
vanhempi
commit
856a3fc56d

+ 4 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_back_goods.ftl

@@ -62,11 +62,11 @@
                             <label for="tel-4">已寄回</label>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="tel-5" name="backGoodsBackStatus" value="4" seleType="send">
+                            <input type="radio" id="tel-6" name="backGoodsBackStatus" value="4" seleType="send">
                             <label for="tel-5">签收待确认</label>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="tel-5" name="backGoodsBackStatus" value="3" seleType="send">
+                            <input type="radio" id="tel-6" name="backGoodsBackStatus" value="3" seleType="send">
                             <label for="tel-5">已收货</label>
                         </div>
                     </div>
@@ -147,8 +147,8 @@
                         <label for="tel-6">不需要转账</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-9" name="backGoodsIsTransfer" value="10" seleType="postage">
-                        <label for="tel-9">需要转账</label>
+                        <input type="radio" id="tel-10" name="backGoodsIsTransfer" value="10" seleType="postage">
+                        <label for="tel-10">需要转账</label>
                     </div>
                     <#--<div class="radio-box">-->
                         <#--<input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1" seleType="postage">-->

+ 22 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -832,8 +832,29 @@
             initProcessResult(allCustomerType);
         })
 
+
         /*默认选择是否需要选择订单*/
-        opentionSelectOrder(isNeedSelectOrder);
+        $("input[name='typeId']").each(function(){
+            var typeId = parseInt($(this).val());
+            var isOrder = 1;
+            switch (typeId){    //1:Soodo电动牙刷   6:WaterO净水机    7:Aiberle净水机    9 :YULIA净水机
+                case 1:
+                    isOrder = 2;
+                    break;
+                case 6:
+                    isOrder = 1;
+                    break;
+                case 7:
+                    isOrder = 1;
+                    break;
+                case 9:
+                    isOrder = 1;
+                    break;
+                default:
+                    break;
+            }
+            opentionSelectOrder(isOrder);
+        })
 
         /*绑定产品类型选择事件*/
         $("input[name='typeId']").change(function (){

+ 4 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_noreason_back.ftl

@@ -59,8 +59,8 @@
                             <label for="tel-5">签收待确认</label>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="tel-5" name="noreasonBackBackStatus" value="3" seleType="send">
-                            <label for="tel-5">已收货</label>
+                            <input type="radio" id="tel-6" name="noreasonBackBackStatus" value="3" seleType="send">
+                            <label for="tel-6">已收货</label>
                         </div>
                     </div>
                 </div>
@@ -133,8 +133,8 @@
                             <label for="tel-6">不需要转账</label>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="tel-6" name="noreasonBackIsTransfer" value="10" seleType="postage">
-                            <label for="tel-6">需要转账</label>
+                            <input type="radio" id="tel-10" name="noreasonBackIsTransfer" value="10" seleType="postage">
+                            <label for="tel-10">需要转账</label>
                         </div>
                         <#--<div class="radio-box">-->
                             <#--<input type="radio" id="tel-7" name="noreasonBackIsTransfer" value="1" seleType="postage">-->

+ 4 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_renewed.ftl

@@ -74,8 +74,8 @@
                         <label for="tel-5">签收待确认</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-5" name="renewedBackStatus" value="3" seleType="send">
-                        <label for="tel-5">已收货</label>
+                        <input type="radio" id="tel-6" name="renewedBackStatus" value="3" seleType="send">
+                        <label for="tel-6">已收货</label>
                     </div>
                 </div>
             </div>
@@ -149,8 +149,8 @@
                         <label for="tel-6">不需要转账</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-6" name="renewedIsTransfer" value="10" seleType="postage">
-                        <label for="tel-6">需要转账</label>
+                        <input type="radio" id="tel-10" name="renewedIsTransfer" value="10" seleType="postage">
+                        <label for="tel-10">需要转账</label>
                     </div>
                     <#--<div class="radio-box">-->
                         <#--<input type="radio" id="tel-7" name="renewedIsTransfer" value="1" seleType="postage">-->

+ 4 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_repair.ftl

@@ -76,8 +76,8 @@
                             <label for="tel-5">签收待确认</label>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="tel-5" name="repairBackStatus" value="3" seleType="send">
-                            <label for="tel-5">已收货</label>
+                            <input type="radio" id="tel-6" name="repairBackStatus" value="3" seleType="send">
+                            <label for="tel-6">已收货</label>
                         </div>
                     </div>
                 </div>
@@ -150,8 +150,8 @@
                             <label for="tel-6">不需要转账</label>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="tel-6" name="repairIsTransfer" value="10" seleType="postage">
-                            <label for="tel-6">需要转账</label>
+                            <input type="radio" id="tel-10" name="repairIsTransfer" value="10" seleType="postage">
+                            <label for="tel-10">需要转账</label>
                         </div>
                         <#--<div class="radio-box">-->
                             <#--<input type="radio" id="tel-7" name="repairIsTransfer" value="1" seleType="postage">-->

+ 8 - 7
watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -595,11 +595,6 @@ function initProcessResult(type){
             default:
                 break;
         }
-
-        if(isNeedSelectOrder == 2){     //不需要订单
-            $("#orderHead").hide();
-            $("#order").hide();
-        }
     }
     for(var i=0;i< result.length;i++){
         var html = statusHtml.replace("status_index",i+1);
@@ -618,6 +613,8 @@ function initProcessResult(type){
     }
 
     $("#processResultStatus").html(resultHtml);
+
+    opentionSelectOrderDiv();
 }
 
 /*已解决|未解决 */
@@ -1500,14 +1497,18 @@ function setStore(companyId,node){
  */
 function  opentionSelectOrder(type){
     isNeedSelectOrder = type ;
-    if(isNeedSelectOrder == 2){
+    opentionSelectOrderDiv();
+}
+
+function opentionSelectOrderDiv(){
+    if(isNeedSelectOrder == 2 || allCustomerType == 1 || allCustomerType == 2 ){
         $("#orderHead").hide();
         $("#order").hide();
     }else{
         $("#orderHead").show();
         $("#order").show();
     }
-}
+};
 
 /*===============================客诉提交  -- start -- =============================== */
 $(function(){