修改客户信息

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

@@ -70,9 +70,10 @@
             <div class="formControls col-9">
             </div>
         </div>
+        <div class="row cl">
         <div class="row cl" style="margin-bottom: 10px;">
-            <label class="form-label col-2 col-sm-2" style="width: 110px;"><span class="c-red">*</span>客户类型：</label>
-            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>客户类型：</label>
+            <div class="formControls col-4 col-sm-4" style="padding: 0 0;width: 383px;">
                  <span class="select-box">
                         <select name="customerType" class="select">
                             <option value="1">个人</option>
@@ -80,8 +81,8 @@
                         </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-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>合作进度：</label>
+            <div class="formControls col-4 col-sm-4" style="padding: 0 0;width: 383px;">
                 <span class="select-box">
                         <select name="cooperativeState" class="select">
                             <option value="1">意向合作</option>
@@ -92,26 +93,26 @@
             </div>
         </div>
         <div class="row cl" style="margin-bottom: 10px;">
-            <label class="form-label col-2 col-sm-2" style="width: 110px;"><span class="c-red">*</span>客户名称：</label>
-            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>客户名称：</label>
+            <div class="formControls col-4 col-sm-4" style="padding: 0 0;width: 383px;">
                 <input type="text" class="input-text trim_input" placeholder="公司/客户 全称" id="customerName" name="customerName" value="">
             </div>
-            <label class="form-label col-2 col-sm-2" style="width: 110px;">客户行业：</label>
-            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;">客户行业：</label>
+            <div class="formControls col-3 col-sm-3" style="padding: 0 0;width: 383px;">
                 <input type="text" class="input-text trim_input" placeholder="请输入行业名称" id="customerIndustry" name="customerIndustry" value="">
             </div>
         </div>
         <div class="row cl" style="position: relative;margin-bottom: 10px;">
-            <label class="form-label col-2 col-sm-2" style="width: 110px;"><span class="c-red">*</span>客户地址：</label>
-            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>客户地址：</label>
+            <div class="formControls col-4 col-sm-4" style="padding: 0 0;width: 383px;">
                 <span class="select-box">
                         <select name="customerProvinceCode" class="select">
                             <option value="">请选择省份</option>
                         </select>
                 </span>
             </div>
-            <label class="form-label col-2 col-sm-2" style="width: 110px;"></label>
-            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;"></label>
+            <div class="formControls col-4 col-sm-4" style="padding: 0 0;width: 383px;">
                 <span class="select-box">
                         <select name="customerCityCode" class="select">
                             <option value="">请选择城市</option>
@@ -120,11 +121,12 @@
             </div>
         </div>
         <div class="row cl" style="margin-bottom: 10px;">
-            <label class="form-label col-2 col-sm-2" style="width: 110px;"></label>
-            <div class="formControls col-7 col-sm-7" style="padding: 0 0;width: 680px;">
-                <input type="text" class="input-text trim_input" placeholder="请输入客户的详细地址" id="customerAddress" name="customerAddress" value="">
+            <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="">
             </div>
         </div>
+        </div>
         <#--客户基本信息 end-->
         <#--对接联系人信息-->
         <div class="row cl">
@@ -134,17 +136,30 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <div class="row cl">
-            <div class="formControls col-9">
-                <span class="c-red">*</span>姓名：<input type="text" class="input-text"  style="width:100px;margin-right: 10px; margin-bottom: 10px;" placeholder="联系人姓名" id="contactName" name="contactName">
-                <span class="c-red">*</span>电话：<input type="text" class="input-text"  style="width:100px;margin-right: 10px;margin-bottom: 10px;"  placeholder="联系人电话" id="contactPhone" name="contactPhone">
-                <span class="c-red">*</span>职位/身份：<input type="text" class="input-text"  style="width:80px;margin-right: 10px;margin-bottom: 10px;"  placeholder="职位或身份" id="contactType" name="contactType">
-                <span class="c-red">*</span>联系邮箱：<input type="text" class="input-text"  style="width:150px;margin-right: 10px;margin-bottom: 10px;"  placeholder="邮箱" id="contactEmail" name="contactEmail">
-                <span class="c-red"><button type="button" style="cursor:pointer; float: right;height: 35px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddDockedContactInfo();">保存</button></span>
+            <div class="row cl">
+                <label class="form-label col-2 col-sm-2" style="width:80px;text-align: right;"><span class="c-red">*</span>姓名：</label>
+                <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;">
+                    <input type="text" class="input-text"  style="width:100px;margin-right: 10px; margin-bottom: 10px;" placeholder="联系人姓名" id="contactName" name="contactName">
+                </div>
+                <label class="form-label col-2 col-sm-2" style="width:80px;text-align: right;"><span class="c-red">*</span>电话：</label>
+                <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;">
+                    <input type="text" class="input-text"  style="width:100px;margin-right: 10px;margin-bottom: 10px;"  placeholder="联系人电话" id="contactPhone" name="contactPhone">
+                </div>
+                <label class="form-label col-2 col-sm-2" style="width:120px;text-align: right;"><span class="c-red">*</span>职位/身份：</label>
+                <div class="formControls col-2 col-sm-2" style="width:140px;padding:0 0;">
+                    <input type="text" class="input-text"  style="width:140px;margin-right: 10px;margin-bottom: 10px;"  placeholder="职位或身份" id="contactType" name="contactType">
+                </div>
+                <label class="form-label col-2 col-sm-2" style="width:120px;text-align: right;"><span class="c-red">*</span>联系邮箱：</label>
+                <div class="formControls col-2 col-sm-2" style="width:140px;padding:0 0;">
+                    <input type="text" class="input-text"  style="width:140px;margin-right: 10px;margin-bottom: 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: 35px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddDockedContactInfo();">保存</button></span>
+                </label>
             </div>
             <div class="mt-20" style="margin: 20px;">
                 <input type="hidden" id="dockedContactInfoJson" name="dockedContactInfoJson">
-                <table class="table table-border table-bordered table-bg table-hover table-sort" style="width: 820px;" id="contactTable">
+                <table class="table table-border table-bordered table-bg table-hover table-sort" style="width: 960px;" id="contactTable">
                     <thead>
                     <tr class="text-c">
                         <th width="100">联系人姓名</th>
@@ -159,7 +174,6 @@
                     </tbody>
                 </table>
             </div>
-        </div>
         <#--客户销售渠道信息备案-->
         <div class="row cl">
             <label class="form-label col-3">
@@ -200,14 +214,6 @@
             </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">
-                    <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>
             <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">
@@ -218,7 +224,14 @@
                     </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">
+                    <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>
             <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>

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

@@ -72,9 +72,11 @@
             <div class="formControls col-9">
             </div>
         </div>
+
+        <div class="row cl">
         <div class="row cl" style="margin-bottom: 10px;">
-            <label class="form-label col-2 col-sm-2" style="width: 110px;"><span class="c-red">*</span>客户类型：</label>
-            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>客户类型：</label>
+            <div class="formControls col-4 col-sm-4" style="padding: 0 0;width: 383px;">
                  <span class="select-box">
                         <select name="customerType" class="select">
                                 <option value="1" <#if customerBasicInfo.customerType == 1>selected</#if>>个人</option>
@@ -82,8 +84,8 @@
                         </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-3 col-sm-3"style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>合作进度：</label>
+            <div class="formControls col-4 col-sm-4"style="padding: 0 0;width: 383px;">
                 <span class="select-box">
                         <select name="cooperativeState" class="select">
                             <option value="1"<#if customerBasicInfo.cooperativeState == 1>selected</#if>>意向合作</option>
@@ -94,26 +96,26 @@
             </div>
         </div>
         <div class="row cl" style="margin-bottom: 10px;">
-            <label class="form-label col-2 col-sm-2" style="width: 110px;"><span class="c-red">*</span>客户名称：</label>
-            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>客户名称：</label>
+            <div class="formControls col-4 col-sm-4" style="padding: 0 0;width: 383px;">
                 <input type="text" class="input-text trim_input" placeholder="公司/客户 全称" id="customerName" name="customerName" value="${customerBasicInfo.customerName!''}">
             </div>
-            <label class="form-label col-2 col-sm-2" style="width: 110px;">客户行业：</label>
-            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;">客户行业：</label>
+            <div class="formControls col-4 col-sm-4" style="padding: 0 0;width: 383px;">
                 <input type="text" class="input-text trim_input" placeholder="请输入行业名称" id="customerIndustry" name="customerIndustry" value="${customerBasicInfo.customerIndustry!''}">
             </div>
         </div>
         <div class="row cl" style="position: relative;margin-bottom: 10px;">
-            <label class="form-label col-2 col-sm-2" style="width: 110px;"><span class="c-red">*</span>客户地址：</label>
-            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>客户地址：</label>
+            <div class="formControls col-4 col-sm-4" style="padding: 0 0;width: 383px;">
                 <span class="select-box">
                         <select name="customerProvinceCode" id="customerProvinceCode" class="select">
                             <option value="">请选择省份</option>
                         </select>
                 </span>
             </div>
-            <label class="form-label col-2 col-sm-2" style="width: 110px;"></label>
-            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;margin-left: 10px;"></label>
+            <div class="formControls col-4 col-sm-4" style="padding: 0 0;width: 383px;">
                 <span class="select-box">
                         <select name="customerCityCode" id="customerCityCode" class="select">
                             <option value="">请选择城市</option>
@@ -121,14 +123,29 @@
                 </span>
             </div>
         </div>
-        <div class="row cl" style="margin-bottom: 10px;">
-            <label class="form-label col-2 col-sm-2" style="width: 110px;"></label>
-            <div class="formControls col-7 col-sm-7" style="padding: 0 0;width: 680px;">
-                <input type="text" class="input-text trim_input" placeholder="请输入客户的详细地址" id="customerAddress" name="customerAddress" value="${customerBasicInfo.customerAddress!''}">
+
+       <#-- <div class="row cl" style="margin-bottom: 10px;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;"><span class="c-red">*</span>客户名称：</label>
+            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+                <input type="text" class="input-text trim_input" placeholder="公司/客户 全称" id="customerName" name="customerName" value="${customerBasicInfo.customerName!''}">
+            </div>
+            <label class="form-label col-2 col-sm-2" style="width: 110px;">客户行业：</label>
+            <div class="formControls col-3 col-sm-3" style="padding: 0 0;">
+                <input type="text" class="input-text trim_input" placeholder="请输入行业名称" id="customerIndustry" name="customerIndustry" value="${customerBasicInfo.customerIndustry!''}">
             </div>
+        </div>-->
+
+
+        <div class="row cl">
+            <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!''}">
+            </div>
+        </div>
         </div>
         <#--客户基本信息 end-->
         <#--对接联系人信息-->
+        <div style="width: 1000px">
         <div class="row cl" style="margin-bottom: 10px;">
             <label class="form-label col-9">
                 <div class="tit-2">对接联系人信息<span style="font-family:'Arial Normal', 'Arial';font-weight:400;font-size:14px;">(请确保真实性，公司将不定期抽验回访)</span></div>
@@ -136,17 +153,39 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <div class="row cl">
-            <div class="formControls col-9">
+            <#--<div class="formControls col-9">
                 <span class="c-red">*</span>姓名：<input type="text" class="input-text"  style="width:100px;margin-right: 10px; margin-bottom: 10px;" placeholder="联系人姓名" id="contactName" name="contactName">
                 <span class="c-red">*</span>电话：<input type="text" class="input-text"  style="width:100px;margin-right: 10px;margin-bottom: 10px;"  placeholder="联系人电话" id="contactPhone" name="contactPhone">
                 <span class="c-red">*</span>职位/身份：<input type="text" class="input-text"  style="width:100px;margin-right: 10px;margin-bottom: 10px;"  placeholder="职位或身份" id="contactType" name="contactType">
                 <span class="c-red">*</span>联系邮箱：<input type="text" class="input-text"  style="width:100px;margin-right: 10px;margin-bottom: 10px;"  placeholder="邮箱" id="contactEmail" name="contactEmail">
                 <span class="c-red"><button type="button" style="cursor:pointer; float: right;height: 35px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddDockedContactInfo();">保存</button></span>
+            </div>-->
+
+            <div class="row cl">
+                <label class="form-label col-2 col-sm-2" style="width:80px;text-align: right;"><span class="c-red">*</span>姓名：</label>
+                <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;">
+                    <input type="text" class="input-text"  style="width:100px;margin-right: 10px; margin-bottom: 10px;" placeholder="联系人姓名" id="contactName" name="contactName">
+                </div>
+                <label class="form-label col-2 col-sm-2" style="width:80px;text-align: right;"><span class="c-red">*</span>电话：</label>
+                <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;">
+                    <input type="text" class="input-text"  style="width:100px;margin-right: 10px;margin-bottom: 10px;"  placeholder="联系人电话" id="contactPhone" name="contactPhone">
+                </div>
+                <label class="form-label col-2 col-sm-2" style="width:120px;text-align: right;"><span class="c-red">*</span>职位/身份：</label>
+                <div class="formControls col-2 col-sm-2" style="width:140px;padding:0 0;">
+                    <input type="text" class="input-text"  style="width:140px;margin-right: 10px;margin-bottom: 10px;"  placeholder="职位或身份" id="contactType" name="contactType">
+                </div>
+                <label class="form-label col-2 col-sm-2" style="width:120px;text-align: right;"><span class="c-red">*</span>联系邮箱：</label>
+                <div class="formControls col-2 col-sm-2" style="width:140px;padding:0 0;">
+                    <input type="text" class="input-text"  style="width:140px;margin-right: 10px;margin-bottom: 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: 35px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddDockedContactInfo();">保存</button></span>
+                </label>
             </div>
+            <div class="row cl">
             <div class="mt-20" style="margin: 20px;">
                 <input type="hidden" id="dockedContactInfoJson" name="dockedContactInfoJson">
-                <table class="table table-border table-bordered table-bg table-hover table-sort" style="width: 820px;" id="contactTable">
+                <table class="table table-border table-bordered table-bg table-hover table-sort" style="width: 975px;" id="contactTable">
                     <thead>
                     <tr class="text-c">
                         <th width="100">联系人姓名</th>
@@ -200,7 +239,7 @@
             </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;">
-                <input type="text" class="input-text"  style="width:90px;margin-right: 0;margin-bottom: 10px;"  placeholder="填写具体店名" id="channelName" name="channelName">
+                <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;">
@@ -211,14 +250,6 @@
             </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">
-                    <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>
             <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">
@@ -229,6 +260,14 @@
                     </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">
+                    <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>
             <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>