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

@@ -293,24 +293,24 @@
         </div>
 
         <#--开票信息-->
-        <div class="row cl" style="margin-bottom: 10px;" >
-            <label class="form-label col-9 skin-minimal">
-                <span class="tit-2">开票信息</span><span class="c-red">&nbsp;&nbsp;&nbsp;*</span>是否开票
-                <div class="radio-box">
-                    <input type="radio" id="isOpenTicket-1" class="isShowOpenTicket" name="isOpenTicket" value="0" checked="checked"  >
-                    <label for="isOpenTicket-1">开票</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="isOpenTicket-2" class="isShowOpenTicket" name="isOpenTicket" value="1"   >
-                    <label for="isOpenTicket-2">不开票</label>
-                </div>
-                <#--<div class="radio-box"><input type="radio" name="isOpenTicket" value="1" checked="checked">开票</div>
-                <div class="radio-box"><input type="radio" name="isOpenTicket" value="2">不开票</div>-->
+        <div class="row cl">
+            <label class="form-label col-9">
+                <div class="tit-2">开票信息</div>
             </label>
-            <div class="formControls col-3">
+            <div class="formControls col-9">
+            </div>
+        </div>
+        <div class="row cl skin-minimal" style="margin-bottom: 10px;">
+            <label class="form-label col-2 col-sm-2" style="width: 125px;"><span class="c-red">*</span>是否开票:</label>
+            <div class="radio-box">
+                <input type="radio" id="isOpenTicket-1" class="isShowOpenTicket" name="isOpenTicket" value="0" checked="checked"  >
+                <label for="isOpenTicket-1">开票</label>
+            </div>
+            <div class="radio-box">
+                <input type="radio" id="isOpenTicket-2" class="isShowOpenTicket" name="isOpenTicket" value="1"   >
+                <label for="isOpenTicket-2">不开票</label>
             </div>
         </div>
-
         <div class="row cl" style="margin-bottom: 10px;" id="isShowOpenTicket">
             <label class="form-label col-2 col-sm-2" style="width: 120px;"><span class="c-red">*</span>发票类型：</label>
             <div class="formControls col-2 col-sm-2">
@@ -330,6 +330,7 @@
                     <input type="text" class="input-text trim_input" placeholder="开票账户" id="ticketOpeningAccount" name="ticketOpeningAccount" value="">
                 </div>
             </div>
+
         <div class="row cl" style="margin-bottom: 10px;" id="isShowEnterprise">
             <label class="form-label col-2 col-sm-2" style="width: 120px;"><span class="c-red">*</span>企业名称：</label>
             <div class="formControls col-2 col-sm-2 skin-minimal">
@@ -429,26 +430,25 @@
             changeSupplyPrice($(this).val());
         })
 
-        /*监听来源入口选择事件*/
-        $('.isShowOpenTicket').on('ifChecked', function(event){
+        /*监听是否开票事件*/
+        $("input[name='isOpenTicket']").change(function (){
             var isOpenTicket = $("input[name='isOpenTicket']:checked").val();
-            isShowOpenTicket(isOpenTicket);
+            if(isOpenTicket == "1"){
+                $("#isShowOpenTicket").hide();
+                $("#isShowEnterprise").hide();
+                $("#isShowAddress").hide();
+            }else if(isOpenTicket == "0"){
+                $("#isShowOpenTicket").show();
+                $("#isShowEnterprise").show();
+                $("#isShowAddress").show();
+            }
         });
         /*监听发票类型*/
         $("[name='ticketType']").change(function (){
             isShowRedStar($(this).val());
         })
-        /*监听输入的价格*/
-        /*$("[name='writeSupplyPrice']").change(function (){
-            writeSupplyPrice($(this).val());
-        })*/
-
     })
 
-
-
-
-
     /*付款/退款信息填充到开票信息*/
     $("input[name='accountNum']").blur(function (){
         var accountType = $("input[name='accountType']:checked").val();
@@ -479,18 +479,6 @@
         $(".dalog-ask").hide();
     });
 
-    function isShowOpenTicket(isOpenTicket) {
-        if(isOpenTicket == "1"){
-            $("#isShowOpenTicket").hide();
-            $("#isShowEnterprise").hide();
-            $("#isShowAddress").hide();
-        }else{
-            $("#isShowOpenTicket").show();
-            $("#isShowEnterprise").show();
-            $("#isShowAddress").show();
-        }
-    }
-
     function isShowRedStar(ticketType) {
         if(ticketType == "1"){
             $(".normalTicketType").show();