From dd86a85485e27498400e96cd450275a69a88d374 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 18 Mar 2020 14:55:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=85=AC=E4=BC=9A=E5=BD=92?=
 =?UTF-8?q?=E5=B1=9E=E7=AE=A1=E7=90=86=20=E6=94=B9=E4=B8=BA=E5=85=AC?=
 =?UTF-8?q?=E4=BC=9A=E5=BD=92=E5=B1=9E=E4=B8=8D=E5=8F=AF=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PromoteController.class.php    |  9 ++++--
 .../Admin/View/Promote/belong_add.html        | 29 ++++++++++++-------
 .../Admin/View/Promote/belong_edit.html       | 15 ++++++----
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index ef77192dc..74e8e64be 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -1309,16 +1309,21 @@ class PromoteController extends ThinkController
         //为数据权限添加
         setPowerPromoteIds($map, 'pb.promote_id');
         $model = M('promote_belong', 'tab_');
+        $field = "
+            pb.id,pb.promote_id,pb.verify_status,pb.company_relation,pb.remark,pb.can_view_recharge,pb.approver_name,pb.applicant_name,pb.verify_time,pb.applicant_time,pb.company_type,
+            pc.company_name,
+            p.company_belong,p.account,p.mobile_phone,p.admin_id,p.ver_status,p.status,p.create_time
+        ";
         $list_data = $model->alias('pb')
             ->join('left join tab_promote as p on p.id=pb.promote_id')
             ->join('left join tab_promote_company as pc on pc.id = p.company_id')
             ->where($map)
-            ->field('p.*,pb.*, pc.company_name')
+            ->field($field)
             ->page($p, $row)
             ->order('verify_status asc,applicant_time asc')
             ->select();
 //        dd($model->_sql());
-//        dd($list_data);
+    //    dd($list_data);
         $count = $model->alias('pb') ->join('left join tab_promote as p on p.id=pb.promote_id')->where($map)->count();
         $page = set_pagination($count, $row);
         if ($page) {
diff --git a/Application/Admin/View/Promote/belong_add.html b/Application/Admin/View/Promote/belong_add.html
index 3d0814dac..99ad10e4e 100644
--- a/Application/Admin/View/Promote/belong_add.html
+++ b/Application/Admin/View/Promote/belong_add.html
@@ -53,29 +53,30 @@
                                 <select id="promote_id" name="promote_id" class="select_gallery"  style="width:120px;">
                                     <option value="">请选择会长账号</option>
                                     <volist name=":promote_listsOther(1)" id="vo">
-                                        <option promote_id-id="{$vo.id}" value="{$vo.id}" <if condition="$vo.id eq $_GET['promote_id']">selected=selected</if>>{$vo.account}</option>
+                                        <option data-company_belong="{$vo['company_belong']}" data-belong="{:getCompanyBlong($vo['company_belong'])}" promote_id-id="{$vo.id}" value="{$vo.id}" <if condition="$vo.id eq $_GET['promote_id']">selected=selected</if>>{$vo.account}</option>
                                     </volist>
                                 </select>
                             </td>
                         </tr>
 
 
-                        <tr>
+                        <tr id="company_belong_box" style="display: none;">
                             <td class="l">工会归属：</td>
                             <td class="r table_radio">
-                        <span class="form_radio">
-                            <label >
-                                <input type="radio"  value="3" name="company_belong" checked="checked" class="company_belong"> 无
+                                <input  id="company_belong" name="company_belong" value="" type="hidden">
+                        <span class="form_radio"  id="company_belong_str">
+                            <!-- <label >
+                                <input type="radio" value="3" name="company_belong" class="company_belong"  checked="checked"> 无
                             </label >
                             <label >
-                                <input type="radio"  value="0" name="company_belong" class="company_belong"> 内团
+                                <input type="radio" value="0" name="company_belong" class="company_belong"> 内团
                             </label >
                             <label >
                                 <input type="radio" value="1" name="company_belong" class="company_belong"> 外团
                             </label>
                             <label >
-                                <input type="radio"  value="2" name="company_belong" class="company_belong"> 外团-分发联盟
-                            </label >
+                                <input type="radio" value="2" name="company_belong" class="company_belong"> 外团-分发联盟
+                            </label > -->
                             </span>
                                 <!--                            <span class="notice-text"></span>-->
                             </td>
@@ -171,8 +172,16 @@
         Think.setValue("category", {$data.category|default = 0});
         $(".select_gallery").select2();
         $(function(){
-            $("#promote_id").on("select2:select",function(e){
-                console.log(e);
+            $("#promote_id").on("change",function(e){
+                
+                var belong = $("#promote_id option:selected").data();
+                $("#company_belong_str").html(belong.belong);
+                $("#company_belong").val(belong.company_belong);
+                if(belong.company_belong > -1){
+                    $("#company_belong_box").show();
+                }else{
+                    $("#company_belong_box").hide();
+                }
             })
             // showTab();
         });
diff --git a/Application/Admin/View/Promote/belong_edit.html b/Application/Admin/View/Promote/belong_edit.html
index ae167dec6..777586f36 100644
--- a/Application/Admin/View/Promote/belong_edit.html
+++ b/Application/Admin/View/Promote/belong_edit.html
@@ -50,12 +50,15 @@
                         <tr>
                             <td class="l">会长账号：</td>
                             <td class="r">
-                                <select id="promote_id" name="promote_id" class="select_gallery"  style="width:120px;">
+                                <input  id="promote_id" name="promote_id" value="{$data['promote_id']}" type="hidden">
+                                {:getPromoteName($data['promote_id'])}
+
+                                <!-- <select id="promote_id" name="promote_id" class="select_gallery"  style="width:120px;">
                                     <option value="">请选择会长账号</option>
                                     <volist name=":promote_listsOther(1)" id="vo">
                                         <option promote_id-id="{$vo.id}" value="{$vo.id}" <if condition="$vo.id eq $data['promote_id']">selected=selected</if>>{$vo.account}</option>
                                     </volist>
-                                </select>
+                                </select> -->
                             </td>
                         </tr>
                         <input type="hidden" name="promote_id" value="{$data['promote_id']}">
@@ -64,8 +67,10 @@
                         <tr>
                             <td class="l">工会归属：</td>
                             <td class="r table_radio">
-                        <span class="form_radio ">
-                            <label >
+                            <input  id="company_belong" name="company_belong" value="{$data['company_belong']}" type="hidden">
+                        <span class="form_radio">
+                            {:getCompanyBlong($data['company_belong'])}
+                            <!-- <label >
                                 <input type="radio" value="3" name="company_belong" <?php if($data['company_belong'] ==3):?>
                                 checked="checked"
                                 <?php endif?> class="company_belong"> 无
@@ -84,7 +89,7 @@
                                 <input type="radio" value="2" name="company_belong" <?php if($data['company_belong'] ==2):?>
                                 checked="checked"
                                 <?php endif?> class="company_belong"> 外团-分发联盟
-                            </label>
+                            </label> -->
                             </span>
                                 <!--                            <span class="notice-text"></span>-->
                             </td>