客户信息系统

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

@@ -10,7 +10,7 @@ public class BillingInfo implements Serializable {
     private static final long serialVersionUID = 1005879663545392938L;
     private Integer billingId;//主键
     private Integer customerId;//主键客户id（外键）
-    private String accountOpeningBranch;//主键
+    private String accountOpeningBranch;//开户支行
     private String accountName;//账号名称
     private String accountNum;//账号
     private String receivablesName;//收款人姓名

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

@@ -14,7 +14,7 @@ public class DockedContactInfo implements Serializable {
     private String contactPhone;//联系人电话
     private String contactType;//职位/身份
     private String contactEmail;//联系邮箱
-    private Date create_date;//创建时间
+    private Date createDate;//创建时间
 
     public Integer getDockedContactId() {
         return dockedContactId;
@@ -64,11 +64,11 @@ public class DockedContactInfo implements Serializable {
         this.contactEmail = contactEmail;
     }
 
-    public Date getCreate_date() {
-        return create_date;
+    public Date getCreateDate() {
+        return createDate;
     }
 
-    public void setCreate_date(Date create_date) {
-        this.create_date = create_date;
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
     }
 }

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

@@ -107,7 +107,7 @@
         SELECT
         billing_id as billingId,
         customer_id as customerId,
-        account_opening_branch as accountOpeningCranch,
+        account_opening_branch as accountOpeningBranch,
         account_name as accountName,
         account_num as accountNum,
         receivables_name as receivablesName,

watero-rst-web/src/main/java/com/iamberry/rst/controllers/customer/CustomerBasicController.java

@@ -114,6 +114,7 @@ public class CustomerBasicController {
     }
 
     @ResponseBody
+    @RequiresPermissions("customerBasic:select:customerBasic")
     @RequestMapping("/customer_Basic_Detail")
     public ModelAndView customerBasicDetail(HttpServletRequest request){
         ModelAndView mv = new ModelAndView("customer/custome_basic_detail");

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

@@ -54,36 +54,49 @@
 <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-3">
+            <label class="form-label col-2">
                 <div class="tit-2">客户基本信息</div>
             </label>
             <div class="formControls col-9">
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">客户类型：</label>
+            <label class="form-label col-2 col-sm-2">客户类型：</label>
             <div class="formControls col-4 col-sm-4">
-				<label id="adminName"></label>
+				<label>
+                    <#if customerBasicInfo.customerType == 1>个人</#if>
+                    <#if customerBasicInfo.customerType == 2>企业</#if>
+                </label>
             </div>
-            <label class="form-label col-1 col-sm-1">合作进度：</label>
+            <label class="form-label col-2 col-sm-2">合作进度：</label>
             <div class="formControls col-4 col-sm-4">
-                <label id="customerSourceType"></label>
+                <label>
+                    <#if customerBasicInfo.cooperativeState == 1>意向合作</#if>
+                    <#if customerBasicInfo.cooperativeState == 2>已经合作</#if>
+                    <#if customerBasicInfo.cooperativeState == 3>停止合作</#if>
+                </label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">客户名称：</label>
+            <label class="form-label col-2 col-sm-2">客户名称：</label>
             <div class="formControls col-4 col-sm-4">
-                <label id="customerCounselType"></label>
+                <label>
+                    ${customerBasicInfo.customerName!''}
+                </label>
             </div>
-            <label class="form-label col-1 col-sm-1">客户行业：</label>
+            <label class="form-label col-2 col-sm-2">客户行业：</label>
             <div class="formControls col-4 col-sm-4">
-                <label id="typeName"></label>
+                <label>
+                    ${customerBasicInfo.customerIndustry!''}
+                </label>
             </div>
         </div>
         <div class="row cl" style="position: relative;">
-            <label class="form-label col-1 col-sm-1">客户地址：</label>
+            <label class="form-label col-2 col-sm-2">客户地址：</label>
             <div class="formControls col-4 col-sm-4">
-                <label id="describeTitle"></label>
+                <label>
+                ${customerBasicInfo.provinceName!''}-${customerBasicInfo.cityName!''}-${customerBasicInfo.customerAddress!''}
+                </label>
             </div>
         </div>
         <div class="row cl">
@@ -95,7 +108,8 @@
         </div>
 
         <div class="row cl">
-            <div class="formControls col-9 col-sm-9 text-c">
+            <label class="form-label col-1 col-sm-1"></label>
+            <div class="formControls col-6 col-sm-6 text-c">
                 <table class="table table-border table-bg table-bordered">
                     <thead>
                     <tr>
@@ -107,10 +121,16 @@
                     </thead>
                     <tbody id="salesOrderHtml">
                     <tr>
-                        <td id="companyName"></td>
-                        <td id="salesOrderId"></td>
-                        <td id="salesAddressName"></td>
-                        <td id="salesAddressTel"></td>
+                    <#if listDockedContactInfo?? &&  (listDockedContactInfo?size > 0) >
+                        <#list listDockedContactInfo as list>
+                            <td>${list.contactName!''}</td>
+                            <td>${list.contactPhone!''}</td>
+                            <td>${list.contactType!''}</td>
+                            <td>${list.contactEmail!''}</td>
+                        </#list>
+                    <#else>
+                    <tr><td colspan="4" class="td-manage text-c" >暂时没有对接人信息，请添加！</td></tr>
+                    </#if>
                     </tr>
                     </tbody>
                 </table>
@@ -126,8 +146,8 @@
         </div>
 
         <div class="row cl">
-
-            <div class="formControls col-9 col-sm-9 text-c">
+            <label class="form-label col-1 col-sm-1"></label>
+            <div class="formControls col-6 col-sm-6 text-c">
                 <table class="table table-border table-bg table-bordered">
                     <thead>
                     <tr>
@@ -139,10 +159,10 @@
                     </thead>
                     <tbody id="salesOrderHtml">
                     <tr>
-                        <td id="companyName"></td>
-                        <td id="salesOrderId"></td>
-                        <td id="salesAddressName"></td>
-                        <td id="salesAddressTel"></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
                     </tr>
                     </tbody>
                 </table>
@@ -156,27 +176,27 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">开户支行：</label>
-            <div class="formControls col-4 col-sm-4">
-                <label id="adminName"></label>
+            <label class="form-label col-2 col-sm-2">开户支行：</label>
+            <div class="formControls col-2 col-sm-2">
+                <label>${billingInfo.accountOpeningBranch!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">账户名称：</label>
-            <div class="formControls col-4 col-sm-4">
-                <label id="customerSourceType"></label>
+            <label class="form-label col-2 col-sm-2">账户名称：</label>
+            <div class="formControls col-1 col-sm-1">
+                <label>${billingInfo.accountName!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">账号：</label>
-            <div class="formControls col-4 col-sm-4">
-                <label id="customerSourceType"></label>
+            <label class="form-label col-2 col-sm-2">账号：</label>
+            <div class="formControls col-2 col-sm-2">
+                <label>${billingInfo.accountNum!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">收款人姓名：</label>
+            <label class="form-label col-2 col-sm-2">收款人姓名：</label>
             <div class="formControls col-4 col-sm-4">
-                <label id="customerCounselType"></label>
+                <label>${billingInfo.receivablesName!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">收款人电话：</label>
+            <label class="form-label col-2 col-sm-2">收款人电话：</label>
             <div class="formControls col-4 col-sm-4">
-                <label id="typeName"></label>
+                <label>${billingInfo.receivablesPhone!''}</label>
             </div>
         </div>
         <div class="row cl">
@@ -188,7 +208,7 @@
         </div>
         <div class="row cl">
             <div class="formControls col-4 col-sm-4">
-                <label id="typeName"></label>
+                <label>${customerBasicInfo.customerRemarks!''}</label>
             </div>
         </div>
     </form>

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

@@ -127,6 +127,7 @@
                                         <a href="#" onclick="deleteState(${list.customerId!''})">删除</a>
                                     </#if>
                                 </#if>
+                                <a href="#" onclick="customerDetail(${list.customerId!''})">详情</a>
                             </td>
 						</tr>
 					</#list>
@@ -173,18 +174,13 @@
             }
 
 
-
-
-            /*批量添加机器*/
-            function batch_add_machine(title,url,w,h){
-                layer_show(title,url,w,h);
-            }
-            /*批量添加机器*/
-            function add_renovationmachine(title,url,w,h){
-                layer_show(title,url,w,h);
+            /**
+             *跳转到详情页面
+             * @param employee
+             */
+            function customerDetail(customerId) {
+                window.location.href= "${path}/admin/customerBasic/customer_Basic_Detail?customerId="+customerId;
             }
-
-
         </script>
 	</body>
 </html>