修改客户信息

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

@@ -63,6 +63,7 @@
         </if>-->
       </where>
         GROUP BY bi.customer_id
+        ORDER BY bi.create_date DESC
   </select>
 
 

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

@@ -61,15 +61,15 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2">客户类型：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2" style="padding:0 0;">客户类型：</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">合作进度：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2"style="padding:0 0;">合作进度：</label>
+            <div class="formControls col-2 col-sm-2"style="padding:0 0;">
                 <label>
                     <#if customerBasicInfo.cooperativeState == 1>意向合作</#if>
                     <#if customerBasicInfo.cooperativeState == 2>已经合作</#if>
@@ -78,22 +78,22 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2">客户名称：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2"style="padding:0 0;">客户名称：</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">客户行业：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2"style="padding:0 0;">客户行业：</label>
+            <div class="formControls col-2 col-sm-2"style="padding:0 0;">
                 <label>
                     ${customerBasicInfo.customerIndustry!''}
                 </label>
             </div>
         </div>
         <div class="row cl" style="position: relative;">
-            <label class="form-label col-2 col-sm-2">客户地址：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2"style="padding:0 0;">客户地址：</label>
+            <div class="formControls col-2 col-sm-2"style="padding:0 0;">
                 <label>
                 ${customerBasicInfo.provinceName!''}-${customerBasicInfo.cityName!''}-${customerBasicInfo.customerAddress!''}
                 </label>
@@ -222,26 +222,26 @@
         </div>
         <#if billingInfo??>
             <div class="row cl">
-                <label class="form-label col-2 col-sm-2">开户支行：</label>
-                <div class="formControls col-2 col-sm-2">
+                <label class="form-label col-2 col-sm-2"style="padding:0 0;">开户支行：</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">账户名称：</label>
-                <div class="formControls col-2 col-sm-2">
+                <label class="form-label col-2 col-sm-2"style="padding:0 0;">账户名称：</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">账号：</label>
-                <div class="formControls col-2 col-sm-2">
+                <label class="form-label col-2 col-sm-2"style="padding:0 0;">账号：</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">收款人姓名：</label>
-                <div class="formControls col-4 col-sm-4">
+                <label class="form-label col-2 col-sm-2"style="padding:0 0;">收款人姓名：</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">收款人电话：</label>
-                <div class="formControls col-4 col-sm-4">
+                <label class="form-label col-2 col-sm-2"style="padding:0 0;">收款人电话：</label>
+                <div class="formControls col-2 col-sm-2"style="padding:0 0;">
                     <label>${billingInfo.receivablesPhone!''}</label>
                 </div>
             </div>
@@ -261,46 +261,46 @@
         </div>
         <#if ticketOpeningInfo??>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2">发票类型：</label>
-            <div class="formControls col-2 col-sm-2">
+            <label class="form-label col-2 col-sm-2" style="padding:0 0;">发票类型：</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">开户支行：</label>
-            <div class="formControls col-2 col-sm-2">
+            <label class="form-label col-2 col-sm-2" style="padding:0 0;">开户支行：</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">开票账号：</label>
-            <div class="formControls col-2 col-sm-2">
+            <label class="form-label col-2 col-sm-2" style="padding:0 0;">开票账号：</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">企业名称：</label>
-            <div class="formControls col-2 col-sm-2">
+            <label class="form-label col-2 col-sm-2" style="padding:0 0;">企业名称：</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">纳税人识别号：</label>
-            <div class="formControls col-2 col-sm-2">
+            <label class="form-label col-2 col-sm-2" style="padding:0 0;">纳税人识别号：</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">开票电话：</label>
-            <div class="formControls col-2 col-sm-2">
+            <label class="form-label col-2 col-sm-2" style="padding:0 0;">开票电话：</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">企业地址：</label>
-            <div class="formControls col-2 col-sm-2">
+            <label class="form-label col-2 col-sm-2" style="padding:0 0;">企业地址：</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"> 不需开票</label>
+                <label class="form-label col-2 col-sm-2" style="padding:0 0;"> 不需开票</label>
             </div>
         </#if>
         <div class="row cl">

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

@@ -14,7 +14,13 @@
             .table-bg thead th{background-color: #e2f6ff;}
             input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
             input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-		</style>
+            .txt2{
+                width:60px;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+        </style>
 	</head>
 	<body>
     <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
@@ -118,7 +124,9 @@
                             <td class="text-c" width="100">
                                 ${list.provinceName!''}-${list.cityName!''}
                             </td>
-                            <td class="text-c" width="50">${list.customerRemarks!''}</td>
+                            <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="td-manage text-c">

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

@@ -48,6 +48,7 @@
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
         .txt-red{color:red}
+        .centen{text-align:center;}
     </style>
     <title>增加客户信息</title>
 </head>
@@ -134,10 +135,10 @@
         </div>
         <div class="row cl">
             <div class="formControls col-9">
-                <span class="c-red">*</span>姓名：<input type="text" class="input-text"  style="width:90px;margin-right: 10px; margin-bottom: 10px;" placeholder="联系人姓名" id="contactName" name="contactName">
-                <span class="c-red">*</span>电话：<input type="text" class="input-text"  style="width:90px;margin-right: 10px;margin-bottom: 10px;"  placeholder="联系人电话" id="contactPhone" name="contactPhone">
-                <span class="c-red">*</span>职位/身份：<input type="text" class="input-text"  style="width:90px;margin-right: 10px;margin-bottom: 10px;"  placeholder="职位或身份" id="contactType" name="contactType">
-                <span class="c-red">*</span>联系邮箱：<input type="text" class="input-text"  style="width:90px;margin-right: 10px;margin-bottom: 10px;"  placeholder="邮箱" id="contactEmail" name="contactEmail">
+                <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-right: 30px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddDockedContactInfo();">保存</button></span>
             </div>
             <div class="mt-20" style="margin: 20px;">
@@ -167,8 +168,8 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>渠道类别：</label>
-            <div class="formControls col-1 col-sm-1">
+            <label class="form-label col-2 col-sm-2" style="width:120px;"><span class="c-red">*</span>渠道类别：</label>
+            <div class="formControls col-2 col-sm-2" style="width:120px; padding:0px 0px;margin-right: 15px;">
                 <span class="select-box">
                     <select name="channelCategory" id="channelCategory" class="select">
                         <option value="1">电商</option>
@@ -178,34 +179,36 @@
                     </select>
                 </span>
             </div>
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>渠道类型：</label>
-            <div class="formControls col-1 col-sm-1">
+            <label class="form-label col-2 col-sm-2" style="width:120px;"><span class="c-red">*</span>渠道类型：</label>
+            <div class="formControls col-2 col-sm-2" style="width:120px; padding:0px 0px;margin-right: 15px;">
                 <span class="select-box">
                     <select name="channelType" id="channelType" class="select">
                     </select>
                 </span>
             </div>
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>渠道名称：</label>
-            <div class="formControls col-1 col-sm-1">
-                <input type="text" class="input-text"  style="width:90px;margin-right: 0px;margin-bottom: 10px;"  placeholder="填写具体店名" id="channelName" name="channelName">
+            <label class="form-label col-2 col-sm-2" style="width:120px;"><span class="c-red">*</span>渠道名称：</label>
+            <div class="formControls col-2 col-sm-2" style="width:120px; padding:0px 0px;margin-right: 15px;">
+                <input type="text" class="input-text"  placeholder="填写具体店名" id="channelName" name="channelName">
             </div>
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>销售产品：</label>
-            <div class="formControls col-1 col-sm-1">
+            <label class="form-label col-2 col-sm-2" style="width:120px;"><span class="c-red">*</span>销售产品：</label>
+            <div class="formControls col-2 col-sm-2" style="width:180px; padding:0px 0px; margin-right: 15px;">
                 <span class="select-box">
                     <select name="promotingProducts" id="promotingProducts" class="select">
                     </select>
                 </span>
             </div>
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>供货价格：</label>
-            <div class="formControls col-1 col-sm-1">
+        </div>
+        <div class="row cl">
+            <label class="form-label col-2 col-sm-2" style="width:120px;"><span class="c-red">*</span>供货价格：</label>
+            <div class="formControls col-2 col-sm-2" style="width:120px; padding:0px 0px;margin-right: 15px;">
                 <span class="select-box">
                     <select name="supplyPrice" id="supplyPrice" class="select">
                     </select>
                 </span>
                     <input type="text" class="input-text"  style="width:90px;margin-right: 0px;margin-bottom: 10px;"  placeholder="填写供货价格" id="writeSupplyPrice" name="writeSupplyPrice">
             </div>
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>账期：</label>
-            <div class="formControls col-1 col-sm-1">
+            <label class="form-label col-2 col-sm-2" style="width:120px;"><span class="c-red">*</span>账期：</label>
+            <div class="formControls col-2 col-sm-2" style="width:120px; padding:0px 0px;margin-right: 15px;">
                 <span class="select-box">
                     <select name="accountPeriod" id="accountPeriod" class="select">
                         <option value="1">先款</option>
@@ -214,7 +217,14 @@
                     </select>
                 </span>
             </div>
-            <button type="button" style="cursor:pointer; float: right;height: 35px;margin-right: 30px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddChannelSaleInfo();">保存</button>
+
+            <label class="form-label col-2 col-sm-2" style="width:150px;">
+                <button type="button" style="cursor:pointer; float: right;height: 35px;margin-right: 30px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddChannelSaleInfo();">保存</button>
+            </label>
+            <div class="formControls col-2 col-sm-2" style="width:120px; padding:0px 0px;margin-right: 15px;">
+
+            </div>
+
             <div class="mt-20" style="margin: 20px;">
                 <input type="hidden" id="channelSaleInfoJson" name="channelSaleInfoJson">
                 <table class="table table-border table-bordered table-bg table-hover table-sort" id="saleTable">
@@ -639,14 +649,19 @@
         row = document.getElementById("contactTable").insertRow();
         if(row!=null){
             cell=row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=contactName;
             cell = row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=contactPhone;
             cell = row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=contactType;
             cell = row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=contactEmail;
             cell = row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=operation;
         }
         $("#contactTbodyId").hide();
@@ -708,18 +723,25 @@
         row = document.getElementById("saleTable").insertRow();
         if(row!=null){
             cell=row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=channelCategory;
             cell = row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=channelType;
             cell = row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=channelName;
             cell = row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=promotingProductsHtml+promotingProductsText;
             cell = row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=supplyPrice;
             cell = row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=accountPeriod;
             cell = row.insertCell();
+            cell.style.textAlign = "center";
             cell.innerHTML=operation;
         }
         $("#channelTbodyId").hide();