修改客户信息

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

@@ -58,9 +58,9 @@
         <if test="contactEmail != null and contactEmail!='' ">
           AND ci.contact_email = #{contactEmail}
         </if>
-        <!--<if test="isSelectAll != null and isSelectAll == 2 ">
+        <if test="isSelectAll != null and isSelectAll == 2 ">
           AND bi.customer_status = #{isSelectAll}
-        </if>-->
+        </if>
       </where>
         GROUP BY bi.customer_id
         ORDER BY bi.create_date DESC

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

@@ -61,14 +61,14 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;">客户类型：</label>
+            <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>
                     <#if customerBasicInfo.customerType == 1>个人</#if>
                     <#if customerBasicInfo.customerType == 2>企业</#if>
                 </label>
             </div>
-            <label class="form-label col-2 col-sm-2"style="padding:0 0;">合作进度：</label>
+            <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>
                     <#if customerBasicInfo.cooperativeState == 1>意向合作</#if>
@@ -78,13 +78,13 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2"style="padding:0 0;">客户名称：</label>
+            <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>
                     ${customerBasicInfo.customerName!''}
                 </label>
             </div>
-            <label class="form-label col-2 col-sm-2"style="padding:0 0;">客户行业：</label>
+            <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>
                     ${customerBasicInfo.customerIndustry!''}
@@ -92,7 +92,7 @@
             </div>
         </div>
         <div class="row cl" style="position: relative;">
-            <label class="form-label col-2 col-sm-2"style="padding:0 0;">客户地址：</label>
+            <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>
                 ${customerBasicInfo.provinceName!''}-${customerBasicInfo.cityName!''}-${customerBasicInfo.customerAddress!''}
@@ -222,32 +222,32 @@
         </div>
         <#if billingInfo??>
             <div class="row cl">
-                <label class="form-label col-2 col-sm-2"style="padding:0 0;">开户支行：</label>
+                <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.accountOpeningBranch!''}</label>
                 </div>
-                <label class="form-label col-2 col-sm-2"style="padding:0 0;">账户名称：</label>
+                <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.accountName!''}</label>
                 </div>
-                <label class="form-label col-2 col-sm-2"style="padding:0 0;">账号：</label>
+                <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.accountNum!''}</label>
                 </div>
             </div>
             <div class="row cl">
-                <label class="form-label col-2 col-sm-2"style="padding:0 0;">收款人姓名：</label>
+                <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>
                 </div>
-                <label class="form-label col-2 col-sm-2"style="padding:0 0;">收款人电话：</label>
+                <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.receivablesPhone!''}</label>
                 </div>
             </div>
         <#else>
             <div class="row cl">
-                <label class="form-label col-2 col-sm-2">无付款/退款信息</label>
+                <label class="form-label col-2 col-sm-2" style="padding:0 0;text-align: center;">无付款/退款信息</label>
             </div>
         </#if>
 
@@ -261,46 +261,46 @@
         </div>
         <#if ticketOpeningInfo??>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;">发票类型：</label>
+            <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>
                 <#if ticketOpeningInfo.ticketType == 1>专票</#if>
                 <#if ticketOpeningInfo.ticketType == 2>普票</#if>
                 </label>
             </div>
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;">开户支行：</label>
+            <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>${ticketOpeningInfo.accountOpeningBranch!''}</label>
             </div>
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;">开票账号：</label>
+            <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>${ticketOpeningInfo.ticketOpeningAccount!''}</label>
             </div>
         </div>
 
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;">企业名称：</label>
+            <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>${ticketOpeningInfo.enterpriseName!''}</label>
             </div>
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;">纳税人识别号：</label>
+            <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>${ticketOpeningInfo.taxpayerIdentificationNum!''}</label>
             </div>
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;">开票电话：</label>
+            <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>${ticketOpeningInfo.ticketOpeningPhone!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;">企业地址：</label>
+            <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>${ticketOpeningInfo.enterpriseAddress!''}</label>
             </div>
         </div>
         <#else>
             <div class="row cl">
-                <label class="form-label col-2 col-sm-2" style="padding:0 0;"> 不需开票</label>
+                <label class="form-label col-2 col-sm-2" style="padding:0 0;text-align: center;"> 不需开票</label>
             </div>
         </#if>
         <div class="row cl">

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

@@ -62,8 +62,8 @@
                     </#if>
                     </select>
                     <input class="my-input" type="text" name="customerName" value="${customerName!''}" placeholder="请输入客户名称"/>
-                    <input class="my-input" type="text" name="contactPhone" value="${contactPhone!''}" placeholder="请输入客户电话"/>
-                    <input class="my-input" type="text" name="contactEmail" value="${contactEmail!''}" placeholder="请输入客户邮箱"/>
+                    <input class="my-input" type="text" name="contactPhone" value="${contactPhone!''}" placeholder="请输入客户联系人电话"/>
+                    <input class="my-input" type="text" name="contactEmail" value="${contactEmail!''}" placeholder="请输入客户联系人邮箱"/>
 					<button type="submit" style="cursor:pointer; " class="my-btn-search">搜索</button>
 			</form>
 		</div>
@@ -71,23 +71,23 @@
 			<table class="table table-border table-bordered table-bg table-hover table-sort">
 				<thead>
 				<tr class="text-c">
-                    <th width="100">状态</th>
-					<th width="100">合作状态</th>
-					<th width="100">业务员</th>
-					<th width="100">客户类型</th>
+                    <th width="50">状态</th>
+					<th width="50">合作状态</th>
+					<th width="60">业务员</th>
+					<th width="30">客户类型</th>
 					<th width="100">客户名称</th>
 					<th width="50">客户行业</th>
-                    <th width="40">所在区域</th>
+                    <th width="100">所在区域</th>
                     <th width="40">备注信息</th>
-                    <th width="40">添加日期</th>
-					<th width="150">操作</th>
+                    <th width="55">添加日期</th>
+					<th width="70">操作</th>
 				</tr>
 				</thead>
 				<tbody id="listid">
                 <#if page.dataList?? &&  (page.dataList?size > 0) >
 					<#list page.dataList as list>
 						<tr>
-                            <td class="text-c" width="100">
+                            <td class="text-c" width="50">
                                 <#if list.customerStatus == 1>
                                     已删除
                                 </#if>
@@ -95,7 +95,7 @@
                                     正常
                                 </#if>
                             </td>
-							<td class="text-c" width="100">
+							<td class="text-c" width="50">
                                 <#if list.cooperativeState == 1>
                                     意向合作
                                 </#if>
@@ -106,8 +106,8 @@
                                     停止合作
                                 </#if>
                             </td>
-							<td class="text-c" width="100">${list.adminName!''}</td>
-                            <td class="text-c" width="100">
+							<td class="text-c" width="60">${list.adminName!''}</td>
+                            <td class="text-c" width="30">
                                 <#if list.customerType == 1>
                                         个人
                                 </#if>
@@ -127,14 +127,16 @@
                             <td class="text-c" width="50">
                                 <span class="txt2" style="display: inline-block;padding: 2px 4px;font-size: 11.844px;" title="${list.customerRemarks!''}" >${list.customerRemarks!''}</span>
                             </td>
-                            <td class="text-c" width="100">${(list.createDate?string("yyyy-MM-dd"))!''}</td>
+                            <td class="text-c" width="55">${(list.createDate?string("yyyy-MM-dd"))!''}</td>
 							<!-- 遍历操作 -->
-							<td class="td-manage text-c">
+							<td class="td-manage text-c" width="70">
                                 <#if !isSelectAll?? ||(isSelectAll != 2) || (adminId == list.idCreateBy)>
                                         <a href="#" onclick="customerDetail(${list.customerId!''})">详情</a>
                                 </#if>
                                 <#if adminId == list.idCreateBy>
-                                    <a href="#" onclick="customerupdate(${list.customerId!''})">修改</a>
+                                    <#if list.customerStatus == 2>
+                                        <a href="#" onclick="customerupdate(${list.customerId!''})">修改</a>
+                                    </#if>
                                 </#if>
                                 <#if list.customerStatus == 2>
                                     <#if adminId == list.idCreateBy>

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

@@ -464,7 +464,6 @@
     /*监听控制退款名称显示事件*/
     $("input[name='accountType']").change(function (){
         var accountType = parseInt($(this).val());
-        alert(accountType);
         if(accountType == 1){
             $("#accountNameId").html("企业名称：");
         }else{