经纪人

app/admin/controller/Broker.php

@@ -59,6 +59,7 @@ class Broker extends BaseController
             'status'      => input('status/d') == 1 ? 1 : 2,
             'latitude'    => input('latitude/f', 0),
             'longitude'   => input('longitude/f', 0),
+            'type'        => input('type/s', ""),
         ];
 
         if (empty($data['latitude']) || empty($data['longitude'])) {
@@ -212,7 +213,7 @@ class Broker extends BaseController
         if (!empty($workerid)) {
             $map[] = ['workerid', '=', $workerid];
         }
-        $list  = BrokerModel::with(['worker', 'agent', 'muser'])->withCount(['user'])->where($map)->order('id', 'DESC')->limit($limit)->page($page)->append(['status_text', 'powerreport_text'])->select();
+        $list  = BrokerModel::with(['worker', 'agent', 'muser'])->withCount(['user'])->where($map)->order('id', 'DESC')->limit($limit)->page($page)->append(['status_text', 'powerreport_text','type_text'])->select();
         $count = BrokerModel::where($map)->count();
         if ($count == 0) {
             exit(json_encode([
@@ -471,7 +472,11 @@ class Broker extends BaseController
         if (!empty($status)) {
             $map[] = ['status', '=', $status];
         }
-        $list  = BrokerFormModel::with(['worker', 'agent'])->where($map)->order('id', 'DESC')->limit($limit)->page($page)->append(['status_text'])->select();
+        $type = input('type/d');
+        if (!empty($type)) {
+            $map[] = ['type', '=', $type];
+        }
+        $list  = BrokerFormModel::with(['worker', 'agent'])->where($map)->order('id', 'DESC')->limit($limit)->page($page)->append(['status_text','type_text'])->select();
         $count = BrokerFormModel::where($map)->count();
         if ($count == 0) {
             exit(json_encode([
@@ -540,6 +545,7 @@ class Broker extends BaseController
             $data['village']    = $fbroker['village'];
             $data['district']   = $fbroker['district'];
             $data['region']     = $fbroker['region'];
+            $data['type']       = $fbroker['type'];
             $data['createtime'] = time();
             $broker             = BrokerModel::create($data);
 

app/admin/view/broker/applylist.html

@@ -15,7 +15,17 @@
 							<option value="">全部状态</option>
 							<option value="1">待审核</option>
 							<option value="2">审核通过</option>
-							<option value="2">审核拒绝</option>
+							<option value="3">审核拒绝</option>
+						</select>
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label">类型</label>
+					<div class="layui-input-block">
+						<select name="status">
+							<option value="">全部</option>
+							<option value="1">经纪人</option>
+							<option value="2">红色合伙人</option>
 						</select>
 					</div>
 				</div>
@@ -75,6 +85,7 @@
 					{ field: 'id', width: 80, title: '表ID', sort: true },
 					{ field: 'title', title: '姓名' },
 					{ field: 'mobile', title: '手机号' },
+					{ field: 'type_text', title: '类型', width: 100, align: 'center' },
 					{ field: 'address', title: '镇街', templet: '#address' },
 					{ field: 'region', title: '区域', width: 100, align: 'center'},
 					{ field: 'workertitle', title: '劳务公司', templet: '#workertitleTpl' },

app/admin/view/broker/brokerform.html

@@ -57,7 +57,13 @@
 								<input type="text" name="qq" value="{$broker.qq}" placeholder="请输入..." autocomplete="off" class="layui-input">
 							</div>
 						</div>
-						
+						<div class="layui-form-item" pane>
+							<label class="layui-form-label">类型</label>
+							<div class="layui-input-block">
+								<input type="radio" name="type" value="1" title="经纪人" {eq name="broker.type|default=1" value="1" }checked{/eq} />
+								<input type="radio" name="type" value="2" title="红色合伙人" {eq name="broker.type" value="2" }checked{/eq} />
+							</div>
+						</div>
 						<div class="layui-form-item" id="LAY-broker-brokerform-edit-areapicker">
 							<label class="layui-form-label"><span style="color:#f90c05;">*</span>省市区</label>
 							<div class="layui-input-inline">

app/admin/view/broker/brokerlist.html

@@ -93,6 +93,7 @@
 					{ field: 'title', title: '姓名', edit: 'text' },
 					{ field: 'mobile', title: '手机号' },
 					{ field: 'muser', title: '关联的用户（姓名-手机号）', templet: '#muserTpl', minWidth: 250, align: 'left' },
+					{ field: 'type_text', title: '类型', width: 100, align: 'center' },
 					{ field: 'address', title: '镇街', templet: '#address' },
 					{ field: 'region', title: '区域' },
 					{ field: 'workertitle', title: '劳务公司', templet: '#workertitleTpl' },

app/agent/controller/Broker.php

@@ -55,6 +55,7 @@ class Broker extends BaseController
             'status'      => input('status/d') == 1 ? 1 : 2,
             'latitude'    => input('latitude/f', 0),
             'longitude'   => input('longitude/f', 0),
+            'type'        => input('type/s', ""),
         ];
 
         if (empty($data['latitude']) || empty($data['longitude'])) {
@@ -179,7 +180,7 @@ class Broker extends BaseController
         if (!empty($status)) {
             $map[] = ['status', '=', $status];
         }
-        $list  = BrokerModel::with(['agent', 'muser'])->withCount(['user'])->where($map)->order('id', 'DESC')->limit($limit)->page($page)->append(['status_text', 'powerreport_text'])->select();
+        $list  = BrokerModel::with(['agent', 'muser'])->withCount(['user'])->where($map)->order('id', 'DESC')->limit($limit)->page($page)->append(['status_text', 'powerreport_text','type_text'])->select();
         $count = BrokerModel::where($map)->count();
         if ($count == 0) {
             exit(json_encode([

app/agent/view/broker/brokerform.html

@@ -59,7 +59,13 @@
 								<input type="text" name="qq" value="{$broker.qq}" placeholder="请输入..." autocomplete="off" class="layui-input">
 							</div>
 						</div>
-						
+						<div class="layui-form-item" pane>
+							<label class="layui-form-label">类型</label>
+							<div class="layui-input-block">
+								<input type="radio" name="type" value="1" title="经纪人" {eq name="broker.type|default=1" value="1" }checked{/eq} />
+								<input type="radio" name="type" value="2" title="红色合伙人" {eq name="broker.type" value="2" }checked{/eq} />
+							</div>
+						</div>
 						<div class="layui-form-item" id="LAY-broker-brokerform-edit-areapicker">
 							<label class="layui-form-label"><span style="color:#f90c05;">*</span>省市区</label>
 							<div class="layui-input-inline">

app/agent/view/broker/brokerlist.html

@@ -85,6 +85,7 @@
 					{ field: 'income', title: '收益', width: 120 },
 					{ field: 'income_total', title: '总收益', width: 120 },
 					{ field: 'muser', title: '关联的用户（姓名-手机号）', templet: '#muserTpl', minWidth: 250, align: 'left' },
+					{ field: 'type_text', title: '类型', width: 100, align: 'center' },
 					{ field: 'address', title: '镇街', templet: '#address' },
 					{ field: 'region', title: '区域' },
 					{ field: 'agenttitle', title: '代理门店', templet: '#agenttitleTpl' },

app/common/model/BrokerForm.php

@@ -23,6 +23,7 @@ class BrokerForm extends Model
         'region'     => 'string',
         'createtime' => 'int',
         'status'     => 'tinyint',
+        'type'       => 'tinyint',
     ];
 
     // 设置字段自动转换类型
@@ -36,6 +37,12 @@ class BrokerForm extends Model
         return $status[$data['status']];
     }
 
+    public function getTypeTextAttr($value, $data)
+    {
+        $status = [1 => '经纪人', 2 => '红色合伙人'];
+        return $status[$data['type']];
+    }
+
     // 关联Worker
     public function worker()
     {

app/worker/controller/Broker.php

@@ -57,6 +57,7 @@ class Broker extends BaseController
             'status'      => input('status/d', 0) == 1 ? 1 : 2,
             'latitude'    => input('latitude/f', 0),
             'longitude'   => input('longitude/f', 0),
+            'type'        => input('type/s', ""),
         ];
 
         if (empty($data['latitude']) || empty($data['longitude'])) {
@@ -198,7 +199,7 @@ class Broker extends BaseController
         if (!empty($agentid)) {
             $map[] = ['agentid', '=', $agentid];
         }
-        $list  = BrokerModel::with(['muser', 'worker', 'agent'])->withCount(['user'])->where($map)->order('id', 'DESC')->limit($limit)->page($page)->append(['status_text', 'powerreport_text'])->select();
+        $list  = BrokerModel::with(['muser', 'worker', 'agent'])->withCount(['user'])->where($map)->order('id', 'DESC')->limit($limit)->page($page)->append(['status_text', 'powerreport_text','type_text'])->select();
         $count = BrokerModel::where($map)->count();
         if ($count == 0) {
             exit(json_encode([

app/worker/view/broker/brokerform.html

@@ -71,7 +71,13 @@
 								<input type="text" name="qq" value="{$broker.qq}" placeholder="请输入..." autocomplete="off" class="layui-input">
 							</div>
 						</div>
-						
+						<div class="layui-form-item" pane>
+							<label class="layui-form-label">类型</label>
+							<div class="layui-input-block">
+								<input type="radio" name="type" value="1" title="经纪人" {eq name="broker.type|default=1" value="1" }checked{/eq} />
+								<input type="radio" name="type" value="2" title="红色合伙人" {eq name="broker.type" value="2" }checked{/eq} />
+							</div>
+						</div>
 						<div class="layui-form-item" id="LAY-broker-brokerform-edit-areapicker">
 							<label class="layui-form-label"><span style="color:#f90c05;">*</span>省市区</label>
 							<div class="layui-input-inline">

app/worker/view/broker/brokerlist.html

@@ -93,6 +93,7 @@
 					{ field: 'income', title: '收益', width: 120 },
 					{ field: 'income_total', title: '总收益', width: 120 },
 					{ field: 'muser', title: '关联的用户（姓名-手机号）', templet: '#muserTpl', minWidth: 250, align: 'left' },
+					{ field: 'type_text', title: '类型', width: 100, align: 'center' },
 					{ field: 'address', title: '镇街', templet: '#address' },
 					{ field: 'region', title: '区域' },
 					{ field: 'agenttitle', title: '代理门店', templet: '#agenttitleTpl' },