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

@@ -232,6 +232,9 @@
                     <select name="supplyPrice" id="supplyPrice" class="select">
                     </select>
                 </span>
+                <#--<input type="text" class="input-text"  style="width:120px;margin-right: 0px;margin-bottom: 10px;"  placeholder="手动填写供货价格" id="writeSupplyPrice" name="writeSupplyPrice">-->
+            </div>
+            <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;margin-right: 15px;">
                 <input type="text" class="input-text"  style="width:120px;margin-right: 0px;margin-bottom: 10px;"  placeholder="手动填写供货价格" id="writeSupplyPrice" name="writeSupplyPrice">
             </div>
             <label class="form-label col-2 col-sm-2" style="width:166px;padding:0 0;">
@@ -754,8 +757,8 @@
             layer.msg("电话不能为空",{icon:2,time:1000});
             return;
         }else{
-            //var reg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
-            var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
+            //var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
+            var reg =  /(^(0[0-9]{2,3}\-)?([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$)|(^((\(\d{3}\))|(\d{3}\-))?(1[358]\d{9})$)/
             if(!reg.test(contactPhone)){
                 layer.msg("请填写正确的手机号码！", {icon:2, time: 3000});
                 return;
@@ -1126,7 +1129,8 @@
                         layer.msg("开票电话不能为空", {icon:2, time: 3000});
                         return;
                     }else{
-                        var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
+                        //var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
+                        var reg =  /(^(0[0-9]{2,3}\-)?([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$)|(^((\(\d{3}\))|(\d{3}\-))?(1[358]\d{9})$)/
                         if(!reg.test(ticketOpeningInfo.ticketOpeningPhone)){
                             layer.msg("请填写正确的开票电话！", {icon: 2, time: 3000});
                             return;

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

@@ -267,9 +267,11 @@
                     <select name="supplyPrice" id="supplyPrice" class="select">
                     </select>
                 </span>
+                <#--<input type="text" class="input-text"  style="width:110px;margin-right: 0;margin-bottom: 10px;"  placeholder="填写供货价格" id="writeSupplyPrice" name="writeSupplyPrice">-->
+            </div>
+            <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;margin-right: 15px;">
                 <input type="text" class="input-text"  style="width:110px;margin-right: 0;margin-bottom: 10px;"  placeholder="填写供货价格" id="writeSupplyPrice" name="writeSupplyPrice">
             </div>
-
             <label class="form-label col-2 col-sm-2" style="width:166px;padding:0 0;">
                 <button type="button" style="cursor:pointer; float: right;height: 31px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddChannelSaleInfo();">保存</button>
             </label>
@@ -573,7 +575,10 @@
         $("[name='cooperativeState']").change(function (){
             isShowBillAndTicketInfo($(this).val());
         });
-
+        /*监听发票类型*/
+        $("[name='ticketType']").change(function (){
+            isShowRedStar($(this).val());
+        })
         /*监听是否开票事件*/
         $("input[name='isOpenTicket']").change(function (){
             var isOpenTicket = $("input[name='isOpenTicket']:checked").val();
@@ -879,8 +884,8 @@
             layer.msg("电话不能为空");
             return;
         }else{
-            //var reg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
-            var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
+            //var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
+            var reg =  /(^(0[0-9]{2,3}\-)?([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$)|(^((\(\d{3}\))|(\d{3}\-))?(1[358]\d{9})$)/
             if(!reg.test(contactPhone)){
                 layer.msg("请填写正确的手机号码！", {icon: 5, time: 3000});
                 return;
@@ -1231,7 +1236,8 @@
                     layer.msg("开票电话不能为空");
                     return;
                 }else{
-                    var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
+                    //var reg =  /^(0?(13[0-9]|15[012356789]|17[013678]|18[0-9]|14[57])[0-9]{8})$/
+                    var reg =  /(^(0[0-9]{2,3}\-)?([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$)|(^((\(\d{3}\))|(\d{3}\-))?(1[358]\d{9})$)/
                     if(!reg.test(ticketOpeningInfo.ticketOpeningPhone)){
                         layer.msg("请填写正确的电话号码！", {icon: 5, time: 3000});
                         return;