修改客户信息

watero-rst-core/src/main/java/com.iamberry.rst.core/customer/CustomerBasicInfo.java

@@ -25,6 +25,7 @@ public class CustomerBasicInfo implements Serializable{
     private String provinceName;//客户所在省份名称
     private String cityName;//客户所在城市姓名
     private Integer isLookAll;//是否查看全部客户 1：查看全部 2：查看自己的
+    private String contactName;//联系人姓名
     private String contactPhone;//联系人电话
     private String contactEmail;//联系人邮箱
     private Integer isSelectAll;//是否查看包括删除的客户信息 1 是 2 否
@@ -189,4 +190,12 @@ public class CustomerBasicInfo implements Serializable{
     public void setProvinceName(String provinceName) {
         this.provinceName = provinceName;
     }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/mapper/CustomerBasicMapper.xml

@@ -55,6 +55,9 @@
         <if test="contactPhone != null and contactPhone!='' ">
           AND ci.contact_phone = #{contactPhone}
         </if>
+        <if test="contactName != null and contactName!='' ">
+          AND ci.contact_name = #{contactName}
+        </if>
         <if test="contactEmail != null and contactEmail!='' ">
           AND ci.contact_email = #{contactEmail}
         </if>

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

@@ -30,8 +30,8 @@
     </nav>
 		<div class="text-c" style="margin-top: 20px;">
 			<form action="${path}/admin/customerBasic/listCustomerBasic" method="post">
-                    <button type="button"  class="my-btn-search" style="margin-right: 20px;" onclick="customerAdd()">新增</button>
-					<select class="my-select" name="isLookAll" style="width: 130px">
+                    <button type="button"  class="my-btn-search" style="margin-right: 10px;height: 32px;" onclick="customerAdd()">新增</button>
+					<select class="my-select" name="isLookAll" style="width: 130px;height: 32px;">
 					<#if isLookAll??>
 						<option value ="1" <#if isLookAll == 1>selected</#if>>查看全部客户</option>
 						<option value ="2" <#if isLookAll == 2>selected</#if>>只看我的客户</option>
@@ -40,7 +40,7 @@
 						<option value ="2">只看我的客户</option>
 					</#if>
 					</select>
-                    <select class="my-select" name="customerType" style="width: 130px">
+                    <select class="my-select" name="customerType" style="width: 130px;height: 32px;">
                         <option value ="">所有客户类型</option>
                         <#if customerType??>
                          <option value ="1" <#if customerType == 1>selected</#if>>个人</option>
@@ -50,7 +50,7 @@
                             <option value ="2">企业</option>
                         </#if>
                     </select>
-                    <select class="my-select" name="cooperativeState" style="width: 130px">
+                    <select class="my-select" name="cooperativeState" style="width: 130px;height: 32px;">
                         <option value ="">合作状态</option>
                     <#if cooperativeState??>
                         <option value ="1" <#if cooperativeState == 1>selected</#if>>意向合作</option>
@@ -62,10 +62,11 @@
                         <option value ="3">停止合作</option>
                     </#if>
                     </select>
-                    <input class="my-input" type="text" name="customerName" style="width: 100px;" value="${customerName!''}" placeholder="请输入客户名称"/>
-                    <input class="my-input" type="text" name="contactPhone" style="width: 100px;" value="${contactPhone!''}" placeholder="请输入客户联系人电话"/>
-                    <input class="my-input" type="text" name="contactEmail" style="width: 100px;" value="${contactEmail!''}" placeholder="请输入客户联系人邮箱"/>
-					<button type="submit" style="cursor:pointer; " class="my-btn-search">搜索</button>
+                    <input class="my-input" type="text" name="customerName" style="width: 100px;height: 32px;" value="${customerName!''}" placeholder="请输入客户名称"/>
+                    <input class="my-input" type="text" name="contactName" style="width: 100px;height: 32px;" value="${contactName!''}" placeholder="请输入客户联系人姓名"/>
+                    <input class="my-input" type="text" name="contactPhone" style="width: 100px;height: 32px;" value="${contactPhone!''}" placeholder="请输入客户联系人电话"/>
+                    <input class="my-input" type="text" name="contactEmail" style="width: 100px;height: 32px;" value="${contactEmail!''}" placeholder="请输入客户联系人邮箱"/>
+					<button type="submit" style="cursor:pointer; height: 32px;" class="my-btn-search">搜索</button>
 			</form>
 		</div>
 		<div class="mt-20" style="margin: 20px;">

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

@@ -52,7 +52,7 @@
     </style>
     <title>增加客户信息</title>
 </head>
-<body>
+<body style="overflow-x:hidden">
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">&gt;</span> 客户信息管理
     <span class="c-gray en">&gt;</span> 增加客户信息
@@ -154,7 +154,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: 35px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddDockedContactInfo();">保存</button></span>
+                    <button type="button" style="cursor:pointer; float: right;height: 31px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddDockedContactInfo();">保存</button></span>
                 </label>
             </div>
             <div class="mt-20" style="margin: 20px;">
@@ -235,7 +235,7 @@
                 <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;">
-                <button type="button" style="cursor:pointer; float: right;height: 35px;" class="my-btn-search" onclick="toAddChannelSaleInfo();">保存</button>
+                <button type="button" style="cursor:pointer; float: right;height: 31px;" class="my-btn-search" onclick="toAddChannelSaleInfo();">保存</button>
             </label>
             <div class="formControls col-2 col-sm-2" style="width:120px; padding:0 0;margin-right: 15px;">
             </div>
@@ -357,25 +357,16 @@
         </div>
 
         <#--客户备注-->
-
-        <div class="row cl">
-            <label class="form-label col-3">
-                <div class="tit-2">客户备注</div>
-            </label>
-            <div class="formControls col-9">
-            </div>
-        </div>
-
-        <div class="row cl">
-            <label class="form-label">
-            </label>
-            <div class="formControls col-9">
-                <#--<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"
+        <div class="row cl" style="margin-bottom: 10px;">
+            <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;">客户备注：</label>
+            <div style="float: left;margin-left: 10px;">
+                <textarea name="customerRemarks" style="width: 690px;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>
+
+
         <#--添加保存按钮-->
 
         <div  class="row cl">

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

@@ -51,7 +51,7 @@
     </style>
     <title>修改客户信息</title>
 </head>
-<body>
+<body  style="overflow-x:hidden">
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">&gt;</span> 客户信息管理
     <span class="c-gray en">&gt;</span> 修改客户信息
@@ -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: 35px;" class="my-btn-search" onclick="toAddDockedContactInfo();">保存</button></span>
+                    <button type="button" style="cursor:pointer; float: right;height: 31px;" class="my-btn-search" onclick="toAddDockedContactInfo();">保存</button></span>
                 </label>
             </div>
             <div class="row cl">
@@ -271,7 +271,7 @@
             </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: 35px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddChannelSaleInfo();">保存</button>
+                <button type="button" style="cursor:pointer; float: right;height: 31px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddChannelSaleInfo();">保存</button>
             </label>
             <div class="formControls col-2 col-sm-2" style="width:120px; padding:0 0;margin-right: 15px;">
 
@@ -500,25 +500,15 @@
         </#if>
 
         <#--客户备注-->
-
-        <div class="row cl">
-            <label class="form-label col-3">
-                <div class="tit-2">客户备注</div>
-            </label>
-            <div class="formControls col-9">
-            </div>
-        </div>
-
-        <div class="row cl">
-            <label class="form-label">
-            </label>
-            <div class="formControls col-9">
-
-                <textarea name="customerRemarks" style="width: 100%;height: 100px;" id="customerRemarks" cols="" rows="" class="textarea"
+            <div class="row cl" style="margin-bottom: 10px;">
+                <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;">客户备注：</label>
+                <div style="float: left;margin-left: 10px;">
+                <textarea name="customerRemarks" style="width: 690px;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>
+                    <p class="textarea-numberbar"><em class="textarea-length"><#if customerBasicInfo.customerRemarks??>${customerBasicInfo.customerRemarks?length} <#else>0</#if></em>/100</p>
+                </div>
             </div>
-        </div>
+
         <#--添加保存按钮-->
         <div  class="row cl">
         <label class="form-label col-5 col-sm-5"></label>