修改客户信息

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

@@ -244,7 +244,7 @@
                     <label>${billingInfo.accountNum!''}</label>
                 </div>
             </div>
-            <div class="row cl">
+           <#-- <div class="row cl">
                 <label class="form-label col-2 col-sm-2"style="padding:0 0;margin-top: 2px;">收款人姓名：</label>
                 <div class="formControls col-2 col-sm-2"style="padding:0 0;">
                     <label>${billingInfo.receivablesName!''}</label>
@@ -253,7 +253,7 @@
                 <div class="formControls col-2 col-sm-2"style="padding:0 0;">
                     <label>${billingInfo.receivablesPhone!''}</label>
                 </div>
-            </div>
+            </div>-->
         <#else>
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"></label>

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

@@ -1198,11 +1198,15 @@
                     saveStates = "保存成功";
                     /*layer.msg(saveStates,{icon: 1,time:2000});
                     window.location.href= "${path}/admin/customerBasic/listCustomerBasic";*/
-                    layer.confirm(saveStates, {icon: 1, title:saveStates}, function(index){
+                    /*layer.confirm(saveStates, {icon: 1, title:saveStates}, function(index){
                         //do something
                         window.location.href= "${path}/admin/customerBasic/listCustomerBasic";
                         layer.close(index);
+                    });*/
+                    layer.msg(saveStates,{time:3000},function() {
+                        window.location.href= "${path}/admin/customerBasic/listCustomerBasic";
                     });
+
                 }else{
                     saveStates = "保存失败";
                     layer.msg(saveStates,{icon: 2,time:1000});

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

@@ -63,7 +63,7 @@
         <input type="hidden" id="saveCustomerInfo" name="saveCustomerInfo" value="">
         <input type="hidden" id="customerId" name="customerId" value="${customerBasicInfo.customerId!''}">
         <input type="hidden" id="billingId" name="billingId" value="<#if billingInfo??>${billingInfo.billingId!''}</#if>">
-        <input type="hidden" id="ticketOpeningId" name="ticketOpeningId" value="<#if billingInfo??>${ticketOpeningInfo.ticketOpeningId!''}</#if>">
+        <input type="hidden" id="ticketOpeningId" name="ticketOpeningId" value="<#if ticketOpeningInfo??>${ticketOpeningInfo.ticketOpeningId!''}</#if>">
         <#--客户基本信息 start-->
         <div class="row cl" style="margin-bottom: 10px;">
             <label class="form-label col-2">
@@ -238,28 +238,29 @@
                 </span>
             </div>
             <label class="form-label col-2 col-sm-2" style="width:110px;"><span class="c-red">*</span>渠道名称：</label>
-            <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;margin-right: 15px;">
+            <div class="formControls col-2 col-sm-2" style="width:140px;padding:0 0;margin-right: 15px;">
                 <input type="text" class="input-text"  style="width:90px;margin-right: 0;"  placeholder="填写具体店名" id="channelName" name="channelName">
             </div>
-            <label class="form-label col-2 col-sm-2" style="width:110px;"><span class="c-red">*</span>销售产品：</label>
-            <div class="formControls col-2 col-sm-2" style="width:180px;padding:0 0;margin-right: 15px;">
+            <label class="form-label col-2 col-sm-2" style="width:110px;text-align: right;"><span class="c-red">*</span>账期：</label>
+            <div class="formControls col-2 col-sm-2" style="width:150px;padding:0 0;margin-right: 15px;">
                 <span class="select-box">
-                    <select name="promotingProducts" id="promotingProducts" class="select">
+                    <select name="accountPeriod" id="accountPeriod" class="select">
+                        <option value="1">先款</option>
+                        <option value="2">月结</option>
+                        <option value="3">两个月</option>
                     </select>
                 </span>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2" style="width:110px;"><span class="c-red">*</span>账期：</label>
+            <label class="form-label col-2 col-sm-2" style="width:110px;"><span class="c-red">*</span>销售产品：</label>
             <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;margin-right: 15px;">
                 <span class="select-box">
-                    <select name="accountPeriod" id="accountPeriod" class="select">
-                        <option value="1">先款</option>
-                        <option value="2">月结</option>
-                        <option value="3">两个月</option>
+                    <select name="promotingProducts" id="promotingProducts" class="select">
                     </select>
                 </span>
             </div>
+
             <label class="form-label col-2 col-sm-2" style="width:110px;"><span class="c-red">*</span>供货价格：</label>
             <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;margin-right: 15px;">
                 <span class="select-box">
@@ -268,9 +269,7 @@
                 </span>
                 <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:110px;padding:0 0;margin-right: 15px;"></label>
-            <label class="form-label col-2 col-sm-2" style="width:110px;"></label>
-            <label class="form-label col-2 col-sm-2" style="width:110px;padding:0 0;margin-right: 15px;"></label>
+
             <label class="form-label col-2 col-sm-2" style="width:166px;padding:0 0;">
                 <button type="button" style="cursor:pointer; float: right;height: 35px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddChannelSaleInfo();">保存</button>
             </label>
@@ -1044,7 +1043,7 @@
         if(customerBasicInfo.customerName == "" || customerBasicInfo.customerName == null ){
             layer.msg("客户名称不能为空");
             return;
-        }else if(getByteLen(customerBasicInfo.customerName) > 20){
+        }else if(getByteLen(customerBasicInfo.customerName) > 30){
             layer.msg("客户名称长度超限");
             return;
         }
@@ -1155,6 +1154,7 @@
         var billingInfo = {};
         if(customerBasicInfo.cooperativeState != "1"){
             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();
@@ -1303,10 +1303,15 @@
                     saveStates = "保存成功";
                     /*layer.msg(saveStates,{icon: 1,time:2000});
                     window.location.href= "${path}/admin/customerBasic/listCustomerBasic";*/
-                    layer.confirm(saveStates, {icon: 1, title:saveStates}, function(index){
+                    /*layer.confirm(saveStates, {icon: 1, title:saveStates}, function(index){
                         window.location.href= "${path}/admin/customerBasic/listCustomerBasic";
                         layer.close(index);
+                    });*/
+
+                    layer.msg(saveStates,{time:3000},function() {
+                        window.location.href= "${path}/admin/customerBasic/listCustomerBasic";
                     });
+
                 }else{
                     saveStates = "保存失败";
                     layer.msg(saveStates,{icon: 5,time:1000});