客户信息系统

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

@@ -1,8 +1,7 @@
 package com.iamberry.rst.core.customer;
 
-import javax.xml.crypto.Data;
-import java.io.DataInput;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * Created by Administrator on 2018/4/19.
@@ -18,12 +17,12 @@ public class CustomerBasicInfo implements Serializable{
     private String customerCityCode;//客户所在城市代号
     private String customerAddress;//客户详细地址
     private Integer customerStatus;//状态 1:已删除 2：正常
-    private Data createDate;//创建时间
-    private Data updateDate;//修改时间
+    private Date createDate;//创建时间
+    private Date updateDate;//修改时间
     private Integer idCreateBy;//创建人Id
     private String customerRemarks;//备注信息
     private String adminName;//管理员姓名
-    private Integer provinceName;//客户所在省份名称
+    private String provinceName;//客户所在省份名称
     private String cityName;//客户所在城市姓名
     private Integer isLookAll;//是否查看全部客户 1：查看全部 2：查看自己的
     private String contactPhone;//联系人电话
@@ -102,19 +101,19 @@ public class CustomerBasicInfo implements Serializable{
         this.customerStatus = customerStatus;
     }
 
-    public Data getCreateDate() {
+    public Date getCreateDate() {
         return createDate;
     }
 
-    public void setCreateDate(Data createDate) {
+    public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
 
-    public Data getUpdateDate() {
+    public Date getUpdateDate() {
         return updateDate;
     }
 
-    public void setUpdateDate(Data updateDate) {
+    public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
 
@@ -167,14 +166,6 @@ public class CustomerBasicInfo implements Serializable{
         this.contactEmail = contactEmail;
     }
 
-    public Integer getProvinceName() {
-        return provinceName;
-    }
-
-    public void setProvinceName(Integer provinceName) {
-        this.provinceName = provinceName;
-    }
-
     public Integer getIsLookAll() {
         return isLookAll;
     }
@@ -190,4 +181,12 @@ public class CustomerBasicInfo implements Serializable{
     public void setIsSelectAll(Integer isSelectAll) {
         this.isSelectAll = isSelectAll;
     }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/customer/CustomerBasicService.java

@@ -1,9 +1,14 @@
 package com.iamberry.rst.faces.customer;
 
+import com.iamberry.rst.core.customer.BillingInfo;
 import com.iamberry.rst.core.customer.CustomerBasicInfo;
+import com.iamberry.rst.core.customer.DockedContactInfo;
+import com.iamberry.rst.core.customer.TicketOpeningInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 
+import java.util.List;
+
 /**
  * Created by Administrator on 2018/4/20.
  */
@@ -12,4 +17,28 @@ public interface CustomerBasicService {
      *  查询客户基本信息列表
      */
     PagedResult<CustomerBasicInfo> listCustomerBasic(PageRequest<CustomerBasicInfo> pageRequest);
+
+    /**
+     *  根据id查询客户基本信息
+     */
+    CustomerBasicInfo getCustomerBasic(CustomerBasicInfo customerBasicInfo);
+
+    /**
+     *  根据id修改客户状态
+     */
+    Integer updateState(CustomerBasicInfo customerBasicInfo);
+
+    /**
+     *  根据客户id查询付款/退款信息
+     */
+    BillingInfo getBillingInfo(BillingInfo billingInfo);
+    /**
+     *  根据客户id查询开票信息
+     */
+    TicketOpeningInfo getOpeningInfo(TicketOpeningInfo ticketOpeningInfo);
+
+    /**
+     *  根据客户id查询联系人集合
+     */
+    List<DockedContactInfo> listDockedContactInfo(DockedContactInfo dockedContactInfo);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/CustomerBasicServiceImpl.java

@@ -1,7 +1,10 @@
 package com.iamberry.rst.service.customer;
 
 import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.customer.BillingInfo;
 import com.iamberry.rst.core.customer.CustomerBasicInfo;
+import com.iamberry.rst.core.customer.DockedContactInfo;
+import com.iamberry.rst.core.customer.TicketOpeningInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.customer.CustomerBasicService;
@@ -26,4 +29,29 @@ public class CustomerBasicServiceImpl implements CustomerBasicService{
         List<CustomerBasicInfo> customerBasicList = customerBasicMapper.listCustomerBasic(pageRequest.getData());
         return PageUtil.getPage(customerBasicList);
     }
+
+    @Override
+    public CustomerBasicInfo getCustomerBasic(CustomerBasicInfo customerBasicInfo) {
+        return customerBasicMapper.getCustomerBasic(customerBasicInfo);
+    }
+
+    @Override
+    public Integer updateState(CustomerBasicInfo customerBasicInfo) {
+        return customerBasicMapper.updateState(customerBasicInfo);
+    }
+
+    @Override
+    public BillingInfo getBillingInfo(BillingInfo billingInfo) {
+        return customerBasicMapper.getBillingInfo(billingInfo);
+    }
+
+    @Override
+    public TicketOpeningInfo getOpeningInfo(TicketOpeningInfo ticketOpeningInfo) {
+        return customerBasicMapper.getOpeningInfo(ticketOpeningInfo);
+    }
+
+    @Override
+    public List<DockedContactInfo> listDockedContactInfo(DockedContactInfo dockedContactInfo) {
+        return customerBasicMapper.listDockedContactInfo(dockedContactInfo);
+    }
 }

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

@@ -1,6 +1,9 @@
 package com.iamberry.rst.service.customer.mapper;
 
+import com.iamberry.rst.core.customer.BillingInfo;
 import com.iamberry.rst.core.customer.CustomerBasicInfo;
+import com.iamberry.rst.core.customer.DockedContactInfo;
+import com.iamberry.rst.core.customer.TicketOpeningInfo;
 
 import java.util.List;
 
@@ -10,4 +13,14 @@ import java.util.List;
 public interface CustomerBasicMapper {
     /*查询客户基本信息列表*/
     List<CustomerBasicInfo> listCustomerBasic(CustomerBasicInfo customerBasicInfo);
+    /*根据id查询客户基本信息*/
+    CustomerBasicInfo getCustomerBasic(CustomerBasicInfo customerBasicInfo);
+    /*根据id修改客户状态*/
+    Integer updateState(CustomerBasicInfo customerBasicInfo);
+    /*根据客户id查询付款/退款信息*/
+    BillingInfo getBillingInfo(BillingInfo billingInfo);
+    /*根据客户id查询开票信息*/
+    TicketOpeningInfo getOpeningInfo(TicketOpeningInfo ticketOpeningInfo);
+    /*根据客户id查询联系人集合*/
+    List<DockedContactInfo> listDockedContactInfo(DockedContactInfo dockedContactInfo);
 }

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

@@ -18,7 +18,7 @@
       bi.customer_remarks customerRemarks,
       sa.admin_name adminName,
       ap.province provinceName,
-      sa.city cityName
+      ac.city cityName
       from tb_rst_customer_basic_info bi
       LEFT JOIN tb_rst_sys_admin sa on bi.id_create_by = sa.admin_id
       LEFT JOIN tb_rst_address_province ap on ap.division_code = bi.customer_province_code
@@ -64,4 +64,97 @@
       </where>
   </select>
 
+
+    <select id="getCustomerBasic" resultType="CustomerBasicInfo" parameterType="CustomerBasicInfo">
+        SELECT
+        bi.customer_id customerId,
+        bi.customer_name customerName,
+        bi.customer_industry customerIndustry,
+        bi.customer_type customerType,
+        bi.cooperative_state cooperativeState,
+        bi.customer_province_code customerProvinceCode,
+        bi.customer_city_code customerCityCode,
+        bi.customer_address customerAddress,
+        bi.customer_status customerStatus,
+        bi.create_date createDate,
+        bi.update_date updateDate,
+        bi.id_create_by idCreateBy,
+        bi.customer_remarks customerRemarks,
+        ap.province provinceName,
+        ac.city cityName
+        from tb_rst_customer_basic_info bi
+        LEFT JOIN tb_rst_address_province ap on ap.division_code = bi.customer_province_code
+        LEFT JOIN tb_rst_address_city ac on ac.division_code = bi.customer_city_code
+        <where>
+            <if test="customerId != null and customerId!='' ">
+                bi.customer_id  = #{customerId}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateState" parameterType="CustomerBasicInfo">
+        UPDATE tb_rst_customer_basic_info
+        <set >
+            <if test="customerStatus != null" >
+                customer_status = #{customerStatus,jdbcType=INTEGER}
+            </if>
+        </set>
+        where customer_id = #{customerId,jdbcType=INTEGER}
+    </update>
+
+
+    <select id="getBillingInfo" resultType="BillingInfo" parameterType="BillingInfo">
+        SELECT
+        billing_id as billingId,
+        customer_id as customerId,
+        account_opening_branch as accountOpeningCranch,
+        account_name as accountName,
+        account_num as accountNum,
+        receivables_name as receivablesName,
+        receivables_phone as receivablesPhone,
+        create_date as createDate
+        from tb_rst_billing_info
+        <where>
+            <if test="customerId != null and customerId !='' ">
+                customer_id  = #{customerId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getOpeningInfo" resultType="TicketOpeningInfo" parameterType="TicketOpeningInfo">
+        SELECT
+        ticket_opening_id as ticketOpeningId,
+        customer_id as customerId,
+        ticket_type as ticketType,
+        account_opening_branch as accountOpeningBranch,
+        ticket_opening_account as ticketOpeningAccount,
+        enterprise_name as enterpriseName,
+        taxpayer_identification_num as taxpayerIdentificationNum,
+        ticket_opening_phone as ticketOpeningPhone,
+        enterprise_address as enterpriseAddress,
+        create_date as createDate
+        from tb_rst_ticket_opening_info
+        <where>
+            <if test="customerId != null and customerId !='' ">
+                customer_id  = #{customerId}
+            </if>
+        </where>
+    </select>
+
+    <select id="listDockedContactInfo" resultType="DockedContactInfo" parameterType="DockedContactInfo">
+        SELECT
+        docked_contact_id as dockedContactId,
+        customer_id as customerId,
+        contact_name as contactName,
+        contact_phone as contactPhone,
+        contact_type as contactType,
+        contact_email as contactEmail,
+        create_date as createDate
+        from tb_rst_docked_contact_info
+        <where>
+            <if test="customerId != null and customerId !='' ">
+                customer_id  = #{customerId}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -1,7 +1,11 @@
 package com.iamberry.rst.controllers.customer;
 
 import com.iamberry.rst.controllers.cm.AdminCustomerController;
+import com.iamberry.rst.core.cm.CustomerInfo;
+import com.iamberry.rst.core.customer.BillingInfo;
 import com.iamberry.rst.core.customer.CustomerBasicInfo;
+import com.iamberry.rst.core.customer.DockedContactInfo;
+import com.iamberry.rst.core.customer.TicketOpeningInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
@@ -9,6 +13,8 @@ import com.iamberry.rst.faces.customer.CustomerBasicService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.wechat.tools.ResponseJson;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,9 +22,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 
 /**
@@ -67,7 +75,73 @@ public class CustomerBasicController {
         if (totalNum != 0) {
             result.setTotal(totalNum);
         }
+        mv.addObject("adminId",adminId);
         StitchAttrUtil.setModelAndView(customerBasicInfo, mv, "/admin/customerBasic/listCustomerBasic", result);
         return mv;
     }
+
+
+    /**
+     * 修改客户状态为已删除
+     *
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("customerBasic:update:customerBasic")
+    @RequestMapping("/update_customerState")
+    public ResponseJson updateCustomerIsSolve(HttpServletRequest request) throws Exception {
+        String customerId = request.getParameter("customerId");
+        if (!StringUtils.isNotEmpty(customerId)) {
+            return new ResponseJson(500, "该客户信息不存在!", 500);
+        }
+
+        //根据id获取客诉信息
+        CustomerBasicInfo customerBasicInfo = new CustomerBasicInfo();
+        customerBasicInfo.setCustomerId(Integer.valueOf(customerId));
+        customerBasicInfo.setCustomerStatus(1);
+        CustomerBasicInfo Info = customerBasicService.getCustomerBasic(customerBasicInfo);
+        if (Info == null) {
+            return new ResponseJson(500, "该客户信息不存在!", 500);
+        }
+        //修改客户状态
+        int num = customerBasicService.updateState(customerBasicInfo);
+        if (num > 0) {
+            return new ResponseJson(200, "删除成功!", 200);
+        } else {
+            return new ResponseJson(500, "删除失败!", 500);
+        }
+    }
+
+    @ResponseBody
+    @RequestMapping("/customer_Basic_Detail")
+    public ModelAndView customerBasicDetail(HttpServletRequest request){
+        ModelAndView mv = new ModelAndView("customer/custome_basic_detail");
+        String customerId = request.getParameter("customerId");
+        if (!StringUtils.isNotEmpty(customerId)) {
+            return mv;
+        }
+        /*查询基本信息*/
+        CustomerBasicInfo customerBasicInfo = new CustomerBasicInfo();
+        customerBasicInfo.setCustomerId(Integer.valueOf(customerId));
+        customerBasicInfo = customerBasicService.getCustomerBasic(customerBasicInfo);
+        /*对接联系人信息*/
+        DockedContactInfo dockedContactInfo = new DockedContactInfo();
+        dockedContactInfo.setCustomerId(Integer.valueOf(customerId));
+        List<DockedContactInfo> listDockedContactInfo = customerBasicService.listDockedContactInfo(dockedContactInfo);
+        /*付款/退款信息*/
+        BillingInfo billingInfo = new BillingInfo();
+        billingInfo.setCustomerId(Integer.valueOf(customerId));
+        billingInfo = customerBasicService.getBillingInfo(billingInfo);
+        /*开票信息*/
+        TicketOpeningInfo ticketOpeningInfo = new TicketOpeningInfo();
+        ticketOpeningInfo.setCustomerId(Integer.valueOf(customerId));
+        ticketOpeningInfo = customerBasicService.getOpeningInfo(ticketOpeningInfo);
+
+        mv.addObject("customerBasicInfo",customerBasicInfo);
+        mv.addObject("listDockedContactInfo",listDockedContactInfo);
+        mv.addObject("billingInfo",billingInfo);
+        mv.addObject("ticketOpeningInfo",ticketOpeningInfo);
+        return mv;
+    }
 }

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

@@ -0,0 +1,206 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+<#include "/base/add_base.ftl">
+    <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
+    <link href="${path}/common/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css"/>
+    <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css"/>
+    <style>
+        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+
+        #suggest, #suggest2 {width:200px}
+        .gray {color:gray}
+        .ac_results {background:#fff;border:1px solid #7f9db9;position: absolute;z-index: 10000;display: none}
+        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
+        .ac_results li {border:1px solid #fff}
+        .ac_over, .ac_results li a:hover {background:#c8e3fc}
+        .ac_results li a span {float:right}
+        .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
+
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
+        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
+        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
+        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
+        .dalog-ask .ask{color: #000;margin: 10px 0 5px 0;}
+        .dalog-ask .answer{color: #666;margin-bottom: 10px;}
+        .dalog-ask .answer:hover{color: #32a3d8;cursor: pointer;}
+        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
+        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
+        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list .red{display: inline-block; padding: 2px; background: red;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
+        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
+        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
+        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
+        .time-line-list>li:first-child .arrow{display: none;}
+        .table-bg th{background-color: #e2f6ff;}
+        .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}
+    </style>
+    <title>客诉基本信息</title>
+</head>
+<body>
+<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">
+                <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>
+            <div class="formControls col-4 col-sm-4">
+				<label id="adminName"></label>
+            </div>
+            <label class="form-label col-1 col-sm-1">合作进度：</label>
+            <div class="formControls col-4 col-sm-4">
+                <label id="customerSourceType"></label>
+            </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="customerCounselType"></label>
+            </div>
+            <label class="form-label col-1 col-sm-1">客户行业：</label>
+            <div class="formControls col-4 col-sm-4">
+                <label id="typeName"></label>
+            </div>
+        </div>
+        <div class="row cl" style="position: relative;">
+            <label class="form-label col-1 col-sm-1">客户地址：</label>
+            <div class="formControls col-4 col-sm-4">
+                <label id="describeTitle"></label>
+            </div>
+        </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">
+            <div class="formControls col-9 col-sm-9 text-c">
+                <table class="table table-border table-bg table-bordered">
+                    <thead>
+                    <tr>
+                        <th>联系人姓名</th>
+                        <th>联系电话</th>
+                        <th>职位/身份</th>
+                        <th>联系邮箱</th>
+                    </tr>
+                    </thead>
+                    <tbody id="salesOrderHtml">
+                    <tr>
+                        <td id="companyName"></td>
+                        <td id="salesOrderId"></td>
+                        <td id="salesAddressName"></td>
+                        <td id="salesAddressTel"></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </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">
+
+            <div class="formControls col-9 col-sm-9 text-c">
+                <table class="table table-border table-bg table-bordered">
+                    <thead>
+                    <tr>
+                        <th>渠道类别</th>
+                        <th>渠道类型</th>
+                        <th>渠道/平台名称</th>
+                        <th>销售产品</th>
+                    </tr>
+                    </thead>
+                    <tbody id="salesOrderHtml">
+                    <tr>
+                        <td id="companyName"></td>
+                        <td id="salesOrderId"></td>
+                        <td id="salesAddressName"></td>
+                        <td id="salesAddressTel"></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </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 col-1 col-sm-1">开户支行：</label>
+            <div class="formControls col-4 col-sm-4">
+                <label id="adminName"></label>
+            </div>
+            <label class="form-label col-1 col-sm-1">账户名称：</label>
+            <div class="formControls col-4 col-sm-4">
+                <label id="customerSourceType"></label>
+            </div>
+            <label class="form-label col-1 col-sm-1">账号：</label>
+            <div class="formControls col-4 col-sm-4">
+                <label id="customerSourceType"></label>
+            </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="customerCounselType"></label>
+            </div>
+            <label class="form-label col-1 col-sm-1">收款人电话：</label>
+            <div class="formControls col-4 col-sm-4">
+                <label id="typeName"></label>
+            </div>
+        </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">
+            <div class="formControls col-4 col-sm-4">
+                <label id="typeName"></label>
+            </div>
+        </div>
+    </form>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript" src="${path}/common/lib/webuploader/0.1.5/webuploader.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
+
+</body>
+</html>

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

@@ -122,8 +122,11 @@
                             <td class="text-c" width="100">${(list.createDate?string("yyyy-MM-dd"))!''}</td>
 							<!-- 遍历操作 -->
 							<td class="td-manage text-c">
-                                <a onclick="machineLogs(${list.machineId});" title="生产流程" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe667;</i></a>
-                                <#--<a onclick="print('${list.machineBarcode }','${list.machineQrcode }','${list.machineId }','${list.machineProduceType }')" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>-->
+                                <#if list.customerStatus == 2>
+                                    <#if adminId == list.idCreateBy>
+                                        <a href="#" onclick="deleteState(${list.customerId!''})">删除</a>
+                                    </#if>
+                                </#if>
                             </td>
 						</tr>
 					</#list>
@@ -141,7 +144,33 @@
 
 		<script type="text/javascript">
 
+            /**
+             * 删除 （修改状态为已删除）
+             */
+            function deleteState(customerId) {
+                layer.confirm('确认要删除吗？',function(index){
+                    $.ajax({
+                        cache: true,
+                        type: "POST",
+                        data: {"customerId":customerId},
+                        url: "${path}/admin/customerBasic/update_customerState",
+                        async: false,
+                        success: function(data){
+                            if (data.returnCode == 200) {
+                                layer.msg(data.resultMsg,{icon: 1,time:1000});
+                                // $('#txt_customerIsSolve').html('已解决');
+                            } else {
+                                layer.msg(data.resultMsg,{icon: 5,time:1000});
+                            }
+                            location.replace(location.href);
+                        },
+                        error: function(XmlHttpRequest, textStatus, errorThrown){
+                        }
+                    })
+                }, function() {
 
+                });
+            }