修改客户信息

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

@@ -247,7 +247,13 @@
             </div>
         <#else>
             <div class="row cl">
-                <label class="form-label col-2 col-sm-2" style="padding:0 0;text-align: center;">无付款/退款信息</label>
+                <label class="form-label col-1 col-sm-1"></label>
+            </div>
+            <div class="row cl">
+                <label class="form-label col-1 col-sm-1"></label>
+                <div class="formControls col-4 col-sm-4">
+                    <label>无付款/退款信息</label>
+                </div>
             </div>
         </#if>
 
@@ -300,7 +306,13 @@
         </div>
         <#else>
             <div class="row cl">
-                <label class="form-label col-2 col-sm-2" style="padding:0 0;text-align: center;"> 不需开票</label>
+                <label class="form-label col-1 col-sm-1"></label>
+            </div>
+            <div class="row cl">
+                <label class="form-label col-1 col-sm-1"></label>
+                <div class="formControls col-4 col-sm-4">
+                    <label>不需开票</label>
+                </div>
             </div>
         </#if>
         <div class="row cl">

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

@@ -1026,7 +1026,8 @@
         //var channelSaleInfoListJson = $("#channelSaleInfoJson").val(JSON.stringify(channelSaleInfoList));
         //付款/退款信息
         var billingInfo = {};
-        if(customerBasicInfo.cooperativeState != "1"){
+        if(customerBasicInfo.cooperativeState != "1")
+            billingInfo.accountType = $("input[name='accountType']:checked").val();
             billingInfo.accountOpeningBranch = $("[name='billAccountOpeningBranch']").val();
             billingInfo.accountName = $("[name='accountName']").val();
             billingInfo.accountNum = $("[name='accountNum']").val();
@@ -1063,11 +1064,11 @@
             }else{
                 var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
                 if(!reg.test(billingInfo.receivablesPhone)){
-                    layer.msg("请填写正确的手机号码！", {icon: 5, time: 3000});
+                    layer.msg("请填写正确的收款人手机号！", {icon: 5, time: 3000});
                     return;
-                }
             }
-        }
+         }
+
         //开票信息
         var ticketOpeningInfo = {};
         var isOpenTicket = $("input[name='isOpenTicket']:checked").val();
@@ -1114,7 +1115,7 @@
                 }else{
                     var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
                     if(!reg.test(ticketOpeningInfo.ticketOpeningPhone)){
-                        layer.msg("请填写正确的手机号码！", {icon: 5, time: 3000});
+                        layer.msg("请填写正确的开票电话！", {icon: 5, time: 3000});
                         return;
                     }
                 }

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

@@ -294,11 +294,11 @@
 
                 <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="accountType-1" name="accountType" value="1" checked>
+                    <input type="radio" id="accountType-1" name="accountType" value="1" <#if billingInfo??><#if billingInfo.accountType == 1>checked</#if><#else>checked</#if>>
                     <label for="accountType-1">公司</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="accountType-2" name="accountType" value="2">
+                    <input type="radio" id="accountType-2" name="accountType" value="2" <#if billingInfo??><#if billingInfo.accountType == 2>checked</#if></#if>>
                     <label for="accountType-2">个人</label>
                 </div>
 
@@ -361,7 +361,7 @@
             <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" name="isOpenTicket" value="1" checked="checked"  >
+                    <input type="radio" id="isOpenTicket-1" name="isOpenTicket" value="1" checked="checked">
                     <label for="isOpenTicket-1">开票</label>
                 </div>
                 <div class="radio-box">
@@ -1056,6 +1056,7 @@
         //付款/退款信息
         var billingInfo = {};
         billingInfo.billingId = $("[name='billingId']").val();
+        billingInfo.accountType = $("input[name='accountType']:checked").val();
         billingInfo.accountOpeningBranch = $("[name='accountOpeningBranch']").val();
         billingInfo.accountName = $("[name='accountName']").val();
         billingInfo.accountNum = $("[name='accountNum']").val();
@@ -1090,9 +1091,9 @@
             layer.msg("收款人手机不能为空");
             return;
         }else{
-            var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
-            if(!reg.test(phone)){
-                layer.msg("请填写正确的手机号码！", {icon: 5, time: 3000});
+            var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/;
+            if(!reg.test(billingInfo.receivablesPhone)){
+                layer.msg("请填写正确的收款人手机号码！", {icon: 5, time: 3000});
                 return;
             }
         }
@@ -1141,7 +1142,7 @@
             }else{
                 var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
                 if(!reg.test(ticketOpeningInfo.ticketOpeningPhone)){
-                    layer.msg("请填写正确的电话号码！", {icon: 5, time: 3000});
+                    layer.msg("请填写正确的开票电话！", {icon: 5, time: 3000});
                     return;
                 }
             }