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

@@ -253,14 +253,28 @@
             <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="accountType-1" name="accountType" value="1" checked>
+                <label for="accountType-1">公司</label>
+            </div>
+            <div class="radio-box">
+                <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;">
             <label class="form-label col-2 col-sm-2" style="width: 125px;"><span class="c-red">*</span>开户支行：</label>
             <div class="formControls col-2 col-sm-2">
                 <input type="text" class="input-text trim_input" placeholder="开户支行" id="billAccountOpeningBranch" name="billAccountOpeningBranch" value="">
             </div>
-            <label class="form-label col-2 col-sm-2" style="width: 125px;"><span class="c-red">*</span>账户名称：</label>
+            <label class="form-label col-2 col-sm-2" style="width: 125px;"><span class="c-red">*</span><span id="accountNameId">企业名称：</span></label>
             <div class="formControls col-2 col-sm-2 skin-minimal">
-                <input type="text" class="input-text trim_input" placeholder="账户名称" id="accountName" name="accountName" value="">
+                <input type="text" class="input-text trim_input" placeholder="企业名称/收款人姓名" id="accountName" name="accountName" value="">
             </div>
             <label class="form-label col-2 col-sm-2" style="width: 125px;"><span class="c-red">*</span>账号：</label>
             <div class="formControls col-2 col-sm-2 skin-minimal">
@@ -268,10 +282,10 @@
             </div>
         </div>
         <div class="row cl" style="margin-bottom: 10px;">
-            <label class="form-label col-2 col-sm-2" style="width: 125px;"><span class="c-red">*</span>收款人姓名：</label>
+            <#--<label class="form-label col-2 col-sm-2" style="width: 125px;"><span class="c-red">*</span>收款人姓名：</label>
             <div class="formControls col-2 col-sm-2 skin-minimal">
                 <input type="text" class="input-text trim_input" placeholder="收款人姓名" id="receivablesName" name="receivablesName" value="">
-            </div>
+            </div>-->
             <label class="form-label col-2 col-sm-2" style="width: 125px;"><span class="c-red">*</span>收款人手机：</label>
             <div class="formControls col-2 col-sm-2 skin-minimal">
                 <input type="text" class="input-text trim_input" placeholder="收款人手机" id="receivablesPhone" name="receivablesPhone" value="">
@@ -319,7 +333,7 @@
         <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">
-                <input type="text" class="input-text trim_input" placeholder="企业名称" id="enterpriseName" name="enterpriseName" value="">
+                <input type="text" class="input-text trim_input" placeholder="企业名称/收款人姓名" id="enterpriseName" name="enterpriseName" value="">
             </div>
             <label class="form-label col-2 col-sm-2" style="width: 140px;"><span class="c-red">*</span>纳税人识别号：</label>
             <div class="formControls col-2 col-sm-2 skin-minimal">
@@ -351,7 +365,10 @@
             <label class="form-label">
             </label>
             <div class="formControls col-9">
-                <textarea id="customerRemarks"  style="width: 100%;height: 100px;" name="customerRemarks" ></textarea>
+                <#--<textarea id="customerRemarks"  style="width: 100%;height: 100px;" name="customerRemarks" ></textarea>-->
+                <textarea name="customerRemarks" style="width: 100%;height: 100px;" id="customerRemarks" cols="" rows="" class="textarea"
+                          placeholder="客户备注，最多支持100字符" onKeyUp="$.Huitextarealength(this,100)" ></textarea>
+                <p class="textarea-numberbar"><em class="textarea-length">0</em>/100</p>
             </div>
         </div>
         <#--添加保存按钮-->
@@ -364,6 +381,7 @@
         </div>
     </form>
 </div>
+<script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
 <script>
     $('.skin-minimal input').iCheck({
         checkboxClass: 'icheckbox-blue',
@@ -427,6 +445,33 @@
 
     })
 
+
+
+
+
+    /*付款/退款信息填充到开票信息*/
+    $("input[name='accountNum']").blur(function (){
+        var accountType = $("input[name='accountType']:checked").val();
+        if(accountType == 1){
+            var accountOpeningBranch = $("#accountOpeningBranch").val();//开户支行
+            var accountName = $("#accountName").val();//企业名称/收款人姓名
+            var accountNum = $("#accountNum").val();//账号
+            $("#ticketAccountOpeningBranch").val($("#billAccountOpeningBranch").val());
+            $("#ticketOpeningAccount").val($("#accountNum").val());
+            $("#enterpriseName").val($("#accountName").val());
+        }
+    });
+    /*监听控制退款名称显示事件*/
+    $("input[name='accountType']").change(function (){
+        var accountType = parseInt($(this).val());
+        alert(accountType);
+        if(accountType == 1){
+            $("#accountNameId").html("企业名称：");
+        }else{
+            $("#accountNameId").html("收款人姓名：");
+        }
+    });
+
     /*业务逻辑js控制 start*/
     $(document).on('click', '.dalog-ask .answer', function() {
         var customerProvinceCode = $(this).find(".customerProvinceCode").val();
@@ -940,7 +985,7 @@
             billingInfo.accountOpeningBranch = $("[name='billAccountOpeningBranch']").val();
             billingInfo.accountName = $("[name='accountName']").val();
             billingInfo.accountNum = $("[name='accountNum']").val();
-            billingInfo.receivablesName = $("[name='receivablesName']").val();
+            /*billingInfo.receivablesName = $("[name='receivablesName']").val();*/
             billingInfo.receivablesPhone = $("[name='receivablesPhone']").val();
             if(billingInfo.accountOpeningBranch == "" || billingInfo.accountOpeningBranch == null ){
                 layer.msg("开户支行不能为空");
@@ -954,10 +999,11 @@
                 layer.msg("账号不能为空");
                 return;
             }
-            if(billingInfo.receivablesName == "" || billingInfo.receivablesName == null ){
+            /*if(billingInfo.receivablesName == "" || billingInfo.receivablesName == null ){
                 layer.msg("收款人姓名不能为空");
                 return;
-            }if(billingInfo.receivablesPhone == "" || billingInfo.receivablesPhone == null ){
+            }*/
+            if(billingInfo.receivablesPhone == "" || billingInfo.receivablesPhone == null ){
                 layer.msg("收款人手机不能为空");
                 return;
             }else{

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

@@ -160,11 +160,11 @@
                         <tr><td colspan="5" id="contactTbodyId"  class="td-manage text-c" style="display: none;" >暂时没有联系人信息，请添加！</td></tr>
                         <#list listDockedContactInfo as list>
                         <tr>
-                            <td>${list.contactName!''}</td>
-                            <td>${list.contactPhone!''}</td>
-                            <td>${list.contactType!''}</td>
-                            <td>${list.contactEmail!''}</td>
-                            <td><a href='javascript:;' onclick='deleteContact(this)'>删除</a></td>
+                            <td style="text-align: center">${list.contactName!''}</td>
+                            <td style="text-align: center">${list.contactPhone!''}</td>
+                            <td style="text-align: center">${list.contactType!''}</td>
+                            <td style="text-align: center">${list.contactEmail!''}</td>
+                            <td style="text-align: center"><a href='javascript:;' onclick='deleteContact(this)'>删除</a></td>
                         </tr>
                         </#list>
                     <#else>
@@ -253,7 +253,7 @@
                     <tr><td colspan="7" class="td-manage text-c" id="channelTbodyId" style="display: none;" >暂时没有客户销售渠道信息，请添加！</td></tr>
                         <#list listChannelSaleInfo as list>
                         <tr>
-                            <td>
+                            <td style="text-align: center">
                                 <#if list.channelCategory??>
                                     <#if list.channelCategory == 1>电商</#if>
                                     <#if list.channelCategory == 2>特殊渠道</#if>
@@ -261,18 +261,18 @@
                                     <#if list.channelCategory == 4>海外</#if>
                                 </#if>
                             </td>
-                            <td>${list.channelType!''}</td>
-                            <td>${list.channelName!''}</td>
-                            <td>${list.promotingProducts!''}</td>
-                            <td>${list.supplyPrice/100!''}</td>
-                            <td>
+                            <td style="text-align: center">${list.channelType!''}</td>
+                            <td style="text-align: center">${list.channelName!''}</td>
+                            <td style="text-align: center">${list.promotingProducts!''}</td>
+                            <td style="text-align: center">${list.supplyPrice/100!''}</td>
+                            <td style="text-align: center">
                                 <#if list.accountPeriod??>
                                     <#if list.accountPeriod == 1>先款</#if>
                                     <#if list.accountPeriod == 2>月结</#if>
                                     <#if list.accountPeriod == 3>俩个月</#if>
                                 </#if>
                             </td>
-                            <td><a href='javascript:;' onclick='deleteChannelSale(this)'>删除</a></td>
+                            <td style="text-align: center"><a href='javascript:;' onclick='deleteChannelSale(this)'>删除</a></td>
                         </tr>
                         </#list>
                     <#else>
@@ -467,7 +467,10 @@
             <label class="form-label">
             </label>
             <div class="formControls col-9">
-                <textarea id="customerRemarks" style="width: 100%;height: 100px;" name="customerRemarks" >${customerBasicInfo.customerRemarks!''}</textarea>
+
+                <textarea name="customerRemarks" style="width: 100%;height: 100px;" id="customerRemarks" cols="" rows="" class="textarea"
+                          placeholder="客户备注，最多支持100字符" onKeyUp="$.Huitextarealength(this,100)" >${customerBasicInfo.customerRemarks!''}</textarea>
+                <p class="textarea-numberbar"><em class="textarea-length"><#if customerBasicInfo.customerRemarks??>${customerBasicInfo.customerRemarks?length} <#else>0</#if></em>/100</p>
             </div>
         </div>
         <#--添加保存按钮-->
@@ -1056,7 +1059,7 @@
         billingInfo.accountOpeningBranch = $("[name='accountOpeningBranch']").val();
         billingInfo.accountName = $("[name='accountName']").val();
         billingInfo.accountNum = $("[name='accountNum']").val();
-        billingInfo.receivablesName = $("[name='receivablesName']").val();
+        /*billingInfo.receivablesName = $("[name='receivablesName']").val();*/
         billingInfo.receivablesPhone = $("[name='receivablesPhone']").val();
         if(billingInfo.accountOpeningBranch == "" || billingInfo.accountOpeningBranch == null ){
             layer.msg("开户支行不能为空");