客户系统管理

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DealerChannel.java

@@ -3,73 +3,114 @@ import  java.util.Date;
 import  java.io.Serializable;
 /**
  *  客户渠道信息类
- * @author xm
- * @Date 2019-07-19
+ * @author Administrator
+ * @Date 2019-07-28
  */
 public class DealerChannel  implements  Serializable{
-    private static final long serialVersionUID = 5173905993542299252L;
+    private static final long serialVersionUID = -7317583076068205788L;
+    //
+    private Integer dealChannelId;
+    //客户id
+    private Integer dealerId;
     //渠道id
     private Integer channelId;
-    //渠道名称
-    private String channelName;
-    //渠道类型id
-    private Integer channelTypeId;
-    //渠道编码
-    private String channelCode;
-    //状态 1:使用中 2:禁用
-    private Integer channelStatus;
+    //店铺id
+    private Integer storeId;
+    //账期
+    private String dealChannelAccountPeriod;
     //创建时间'
     private Date createDate;
 
-    //渠道
+    //渠道大类id
+    private Integer channelTypeId;
+
+    //渠道类型名称
+    private String channelName;
+    //渠道大类
+    private String channelTypeName;
+    //店铺名称
+    private String storeName;
+    //
     private String dealChannelIdStr;
 
-    public Integer getChannelId() {
-        return channelId;
+    public Integer getDealChannelId(){
+        return dealChannelId;
     }
 
-    public void setChannelId(Integer channelId) {
-        this.channelId = channelId;
+    public void setDealChannelId(Integer  dealChannelId){
+        this.dealChannelId=dealChannelId;
     }
 
-    public String getChannelName() {
-        return channelName;
+    public Integer getDealerId(){
+        return dealerId;
     }
 
-    public void setChannelName(String channelName) {
-        this.channelName = channelName;
+    public void setDealerId(Integer  dealerId){
+        this.dealerId=dealerId;
     }
 
-    public Integer getChannelTypeId() {
-        return channelTypeId;
+    public Integer getChannelId(){
+        return channelId;
     }
 
-    public void setChannelTypeId(Integer channelTypeId) {
-        this.channelTypeId = channelTypeId;
+    public void setChannelId(Integer  channelId){
+        this.channelId=channelId;
     }
 
-    public String getChannelCode() {
-        return channelCode;
+    public Integer getStoreId(){
+        return storeId;
     }
 
-    public void setChannelCode(String channelCode) {
-        this.channelCode = channelCode;
+    public void setStoreId(Integer  storeId){
+        this.storeId=storeId;
     }
 
-    public Integer getChannelStatus() {
-        return channelStatus;
+    public String getDealChannelAccountPeriod(){
+        return dealChannelAccountPeriod;
     }
 
-    public void setChannelStatus(Integer channelStatus) {
-        this.channelStatus = channelStatus;
+    public void setDealChannelAccountPeriod(String  dealChannelAccountPeriod){
+        this.dealChannelAccountPeriod=dealChannelAccountPeriod;
     }
 
-    public Date getCreateDate() {
+    public Date getCreateDate(){
         return createDate;
     }
 
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    public void setCreateDate(Date  createDate){
+        this.createDate=createDate;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public String getChannelTypeName() {
+        return channelTypeName;
+    }
+
+    public void setChannelTypeName(String channelTypeName) {
+        this.channelTypeName = channelTypeName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public Integer getChannelTypeId() {
+        return channelTypeId;
+    }
+
+    public void setChannelTypeId(Integer channelTypeId) {
+        this.channelTypeId = channelTypeId;
     }
 
     public String getDealChannelIdStr() {

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DealerProduct.java

@@ -19,6 +19,8 @@ public class DealerProduct  implements  Serializable{
     private Integer dealProdPrice;
     //创建时间'
     private Date createDate;
+    //
+    private String dealProdIdStr;
 
     public Integer getDealProdId(){
         return dealProdId;
@@ -59,4 +61,12 @@ public class DealerProduct  implements  Serializable{
     public void setCreateDate(Date  createDate){
         this.createDate=createDate;
     }
+
+    public String getDealProdIdStr() {
+        return dealProdIdStr;
+    }
+
+    public void setDealProdIdStr(String dealProdIdStr) {
+        this.dealProdIdStr = dealProdIdStr;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DmChannel.java

@@ -4,17 +4,17 @@ import  java.io.Serializable;
 /**
  *  渠道信息类
  * @author xm
- * @Date 2019-07-19
+ * @Date 2019-07-28
  */
 public class DmChannel  implements  Serializable{
-    private static final long serialVersionUID = -426580931981606380L;
+    private static final long serialVersionUID = 75999186172541686L;
     //渠道id
     private Integer channelId;
-    //渠道类别 1：电商 2：特殊渠道 3：线下 4：海外
-    private Integer channelCategory;
-    //渠道类型/名称
-    private String channelType;
-    //渠道类型编码
+    //渠道名称
+    private String channelName;
+    //渠道类型id
+    private Integer channelTypeId;
+    //渠道编码
     private String channelCode;
     //状态 1:使用中 2:禁用
     private Integer channelStatus;
@@ -29,20 +29,20 @@ public class DmChannel  implements  Serializable{
         this.channelId=channelId;
     }
 
-    public Integer getChannelCategory(){
-        return channelCategory;
+    public String getChannelName(){
+        return channelName;
     }
 
-    public void setChannelCategory(Integer  channelCategory){
-        this.channelCategory=channelCategory;
+    public void setChannelName(String  channelName){
+        this.channelName=channelName;
     }
 
-    public String getChannelType(){
-        return channelType;
+    public Integer getChannelTypeId(){
+        return channelTypeId;
     }
 
-    public void setChannelType(String  channelType){
-        this.channelType=channelType;
+    public void setChannelTypeId(Integer  channelTypeId){
+        this.channelTypeId=channelTypeId;
     }
 
     public String getChannelCode(){

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dealerChannelMapper.xml

@@ -4,7 +4,7 @@
     <resultMap  id="BaseResultMap" type="DealerChannel" >
         <result    column="deal_channel_id"    property="dealChannelId" />
         <result    column="dealer_id"    property="dealerId" />
-        <result    column="channel_division_id"    property="channelDivisionId" />
+        <result    column="channel_id"    property="channelId" />
         <result    column="store_id"    property="storeId" />
         <result    column="deal_channel_account_period"    property="dealChannelAccountPeriod" />
         <result    column="create_date"    property="createDate" />
@@ -12,7 +12,7 @@
     <sql    id="Base_List" >
         t.deal_channel_id,
         t.dealer_id,
-        t.channel_division_id,
+        t.channel_id,
         t.store_id,
         t.deal_channel_account_period,
         t.create_date
@@ -28,8 +28,8 @@
             <if test="dealerId != null ">
                 AND t.dealer_id = #{dealerId}
             </if >
-            <if test="channelDivisionId != null ">
-                AND t.channel_division_id = #{channelDivisionId}
+            <if test="channelId != null ">
+                AND t.channel_id = #{channelId}
             </if >
             <if test="storeId != null ">
                 AND t.store_id = #{storeId}
@@ -52,7 +52,7 @@
         tb_rst_dm_dealer_channel
         (
         dealer_id,
-        channel_division_id,
+        channel_id,
         store_id,
         deal_channel_account_period
         )
@@ -60,7 +60,7 @@
         <foreach collection="list" item="node" index="index" separator="," open="" close="">
             (
             #{node.dealerId},
-            #{node.channelDivisionId},
+            #{node.channelId},
             #{node.storeId},
             #{node.dealChannelAccountPeriod}
             )
@@ -74,8 +74,8 @@
                 <if test="node.dealerId != null ">
                     dealer_id = #{node.dealerId},
                 </if >
-                <if test="node.channelDivisionId != null ">
-                    channel_division_id = #{node.channelDivisionId},
+                <if test="node.channelId != null ">
+                    channel_id = #{node.channelId},
                 </if >
                 <if test="node.storeId != null ">
                     store_id = #{node.storeId},

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmChannelMapper.xml

@@ -82,7 +82,7 @@
         where channel_id= #{channelId}
     </update>
     <delete id="delete" parameterType="Integer" >
-        delete FROM
+        delete
             tb_rst_dm_channel
         where channel_id=#{channelId}
     </delete>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmChannelController.java

@@ -1,7 +1,9 @@
 package com.iamberry.rst.controllers.dm;
 
 import com.iamberry.rst.core.dm.DmChannel;
+import com.iamberry.rst.core.dm.DmChannelType;
 import com.iamberry.rst.faces.dm.DmChannelService;
+import com.iamberry.rst.faces.dm.DmChannelTypeService;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,6 +22,8 @@ public class DmChannelController {
     private Logger logger = LoggerFactory.getLogger(DmChannelController.class);
     @Autowired
     private DmChannelService dmChannelService;
+    @Autowired
+    private DmChannelTypeService dmChannelTypeService;
 
     /**
      * 获取渠道类型
@@ -28,14 +32,37 @@ public class DmChannelController {
      */
     @ResponseBody
     @RequestMapping("/get_channel_type")
-    public ResponseJson getChannelType(HttpServletRequest request,DmChannel dmChannel) {
+    public ResponseJson getChannelType(HttpServletRequest request,DmChannelType dmChannelType) {
+        ResponseJson rj = ResponseJson.getSUCCESS();
+        dmChannelType.setChannelTypeStatus(1);
+        List<DmChannelType>  dmChannelTypeList = dmChannelTypeService.getDmChannelTypeList(dmChannelType);
+        if(dmChannelTypeList == null || dmChannelTypeList.size()<1){
+            rj = ResponseJson.getFAILURE();
+            return  rj;
+        }else{
+            rj.addResponseKeyValue("dmChannelTypeList",dmChannelTypeList);
+            rj.setResultMsg("查询成功");
+            return rj;
+        }
+    }
+
+    /**
+     * 获取渠道类型
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/get_channel")
+    public ResponseJson getChannel(HttpServletRequest request,DmChannel dmChannel) {
         ResponseJson rj = ResponseJson.getSUCCESS();
+        dmChannel.setChannelStatus(1);
         List<DmChannel> dmChannelList = dmChannelService.getDmChannelList(dmChannel);
         if(dmChannelList == null || dmChannelList.size()<1){
             rj = ResponseJson.getFAILURE();
             return  rj;
         }else{
-            rj.setResultMsg("添加成功");
+            rj.addResponseKeyValue("dmChannelList",dmChannelList);
+            rj.setResultMsg("查询成功");
             return rj;
         }
     }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmDealerController.java

@@ -1,11 +1,14 @@
 package com.iamberry.rst.controllers.dm;
 
+import com.iamberry.rst.core.cm.StoreInfo;
 import com.iamberry.rst.core.dm.DealerChannel;
 import com.iamberry.rst.core.dm.DealerContact;
+import com.iamberry.rst.core.dm.DealerProduct;
 import com.iamberry.rst.core.dm.DmDealer;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
+import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.rst.faces.dm.DealerContactService;
 import com.iamberry.rst.faces.dm.DmDealerService;
 import com.iamberry.rst.faces.sys.SysService;
@@ -21,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @Controller
 @RequestMapping("/admin/dealer")
@@ -33,6 +37,8 @@ public class DmDealerController {
     private DmDealerService dmDealerService;
     @Autowired
     private DealerContactService dealerContactService;
+    @Autowired
+    private StoreInfoService storeInfoService;
 
     /**
      * 查询客户基本信息列表
@@ -95,7 +101,7 @@ public class DmDealerController {
     }
 
     /**
-     * 添加客户页面- 添加对接人
+     * 添加客户页面- 添加渠道商
      * @return
      * @author
      * @date
@@ -105,6 +111,25 @@ public class DmDealerController {
     public ModelAndView toAddDealerChannel(HttpServletRequest request,DealerChannel dealerChannel) {
         ModelAndView mv = new ModelAndView("dm/dealer/add_dealer_channel");
         mv.addObject("dealerChannel",dealerChannel);
+        StoreInfo storeInfo = new StoreInfo();
+        storeInfo.setStoreStatus(1);
+        List<StoreInfo> storeInfoList = storeInfoService.listStore(storeInfo);
+        mv.addObject("storeInfoList",storeInfoList);
+        return mv;
+    }
+
+    /**
+     * 添加客户页面- 添加渠道商
+     * @return
+     * @author
+     * @date
+     */
+    @RequiresPermissions("dm:dealer:add")
+    @RequestMapping("/to_add_dealer_product")
+    public ModelAndView toAddDealerProduct(HttpServletRequest request,DealerProduct dealerProduct) {
+        ModelAndView mv = new ModelAndView("dm/dealer/add_dealer_channel");
+        mv.addObject("dealerProduct",dealerProduct);
+
         return mv;
     }
 

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/add_dealer.ftl

@@ -155,7 +155,7 @@
 
             <div class="row cl" id="add_dealer_channel_make" style="margin-left: 25px;">
                 <div class="formControls col-11 col-sm-11">
-                    <input type="button" class="btn btn-primary" onclick="add_product()" value="添加销售渠道" >
+                    <input type="button" class="btn btn-primary" onclick="addDealerChannnel()" value="添加销售渠道" >
                     <table class="table table-border table-bg table-bordered" style="margin-top: 10px;" id="">
                         <thead>
                         <tr class="text-c" id="table1">
@@ -181,7 +181,7 @@
                 </div>
             </div>
 
-            <div class="row cl" id="" style="margin-left: 25px;">
+            <div class="row cl" id="add_dealer_product_make" style="margin-left: 25px;">
                 <div class="formControls col-11 col-sm-11">
                     <input type="button" class="btn btn-primary" onclick="add_product()" value="添加供应产品" >
                     <table class="table table-border table-bg table-bordered" style="margin-top: 10px;" id="">
@@ -194,7 +194,7 @@
                             <th style="text-align: center;" width="5">操作</th>
                         </tr>
                         </thead>
-                        <tbody id="add_color_id">
+                        <tbody id="add_product_id">
                         <tr><td colspan="5" class="td-manage text-c" >暂时没有供应产品，请添加！</td></tr>
                         </tbody>
                     </table>
@@ -236,7 +236,7 @@
                 </div>
             </div>
 
-            <div class="row cl" id="" style="margin-left: 25px;">
+            <div class="row cl" id="" style="margin-top: 30px">
                 <div class="formControls col-11 col-sm-11">
                     <textarea id="dealerRemarks" name="dealerRemarks" style="height: 65px;width: 100%"></textarea>
                 </div>
@@ -251,10 +251,11 @@
     </div>
 </article>
 <#-- 业务脚本JS -->
-<script type="text/javascript" charset="utf-8" src="${path}/common/js/dealer/dealer.js"></script>
 <script type="text/javascript">
     var url_path = "${path}";
 </script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/js/dealer/dealer.js"></script>
+
 
 
 <script type="text/javascript">
@@ -267,21 +268,21 @@
     //是否是修改
     var ISUPDATE = false;
 
-    var CHANNEL_ID_PREFIX = "CHANNEL_";
-    var CHANNEL_ID_NUM = 0;
-    var CHANNEL_IS_UPDATE = 1;  //用来标识渠道的弹窗是添加还是修改，  1添加 2修改
-    var CHANNEL_TR_NUM = 0; //渠道信息数量  1：表示有   0：表示没有
-
+    var PRODUCT_ID_PREFIX = "PRODUCT_";
+    var PRODUCT_ID_NUM = 0;
+    var PRODUCT_IS_UPDATE = 1;  //用来标识渠道的弹窗是添加还是修改，  1添加 2修改
+    var PRODUCT_TR_NUM = 0; //渠道信息数量  1：表示有   0：表示没有
     /**
-     * 添加对接人
+     * 添加产品
      */
-    function addDealerChannnel() {
-        CHANNEL_IS_UPDATE = 1;
-        CHANNEL_ID_NUM ++;
-        dealChannelIdStr = CHANNEL_ID_PREFIX + CHANNEL_ID_NUM;
-        layer_show_height("添加对接人","${path}/admin/dealer/to_add_dealer_contact?dealContactStr="+dealChannelIdStr,1);
+    function addDealerProduct() {
+        PRODUCT_IS_UPDATE = 1;
+        PRODUCT_TR_NUM ++;
+        var dealProdIdStr = PRODUCT_ID_PREFIX + PRODUCT_ID_NUM;
+        layer_show_height("添加对接人","${path}/admin/dealer/to_add_dealer_product?dealProdIdStr="+dealProdIdStr,1);
     }
 
+
 </script>
 
 

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/add_dealer_channel.ftl

@@ -35,8 +35,9 @@
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .msg-phone{height: 35px;line-height: 35px;}
         .all_down{text-decoration: underline;color: #00c;}
+        .form-label{}
     </style>
-    <title>渠道添加 - 客户管理 - RST</title>
+    <title>对接人添加 - 客户管理 - RST</title>
 </head>
 <body>
 
@@ -47,37 +48,57 @@
             <input type="hidden" class="input-text" value="${dealerChannel.dealChannelId!0}" id="dealChannelId" name="dealChannelId"  >
             <input type="hidden" class="input-text" value="${dealerChannel.dealChannelIdStr!""}" id="dealChannelIdStr" name="dealChannelIdStr"  >
 
-            <div class="row cl" id="" style="">
-                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>渠道类型：</label>
-                <div class="formControls col-xs-8 col-sm-8">
+            <div class="ulc_contact" code="returnCode" msg="resultMsg" data="returnMsg" urlPrefix="${path}">
+                <div class="row cl ulc_contact" id="" style="">
+                    <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>渠道大类：</label>
+                    <div class="formControls col-xs-8 col-sm-8" >
                     <span class="select-box">
-                         <select name="dealerType" class="select" id="complaint">
-                             <option value="1">个人</option>
-                             <option value="2">企业</option>
-                             <option value="2">企业</option>
-                             <option value="2">企业</option>
+                         <select name="channelTypeId" class="select ulc_select" id="channelTypeId"
+                                 ulcId="${dealerChannel.channelTypeId!''}"
+                                 ulcValName="channelTypeName" ulcValId="channelTypeId"  ulcURL="/admin/dmchannel/get_channel_type" ulcMsg="" ulcList="dmChannelTypeList"
+                         >
                          </select>
 				    </span>
+                    </div>
+                </div>
+
+                <div class="row cl ulc_contact" id="" style="">
+                    <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>渠道类型：</label>
+                    <div class="formControls col-xs-8 col-sm-8">
+                        <span class="select-box">
+                            <select name="channelId" class="select ulc_select" id="channelId"
+                                    ulcId="${dealerChannel.channelId!''}"
+                                    ulcValName="channelName" ulcValId="channelId"  ulcURL="/admin/dmchannel/get_channel?channelTypeId=" ulcMsg="" ulcList="dmChannelList"
+                            >
+                            </select>
+                        </span>
+                    </div>
                 </div>
             </div>
 
-            <div class="row cl" id="" style="">
-                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>职位：</label>
+            <div class="row cl " id="" style="">
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>渠道类型：</label>
                 <div class="formControls col-xs-8 col-sm-8">
-                    <input type="text" class="input-text add_form" value="${dealerChannel.dealContactType!""}" placeholder="填写职位" id="dealContactType" name="dealContactType" myMinlength="1"  myMaxlength="20" errormsg="职位格式不正确！" >
+                    <select class="chosen select" name="storeId" id="storeId" >
+                        <#if storeInfoList?? &&  (storeInfoList?size > 0) >
+                            <#list storeInfoList as store>
+                                <option value="${store.storeId}" <#if dealerChannel.channelId??><#if dealerChannel.storeId==store.storeId>selected</#if></#if>>${store.storeName}</option>
+                            </#list>
+                        </#if>
+                    </select>
                 </div>
             </div>
 
             <div class="row cl" id="" style="">
-                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>手机号：</label>
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>账期：</label>
                 <div class="formControls col-xs-8 col-sm-8">
-                    <input type="text" class="input-text add_form" value="${dealerChannel.dealContactPhone!""}" placeholder="填写手机号" id="dealContactPhone" name="dealContactPhone"  myMinlength="1"  myMaxlength="20" errormsg="手机号格式不正确！" >
+                    <input type="text" class="input-text add_form" value="${dealerChannel.dealChannelAccountPeriod!""}" placeholder="填写账期" id="dealChannelAccountPeriod" name="dealChannelAccountPeriod" myMinlength="1"  myMaxlength="30" errormsg="账期不正确！"  >
                 </div>
             </div>
 
-            <div class="row cl">
+            <div class="row cl" style="margin-top: 30px">
                 <div class="col-2 col-sm-2 col-offset-3">
-                    <input type="text" class="btn  btn-primary "  onclick="save()" value="保存">
+                    <input type="text" class="btn  btn-primary "  onclick="save_contact()" value="保存">
                 </div>
             </div>
 
@@ -91,19 +112,46 @@
 
 <script type="text/javascript">
 
-
+    var ulc = $(".ulc_contact").initUlcByHtml({
+        urlPrefix: root_path,
+        ulcLevel:null
+    });
+
+    var storeNode = $('.chosen').chosen({
+        no_results_text: "没有找到结果！",//搜索无结果时显示的提示
+        search_contains:true,   //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
+        allow_single_deselect:true, //单选下拉框是否允许取消选择。如果允许，选中选项会有一个x号可以删除选项
+        disable_search: false, //禁用搜索。设置为true，则无法搜索选项。
+        disable_search_threshold: 0, //当选项少等于于指定个数时禁用搜索。
+        inherit_select_classes: true, //是否继承原下拉框的样式类，此处设为继承
+        placeholder_text_single: '选择店铺', //单选选择框的默认提示信息，当选项为空时会显示。如果原下拉框设置了data-placeholder，会覆盖这里的值。
+        width: '100%', //设置chosen下拉框的宽度。即使原下拉框本身设置了宽度，也会被width覆盖。
+        max_shown_results: 1000, //下拉框最大显示选项数量
+        display_disabled_options: false,
+        single_backstroke_delete: false, //false表示按两次删除键才能删除选项，true表示按一次删除键即可删除
+        case_sensitive_search: false, //搜索大小写敏感。此处设为不敏感
+        group_search: false, //选项组是否可搜。此处搜索不可搜
+        include_group_label_in_selected: true //选中选项是否显示选项分组。false不显示，true显示。默认false。
+    });
 
     /**
      * 保存
      */
-    function save() {
+    function save_contact() {
         if(!verification()){
             return false;
         }
-        var contact = new Object();
-        contact.dealChannelId=$("#dealChannelId").val();
-        contact.dealChannelIdStr=$("#dealChannelIdStr").val();
-        parent.showContact(contact);
+        var channel = new Object();
+        channel.dealChannelId=$("#dealChannelId").val();
+        channel.dealChannelIdStr=$("#dealChannelIdStr").val();
+        channel.channelId=$("#channelId").val();
+        channel.channelTypeId=$("#channelTypeId").val();
+        channel.channelName=$("#channelId").find("option:selected").text();
+        channel.channelTypeName=$("#channelTypeId").find("option:selected").text();
+        channel.storeId= $('#storeId').val();
+        channel.storeName=$("#storeId").find("option:selected").text();
+        channel.dealChannelAccountPeriod=$("#dealChannelAccountPeriod").val();
+        parent.showChannel(channel);
         parent.layer.close(parent.layer.getFrameIndex(window.name));
     }
 
@@ -133,8 +181,6 @@
         return flag;
     }
 
-
-
 </script>
 
 

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/add_dealer_contact.ftl

@@ -89,8 +89,8 @@
                 </div>
             </div>
 
-            <div class="row cl">
-                <div class="col-2 col-sm-2 col-offset-3">
+            <div class="row cl" style="margin-top: 30px">
+                <div class="col-2 col-sm-2 col-offset-3" >
                     <input type="text" class="btn  btn-primary "  onclick="save_contact()" value="保存">
                 </div>
             </div>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/dealer_list.ftl

@@ -141,10 +141,10 @@
 </tfoot>
 
 <script type="text/javascript">
-    var ulc = $(".ulc_question").initUlcByHtml({
-        urlPrefix: root_path,
-        ulcLevel:null
-    });
+//    var ulc = $(".ulc_question").initUlcByHtml({
+//        urlPrefix: root_path,
+//        ulcLevel:null
+//    });
 
     /**
      * 跳转到添加客户

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -87,13 +87,13 @@
                     <div class="formControls col-7 col-sm-7">
                         <table class="table table-border table-bg table-bordered" style="margin-top: 10px;margin-left: 14px;display: none;" id="all_detect_product">
                             <thead>
-                            <tr class="text-c">
-                                <th style="text-align: center;" width="30" >请选择要发货的机器</th>
-                                <th style="text-align: center;" width="25" >维修编号</th>
-                                <th style="text-align: center;" width="10">维修状态</th>
-                                <th style="text-align: center;" width="10">维修机器</th>
-                                <th style="text-align: center;" width="10">维修颜色</th>
-                            </tr>
+                                <tr class="text-c">
+                                    <th style="text-align: center;" width="30" >请选择要发货的机器</th>
+                                    <th style="text-align: center;" width="25" >维修编号</th>
+                                    <th style="text-align: center;" width="10">维修状态</th>
+                                    <th style="text-align: center;" width="10">维修机器</th>
+                                    <th style="text-align: center;" width="10">维修颜色</th>
+                                </tr>
                             </thead>
                             <tbody id="detect_product">
                             </tbody>

watero-rst-web/src/main/webapp/common/js/dealer/dealer.js

@@ -50,8 +50,8 @@ function showContact(contact){
 function addDealerContact() {
     CONTACT_IS_UPDATE = 1;
     CONTACT_ID_NUM ++;
-    dealContactStr = CONTACT_ID_PREFIX + CONTACT_ID_NUM;
-    layer_show_height("添加对接人","${path}/admin/dealer/to_add_dealer_contact?dealContactStr="+dealContactStr,1);
+    var dealContactStr = CONTACT_ID_PREFIX + CONTACT_ID_NUM;
+    layer_show_height("添加对接人",url_path+"/admin/dealer/to_add_dealer_contact?dealContactStr="+dealContactStr,1);
 }
 /**
  * 修改对接人
@@ -68,12 +68,80 @@ function updateDealerContact($this) {
     contact.dealContactEmail=$contact.find(".dealContactEmail").text();
     contact.dealContactWechat=$contact.find(".dealContactWechat").text();
     contact.dealContactQq=$contact.find(".dealContactQq").text();
-    layer_show_height("添加对接人","${path}/admin/dealer/to_add_dealer_contact?"+parseParam(contact),1);
+    layer_show_height("添加对接人",url_path+"/admin/dealer/to_add_dealer_contact?"+parseParam(contact),1);
 }
 //-----------------------对接人 END -----------------------------
 
+var CHANNEL_ID_PREFIX = "CHANNEL_";
+var CHANNEL_ID_NUM = 0;
+var CHANNEL_IS_UPDATE = 1;  //用来标识渠道的弹窗是添加还是修改，  1添加 2修改
+var CHANNEL_TR_NUM = 0; //渠道信息数量  1：表示有   0：表示没有
 
+/**
+ * 添加渠道商
+ */
+function addDealerChannnel() {
+    CHANNEL_IS_UPDATE = 1;
+    CHANNEL_ID_NUM ++;
+    var dealChannelIdStr = CHANNEL_ID_PREFIX + CHANNEL_ID_NUM;
+    layer_show_height("添加对接人","${path}/admin/dealer/to_add_dealer_channel?dealChannelIdStr="+dealChannelIdStr,1);
+}
+
+function showChannel(channel) {
+    var $addHtmlNode = $("#add_dealer_channel");
+    if(CHANNEL_IS_UPDATE == 1){ //添加
+        var html = '<tr class="text-c" >';
+        html += ' <input type="hidden" class="input-text dealChannelId" value="" >';
+        html += ' <input type="hidden" class="input-text dealChannelIdStr" value="'+ cufte(channel.dealChannelIdStr) +'" >';
+        html += ' <input type="hidden" class="input-text channelId" value="'+ cufte(channel.channelId) +'" >';
+        html += ' <input type="hidden" class="input-text channelTypeId" value="'+ cufte(channel.channelTypeId) +'" >';
+        html += ' <input type="hidden" class="input-text storeId" value="'+ cufte(channel.storeId) +'" >';
+        html += '<td class="channelTypeName">'+ cufte(channel.channelTypeName) +'</td>';
+        html += '<td class="channelName">'+ cufte(channel.channelName) +'</td>';
+        html += '<td class="storeName">'+ cufte(channel.storeName) +'</td>';
+        html += '<td class="dealChannelAccountPeriod">'+ cufte(channel.dealChannelAccountPeriod) +'</td>';
+        html += '<td><a href="javascript:void(0)" onclick="updateDealerChannel($(this))">修改</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="delTableByTr($(this),2)">删除</a></td>';
+        if(CHANNEL_TR_NUM == 0){
+            $addHtmlNode.html(html);
+            CHANNEL_TR_NUM =1;
+        }else{
+            $addHtmlNode.append(html);
+        }
+    }else{
+        //修改
+        var $channelTr;
+        $addHtmlNode.find("tr").each(function () {
+            var dealChannelIdStr = $(this).find(".dealChannelIdStr").val();
+            if(dealChannelIdStr == channel.dealChannelIdStr){
+                $channelTr =  $(this);
+            }
+        });
+        $channelTr.find(".channelId").val(cufte(channel.channelId));
+        $channelTr.find(".storeId").val(cufte(channel.storeId));
+        $channelTr.find(".channelTypeId").val(cufte(channel.channelTypeId));
+        $channelTr.find(".channelTypeName").text(cufte(channel.channelTypeName));
+        $channelTr.find(".channelName").text(cufte(channel.channelName));
+        $channelTr.find(".storeName").text(cufte(channel.storeName));
+        $channelTr.find(".dealChannelAccountPeriod").text(cufte(channel.dealChannelAccountPeriod));
+    }
+}
 
+/**
+ * 修改渠道商
+ */
+function updateDealerChannel($this) {
+    CHANNEL_IS_UPDATE =2;
+    var $contact = $this.parents("tr");
+    var channel = new Object();
+    channel.dealChannelId = $contact.find(".dealChannelId").val();
+    channel.dealChannelIdStr = $contact.find(".dealChannelIdStr").val();
+    channel.channelId= $contact.find(".channelId").val();
+    channel.channelTypeId= $contact.find(".channelTypeId").val();
+    channel.storeId=$contact.find(".storeId").val();
+    channel.dealChannelAccountPeriod=$contact.find(".dealChannelAccountPeriod").text();
+    layer_show_height("添加对接人",url_path+"/admin/dealer/to_add_dealer_channel?"+parseParam(channel),1);
+}
+//-----------------------渠道商 END -----------------------------
 
 /**
  * 删除
@@ -82,9 +150,9 @@ function updateDealerContact($this) {
 function delTableByTr($this,type) {
     var typeDesc = '';
     if(type == 1 && $("#add_contact").find("tr").length < 2){
-        vailErrorMsg_3($("#add_contact_make"),"必须要要有一个对接人");
-    }else if(type == 2){
-
+        vailErrorMsg_3($("#add_contact_make"),"必须要有一个对接人");
+    }else if(type == 2 && $("#add_dealer_channel").find("tr").length < 2){
+        vailErrorMsg_3($("#add_dealer_channel_make"),"必须要有一个渠道信息");
     }else{
         $this.parents("tr").remove();
     }