diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php
index 34be47beb..4fa12d3dd 100644
--- a/Application/Admin/Controller/CompanyRelationController.class.php
+++ b/Application/Admin/Controller/CompanyRelationController.class.php
@@ -65,6 +65,37 @@ class CompanyRelationController extends AdminController
     public function delRelation()
     {
        
+    }
+    public function getCompanyList($type)
+    {
+        if($type ==''){
+            $this->success([],'',true);
+        }
+        $companyInfo = [];
+        if($type == 0){
+            //己方公司
+            $companyInfo = M("CompanyInfo","tab_")->field("id,partner company_name,link_man,link_phone")->where("status='1'")->select();
+        }
+        if($type == 1){
+            //上游
+            $companyInfo = M("Partner","tab_")->field("id,partner company_name,company_type,link_man,link_phone")->where("status='1'")->select();
+        }
+        if($type == 2){
+            //下游游
+            $companyInfo = M("PromoteCompany","tab_")->field("id,company_belong,company_name,company_type,settlement_contact link_man,contact_phone link_phone")->where("status='1'")->select();
+        }
+        foreach($companyInfo as $k=>&$v){
+            if(isset($v['company_belong'])){
+                $v['company_belong'] = getCompanyBlong($v['company_belong']);
+            }
+            if(isset($v['company_type'])){
+                $v['company_type'] = ($v['company_type'] == 1 ?"公司" :'个人');
+            }
+            if(isset($v['link_phone']) && $v['link_phone']==0){
+                $v['link_phone'] = '';
+            }
+        }
+        $this->success($companyInfo,'',true);
     }
     public function menuAuth()
     {
diff --git a/Application/Admin/View/CompanyRelation/addRelation.html b/Application/Admin/View/CompanyRelation/addRelation.html
index e236ab7b4..b389e2b0c 100644
--- a/Application/Admin/View/CompanyRelation/addRelation.html
+++ b/Application/Admin/View/CompanyRelation/addRelation.html
@@ -119,43 +119,15 @@
                 <td class="l"><i class="mustmark">*</i>甲方公司:</td>
                 <td class="r promote_id">
                   <select name="first_company_id" id="first_company_id" class="select_gallery">
-                    <option value="">请先选择甲方公司</option>
+                    <option value="">请先选择甲方公司类型</option>
                   </select>
                 </td>
               </tr>
               <input type="hidden" name="first_company_name" id="first_company_name" value="" />
 
-
-              <tr>
-                <td class="l">内外团:</td>
-                <td class="r table_radio">
-                  <span class="form_radio table_btn" id="first_company_belong">请先选择甲方公司</span>
-                </td>
-              </tr>
-              <tr>
-                <td class="l">公司性质:</td>
-                <td class="r table_radio">
-                  <span class="form_radio table_btn" id="first_company_type">请先选择甲方公司</span>
-                </td>
-              </tr>
-              <tr>
-                <td class="l">开发类型:</td>
-                <td class="r table_radio">
-                  <span class="form_radio table_btn" id="first_company_relation">请先选择甲方公司</span>
-                </td>
-              </tr>
-              <tr>
-                <td class="l">联系人:</td>
-                <td class="r table_radio">
-                  <span class="form_radio table_btn" id="first_settlement_contact">请先选择甲方公司</span>
-                </td>
-              </tr>
-              <tr>
-                <td class="l">联系电话:</td>
-                <td class="r table_radio">
-                  <span class="form_radio table_btn" id="first_contact_phone">请先选择甲方公司</span>
-                </td>
-              </tr>
+              <tbody id="first_company_info">
+                
+               </tbody>
 
               </tbody>
             </table>
@@ -167,7 +139,7 @@
                 <tr>
                   <td class="l"><i class="mustmark">*</i>乙方公司类型:</td>
                   <td class="r">
-                    <select name="second_company_type" id="first_company_type" class="select_gallery">
+                    <select name="second_company_type" id="second_company_type" class="select_gallery">
                     <option value="">请选择乙方公司类型</option>
                       <volist name="companyType" id="vo">
                         <option  value="{$key}">{$vo}</option>
@@ -187,38 +159,9 @@
                   </td>
                 </tr>
                 <input type="hidden" name="second_company_name" id="second_company_name" value="" />
-
-
-              <tr>
-                <td class="l">内外团:</td>
-                <td class="r table_radio">
-                  <span class="form_radio table_btn" id="second_company_belong">请先选择乙方公司</span>
-                </td>
-              </tr>
-              <tr>
-                <td class="l">公司性质:</td>
-                <td class="r table_radio">
-                  <span class="form_radio table_btn" id="second_company_type">请先选择乙方公司</span>
-                </td>
-              </tr>
-              <tr>
-                <td class="l">开发类型:</td>
-                <td class="r table_radio">
-                  <span class="form_radio table_btn" id="second_company_relation">请先选择乙方公司</span>
-                </td>
-              </tr>
-              <tr>
-                <td class="l">联系人:</td>
-                <td class="r table_radio">
-                  <span class="form_radio table_btn" id="second_settlement_contact">请先选择乙方公司</span>
-                </td>
-              </tr>
-              <tr>
-                <td class="l">联系电话:</td>
-                <td class="r table_radio">
-                  <span class="form_radio table_btn" id="second_contact_phone">请先选择乙方公司</span>
-                </td>
-              </tr>
+                <tbody id="second_company_info">
+                
+                </tbody>
 
               </tbody>
             </table>
@@ -308,88 +251,44 @@
   <script src="__STATIC__/czinputcheck.js?v=1.29" type="text/javascript"></script>
 <script type="text/javascript">
 //导航高亮
-highlight_subnav("{:U('index')}");
+highlight_subnav("{:U('list')}");
 $(".select_gallery").select2();
+var first_company={};
+var second_company={};
+var first_company_type=0;
+var second_company_type=0;
 
 $(function(){
-    $('.time').datetimepicker({
-      format: 'yyyy-mm-dd',
-      language: "zh-CN",
-      minView: 2,
-      autoclose: true
-    });
-    showTab();
-
-    var promoteGameRatioData = {};
-    promoteGameRatioData.ratio = '0.00';
-    promoteGameRatioData.begin_time = '';
-    promoteGameRatioData.end_time = '';
-    promoteGameRatioData.remark = '';
-
-
-    $('#relation_game_id').change(function (e) {
-        var original_package_name =  $('#relation_game_id option:selected').data("original");
-        if(original_package_name == ''){
-          original_package_name = '未配置原包名'
-        }
-        $("#original_package_name").html(original_package_name);
-    });
-
-
-
-
-    $('#ratio, #begin_time, #end_time, #remark').change(function () {
-        var val = $(this).val();
-        var elementIdName = $(this).attr('id');
-        promoteGameRatioData[elementIdName] = val;
-    });
-    subevn();
-    function subevn(){
-      $('#submit').off("click"); 
-      $('#submit').click(function (e) {
+    //
+    $('#submit').click(function (e) {
         //查看是否报错
         var flag = true;
         var obj = {
-            "company_id":["required","推广公司不能为空","select"],
-            "relation_game_id":["required","游戏不能为空","select"],
-            "ratio":["number","默认比例必须是大于0的数字"],
-            "begin_time":["date","开始时间不能为空"],
-            "end_time":["nocheck"],
-            "remark":["nocheck",'',"textarea"]
+            "first_company_type":["required","甲方公司类型不能为空","select"],
+            "first_company_id":["required","甲方公司不能为空","select"],
+            "second_company_type":["required","乙方公司类型不能为空","select"],
+            "second_company_id":["required","乙方公司不能为空","select"]
         }
         var cres = CIC.checkAddInput(obj);
         if(!cres){
             return false;
         }
-        if(cres.ratio > 100){
-          layer.msg("默认比例不能大于100", {icon: 2});
+
+        if(cres.first_company_type == cres.second_company_type){
+          layer.msg("合作甲乙双方不能是同类型公司", {icon: 2});
           return false;
         }
-        
-
-        $(".error-message").each(function(index,elm){
-          var t = $(elm).css("display");
-          if(t == 'block' || t == 'inline'){
-            flag = false;
-            layer.msg("请先处理错误的比例配置", {icon: 2});
-            return false;
-          }
-        })
-        $(".turnover_money").each(function(index,elm){
-          var t = $(elm).val();
-          if(t == ''){
-            flag = false;
-            layer.msg("流水及比例不允许为空", {icon: 2});
-            return false;
-          }
-        })
-
-        if(!flag){
+        if(cres.first_company_type != 0 && cres.second_company_type !=0){
+          layer.msg("合作甲乙双方必须有个是己方公司", {icon: 2});
           return false;
         }
+        
+        
         var target = $('form').get(0).action;
         var query = $('form').serialize();
         var that = this;
+        console.log(query);
+        return false;
         $(that).addClass('disabled').attr('autocomplete','off').prop('disabled',true);
           $.post(target,query).success(function(data){
               if(layer) {layer.closeAll('loading');}
@@ -414,124 +313,110 @@ $(function(){
               }
           });
       });
-    }
     
-
-    $('.iconfont-btn-add').click(function (e) {
-        var delBtn = $('.iconfont-btn-del');
-        var html = '';
-        html += '<div class="li-ratio">';
-        html += '<label class="instanceof_text">月流水：</label>';
-        html += '<select name="instanceof[]" style="width: 50px;margin-right: 10px;">';
-        html += '<option value="1">≥</option>';
-        html += '<option value="2">></option>';
-        html += '</select>';
-        html += '<div class="turnover">';
-        html += '<input type="text" class="txt turnover_money" name="turnover[]" value="" placeholder="请输入金额" onKeyUp="value=value.replace(/[^\\w\\.\\/]/ig, \'\')" style="width: 100px;margin-right: 10px;">';
-        html += '<span class="error-message"></span>';
-        html += '</div>';
-        html += '<label>分成比例：</label>';
-        html += '<div class="turnover-ratio">';
-        html += '<input type="text" class="txt turnover_ratio" name="turnover_ratio[]" value="" placeholder="请输入比例" onKeyUp="value=value.replace(/[^\\w\\.\\/]/ig, \'\')" style="width: 60px;">';
-        html += '<span class="form_unit" style="margin-right: 10px;">%</span>';
-        html += '<span class="error-message"></span>';
-        html += '</div>';
-        html += '</div>';
-
-        $('.list-ratio').append(html);
-        subevn();
-        if ($('.list-ratio').children().length > 1 && delBtn.children('i').hasClass('iconfont-unselected')) {
-            delBtn.children('i').removeClass('iconfont-unselected');
-            delBtn.children('i').addClass('iconfont-selected');
-        }
-
-        $('.list-ratio').children(':last-child').children('.turnover').children('input').change(function (e) {
-            turnoverChangeHandle();
-        });
-
-        $('.list-ratio').children(':last-child').children('.turnover-ratio').children('input').change(function (e) {
-            turnoverRatioChangeHandle();
-        });
-    });
-
-    $('.list-ratio').children('.li-ratio').children('.turnover').children('input').change(function (e) {
-        turnoverChangeHandle();
-    });
-
-    $('.list-ratio').children('.li-ratio').children('.turnover-ratio').children('input').change(function (e) {
-        turnoverRatioChangeHandle();
-    });
-
-    function turnoverChangeHandle()
-    {
-        $('.list-ratio').children('.li-ratio').children('.turnover').children('input').each(function () {
-            var that = $(this);
-            var thatLiRatio = that.parent().parent();
-            var thatLiRatioIndex = thatLiRatio.index();
-            var prevTurnover = 0;
-            var prev = thatLiRatio.prev().children().children('input');
-            var thatTurnover = parseFloat(that.val());
-
-            if (thatLiRatioIndex > 0) {
-                prevTurnover = parseFloat(prev.val());
-                prevTurnoverHandle(thatTurnover, prevTurnover, that);
+    $("#first_company_type").on("change",function(){
+        //置空
+        $("#first_company_info").html('');
+        $("#first_company_name").val('');
+        //逻辑
+        var type =  $(this).find("option:selected").val();
+        first_company_type = type;
+        var typename=setTypeName(type);
+        var url = "{:U('getCompanyList')}"+"&type="+type;
+        $.get(url,function(data){
+            first_company = data.info;
+            var companystr = '<option value="">'+typename+'</option>';
+            for (var i in first_company) {
+                companystr += "<option value='" + first_company[i].id + "'>" + first_company[i].company_name + "</option>"
             }
-        });
-    }
-
-    function turnoverRatioChangeHandle() {
-        var ratio = parseFloat($('#ratio').val());
-        $('.list-ratio').children('.li-ratio').children('.turnover-ratio').children('input').each(function () {
-            var that = $(this);
-            var thatLiRatio = that.parent().parent();
-            var thatLiRatioIndex = thatLiRatio.index();
-            var thatTurnoverRatio = parseFloat(that.val());
+            $("#first_company_id").html(companystr);
+            $("#first_company_id").select2();
+        })
+    })
+    $("#first_company_id").on("change",function(){
+        var id =  $(this).find("option:selected").val();
+        //获取基础信息
+        if(id == ''){return ;}
+        var companyinfo = first_company.find(function(x){
+            return x.id == id;
+        })
+        $("#first_company_name").val(companyinfo.company_name);
+        $("#first_company_info").html(setCompanyInfo(companyinfo));
+    });
 
-            if (thatLiRatioIndex === 1) {
-                prevTurnoverRatio = ratio;
-                prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that, true);
-            } else {
-                var prev = thatLiRatio.prev().children('.turnover-ratio').children('input');
-                var prevTurnoverRatio = parseFloat(prev.val());
-                prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that);
+    $("#second_company_type").on("change",function(){
+        //置空
+        $("#second_company_info").html('');
+        $("#second_company_name").val('');
+        //逻辑
+        var type =  $(this).find("option:selected").val();
+        second_company_type = type;
+        var typename=setTypeName(type,"second");
+        var url = "{:U('getCompanyList')}"+"&type="+type;
+        $.get(url,function(data){
+            second_company = data.info;
+            var companystr = '<option value="">'+typename+'</option>';
+            for (var i in second_company) {
+                companystr += "<option value='" + second_company[i].id + "'>" + second_company[i].company_name + "</option>"
             }
-        });
-    }
+            $("#second_company_id").html(companystr);
+            $("#second_company_id").select2();
+        })
+    })
+    $("#second_company_id").on("change",function(){
+        var id =  $(this).find("option:selected").val();
+        //获取基础信息
+        if(id == ''){return ;}
+        var companyinfo = second_company.find(function(x){
+            return x.id == id;
+        })
+        $("#second_company_name").val(companyinfo.company_name);
+        $("#second_company_info").html(setCompanyInfo(companyinfo));
+    });
 
-    function prevTurnoverHandle(thatTurnover, prevTurnover, that)
-    {
-        if (thatTurnover <= prevTurnover) {
-            that.parent().children('span').text('月流水必须大于上一个月流水');
-            that.parent().children('span').show();
-        } else {
-            that.parent().children('span').hide();
+    function setCompanyInfo(companyinfo){
+        var companyinfostr = '';
+        if("company_belong" in companyinfo){
+            companyinfostr += '<tr><td class="l">内外团:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_belong+'</span></td></tr>';
         }
-        return true;
-    }
-
-    function prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that, isDefault = false)
-    {
-        if (thatTurnoverRatio <= prevTurnoverRatio) {
-            var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例';
-            that.parent().children('.error-message').text(msg);
-            that.parent().children('.error-message').show();
-        } else {
-            that.parent().children('.error-message').hide();
+        if("company_type" in companyinfo){
+            companyinfostr += '<tr><td class="l">公司性质:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_type+'</span></td></tr>';
+        }
+        if("company_relation" in companyinfo){
+            companyinfostr += '<tr><td class="l">开发类型:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_relation+'</span></td></tr>';
+        }
+        if("link_man" in companyinfo){
+            companyinfostr += '<tr><td class="l">联系人:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.link_man+'</span></td></tr>';
         }
-        return true;
+        if("link_phone" in companyinfo){
+            companyinfostr += '<tr><td class="l">联系电话:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.link_phone+'</span></td></tr>';
+        }
+        return companyinfostr;
     }
 
-    $('.iconfont-btn-del').click(function (e) {
-        var that = $(this);
 
-        if ($('.list-ratio').children().length > 1) {
-            $('.list-ratio').children(':last-child').remove();
-            if ($('.list-ratio').children().length === 1) {
-                that.children('i').removeClass('iconfont-selected');
-                that.children('i').addClass('iconfont-unselected');
-            }
+    function setTypeName(type,company="first") {
+        var typename = '';
+        switch (type) {
+            case '':
+                typename = (company == "first" ? "请先选择甲方公司类型" : "请先选择乙方公司类型");
+                break;
+            case '0':
+                typename = "请选择已方公司";
+                break;
+            case "1":
+                typename = "请选择上游CP公司";
+                break;
+            case "2":
+                typename ="请选择联运下游渠道公司";;
+                break;
+            default:
+                break;
         }
-    });
+        return typename;
+    }
+
+    
 });
 </script>
 </block>