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

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

@@ -326,14 +326,14 @@
             </div>
         </div>
         <#--付款/退款信息-->
-        <div class="row cl" style="margin-bottom: 10px;">
+        <div class="row cl" style="margin-bottom: 10px;" 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;padding-right: 0;text-align: right;"><span class="c-red">*</span>账户类型：</label>
                 <div class="radio-box" style="margin-left: 10px;">
@@ -347,7 +347,7 @@
 
         </div>
         <#if billingInfo??>
-        <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="accountOpeningBranch" name="accountOpeningBranch" value="${billingInfo.accountOpeningBranch!''}">
@@ -374,7 +374,7 @@
             </div>
         </div>-->
         <#else >
-            <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="accountOpeningBranch" name="accountOpeningBranch" value="">
@@ -400,14 +400,14 @@
             </div>
         </#if>
         <#--开票信息-->
-        <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"  >
@@ -535,6 +535,7 @@
 <#--业务js-->
 <#--<script type="text/javascript" src="${path}/common/js/customerSaveAdmin/save_customer_info.js"></script>-->
 <script>
+    $("#writeSupplyPrice").hide();//隐藏手动输入产品价格框
     /*初始化页面参数*/
     $(function () {
 
@@ -546,6 +547,9 @@
             increaseArea: '20%'
         });
 
+        //页面初始化
+        isShowBillAndTicketInfo('${customerBasicInfo.cooperativeState!''}');
+
         /*初始化省份（大类）*/
         initProvince();
         //初始化市
@@ -575,6 +579,12 @@
         $("[name='supplyPrice']").change(function (){
             changeSupplyPrice($(this).val());
         })
+
+        /*监听合作进度*/
+        $("[name='cooperativeState']").change(function (){
+            isShowBillAndTicketInfo($(this).val());
+        });
+
         /*监听是否开票事件*/
         $("input[name='isOpenTicket']").change(function (){
             var isOpenTicket = $("input[name='isOpenTicket']:checked").val();
@@ -621,6 +631,29 @@
         $(".dalog-ask").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();
+        }
+    }
+
     /*初始化省份*/
     function initProvince() {
         //默认查询参数为空
@@ -767,6 +800,7 @@
                         }
                         html += '<option value="'+ promotingProductsInfo.productId +'">'+ promotingProductsInfo.productName +'</option>';
                     }
+                    initSupplyPrice("");
                 }else{
                     html = '';
                 }
@@ -782,7 +816,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",
@@ -792,17 +826,21 @@
                 url: "${path}/admin/customerBasic/query_supplyPriceList",
                 async: true,
                 success: function(data){
-                    var html = '<option value="">手动输入产品价格</option>';
+                    //var html = '<option value="">手动输入产品价格</option>';
+                    var html = '';
+                    var chose = "手动输入产品价格"
                     if (data.returnCode == 200) {
                         for(var i=0;i<data.returnMsg.supplyPriceList.length;i++){
                             var supplyPriceInfo = data.returnMsg.supplyPriceList[i];
                             html += '<option value="'+ supplyPriceInfo.colorPrice/100 +'">'+ supplyPriceInfo.colorPrice/100 +'</option>';
                         }
+                        html += '<option value="00">'+ chose +'</option>';
+                        $("#writeSupplyPrice").hide();
                     }else{
                         html = '';
                     }
                     $("[name='supplyPrice']").html(html);
-                    $("#writeSupplyPrice").show();
+                    //$("#writeSupplyPrice").show();
                 },
                 error: function(XmlHttpRequest, textStatus, errorThrown){
                 }
@@ -812,7 +850,7 @@
 
     /*监听产品价格选项*/
     function changeSupplyPrice(supplyPrice){
-        if(supplyPrice == ""){
+        if(supplyPrice == "00"){
             $("#writeSupplyPrice").show();
         }else{
             $("#writeSupplyPrice").hide();