From 5d315d41825bd794b9797ec8399a00283631cf2a Mon Sep 17 00:00:00 2001
From: jbRotk <2436953959@qq.com>
Date: Fri, 7 Feb 2020 14:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BC=9A=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PromoteController.class.php    | 10 +++-
 Application/Admin/View/Promote/belong.html    | 25 +++++++++
 .../Admin/View/Promote/belong_add.html        | 54 +++++++++++++------
 .../Admin/View/Promote/belong_edit.html       | 37 ++++++++++++-
 Data/update.sql                               |  6 +++
 5 files changed, 114 insertions(+), 18 deletions(-)

diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index 08cc2bd37..a94784d64 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -1223,6 +1223,10 @@ class PromoteController extends ThinkController
             $map['pb.can_view_recharge'] = I('can_view_recharge');
         }
 
+        if (!is_null(I('company_type', null))) {
+            $map['pb.company_type'] = I('company_type');
+        }
+
         if (!is_null(I('company_id', null))) {
             $map['p.company_id'] = I('company_id');
         }
@@ -1265,7 +1269,7 @@ class PromoteController extends ThinkController
         $this->display();
     }
 
-    public function belong_add($promote_id=null, $company_belong = null, $company_relation = null, $remark = null, $can_view_recharge = null)
+    public function belong_add($promote_id=null, $company_belong = null, $company_relation = null, $remark = null, $can_view_recharge = null, $company_type = null)
     {
         if (IS_POST) {
             if (empty($promote_id)) {
@@ -1276,6 +1280,7 @@ class PromoteController extends ThinkController
                 'company_belong' => $company_belong,
                 'company_relation' => $company_relation,
                 'can_view_recharge' => $can_view_recharge,
+                'company_type' => $company_type,
                 'verify_status' => 0,
                 'remark' => $remark,
                 'applicant_id' => getAdmin(),
@@ -1302,7 +1307,7 @@ class PromoteController extends ThinkController
         }
     }
 
-    public function belong_edit($promote_id=null, $company_belong = null, $company_relation = null, $remark = null, $can_view_recharge = null)
+    public function belong_edit($promote_id=null, $company_belong = null, $company_relation = null, $remark = null, $can_view_recharge = null, $company_type = null)
     {
         if (IS_POST) {
             if (empty($promote_id)) {
@@ -1313,6 +1318,7 @@ class PromoteController extends ThinkController
                 'company_belong' => $company_belong,
                 'company_relation' => $company_relation,
                 'can_view_recharge' => $can_view_recharge,
+                'company_type' => $company_type,
                 'verify_status' => 0,
                 'remark' => $remark,
                 'applicant_id' => getAdmin(),
diff --git a/Application/Admin/View/Promote/belong.html b/Application/Admin/View/Promote/belong.html
index 20a550f41..9678510a2 100644
--- a/Application/Admin/View/Promote/belong.html
+++ b/Application/Admin/View/Promote/belong.html
@@ -81,6 +81,13 @@
                         <option value="1">只维护</option>
                     </select>
                 </div>
+                <div class="input-list input-list-channelstatus">
+                    <select name="company_type">
+                        <option value="">工会类型</option>
+                        <option value="1">公司</option>
+                        <option value="2">个人</option>
+                    </select>
+                </div>
                 <div class="input-list input-list-channelstatus">
                     <select name="verify_status">
                         <option value="">审核状态</option>
@@ -123,6 +130,7 @@
                         <th>身份状态</th>
                         <th>内外团</th>
                         <th>归属状态</th>
+                        <th>工会类型</th>
                         <th>充值信息权限</th>
                         <th>申请时间</th>
                         <th>备注</th>
@@ -200,6 +208,12 @@
                                     <?php if(intval($data['company_belong']) == 1) {?>
                                     <span>外团</span>
                                     <?php }?>
+                                    <?php if(intval($data['company_belong']) == 2) {?>
+                                        <span>外团-分发联盟</span>
+                                    <?php }?>
+                                    <?php if(intval($data['company_belong']) == 3) {?>
+                                        <span>无</span>
+                                    <?php }?>
                                 </td>
                                 <td>
                                     <?php if($data['company_relation'] == 0) {?>
@@ -208,6 +222,17 @@
                                     <?php if(intval($data['company_relation']) == 1) {?>
                                     <span>只维护</span>
                                     <?php }?>
+                                    <?php if(intval($data['company_relation']) == 2) {?>
+                                        <span>无</span>
+                                        <?php }?>
+                                </td>
+                                <td>
+                                    <?php if($data['company_type'] == 1) {?>
+                                    <span>公司</span>
+                                    <?php }?>
+                                    <?php if(intval($data['company_type']) == 2) {?>
+                                    <span>个人</span>
+                                    <?php }?>
                                 </td>
                                 <td>
                                     <?php if($data['can_view_recharge'] == 0) {?>
diff --git a/Application/Admin/View/Promote/belong_add.html b/Application/Admin/View/Promote/belong_add.html
index b8cc5467a..145dea6b5 100644
--- a/Application/Admin/View/Promote/belong_add.html
+++ b/Application/Admin/View/Promote/belong_add.html
@@ -63,33 +63,57 @@
                         <tr>
                             <td class="l">工会归属：</td>
                             <td class="r table_radio">
-                        <span class="form_radio table_btn">
+                        <span class="form_radio">
+                            <label >
+                                <input type="radio"  value="3" name="company_belong" checked="checked" class="company_belong"> 无
+                            </label >
                             <label >
-                                <input type="radio"  value="0" name="company_belong" checked="checked" 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>
-                            </span>
-                                <!--                            <span class="notice-text"></span>-->
-                            </td>
-                        </tr>
-
-                        <tr  id="company_relation">
-                            <td class="l">工会关系：</td>
-                            <td class="r table_radio">
-                        <span class="form_radio table_btn">
                             <label >
-                                <input type="radio"  value="0" name="company_relation" checked="checked"> 自主开发及维护
+                                <input type="radio"  value="2" name="company_belong" class="company_belong"> 外团-分发联盟
                             </label >
-                            <label >
-                                <input type="radio" value="1" name="company_relation" > 只维护
-                            </label>
                             </span>
                                 <!--                            <span class="notice-text"></span>-->
                             </td>
                         </tr>
 
+                        <tr  id="company_relation">
+                                <td class="l">工会关系：</td>
+                                <td class="r table_radio">
+                            <span class="form_radio table_btn">
+                                <label >
+                                    <input type="radio"  value="2" name="company_relation" checked="checked"> 无
+                                </label >
+                                <label >
+                                    <input type="radio"  value="0" name="company_relation"> 自主开发及维护
+                                </label >
+                                <label >
+                                    <input type="radio" value="1" name="company_relation" > 只维护
+                                </label>
+                                </span>
+                                    <!--                            <span class="notice-text"></span>-->
+                                </td>
+                            </tr>
+
+                            <tr  id="company_type">
+                                    <td class="l">工会类型：</td>
+                                    <td class="r table_radio">
+                                <span class="form_radio table_btn">
+                                    <label >
+                                        <input type="radio"  value="1" name="company_type" checked="checked"> 公司
+                                    </label >
+                                    <label >
+                                        <input type="radio"  value="2" name="company_type" > 个人
+                                    </label >
+                                    </span>
+                                        <!--                            <span class="notice-text"></span>-->
+                                    </td>
+                                </tr>
+
                         <tr  id="can_view_recharge">
                             <td class="l">充值信息查看权限：</td>
                             <td class="r table_radio">
diff --git a/Application/Admin/View/Promote/belong_edit.html b/Application/Admin/View/Promote/belong_edit.html
index f39d3750a..ee3b035c9 100644
--- a/Application/Admin/View/Promote/belong_edit.html
+++ b/Application/Admin/View/Promote/belong_edit.html
@@ -64,7 +64,12 @@
                         <tr>
                             <td class="l">工会归属：</td>
                             <td class="r table_radio">
-                        <span class="form_radio table_btn">
+                        <span class="form_radio ">
+                            <label >
+                                <input type="radio" value="3" name="company_belong" <?php if($data['company_belong'] ==3):?>
+                                checked="checked"
+                                <?php endif?> class="company_belong"> 无
+                            </label>
                             <label >
                                 <input type="radio"  value="0" name="company_belong" <?php if($data['company_belong'] ==0):?>
                                 checked="checked"
@@ -75,6 +80,11 @@
                                 checked="checked"
                                 <?php endif?> class="company_belong"> 外团
                             </label>
+                            <label >
+                                <input type="radio" value="2" name="company_belong" <?php if($data['company_belong'] ==2):?>
+                                checked="checked"
+                                <?php endif?> class="company_belong"> 外团-分发联盟
+                            </label>
                             </span>
                                 <!--                            <span class="notice-text"></span>-->
                             </td>
@@ -84,6 +94,11 @@
                             <td class="l">工会关系：</td>
                             <td class="r table_radio">
                         <span class="form_radio table_btn">
+                            <label >
+                                <input type="radio" value="2" name="company_relation" <?php if($data['company_relation'] ==2):?>
+                                checked="checked"
+                                <?php endif?>> 无
+                            </label>
                             <label >
                                 <input type="radio"  value="0" name="company_relation" <?php if($data['company_relation'] ==0):?>
                                 checked="checked"
@@ -100,6 +115,26 @@
                             </td>
                         </tr>
 
+                        <tr  id="company_type">
+                            <td class="l">工会类型：</td>
+                            <td class="r table_radio">
+                        <span class="form_radio table_btn">
+                            <label >
+                                <input type="radio" value="1" name="company_type" <?php if($data['company_type'] ==1):?>
+                                checked="checked"
+                                <?php endif?>> 公司
+                            </label>
+                            <label >
+                                <input type="radio"  value="2" name="company_type" <?php if($data['company_type'] ==2):?>
+                                checked="checked"
+                                <?php endif?>
+                                > 个人
+                            </label >
+                            </span>
+                                <!--                            <span class="notice-text"></span>-->
+                            </td>
+                        </tr>
+
                         <tr  id="can_view_recharge">
                             <td class="l">充值信息查看权限：</td>
                             <td class="r table_radio">
diff --git a/Data/update.sql b/Data/update.sql
index 6a5649935..bc21d0e6c 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1118,3 +1118,9 @@ CREATE TABLE `tab_reward_record` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 
+-- 推广工会管理 新增属性类型
+ALTER TABLE `tab_promote_belong`
+MODIFY COLUMN `company_belong`  tinyint(1) UNSIGNED NOT NULL DEFAULT 3 COMMENT '工会归属：0-内团；1-外团  2-分发联盟 3 无' AFTER `verify_status`,
+MODIFY COLUMN `company_relation`  tinyint(1) UNSIGNED NOT NULL DEFAULT 2 COMMENT '工会关系：0-自主开发及维护；1-只维护 2 无' AFTER `company_belong`;
+ADD COLUMN `company_type`  tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '工会类型 1公司 2个人' AFTER `can_view_recharge`;
+