Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -263,14 +263,14 @@
             </div>
         </div>
         <#--付款/退款信息-->
-        <div class="row cl">
+        <div class="row cl" id="titleOfBillInfo">
             <label class="form-label col-9">
                 <div class="tit-2">付款/退款信息<span style="font-family:'Arial Normal', 'Arial';font-weight:400;font-size:14px;">(请真实有效，用于财务收款确认或退款业务)</span></div>
             </label>
             <div class="formControls col-9">
             </div>
         </div>
-        <div class="row cl skin-minimal" style="margin-bottom: 10px;">
+        <div class="row cl skin-minimal" style="margin-bottom: 10px;" id="billAccountType">
             <label class="form-label col-2 col-sm-2" style="width: 110px;float: left;margin-left: 10px;"padding-right: 0;text-align: right;"><span class="c-red">*</span>账户类型：</label>
             <div class="radio-box">
                 <input type="radio" id="accountType-1" name="accountType" value="1" checked>
@@ -280,10 +280,9 @@
                 <input type="radio" id="accountType-2" name="accountType" value="2">
                 <label for="accountType-2">个人</label>
             </div>
-
         </div>
 
-        <div class="row cl" style="margin-bottom: 10px;">
+        <div class="row cl" style="margin-bottom: 10px;" id="billAccountInfo">
             <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;"><span class="c-red">*</span>开户支行：</label>
             <div style="width: 150px;float: left;margin-left: 10px;">
                 <input type="text" class="input-text trim_input" placeholder="开户支行" id="billAccountOpeningBranch" name="billAccountOpeningBranch" value="">
@@ -299,14 +298,14 @@
         </div>
 
         <#--开票信息-->
-        <div class="row cl">
+        <div class="row cl" id="titleOfOpenTicket">
             <label class="form-label col-9">
                 <div class="tit-2">开票信息</div>
             </label>
             <div class="formControls col-9">
             </div>
         </div>
-        <div class="row cl skin-minimal" style="margin-bottom: 10px;">
+        <div class="row cl skin-minimal" style="margin-bottom: 10px;" id="isOpenTicket">
             <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;"><span class="c-red">*</span>是否开票：</label>
             <div class="radio-box" style="margin-left: 10px;">
                 <input type="radio" id="isOpenTicket-1" class="isShowOpenTicket" name="isOpenTicket" value="0" checked="checked"  >
@@ -407,6 +406,8 @@
         /* 初始化单选框样式 */
         //initCheck();
 
+        //页面初始化
+        isShowBillAndTicketInfo("1");
         /*初始化省份（大类）*/
         initProvince();
 
@@ -449,6 +450,11 @@
                 $("#isShowAddress").show();
             }
         });
+
+        /*监听合作进度*/
+        $("[name='cooperativeState']").change(function (){
+            isShowBillAndTicketInfo($(this).val());
+        });
         /*监听发票类型*/
         $("[name='ticketType']").change(function (){
             isShowRedStar($(this).val());
@@ -488,10 +494,30 @@
     function isShowRedStar(ticketType) {
         if(ticketType == "1"){
             $(".normalTicketType").show();
-
         }else{
             $(".normalTicketType").hide();
+        }
+    }
 
+    function isShowBillAndTicketInfo(cooperativeState) {
+        if(cooperativeState == "1"){
+            $("#titleOfBillInfo").hide();
+            $("#billAccountType").hide();
+            $("#billAccountInfo").hide();
+            $("#titleOfOpenTicket").hide();
+            $("#isOpenTicket").hide();
+            $("#isShowOpenTicket").hide();
+            $("#isShowEnterprise").hide();
+            $("#isShowAddress").hide();
+        }else{
+            $("#titleOfBillInfo").show();
+            $("#billAccountType").show();
+            $("#billAccountInfo").show();
+            $("#titleOfOpenTicket").show();
+            $("#isOpenTicket").show();
+            $("#isShowOpenTicket").show();
+            $("#isShowEnterprise").show();
+            $("#isShowAddress").show();
         }
     }
     /*初始化省份*/
@@ -646,6 +672,7 @@
                         }
                         html += '<option value="'+ promotingProductsInfo.productId +'">'+ promotingProductsInfo.productName +'</option>';
                     }
+                    initSupplyPrice("");
                 }else{
                     html = '';
                 }
@@ -661,7 +688,7 @@
         //var supplyPriceInfo = null;
         if(promotingProductsId == null || promotingProductsId == ""){
             var html = '<option value="">请选择销售产品</option>';
-            //$("[name='promotingProducts']").html(html);
+            $("[name='supplyPrice']").html(html);
         }else{
             $.ajax({
                 type: "POST",
@@ -680,6 +707,7 @@
                             html += '<option value="'+ supplyPriceInfo.colorPrice/100 +'">'+ supplyPriceInfo.colorPrice/100 +'</option>';
                         }
                         html += '<option value="00">'+ chose +'</option>';
+                        $("#writeSupplyPrice").hide();
                     }else{
                         html = '';
                     }