Skip to content

H
hongruiboyuan
提交 42afbfe4 authored 作者: 李达's avatar 李达
浏览文件
操作

修改财务审核,销售中心审核,业务部审核按照手机号搜索功能问题

上级 6ddb0604
显示空白字符变更
内嵌 并排
正在显示 包含 257 行增加 和 71 行删除
backend/controllers/UserController.php
浏览文件 @ 42afbfe4
...@@ -387,37 +387,108 @@ class UserController extends ControllerBase ...@@ -387,37 +387,108 @@ class UserController extends ControllerBase
*/ */
public function actionRealName() public function actionRealName()
{ {
$condition = ''; // $condition = '';
$keywords = Yii::$app->request->get('keywords', ''); $keywords = Yii::$app->request->get('keywords', '');
// $keywords = trim($keywords); // $keywords = trim($keywords);
// if (!empty($keywords)) { // if (!empty($keywords)) {
// $condition .= " AND (uid = '{$keywords}')"; // $condition .= " AND (uid = '{$keywords}')";
// } // }
$keywords = trim($keywords); $keywords = trim($keywords);
// if (!empty($keywords)) {
// $nnme='/^\d$/u';
// if(preg_match($nnme, $keywords)){//匹配数字
// $condition .= " uid = '{$keywords}'";
// }elseif(preg_match("/[\x{4e00}-\x{9fa5}]+/u", $keywords)){ //包含汉字 查询销售名
// $info=User::find()->select('uid')->where("username =:username",[":username"=>$keywords])->one();
// $condition .= " uid = '{$info['uid']}'";
// }elseif(preg_match("/^[ a-z0-9]+$/i", $keywords)){//匹配登录名
// $info=User::find()->select('uid')->where("accountname =:accountname",[":accountname"=>$keywords])->one();
// $condition .= "uid = '{$info['uid']}'";
// }
// }
$searchArr["username"] = trim(Yii::$app->request->get('username', ''));
$searchArr["referrer"] = trim(Yii::$app->request->get('referrer', ''));
if($searchArr['referrer']){
$tjr = User::findOne(['accountname'=>$searchArr['referrer']]);
}
if($searchArr['username']){
$tjrs = User::findOne(['realname'=>$searchArr['username']]);
}
$mf=0;//手机号搜索
if (!empty($keywords)) { if (!empty($keywords)) {
$nnme='/^\d$/u'; $nnme='/^\d$/u';
if(preg_match($nnme, $keywords)){//匹配数字 if(preg_match("/^1[3456789]{1}[0-9]{9}$/", $keywords)){//匹配手机号
$condition .= " uid = '{$keywords}'"; // $info=User::find()->select('uid')->where("mobile =:mobile",[":mobile"=>$keywords])->one();
// $condition =array("uid"=>$info['uid']);
$info=User::find()->select('uid')->where("mobile =:mobile",[":mobile"=>$keywords])->all();
$mf=1; //手机号搜索
foreach($info as $k=>$v){
$condition[] =array("uid"=>$v['uid']);
}
}elseif(preg_match("/[\x{4e00}-\x{9fa5}]+/u", $keywords)){ //包含汉字 查询销售名 }elseif(preg_match("/[\x{4e00}-\x{9fa5}]+/u", $keywords)){ //包含汉字 查询销售名
$info=User::find()->select('uid')->where("username =:username",[":username"=>$keywords])->one(); $info=User::find()->select('uid')->where("username =:username",[":username"=>$keywords])->one();
$condition .= " uid = '{$info['uid']}'"; $condition =array("uid"=>$info['uid']);
}elseif(preg_match("/^[ a-z0-9]+$/i", $keywords)){//匹配登录名 }elseif(preg_match("/^[ a-z0-9]+$/i", $keywords)){//匹配登录名
$info=User::find()->select('uid')->where("accountname =:accountname",[":accountname"=>$keywords])->one(); $info=User::find()->where("accountname =:accountname",[":accountname"=>$keywords])->one();
$condition .= "uid = '{$info['uid']}'"; $condition =array("uid"=>$info['uid']);
}elseif (preg_match($nnme, $keywords)){//匹配数字
$condition =array("uid"=>$keywords);
}
if($searchArr["username"] && $searchArr['referrer']){
$condition['uid']=$tjr['uid'];
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr["username"]){
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr['referrer']){
$condition['uid']=$tjr['uid'];
}
}else{
if($searchArr["username"] && $searchArr['referrer']){
$condition['uid']=$tjr['uid'];
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr["username"]){
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr['referrer']){
$condition['uid']=$tjr['uid'];
}else{
$condition =array();
} }
} }
// $list = ReportForm::find()->where($condition)->orderBy(["status"=>SORT_ASC,'created_at'=>SORT_DESC]); // $list = ReportForm::find()->where($condition)->orderBy(["status"=>SORT_ASC,'created_at'=>SORT_DESC]);
// $list->orderBy(["status"=>SORT_ASC,'created_at'=>SORT_DESC]); // $list->orderBy(["status"=>SORT_ASC,'created_at'=>SORT_DESC]);
/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
// $model=ReportForm::find();
// $count=$model->where($condition)->count();
// $pageSize=Yii::$app->params['pageSize']['manage']; //每页条数
// $pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]);
// $list=$model->offset($pager->offset)->where($condition)->limit($pager->limit)->orderBy(["status"=>SORT_ASC,'created_at'=>SORT_DESC])->all();
if($mf){
foreach($condition as $kk=>$vv){
$model=ReportForm::find();
$count=$model->where($vv)->count();
$pageSize=Yii::$app->params['pageSize']['manage']; //每页条数
$pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]);
$list[]=$model->offset($pager->offset)->where($vv)->limit($pager->limit)->orderBy(["status"=>SORT_DESC,'created_at'=>SORT_DESC])->one();
}
}else{
$model=ReportForm::find(); $model=ReportForm::find();
$count=$model->where($condition)->count(); $count=$model->where($condition)->count();
$pageSize=Yii::$app->params['pageSize']['manage']; //每页条数 $pageSize=Yii::$app->params['pageSize']['manage']; //每页条数
$pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]); $pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]);
$list=$model->offset($pager->offset)->where($condition)->limit($pager->limit)->orderBy(["status"=>SORT_ASC,'created_at'=>SORT_DESC])->all(); $list=$model->offset($pager->offset)->where($condition)->limit($pager->limit)->orderBy(["status"=>SORT_DESC,'created_at'=>SORT_DESC])->all();
}
/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
$this->view->title = '销售中心列表'; $this->view->title = '销售中心列表';
return $this->render('real-name', ['list' => $list,"pager"=>$pager, 'keywords' => $keywords]); return $this->render('real-name', ['list' => $list,"pager"=>$pager, "searchArr"=>$searchArr,'keywords' => $keywords]);
} }
/** /**
...@@ -837,39 +908,78 @@ class UserController extends ControllerBase ...@@ -837,39 +908,78 @@ class UserController extends ControllerBase
$id=\Yii::$app->user->id; $id=\Yii::$app->user->id;
$keywords = Yii::$app->request->get('keywords', ''); $keywords = Yii::$app->request->get('keywords', '');
$keywords = trim($keywords); $keywords = trim($keywords);
$searchArr["username"] = trim(Yii::$app->request->get('username', ''));
$searchArr["referrer"] = trim(Yii::$app->request->get('referrer', ''));
if($searchArr['referrer']){
$tjr = User::findOne(['accountname'=>$searchArr['referrer']]);
}
if($searchArr['username']){
$tjrs = User::findOne(['realname'=>$searchArr['username']]);
}
$mf=0; //手机号搜索
if (!empty($keywords)) { if (!empty($keywords)) {
$nnme='/^\d$/u'; $nnme='/^\d$/u';
if(preg_match($nnme, $keywords)){//匹配数字 if(preg_match("/^1[3456789]{1}[0-9]{9}$/", $keywords)){//匹配手机号
// $condition .= " uid = '{$keywords}'"; $info=User::find()->select('uid')->where("mobile =:mobile",[":mobile"=>$keywords])->all();
$condition =array("uid"=>$keywords); $mf=1; //手机号搜索
foreach($info as $k=>$v){
// $condition =array("uid"=>$info['uid']);
$condition[] =array("uid"=>$v['uid']);
}
}elseif(preg_match("/[\x{4e00}-\x{9fa5}]+/u", $keywords)){ //包含汉字 查询销售名 }elseif(preg_match("/[\x{4e00}-\x{9fa5}]+/u", $keywords)){ //包含汉字 查询销售名
$info=User::find()->select('uid')->where("username =:username",[":username"=>$keywords])->one(); $info=User::find()->select('uid')->where("username =:username",[":username"=>$keywords])->one();
$condition =array("uid"=>$info['uid']); $condition =array("uid"=>$info['uid']);
}elseif(preg_match("/^[ a-z0-9]+$/i", $keywords)){//匹配登录名 }elseif(preg_match("/^[ a-z0-9]+$/i", $keywords)){//匹配登录名
$info=User::find()->where("accountname =:accountname",[":accountname"=>$keywords])->one(); $info=User::find()->where("accountname =:accountname",[":accountname"=>$keywords])->one();
$condition =array("uid"=>$info['uid']); $condition =array("uid"=>$info['uid']);
// $condition .= "uid = '{$info['uid']}'"; }elseif (preg_match($nnme, $keywords)){//匹配数字
$condition =array("uid"=>$keywords);
} }
if($searchArr["username"] && $searchArr['referrer']){
$condition['uid']=$tjr['uid'];
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr["username"]){
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr['referrer']){
$condition['uid']=$tjr['uid'];
}
}else{
if($searchArr["username"] && $searchArr['referrer']){
$condition['uid']=$tjr['uid'];
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr["username"]){
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr['referrer']){
$condition['uid']=$tjr['uid'];
}else{ }else{
$condition =array(); $condition =array();
} }
}
if($mf){
foreach($condition as $kk=>$vv){
$model=ReportForm::find();
$count=$model->where($vv)->count();
// if($id==1){ $pageSize=Yii::$app->params['pageSize']['manage']; //每页条数
// $condition =array(); $pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]);
// }else{ $lists[]=$model->offset($pager->offset)->where($vv)->limit($pager->limit)->orderBy(["status"=>SORT_DESC,'created_at'=>SORT_DESC])->one();
// $condition =array();
// }
//// $condition =array("report_uid"=>$id);
// } }else{
$model=ReportForm::find(); $model=ReportForm::find();
$count=$model->where($condition)->count(); $count=$model->where($condition)->count();
$pageSize=Yii::$app->params['pageSize']['manage']; //每页条数 $pageSize=Yii::$app->params['pageSize']['manage']; //每页条数
$pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]); $pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]);
$lists=$model->offset($pager->offset)->where($condition)->limit($pager->limit)->orderBy(["status"=>SORT_DESC,'created_at'=>SORT_DESC])->all(); $lists=$model->offset($pager->offset)->where($condition)->limit($pager->limit)->orderBy(["status"=>SORT_DESC,'created_at'=>SORT_DESC])->all();
}
$url = Yii::$app->request->referrer; $url = Yii::$app->request->referrer;
if (Yii::$app->request->get('op') == 'exports') { //导出全部数据 if (Yii::$app->request->get('op') == 'exports') { //导出全部数据
$manager=new ManagerLog(); $manager=new ManagerLog();
...@@ -1074,7 +1184,6 @@ class UserController extends ControllerBase ...@@ -1074,7 +1184,6 @@ class UserController extends ControllerBase
]); ]);
return yii::$app->util->alert('报单导出成功',$url); return yii::$app->util->alert('报单导出成功',$url);
} }
return $this->render('report-confirm',["sholdernums"=>$lists,"pager"=>$pager,'searchArr' => $searchArr,"keywords"=>$keywords]); return $this->render('report-confirm',["sholdernums"=>$lists,"pager"=>$pager,'searchArr' => $searchArr,"keywords"=>$keywords]);
} }
...@@ -1368,43 +1477,112 @@ class UserController extends ControllerBase ...@@ -1368,43 +1477,112 @@ class UserController extends ControllerBase
} }
//业务部审核列表 //业务部审核列表
public function actionYeWuConfirm(){ public function actionYeWuConfirm(){
// $searchArr = ['keywords' => '', 'date' => ['start' => date('2018-01-01 00:00'), 'end' => date('Y-m-d H:i')]];
// $id=\Yii::$app->user->id;
// $keywords = Yii::$app->request->get('keywords', '');
// $keywords = trim($keywords);
// if (!empty($keywords)) {
// $nnme='/^\d$/u';
// if(preg_match($nnme, $keywords)){//匹配数字
//// $condition .= " uid = '{$keywords}'";
// $condition =array("uid"=>$keywords);
//
// }elseif(preg_match("/[\x{4e00}-\x{9fa5}]+/u", $keywords)){ //包含汉字 查询销售名
// $info=User::find()->select('uid')->where("username =:username",[":username"=>$keywords])->one();
// $condition =array("uid"=>$info['uid']);
//
// }elseif(preg_match("/^[ a-z0-9]+$/i", $keywords)){//匹配登录名
// $info=User::find()->where("accountname =:accountname",[":accountname"=>$keywords])->one();
// $condition =array("uid"=>$info['uid']);
//// $condition .= "uid = '{$info['uid']}'";
// }
// }else{
// $condition =array();
// }
$searchArr = ['keywords' => '', 'date' => ['start' => date('2018-01-01 00:00'), 'end' => date('Y-m-d H:i')]]; $searchArr = ['keywords' => '', 'date' => ['start' => date('2018-01-01 00:00'), 'end' => date('Y-m-d H:i')]];
$id=\Yii::$app->user->id; $id=\Yii::$app->user->id;
$keywords = Yii::$app->request->get('keywords', ''); $keywords = Yii::$app->request->get('keywords', '');
$keywords = trim($keywords); $keywords = trim($keywords);
$searchArr["username"] = trim(Yii::$app->request->get('username', ''));
$searchArr["referrer"] = trim(Yii::$app->request->get('referrer', ''));
if($searchArr['referrer']){
$tjr = User::findOne(['accountname'=>$searchArr['referrer']]);
}
if($searchArr['username']){
$tjrs = User::findOne(['realname'=>$searchArr['username']]);
}
$mf=0; //手机号搜索
if (!empty($keywords)) { if (!empty($keywords)) {
$nnme='/^\d$/u'; $nnme='/^\d$/u';
if(preg_match($nnme, $keywords)){//匹配数字 if(preg_match("/^1[3456789]{1}[0-9]{9}$/", $keywords)){//匹配手机号
// $condition .= " uid = '{$keywords}'"; // $info=User::find()->select('uid')->where("mobile =:mobile",[":mobile"=>$keywords])->one();
$condition =array("uid"=>$keywords); // $condition =array("uid"=>$info['uid']);
$info=User::find()->select('uid')->where("mobile =:mobile",[":mobile"=>$keywords])->all();
$mf=1; //手机号搜索
foreach($info as $k=>$v){
$condition[] =array("uid"=>$v['uid']);
}
}elseif(preg_match("/[\x{4e00}-\x{9fa5}]+/u", $keywords)){ //包含汉字 查询销售名 }elseif(preg_match("/[\x{4e00}-\x{9fa5}]+/u", $keywords)){ //包含汉字 查询销售名
$info=User::find()->select('uid')->where("username =:username",[":username"=>$keywords])->one(); $info=User::find()->select('uid')->where("username =:username",[":username"=>$keywords])->one();
$condition =array("uid"=>$info['uid']); $condition =array("uid"=>$info['uid']);
}elseif(preg_match("/^[ a-z0-9]+$/i", $keywords)){//匹配登录名 }elseif(preg_match("/^[ a-z0-9]+$/i", $keywords)){//匹配登录名
$info=User::find()->where("accountname =:accountname",[":accountname"=>$keywords])->one(); $info=User::find()->where("accountname =:accountname",[":accountname"=>$keywords])->one();
$condition =array("uid"=>$info['uid']); $condition =array("uid"=>$info['uid']);
// $condition .= "uid = '{$info['uid']}'"; }elseif (preg_match($nnme, $keywords)){//匹配数字
$condition =array("uid"=>$keywords);
}
if($searchArr["username"] && $searchArr['referrer']){
$condition['uid']=$tjr['uid'];
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr["username"]){
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr['referrer']){
$condition['uid']=$tjr['uid'];
} }
}else{
if($searchArr["username"] && $searchArr['referrer']){
$condition['uid']=$tjr['uid'];
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr["username"]){
$condition['uid']=$tjrs['uid'];
}elseif ($searchArr['referrer']){
$condition['uid']=$tjr['uid'];
}else{ }else{
$condition =array(); $condition =array();
} }
}
if($mf){
foreach($condition as $kk=>$vv){
$model=ReportForm::find();
$count=$model->where($vv)->count();
// if($id==1){ $pageSize=Yii::$app->params['pageSize']['manage']; //每页条数
// $condition =array(); $pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]);
// }else{ $lists[]=$model->offset($pager->offset)->where($vv)->limit($pager->limit)->orderBy(["status"=>SORT_DESC,'created_at'=>SORT_DESC])->one();
// $condition =array();
// }
//// $condition =array("report_uid"=>$id);
// } }else{
$model=ReportForm::find(); $model=ReportForm::find();
$count=$model->where($condition)->count(); $count=$model->where($condition)->count();
$pageSize=Yii::$app->params['pageSize']['manage']; //每页条数 $pageSize=Yii::$app->params['pageSize']['manage']; //每页条数
$pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]); $pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]);
$lists=$model->offset($pager->offset)->where($condition)->limit($pager->limit)->orderBy(["status"=>SORT_DESC,'created_at'=>SORT_DESC])->all(); $lists=$model->offset($pager->offset)->where($condition)->limit($pager->limit)->orderBy(["status"=>SORT_DESC,'created_at'=>SORT_DESC])->all();
}
// $model=ReportForm::find();
// $count=$model->where($condition)->count();
//
// $pageSize=Yii::$app->params['pageSize']['manage']; //每页条数
// $pager=new pagination(['totalCount'=>$count,"pageSize"=>$pageSize]);
//
// $lists=$model->offset($pager->offset)->where($condition)->limit($pager->limit)->orderBy(["status"=>SORT_DESC,'created_at'=>SORT_DESC])->all();
$url = Yii::$app->request->referrer; $url = Yii::$app->request->referrer;
if (Yii::$app->request->get('op') == 'exports') { //导出全部数据 if (Yii::$app->request->get('op') == 'exports') { //导出全部数据
$manager=new ManagerLog(); $manager=new ManagerLog();
......
backend/views/user/real-name.php
浏览文件 @ 42afbfe4
...@@ -35,10 +35,18 @@ use common\helpers\Utils; ...@@ -35,10 +35,18 @@ use common\helpers\Utils;
<div class="col-xs-12 col-sm-5"> <div class="col-xs-12 col-sm-5">
<input type="hidden" name="r" value="user/real-name"> <input type="hidden" name="r" value="user/real-name">
<input type="text" class="form-control" name="keywords" value="<?= $keywords ?>" <input type="text" class="form-control" name="keywords" value="<?= $keywords ?>"
placeholder="销售名、登录名"> placeholder="销售名、登录名,手机号">
</div> </div>
<button type="submit" class="btn btn-info">搜索</button>
</div> </div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 col-lg-1 control-label">受益人</label>
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-6">
<?= Html::textInput('username', $searchArr['username'], ['class' => 'form-control', 'placeholder' => "受益人"]); ?>
<div class="help-block">请输入受益人</div>
</div>
</div>
<button type="submit" class="btn btn-info">搜索</button>
</form> </form>
......
backend/views/user/report-confirm.php
浏览文件 @ 42afbfe4
...@@ -34,18 +34,18 @@ use yii\helpers\Url; ...@@ -34,18 +34,18 @@ use yii\helpers\Url;
<div class="col-xs-12 col-sm-5"> <div class="col-xs-12 col-sm-5">
<input type="hidden" name="r" value="user/report-confirm"> <input type="hidden" name="r" value="user/report-confirm">
<input type="text" class="form-control" name="keywords" value="<?= $keywords ?>" <input type="text" class="form-control" name="keywords" value="<?= $keywords ?>"
placeholder="销售名、登录名"> placeholder="销售名、登录名,手机号">
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 col-lg-1 control-label">受益人</label>
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-6">
<?= Html::textInput('username', $searchArr['username'], ['class' => 'form-control', 'placeholder' => "受益人"]); ?>
<div class="help-block">请输入受益人</div>
</div> </div>
<button type="submit" class="btn btn-info">搜索</button>
</div> </div>
<!-- <div class="form-group">--> <button type="submit" class="btn btn-info">搜索</button>
<!-- <label class="col-xs-12 col-sm-3 col-md-2 col-lg-1 control-label"></label>-->
<!-- <div class="col-xs-12 col-sm-5">-->
<!-- <button type="submit" class="btn btn-info">搜索</button>-->
<!---->
<!-- </div>-->
<!-- </div>-->
</form> </form>
......
backend/views/user/report-yewu.php
浏览文件 @ 42afbfe4
...@@ -34,18 +34,18 @@ use yii\helpers\Url; ...@@ -34,18 +34,18 @@ use yii\helpers\Url;
<div class="col-xs-12 col-sm-5"> <div class="col-xs-12 col-sm-5">
<input type="hidden" name="r" value="user/ye-wu-confirm"> <input type="hidden" name="r" value="user/ye-wu-confirm">
<input type="text" class="form-control" name="keywords" value="<?= $keywords ?>" <input type="text" class="form-control" name="keywords" value="<?= $keywords ?>"
placeholder="销售名、登录名"> placeholder="销售名、登录名,手机号">
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 col-lg-1 control-label">受益人</label>
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-6">
<?= Html::textInput('username', $searchArr['username'], ['class' => 'form-control', 'placeholder' => "受益人"]); ?>
<div class="help-block">请输入受益人</div>
</div> </div>
<button type="submit" class="btn btn-info">搜索</button>
</div> </div>
<button type="submit" class="btn btn-info">搜索</button>
<!-- <div class="form-group">-->
<!-- <label class="col-xs-12 col-sm-3 col-md-2 col-lg-1 control-label"></label>-->
<!-- <div class="col-xs-12 col-sm-5">-->
<!-- <button type="submit" class="btn btn-info">搜索</button>-->
<!---->
<!-- </div>-->
<!-- </div>-->
</form> </form>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论