From 304c59be106fefb72feaaf23c5c02dd760ef5777 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Thu, 24 Dec 2020 13:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B2=E4=B9=99=E6=96=B9=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PartnerController.class.php    |  4 +-
 .../PromoteCompanyController.class.php        |  4 +-
 Application/Admin/View/Partner/edit.html      | 12 +++---
 Application/Admin/View/Partner/show.html      | 42 ++++++++++++-------
 .../Admin/View/PromoteCompany/edit.html       | 12 +++---
 .../Admin/View/PromoteCompany/view.html       | 41 ++++++++++++------
 6 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 1a76b0ac9..6866af2b7 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -475,10 +475,10 @@ class PartnerController extends ThinkController
             $this->checkData($save);
             $save['relation']['collaborate_way'] = $save['part_a_type'];
             if ($save['part_a_type'] == 1) {
-                $save['relation']['self_company_id'] = $save['part_b'];
+                $save['relation']['self_company_id'] = $save['part_a'];
             }
             if ($save['part_a_type'] == 2) {
-                $save['relation']['self_company_id'] = $save['part_a'];
+                $save['relation']['self_company_id'] = $save['part_b'];
             }
 
             $res =D("PartnerVerify")->edit_db($save);
diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index eaf5f5484..87bb0b6ae 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -734,10 +734,10 @@ class PromoteCompanyController extends ThinkController
 
             $save['relation']['collaborate_way'] = $save['part_a_type'];
             if ($save['part_a_type'] == 1) {
-                $save['relation']['self_company_id'] = $save['part_b'];
+                $save['relation']['self_company_id'] = $save['part_a'];
             }
             if ($save['part_a_type'] == 2) {
-                $save['relation']['self_company_id'] = $save['part_a'];
+                $save['relation']['self_company_id'] = $save['part_b'];
             }
 
             $this->checkData($save);
diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html
index 0049c5b8d..b198d8e1f 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" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>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" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</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>
@@ -179,7 +179,7 @@
                                   <span class="notice-text"></span>
                                 </td>
                             </tr>-->
-                            <?php if($relation['collaborate_way'] == 2):?>
+                            <?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;">
@@ -200,7 +200,7 @@
                                 </td>
                             </tr>
                             <?php endif;?>
-                            <?php if($relation['collaborate_way'] == 1):?>
+                            <?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;">
diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html
index 72d65cda1..4e8b10add 100644
--- a/Application/Admin/View/Partner/show.html
+++ b/Application/Admin/View/Partner/show.html
@@ -149,16 +149,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" disabled>
-                                        <option  value="1" selected>上游CP公司</option>
-                                        <option  value="2">己方公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>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" disabled>
-                                        <option  value="1" >上游CP公司</option>
-                                        <option  value="2" selected>己方公司</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>
@@ -176,11 +176,32 @@
                                   <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="l" style="width: 50px;">
+                                    <select name="part_b" id="part_b" class="select_gallery" disabled>
+                                        <?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_a" id="part_a" class="select_gallery" disabled>
-
+                                        <option id="cp_company" value='1'></option>
+                                    </select>
+                                    <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="l" style="width: 50px;">
+                                    <select name="part_a" id="part_a" class="select_gallery" disabled>
+                                        <option id="cp_company" value='1'></option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
@@ -194,6 +215,7 @@
                                     <span class="notice-text"></span>
                                 </td>
                             </tr>
+                            <?php endif;?>
 
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算周期:</td>
@@ -467,21 +489,13 @@
             }
         }
         $(function() {
-            if (!$("#partner").val()) {
-                $("#tab_tab1").click();
-            } else {
-                $("#part_a").children().remove();
-                $("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
-            }
+            $("#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>");
                 return false;
             });
 
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index 27b85fae2..c33a8ab55 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -500,16 +500,16 @@
                                 <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" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>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" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</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>
@@ -527,7 +527,7 @@
                                   <span class="notice-text"></span>
                                 </td>
                             </tr>-->
-                            <?php if($relation['collaborate_way'] == 1):?>
+                            <?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;">
@@ -547,7 +547,7 @@
                                 </td>
                             </tr>
                             <?php endif;?>
-                            <?php if($relation['collaborate_way'] == 2):?>
+                            <?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;">
diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html
index 301ece91c..9c0d5dff7 100644
--- a/Application/Admin/View/PromoteCompany/view.html
+++ b/Application/Admin/View/PromoteCompany/view.html
@@ -486,16 +486,16 @@
                                 <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" disabled>
-                                        <option  value="1" selected>下游推广公司</option>
-                                        <option  value="2">己方公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>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" disabled>
-                                        <option  value="1" >下游推广公司</option>
-                                        <option  value="2" selected>己方公司</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>
@@ -513,11 +513,32 @@
                                   <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" disabled>
-
+                                        <?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" disabled>
+                                        <option id="cp_company" value='1'></option>
+                                    </select>
+                                    <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" disabled>
+                                        <option id="cp_company" value='1'></option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
@@ -531,6 +552,7 @@
                                     <span class="notice-text"></span>
                                 </td>
                             </tr>
+                            <?php endif;?>
 
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算周期:</td>
@@ -821,12 +843,7 @@
             }
         }
         $(function() {
-            if (!$("#partner").val()) {
-                $("#tab_tab1").click();
-            } else {
-                $("#part_a").children().remove();
-                $("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
-            }
+            $("#cp_company").text($("#partner").val());
 
             $("#tab_tab2").click(function() {
                 if (!$("#partner").val()) {
@@ -834,8 +851,6 @@
                     $("#tab_tab1").click();
                 }
 
-                $("#part_a").children().remove();
-                $("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
                 return false;
             });