diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index 9c3ccbb5a..75258aa05 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -141,6 +141,7 @@ class PromoteController extends ThinkController
//为数据权限添加
setPowerPromoteIds($map, 'id');
$list_data = D(self::model_name)->where($map)->order('id DESC')->page($p, $row)->select();
+ $list_data = D(self::model_name)->parseListData($list_data);
$oa_data = [];
if (I('oa_associated', -1) == -1) {
foreach ($list_data as $k => $v) {
@@ -220,14 +221,29 @@ class PromoteController extends ThinkController
if ($this->accountExist($account)) {
$this->error('该账号已存在');
}
- $data = array('account'=>$account,'password'=>$password,'second_pwd'=>$second_pwd,'real_name'=>$real_name,
- 'email'=>$email,'mobile_phone'=>$mobile_phone,'bank_name'=>$bank_name,'bank_card'=>$bank_card,
- 'admin_id'=>session('user_auth')['uid'],'status'=>$status,'ba_id'=>$ba_id, 'company_id' => $company_id);
+ $company_belong = $_REQUEST['company_belong'];
+ $company_relation = $_REQUEST['company_relation'];
+ $data = array(
+ 'account'=>$account,
+ 'password'=>$password,
+ 'second_pwd'=>$second_pwd,
+ 'real_name'=>$real_name,
+ 'email'=>$email,
+ 'mobile_phone'=>$mobile_phone,
+ 'bank_name'=>$bank_name,
+ 'bank_card'=>$bank_card,
+ 'admin_id'=>session('user_auth')['uid'],
+ 'status'=>$status,
+ 'ba_id'=>$ba_id,
+ 'company_id' => $company_id,
+ 'company_belong' => $company_belong,
+ 'company_relation' => $company_relation,
+ );
if (preg_match('/^[a-zA-Z0-9]{6,15}$/', $account)==false) {
$this->error('账号只能是6-15位字母或数字');
}
- if (empty($company_id)) {
+ if ($company_id < 0) {
$this->error('请选择推广公司');
}
$promoteService = new PromoteService();
@@ -277,12 +293,16 @@ class PromoteController extends ThinkController
if (preg_match('/^[a-zA-Z0-9]{6,15}$/', I('post.account'))==false) {
$this->error('账号只能是6-15位字母或数字');
}
- $promote = M("promote", "tab_")->where(array("id" => $_POST['id']))->field('id, level')->find();
+ $promote = M("promote", "tab_")
+ ->where(array("id" => $_POST['id']))
+ ->field('id, level, company_belong, company_relation, company_id')
+ ->find();
$data['account'] = I('post.account');
if ($this->accountExist($data['account'], $_POST['id'])) {
$this->error('该账号已存在');
}
- if (empty(I('company_id')) && $promote['level'] ==1) {
+ $company_id = I('company_id');
+ if ($company_id <0 && $promote['level'] ==1) {
$this->error('请选择推广公司');
}
empty(I('post.id')) ? : $data['id'] =I('post.id');
@@ -310,15 +330,33 @@ class PromoteController extends ThinkController
$ba = new \Admin\Model\BusinessAffairsModel();
$ba->update_child($ba_id['ba_id'], $_REQUEST['ba_id'], $id);
}
- if (!empty(I('company_id')) && $promote['level'] ==1) {
- $data['company_id'] = I('company_id');
+
+ if ($promote['level'] ==1) {//如果是会长才能修改的选项
+ if (!is_null($company_id)) {
+ $data['company_id'] = $company_id;//推广公司
+ }
+
+ $data['company_belong'] = I('company_belong');//工会归属
+ $data['company_relation'] = I('company_relation');//工会关系
}
+
$res = M("promote", "tab_")->where(array("id"=>$_POST['id']))->save($data);
if ($res !== false) {
- if (!empty(I('company_id')) && $promote['level'] ==1) {//修改会长底下推广员的推广公司
- M("promote", "tab_")->where("chain like '%/{$_POST['id']}/%'")->save([
- 'company_id' => I('company_id')
- ]);
+ if ($promote['level'] == 1) {//修改会长底下推广员的推广公司
+ $array = array();
+ if ($promote['company_id'] != $company_id) {
+ $array['company_id'] = I('company_id');
+ }
+ if ($promote['company_belong'] != I('company_belong')) {
+ $array['company_belong'] = I('company_belong');
+ }
+ if ($promote['company_relation'] != I('company_relation')) {
+ $array['company_relation'] = I('company_relation');
+ }
+ if ($array) {
+ $res = M("promote", "tab_")->where("chain like '%/{$_POST['id']}/%'")->save($array);
+ }
+
}
$this->success("修改成功", U('lists'));
} else {
diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php
index b466da9a2..2e9a02bd8 100644
--- a/Application/Admin/Model/PromoteModel.class.php
+++ b/Application/Admin/Model/PromoteModel.class.php
@@ -407,4 +407,16 @@ class PromoteModel extends Model{
return $result;
}
+
+ public function parseListData($result)
+ {
+ $parseData = array();
+ foreach ($result as $key => $value) {
+ $parseData[$key] = $value;
+ $parseData[$key]['company_belong_str'] = $value['company_belong'] ? '外团' : '内团';
+ }
+ return $parseData;
+ }
+
+
}
\ No newline at end of file
diff --git a/Application/Admin/View/Promote/add.html b/Application/Admin/View/Promote/add.html
index d2a4326dd..ccc01973a 100644
--- a/Application/Admin/View/Promote/add.html
+++ b/Application/Admin/View/Promote/add.html
@@ -43,7 +43,8 @@
| *所属推广公司 |
|
+
+
+ | 工会归属： |
+
+
+
+
+
+
+ |
+
+
+
+ | 工会关系： |
+
+
+
+
+
+
+ |
+
+
| 真实姓名： |
@@ -137,6 +169,15 @@ $(function(){
prov="{:substr($data['bank_area'],0,2)}";
city="{:substr($data['bank_area'],2,2)}";
ciarea="{:substr($data['bank_area'],4,2)}";
+ $("input[name=company_belong]").click(function () {
+ if ($(this).val() == 1) {
+ $('#company_relation').show();
+ } else {
+ $('#company_relation').hide();
+ }
+
+ });
+
});
//得到地区码
function getAreaID(){
diff --git a/Application/Admin/View/Promote/edit.html b/Application/Admin/View/Promote/edit.html
index f7eb7fc90..6abc2b084 100644
--- a/Application/Admin/View/Promote/edit.html
+++ b/Application/Admin/View/Promote/edit.html
@@ -183,7 +183,8 @@
|
+
+
+
+ | 工会归属： |
+
+
+
+
+
+
+ |
+
+
+ id="company_relation">
+ | 工会关系： |
+
+
+
+
+
+
+ |
+
+
+
+
+ | 工会归属： |
+
+
+
+
+
+
+ |
+
+
+ id="company_relation">
+ | 工会关系： |
+
+
+
+
+
+
+ |
+
+
+
| 注册时间： |
@@ -353,6 +430,15 @@ $(function(){
city="{:substr($data['bank_area'],2,2)}";
ciarea="{:substr($data['bank_area'],4,2)}";
//initComplexArea('seachprov', 'seachcity', 'seachdistrict', area_array, sub_array, prov, city, ciarea);
+
+ $("input[name=company_belong]").click(function () {
+ if ($(this).val() == 1) {
+ $('#company_relation').show();
+ } else {
+ $('#company_relation').hide();
+ }
+
+ });
});
// //得到地区码
// function getAreaID(){
diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html
index 0aa7f9d25..c36ecc8df 100644
--- a/Application/Admin/View/Promote/lists.html
+++ b/Application/Admin/View/Promote/lists.html
@@ -184,6 +184,7 @@
最后登录时间 |
渠道类型 |
所属会长 |
+ 工会归属 |
商务专员 |
状态 |
身份状态 |
@@ -231,6 +232,7 @@
{:encryptStr(getTopPromote($data['id'])['account'])}
+ {$data['company_belong_str']} |
{:get_business_affairs_account($data['ba_id'])} |
diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index 06cf3c2f4..606dfed31 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -940,6 +940,8 @@ class PromoteService {
'company_id' => $params['company_id'] ?? 0,
'invite_code' => $params['invite_code'] ?? '',
'create_time' => time(),
+ 'company_belong' => $params['company_belong'] ?? 0,
+ 'company_relation' => $params['company_relation'] ?? 0,
];
if ($parent) {
|