From 08df25eab3a4d0c03857402b3d3e807976357f64 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Thu, 24 Dec 2020 10:24:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Partner/edit.html      | 36 ++++++++++++++---
 .../Admin/View/PromoteCompany/edit.html       | 40 ++++++++++++++-----
 2 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html
index 9b7736b4c..0049c5b8d 100644
--- a/Application/Admin/View/Partner/edit.html
+++ b/Application/Admin/View/Partner/edit.html
@@ -152,16 +152,16 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
                                 <td class="l" style="width: 50px;">
                                     <select name="part_a_type" id="part_a_type" class="select_gallery">
-                                        <option  value="1" selected>上游CP公司</option>
-                                        <option  value="2">己方公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
                                 <td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
                                 <td class="r">
                                     <select name="part_b_type" id="part_b_type" class="select_gallery">
-                                        <option  value="1" >上游CP公司</option>
-                                        <option  value="2" selected>己方公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
@@ -179,11 +179,33 @@
                                   <span class="notice-text"></span>
                                 </td>
                             </tr>-->
+                            <?php if($relation['collaborate_way'] == 2):?>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="l" style="width: 50px;">
                                     <select name="part_a" id="part_a" class="select_gallery">
+                                        <?php foreach($selfCompanies as $selfCompany):?>
+                                        <option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
+                                        <?php endforeach;?>
+                                    </select>
 
+                                    <span class="notice-text"></span>
+                                </td>
+                                <td class="l" style="width: 90px;"><i class="mustmark" >*</i>乙方公司:</td>
+                                <td class="r">
+                                    <select name="part_b" id="part_b" class="select_gallery">
+                                        <option id="cp_company" value='1'></option>
+                                    </select>
+                                    <span class="notice-text"></span>
+                                </td>
+                            </tr>
+                            <?php endif;?>
+                            <?php if($relation['collaborate_way'] == 1):?>
+                            <tr>
+                                <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
+                                <td class="l" style="width: 50px;">
+                                    <select name="part_a" id="part_a" class="select_gallery">
+                                        <option id="cp_company" value='1'></option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
@@ -197,6 +219,7 @@
                                     <span class="notice-text"></span>
                                 </td>
                             </tr>
+                            <?php endif;?>
 
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算周期:</td>
@@ -484,8 +507,9 @@
                     $("#tab_tab1").click();
                 }
 
-                $("#part_a").children().remove();
-                $("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
+                $("#cp_company").text($("#partner").val());
+                // $("#part_a").children().remove();
+                // $("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
                 return false;
             });
 
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index 42ce732e4..27b85fae2 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -500,20 +500,21 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
                                 <td class="r" style="width: 50px;">
                                     <select name="part_a_type" id="part_a_type" class="select_gallery">
-                                        <option  value="1" selected>下游推广公司</option>
-                                        <option  value="2">己方公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
                                 <td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
                                 <td class="r">
                                     <select name="part_b_type" id="part_b_type" class="select_gallery" >
-                                        <option  value="1" >下游推广公司</option>
-                                        <option  value="2" selected>己方公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
                             </tr>
+
                             <!--<tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>己方公司:</td>
                                 <td class="r">
@@ -526,12 +527,12 @@
                                   <span class="notice-text"></span>
                                 </td>
                             </tr>-->
-
+                            <?php if($relation['collaborate_way'] == 1):?>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="r" style="width: 50px;">
                                     <select name="part_a" id="part_a" class="select_gallery">
-
+                                        <option id="cp_company" value='1'></option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
@@ -545,6 +546,27 @@
                                     <span class="notice-text"></span>
                                 </td>
                             </tr>
+                            <?php endif;?>
+                            <?php if($relation['collaborate_way'] == 2):?>
+                            <tr>
+                                <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
+                                <td class="r" style="width: 50px;">
+                                    <select name="part_a" id="part_a" class="select_gallery">
+                                        <?php foreach($selfCompanies as $selfCompany):?>
+                                        <option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
+                                        <?php endforeach;?>
+                                    </select>
+                                    <span class="notice-text"></span>
+                                </td>
+                                <td class="l" style="width: 90px"><i class="mustmark" >*</i>乙方公司:</td>
+                                <td class="r">
+                                    <select name="part_b" id="part_b" class="select_gallery">
+                                        <option id="cp_company" value='1'></option>
+                                    </select>
+                                    <span class="notice-text"></span>
+                                </td>
+                            </tr>
+                            <?php endif;?>
 
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算周期:</td>
@@ -837,15 +859,15 @@
             if (!$("#partner").val()) {
                 $("#tab_tab1").click();
             }
+            $("#cp_company").text($("#partner").val());
 
             $("#tab_tab2").click(function() {
                 if (!$("#partner").val()) {
                     alert('请填写合作方名称');
                     $("#tab_tab1").click();
                 }
-
-                $("#part_a").children().remove();
-                $("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
+                //$("#part_a").children().remove();
+                //$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
                 return false;
             });