From 858e92919998b9b7dd4520bb203d5da9733e4d20 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Thu, 24 Dec 2020 14:49:16 +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

---
 Application/Admin/View/Partner/edit.html      | 12 +++++-----
 Application/Admin/View/Partner/show.html      | 16 ++++++-------
 .../Admin/View/PromoteCompany/edit.html       | 24 +++++++++----------
 .../Admin/View/PromoteCompany/view.html       | 12 +++++-----
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html
index b198d8e1f..34eddca3e 100644
--- a/Application/Admin/View/Partner/edit.html
+++ b/Application/Admin/View/Partner/edit.html
@@ -184,9 +184,9 @@
                                 <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;?>
+                                        <volist name="selfCompanies" id="vo">
+                                            <option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
+                                        </volist>
                                     </select>
 
                                     <span class="notice-text"></span>
@@ -212,9 +212,9 @@
                                 <td class="l" style="width: 90px;"><i class="mustmark" >*</i>乙方公司:</td>
                                 <td class="r">
                                     <select name="part_b" id="part_b" 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;?>
+                                        <volist name="selfCompanies" id="vo">
+                                            <option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
+                                        </volist>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html
index 4e8b10add..5e6445583 100644
--- a/Application/Admin/View/Partner/show.html
+++ b/Application/Admin/View/Partner/show.html
@@ -180,16 +180,16 @@
                             <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 name="part_a" id="part_a" class="select_gallery" disabled>
+                                        <volist name="selfCompanies" id="vo">
+                                        <option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
+                                        </volist>
                                     </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>
+                                    <select name="part_b" id="part_b" class="select_gallery" disabled>
                                         <option id="cp_company" value='1'></option>
                                     </select>
                                     <span class="notice-text"></span>
@@ -208,9 +208,9 @@
                                 <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>
-                                        <?php foreach($selfCompanies as $selfCompany):?>
-                                        <option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
-                                        <?php endforeach;?>
+                                        <volist name="selfCompanies" id="vo">
+                                            <option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
+                                        </volist>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index c33a8ab55..b00066973 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -527,41 +527,41 @@
                                   <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="r" style="width: 50px;">
-                                    <select name="part_a" id="part_a" class="select_gallery">
-                                        <option id="cp_company" value='1'></option>
-                                    </select>
+                                    <volist name="selfCompanies" id="vo">
+                                        <option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
+                                    </volist>
                                     <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">
-                                        <?php foreach($selfCompanies as $selfCompany):?>
-                                        <option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
-                                        <?php endforeach;?>
+                                        <option id="cp_company" value='1'></option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </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="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;?>
+                                        <option id="cp_company" value='1'></option>
                                     </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>
+                                        <volist name="selfCompanies" id="vo">
+                                            <option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
+                                        </volist>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html
index 9c0d5dff7..3dc1981c7 100644
--- a/Application/Admin/View/PromoteCompany/view.html
+++ b/Application/Admin/View/PromoteCompany/view.html
@@ -518,9 +518,9 @@
                                 <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;?>
+                                        <volist name="selfCompanies" id="vo">
+                                            <option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
+                                        </volist>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
@@ -545,9 +545,9 @@
                                 <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>
-                                        <?php foreach($selfCompanies as $selfCompany):?>
-                                        <option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
-                                        <?php endforeach;?>
+                                        <volist name="selfCompanies" id="vo">
+                                            <option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
+                                        </volist>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>