修改客户信息

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

@@ -55,10 +55,7 @@
 <article class="cl pd-20">
     <form action="" method="post" class="form form-horizontal" id="form-article-add">
         <div  class="row cl">
-            <label class="form-label col-5 col-sm-5"></label>
-            <div class="formControls col-5 col-sm-5 skin-minimal">
-                <span class="c-red"><button type="button" style="cursor:pointer; float: inherit;" class="my-btn-search" onclick="window.history.back()">返回</button></span>
-            </div>
+                <span class="c-red"><button type="button" style="cursor:pointer; float: left;margin-left: 20px;" class="my-btn-search" onclick="window.history.back()">返回</button></span>
         </div>
 
 

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

@@ -157,7 +157,7 @@
                     <button type="button" style="cursor:pointer; float: right;height: 31px;margin-bottom: 10px;" class="my-btn-search" id="contactButtonId" onclick="toAddDockedContactInfo();">保存</button></span>
                 </label>
             </div>
-            <div class="mt-20" style="margin: 20px;">
+            <div class="mt-20" style="margin: 10px 20px 20px 20px;">
                 <input type="hidden" id="dockedContactInfoJson" name="dockedContactInfoJson">
                 <table class="table table-border table-bordered table-bg table-hover table-sort" style="width: 960px;" id="contactTable">
                     <thead>
@@ -253,7 +253,7 @@
                         <th width="100">渠道类型</th>
                         <th width="100">渠道/平台名称</th>
                         <th width="100">销售产品型号</th>
-                        <th width="100">供货价(元)</th>
+                        <th width="100">供货价(元，含17%税)</th>
                         <th width="100">账期 </th>
                         <th width="100">操作</th>
                     </tr>
@@ -371,7 +371,7 @@
 
         <div class="row cl" style="margin-bottom: 10px;">
             <label class="form-label col-xs-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;">客户备注：</label>
-            <div class="formControls col-xs-6 col-sm-6" style="margin-left: -5px;">
+            <div class="formControls col-xs-7 col-sm-7" style="margin-left: -5px;">
                 <textarea name="customerRemarks" 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>

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

@@ -136,7 +136,7 @@
         </div>-->
 
 
-        <div class="row cl">
+        <div class="row cl" style="margin-bottom: 10px;">
             <label class="form-label col-2 col-sm-2" style="width: 105px;"></label>
             <div class="formControls col-8 col-sm-8" >
                 <input type="text" class="input-text trim_input" style="width: 886px;" placeholder="请输入客户的详细地址" id="customerAddress" name="customerAddress" value="${customerBasicInfo.customerAddress!''}">
@@ -179,7 +179,7 @@
                     <input type="text" class="input-text"  style="width:140px;margin-right: 10px;"  placeholder="邮箱" id="contactEmail" name="contactEmail">
                 </div>
                 <label class="form-label col-2 col-sm-2" style="width:110px;text-align: right;">
-                    <button type="button" style="cursor:pointer; float: right;height: 31px;" id="contactButtonId" class="my-btn-search" onclick="toAddDockedContactInfo();">保存</button></span>
+                    <button type="button" style="cursor:pointer; float: right;height: 31px;" id="contactButtonId" class="my-btn-search" onclick="toAddDockedContactInfo();">添加</button></span>
                 </label>
             </div>
             <div class="row cl">
@@ -241,8 +241,11 @@
             <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>
+        </div>
+        <div class="row cl">
+
             <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;">
+            <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>
@@ -251,8 +254,6 @@
                     </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>
             <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;margin-right: 15px;">
                 <span class="select-box">
@@ -267,13 +268,13 @@
                     <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;">
                 <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" id="channelSaleId" onclick="toAddChannelSaleInfo();">保存</button>
+                <button type="button" style="cursor:pointer; float: right;height: 31px;margin-bottom: 10px;" class="my-btn-search" id="channelSaleId" onclick="toAddChannelSaleInfo();">添加</button>
             </label>
             <div class="formControls col-2 col-sm-2" style="width:120px; padding:0 0;margin-right: 15px;">
 
@@ -287,7 +288,7 @@
                         <th width="100">渠道类型</th>
                         <th width="100">渠道/平台名称</th>
                         <th width="100">销售产品型号</th>
-                        <th width="100">供货价(元)</th>
+                        <th width="100">供货价(元，含17%税)</th>
                         <th width="100">账期 </th>
                         <th width="100">操作</th>
                     </tr>
@@ -512,7 +513,7 @@
             </div>-->
             <div class="row cl" style="margin-bottom: 10px;">
                 <label class="form-label col-xs-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;">客户备注：</label>
-                <div class="formControls col-xs-6 col-sm-6" style="margin-left: -5px;">
+                <div class="formControls col-xs-7 col-sm-7" style="margin-left: -5px;">
                 <textarea name="customerRemarks" 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>