From 8e965f92bcd31c36c5b2f39422f22e5515c4dcbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com> Date: Tue, 31 Jan 2023 16:39:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B6=88=E6=81=AF=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E3=80=81=E5=85=9A=E5=8A=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Api.php | 7 + app/admin/controller/Notice.php | 152 +++++++++++++ app/admin/controller/nk/Category.php | 87 ++++++++ .../controller/nk/party/BranchPayList.php | 193 ++++++++++++----- .../controller/nk/party/BranchPayUser.php | 199 +++++++++++++----- app/admin/model/Notice.php | 97 +++++++++ app/admin/validate/NoticeValidate.php | 26 +++ app/admin/view/nk/category/add.html | 156 ++++++++++++++ app/admin/view/nk/category/index.html | 84 ++++++++ app/admin/view/nk/party/article/index.html | 2 +- app/admin/view/nk/party/branch/index.html | 2 +- .../view/nk/party/branch_pay_list/add.html | 53 ----- .../view/nk/party/branch_pay_list/edit.html | 52 ----- .../view/nk/party/branch_pay_list/index.html | 35 --- .../view/nk/party/branch_pay_user/add.html | 66 ------ .../view/nk/party/branch_pay_user/edit.html | 71 ------- .../view/nk/party/branch_pay_user/index.html | 35 --- .../view/nk/party/branchpaylist/add.html | 110 ++++++++++ .../view/nk/party/branchpaylist/edit.html | 120 +++++++++++ .../view/nk/party/branchpaylist/index.html | 164 +++++++++++++++ .../view/nk/party/branchpaylist/read.html | 81 +++++++ .../view/nk/party/branchpayuser/add.html | 130 ++++++++++++ .../view/nk/party/branchpayuser/edit.html | 140 ++++++++++++ .../view/nk/party/branchpayuser/index.html | 169 +++++++++++++++ .../view/nk/party/branchpayuser/read.html | 81 +++++++ app/admin/view/nk/party/info/index.html | 2 +- app/admin/view/nk/party/vote/index.html | 2 +- .../view/nk/party/votecomment/index.html | 2 +- app/admin/view/notice/add.html | 79 +++++++ app/admin/view/notice/datalist.html | 148 +++++++++++++ app/admin/view/notice/edit.html | 86 ++++++++ app/admin/view/notice/read.html | 38 ++++ 32 files changed, 2238 insertions(+), 431 deletions(-) create mode 100644 app/admin/controller/Notice.php create mode 100644 app/admin/controller/nk/Category.php create mode 100644 app/admin/model/Notice.php create mode 100644 app/admin/validate/NoticeValidate.php create mode 100644 app/admin/view/nk/category/add.html create mode 100644 app/admin/view/nk/category/index.html delete mode 100644 app/admin/view/nk/party/branch_pay_list/add.html delete mode 100644 app/admin/view/nk/party/branch_pay_list/edit.html delete mode 100644 app/admin/view/nk/party/branch_pay_list/index.html delete mode 100644 app/admin/view/nk/party/branch_pay_user/add.html delete mode 100644 app/admin/view/nk/party/branch_pay_user/edit.html delete mode 100644 app/admin/view/nk/party/branch_pay_user/index.html create mode 100644 app/admin/view/nk/party/branchpaylist/add.html create mode 100644 app/admin/view/nk/party/branchpaylist/edit.html create mode 100644 app/admin/view/nk/party/branchpaylist/index.html create mode 100644 app/admin/view/nk/party/branchpaylist/read.html create mode 100644 app/admin/view/nk/party/branchpayuser/add.html create mode 100644 app/admin/view/nk/party/branchpayuser/edit.html create mode 100644 app/admin/view/nk/party/branchpayuser/index.html create mode 100644 app/admin/view/nk/party/branchpayuser/read.html create mode 100644 app/admin/view/notice/add.html create mode 100644 app/admin/view/notice/datalist.html create mode 100644 app/admin/view/notice/edit.html create mode 100644 app/admin/view/notice/read.html diff --git a/app/admin/controller/Api.php b/app/admin/controller/Api.php index d06feb8..8096a2f 100644 --- a/app/admin/controller/Api.php +++ b/app/admin/controller/Api.php @@ -356,5 +356,12 @@ class Api extends BaseController return to_assign(0, '', ['data_first' => hour_document($data_first), 'data_second' => hour_document($data_second), 'data_three'=>date_document($data_three)]); } + public function getbytype(){ + $type = get_params("type"); + $where['type'] = $type; + $where['status'] = 'normal'; + $list = Db::table('fa_category')->where($where)->order('weigh asc,id asc')->select(); + return to_assign(0, '', $list); + } } diff --git a/app/admin/controller/Notice.php b/app/admin/controller/Notice.php new file mode 100644 index 0000000..064dcbe --- /dev/null +++ b/app/admin/controller/Notice.php @@ -0,0 +1,152 @@ +model = new NoticeModel(); + $this->uid = get_login_admin('id'); + // 获取用户信息 + $this->users = Db::table('fa_szxc_information_usermsg')->where('status',1)->field('user_id,name')->select(); + } + /** + * 数据列表 + */ + public function datalist() + { + if (request()->isAjax()) { + $param = get_params(); + $where = []; + + $list = $this->model->getNoticeList($where,$param); + foreach ($list as $k =>$v){ + $list[$k]['user_name'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$v['user_id'])->value('name'); + if($v['status'] == 1){ + $list[$k]['status'] = '正常'; + }else{ + $list[$k]['status'] = '禁用'; + } + if($v['is_read'] == 1){ + $list[$k]['is_read'] = '已读'; + }else{ + $list[$k]['is_read'] = '未读'; + } + if($v['read_time']){ + $list[$k]['read_time'] = date('Y-m-d H:i:s',$v['read_time']); + } + } + return table_assign(0, '', $list); + } + else{ + return view(); + } + } + + /** + * 添加 + */ + public function add() + { + if (request()->isAjax()) { + $param = get_params(); + + // 检验完整性 + try { + validate(NoticeValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + + $this->model->addNotice($param); + }else{ + View::assign('users', $this->users); + return view(); + } + } + + + /** + * 编辑 + */ + public function edit() + { + $param = get_params(); + + if (request()->isAjax()) { + // 检验完整性 + try { + validate(NoticeValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + + $this->model->editNotice($param); + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getNoticeById($id); + if (!empty($detail)) { + View::assign('detail', $detail); + View::assign('users', $this->users); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + } + + + /** + * 查看信息 + */ + public function read() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getNoticeById($id); + if (!empty($detail)) { + View::assign('detail', $detail); + View::assign('users', $this->users); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + + /** + * 删除 + * type=0,逻辑删除，默认 + * type=1,物理删除 + */ + public function del() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + + $this->model->delNoticeById($id,$type); + } +} diff --git a/app/admin/controller/nk/Category.php b/app/admin/controller/nk/Category.php new file mode 100644 index 0000000..51fb58c --- /dev/null +++ b/app/admin/controller/nk/Category.php @@ -0,0 +1,87 @@ +adminInfo = get_login_admin(); + // 类型 + $map[] = ['pid','=','0']; + $map[] = ['status','=','normal']; + $this->type = Db::table('fa_category')->where($map)->field('id,type,name')->select(); + } + + public function index() + { + if (request()->isAjax()) { + $list = Db::table('fa_category')->order('weigh asc,id asc')->select()->toArray(); + foreach ($list as $k =>$v){ + if($v['status'] == 'normal'){ + $list[$k]['status'] = '正常'; + }else{ + $list[$k]['status'] = '禁用'; + } + } + return to_assign(0, '', $list); + } else { + return view(); + } + } + + //添加 + public function add() + { + $param = get_params(); + if (request()->isAjax()) { + + return to_assign(); + } else { + $id = isset($param['id']) ? $param['id'] : 0; + $pid = isset($param['pid']) ? $param['pid'] : 0; + if($id>0){ + $detail = Db::name('fa_category')->where('id',$id)->find(); + View::assign('detail', $detail); + } + View::assign('id', $id); + View::assign('pid', $pid); + View::assign('type', $this->type); + return view(); + } + } + //删除 + public function delete() + { + $id = get_params("id"); + $count = Db::name('AdminRule')->where(["pid" => $id])->count(); + if ($count > 0) { + return to_assign(1, "该节点下还有子节点，无法删除"); + } + if (Db::name('AdminRule')->delete($id) !== false) { + clear_cache('adminRules'); + add_log('delete', $id, []); + return to_assign(0, "删除节点成功"); + } else { + return to_assign(1, "删除失败"); + } + } + + public function getbytype(){ + $type = get_params("type"); + $where['type'] = $type; + $where['status'] = 'normal'; + $list = Db::table('fa_category')->where($where)->order('weigh asc,id asc')->select(); + return to_assign(0, '', $list); + } + +} diff --git a/app/admin/controller/nk/party/BranchPayList.php b/app/admin/controller/nk/party/BranchPayList.php index bc50c8d..f388bd0 100644 --- a/app/admin/controller/nk/party/BranchPayList.php +++ b/app/admin/controller/nk/party/BranchPayList.php @@ -1,59 +1,51 @@ model = new \app\admin\model\party\BranchPayList; - + $this->adminInfo = get_login_admin(); + $this->url=[ + '/admin/nk.party.branchpaylist/index', + '/admin/nk.party.branchpaylist/add', + '/admin/nk.party.branchpaylist/edit', + '/admin/nk.party.branchpaylist/del', + '/admin/nk.party.branchpaylist/read', + ]; +// 获取用户信息 + $this->users = Db::table('fa_szxc_information_usermsg')->where('status',1)->field('user_id,name')->select(); +// 党支部 + $this->party_branch = Db::table('fa_szxc_party_branch')->where('status',1)->field('id,name')->select(); } - /** - * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 - * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 - * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 - */ - /** - * 查看 + * 数据列表 */ public function index() { - - //设置过滤方法 - $this->request->filter(['strip_tags']); - if ($this->request->isAjax()) { -// dump();die; - //如果发送的来源是Selectpage，则转发到Selectpage - if ($this->request->request('keyField')) { - return $this->selectpage(); + if (request()->isAjax()) { + $params= get_params(); + $where['status']=1; + if (isset($params['keywords'])){ + $where[]=['title','like','%'.$params['keywords'].'%']; } - [$where, $sort, $order, $offset, $limit] = $this->buildparams(); - - //权限组信息 - $getGroups = $this->auth->getGroups(); - if($getGroups[0]['pid'] != 0){ //不是超级管理员 - $userInfo = $this->auth->getUserinfo(); - $admin_id = $userInfo['id']; - $www['admin_id'] = $admin_id; - $user_address = Db::name('szxc_information_useraddress')->where($www)->find(); + if($this->adminInfo['position_id'] != 1){ //不是超级管理员 + $www['admin_id'] = $this->adminInfo['id']; + $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address){ if($user_address['auth_range'] == 1){ $where['village'] = $user_address['village_id']; @@ -61,8 +53,6 @@ class BranchPayList extends Backend $where['township'] = $user_address['street_id']; }elseif ($user_address['auth_range'] == 3){ $where['county'] = $user_address['area_id']; - }elseif ($user_address['auth_range'] == 4){ - }else{ $where['village'] = $user_address['village_id']; } @@ -71,30 +61,119 @@ class BranchPayList extends Backend } } - $total = $this->model - ->with(['usermsg','area','street','village']) + $total = Db::table('fa_szxc_party_branch_pay_list') ->where($where) - ->order($sort, $order) ->count(); - - $list = $this->model - ->with(['usermsg','area','street','village']) + $list = Db::table('fa_szxc_party_branch_pay_list') + ->withAttr('party_branch',function ($value,$data){ + return Db::table('fa_szxc_party_branch')->where('id',$data['branch_id'])->value('name'); + }) + ->withAttr('area',function ($value,$data){ + return Db::table('fa_geo_area')->where('area_code',$data['county'])->value('area_name'); + }) + ->withAttr('street',function ($value,$data){ + return Db::table('fa_geo_street')->where('street_code',$data['township'])->value('street_name'); + }) + ->withAttr('village',function ($value,$data){ + return Db::table('fa_geo_village')->where('village_id',$data['village'])->value('village_name'); + }) + ->withAttr('status',function ($value,$data){ + if($value == 1){ + return '正常'; + }else{ + return '禁用'; + } + }) ->where($where) - ->order($sort, $order) - ->limit($offset, $limit) + ->page($params['page']) + ->limit($params['limit']) + ->order('id desc') ->select(); - $list = $list->toArray(); - if ($list){ - foreach ($list as $k=>$v){ - $list[$k]['branch_id'] = Db::name('szxc_party_branch')->where('id',$v['branch_id'])->value('name'); - } - } - $result = ['total' => $total, 'rows' => $list]; - - return json($result); + $result = ['total' => $total, 'data' => $list]; + return table_assign(0, '', $result); } + else{ + return view('nk/party/branchpaylist/index',['url'=>$this->url]); + } + } - return $this->view->fetch(); + public function add(){ + if (request()->isAjax()) { + $param= get_params(); + $adds=Db::table('fa_szxc_information_useraddress')->where('admin_id',$this->adminInfo['id'])->find(); + $param['county']=$adds['area_id']; + $param['township']=$adds['street_id']; + $param['village']=$adds['village_id']; + $res=Db::table('fa_szxc_party_branch_pay_list')->strict(false)->field(true)->insertGetId($param); + if ($res){ + return to_assign(0,'操作成功',['aid'=>$res]); + } + return to_assign(1, '操作失败，原因：'.$res); + }else{ + View::assign('editor', get_system_config('other','editor')); + View::assign('party_branch', $this->party_branch); + View::assign('users', $this->users); + return view(); + } + } + + + public function edit(){ + $param= get_params(); + if (request()->isAjax()) { + $res=Db::table('fa_szxc_party_branch_pay_list')->where('id',$param['id'])->strict(false)->field(true)->update($param); + if ($res){ + return to_assign(); + }else{ + return to_assign(1, '操作失败，原因：'.$res); + } + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = Db::table('fa_szxc_party_branch_pay_list')->where('id',$id)->find(); + View::assign('editor', get_system_config('other','editor')); + if (!empty($detail)) { + View::assign('detail', $detail); + View::assign('users', $this->users); + View::assign('party_branch', $this->party_branch); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + } + /** + * 查看信息 + */ + public function read() + { + $param= get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $detail = Db::table('fa_szxc_party_branch_pay_list')->where('id',$id)->find(); + if (!empty($detail)) { + View::assign('detail', $detail); + View::assign('users', $this->users); + View::assign('party_branch', $this->party_branch); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + /** + * 删除 + */ + public function del() + { + $param= get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + $res = Db::table('fa_szxc_party_branch_pay_list')->where('id',$id)->update(['status'=>$type]); + if ($res){ + return to_assign(); + }else{ + return to_assign(1, '操作失败，原因：'.$res); + } } diff --git a/app/admin/controller/nk/party/BranchPayUser.php b/app/admin/controller/nk/party/BranchPayUser.php index 4b62174..e1bfadb 100644 --- a/app/admin/controller/nk/party/BranchPayUser.php +++ b/app/admin/controller/nk/party/BranchPayUser.php @@ -1,60 +1,52 @@ model = new \app\admin\model\party\BranchPayUser; - + $this->adminInfo = get_login_admin(); + $this->url=[ + '/admin/nk.party.branchpayuser/index', + '/admin/nk.party.branchpayuser/add', + '/admin/nk.party.branchpayuser/edit', + '/admin/nk.party.branchpayuser/del', + '/admin/nk.party.branchpayuser/read', + ]; +// 获取用户信息 + $this->users = Db::table('fa_szxc_information_usermsg')->where('status',1)->field('user_id,name')->select(); +// 党支部 + $this->party_branch = Db::table('fa_szxc_party_branch')->where('status',1)->field('id,name')->select(); + // 清单 + $this->pay_list = Db::table('fa_szxc_party_branch_pay_list')->where('status',1)->field('id')->select(); } - /** - * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 - * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 - * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 - */ - - /** - * 查看 + * 数据列表 */ public function index() { - - //设置过滤方法 - $this->request->filter(['strip_tags']); - if ($this->request->isAjax()) { -// dump();die; - //如果发送的来源是Selectpage，则转发到Selectpage - if ($this->request->request('keyField')) { - return $this->selectpage(); + if (request()->isAjax()) { + $params= get_params(); + $where['status']=1; + if (isset($params['keywords'])){ + $where[]=['title','like','%'.$params['keywords'].'%']; } - [$where, $sort, $order, $offset, $limit] = $this->buildparams(); - - //权限组信息 - $getGroups = $this->auth->getGroups(); - if($getGroups[0]['pid'] != 0){ //不是超级管理员 - $userInfo = $this->auth->getUserinfo(); - $admin_id = $userInfo['id']; - $www['admin_id'] = $admin_id; - $user_address = Db::name('szxc_information_useraddress')->where($www)->find(); + if($this->adminInfo['position_id'] != 1){ //不是超级管理员 + $www['admin_id'] = $this->adminInfo['id']; + $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); if ($user_address){ if($user_address['auth_range'] == 1){ $where['village'] = $user_address['village_id']; @@ -62,8 +54,6 @@ class BranchPayUser extends Backend $where['township'] = $user_address['street_id']; }elseif ($user_address['auth_range'] == 3){ $where['county'] = $user_address['area_id']; - }elseif ($user_address['auth_range'] == 4){ - }else{ $where['village'] = $user_address['village_id']; } @@ -72,30 +62,125 @@ class BranchPayUser extends Backend } } - $total = $this->model - ->with(['usermsg','area','street','village']) + $total = Db::table('fa_szxc_party_branch_pay_user') ->where($where) - ->order($sort, $order) ->count(); - - $list = $this->model - ->with(['usermsg','area','street','village']) + $list = Db::table('fa_szxc_party_branch_pay_user') + ->withAttr('party_branch',function ($value,$data){ + return Db::table('fa_szxc_party_branch')->where('id',$data['branch_id'])->value('name'); + }) + ->withAttr('user_name',function ($value,$data){ + return Db::table('fa_szxc_information_usermsg')->where('user_id',$data['user_id'])->value('name'); + }) + ->withAttr('area',function ($value,$data){ + return Db::table('fa_geo_area')->where('area_code',$data['county'])->value('area_name'); + }) + ->withAttr('street',function ($value,$data){ + return Db::table('fa_geo_street')->where('street_code',$data['township'])->value('street_name'); + }) + ->withAttr('village',function ($value,$data){ + return Db::table('fa_geo_village')->where('village_id',$data['village'])->value('village_name'); + }) + ->withAttr('status',function ($value,$data){ + if($value == 1){ + return '正常'; + }else{ + return '禁用'; + } + }) ->where($where) - ->order($sort, $order) - ->limit($offset, $limit) + ->page($params['page']) + ->limit($params['limit']) + ->order('id desc') ->select(); - $list = $list->toArray(); - if ($list){ - foreach ($list as $k=>$v){ - $list[$k]['branch_id'] = Db::name('szxc_party_branch')->where('id',$v['branch_id'])->value('name'); - } - } - $result = ['total' => $total, 'rows' => $list]; - - return json($result); + $result = ['total' => $total, 'data' => $list]; + return table_assign(0, '', $result); } + else{ + return view('nk/party/branchpayuser/index',['url'=>$this->url]); + } + } - return $this->view->fetch(); + public function add(){ + if (request()->isAjax()) { + $param= get_params(); + $adds=Db::table('fa_szxc_information_useraddress')->where('admin_id',$this->adminInfo['id'])->find(); + $param['county']=$adds['area_id']; + $param['township']=$adds['street_id']; + $param['village']=$adds['village_id']; + $res=Db::table('fa_szxc_party_branch_pay_user')->strict(false)->field(true)->insertGetId($param); + if ($res){ + return to_assign(0,'操作成功',['aid'=>$res]); + } + return to_assign(1, '操作失败，原因：'.$res); + }else{ + View::assign('editor', get_system_config('other','editor')); + View::assign('party_branch', $this->party_branch); + View::assign('pay_list', $this->pay_list); + View::assign('users', $this->users); + return view(); + } + } + + + public function edit(){ + $param= get_params(); + if (request()->isAjax()) { + $res=Db::table('fa_szxc_party_branch_pay_user')->where('id',$param['id'])->strict(false)->field(true)->update($param); + if ($res){ + return to_assign(); + }else{ + return to_assign(1, '操作失败，原因：'.$res); + } + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = Db::table('fa_szxc_party_branch_pay_user')->where('id',$id)->find(); + View::assign('editor', get_system_config('other','editor')); + if (!empty($detail)) { + View::assign('detail', $detail); + View::assign('users', $this->users); + View::assign('party_branch', $this->party_branch); + View::assign('pay_list', $this->pay_list); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + } + /** + * 查看信息 + */ + public function read() + { + $param= get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $detail = Db::table('fa_szxc_party_branch_pay_user')->where('id',$id)->find(); + if (!empty($detail)) { + View::assign('detail', $detail); + View::assign('users', $this->users); + View::assign('party_branch', $this->party_branch); + View::assign('pay_list', $this->pay_list); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + /** + * 删除 + */ + public function del() + { + $param= get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + $res = Db::table('fa_szxc_party_branch_pay_user')->where('id',$id)->update(['status'=>$type]); + if ($res){ + return to_assign(); + }else{ + return to_assign(1, '操作失败，原因：'.$res); + } } diff --git a/app/admin/model/Notice.php b/app/admin/model/Notice.php new file mode 100644 index 0000000..690870b --- /dev/null +++ b/app/admin/model/Notice.php @@ -0,0 +1,97 @@ +field('id,user_id,title,content,create_time,status,is_read,read_time')->order($order)->paginate($rows, false, ['query' => $param]); + return $list; + } + + /** + * 添加数据 + * @param $param + */ + public function addNotice($param) + { + $insertId = 0; + try { + $param['create_time'] = time(); + $insertId = self::strict(false)->field(true)->insertGetId($param); + add_log('add', $insertId, $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(0,'操作成功',['aid'=>$insertId]); + } + + /** + * 编辑信息 + * @param $param + */ + public function editNotice($param) + { + try { + $param['update_time'] = time(); + self::where('id', $param['id'])->strict(false)->field(true)->update($param); + add_log('edit', $param['id'], $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(); + } + + + /** + * 根据id获取信息 + * @param $id + */ + public function getNoticeById($id) + { + $info = self::where('id', $id)->find(); + return $info; + } + + /** + * 删除信息 + * @param $id + * @return array + */ + public function delNoticeById($id,$type=0) + { + if($type==0){ + //逻辑删除 + try { + $param['delete_time'] = time(); + self::where('id', $id)->update(['delete_time'=>time()]); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + else{ + //物理删除 + try { + self::where('id', $id)->delete(); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + return to_assign(); + } +} + diff --git a/app/admin/validate/NoticeValidate.php b/app/admin/validate/NoticeValidate.php new file mode 100644 index 0000000..787f9cd --- /dev/null +++ b/app/admin/validate/NoticeValidate.php @@ -0,0 +1,26 @@ + 'require', + 'title' => 'require', + 'content' => 'require', + 'status' => 'require', +]; + + protected $message = [ + 'user_id.require' => '接收人不能为空', + 'title.require' => '标题不能为空', + 'content.require' => '通知内容不能为空', + 'status.require' => '状态不能为空', +]; +} \ No newline at end of file diff --git a/app/admin/view/nk/category/add.html b/app/admin/view/nk/category/add.html new file mode 100644 index 0000000..ce41449 --- /dev/null +++ b/app/admin/view/nk/category/add.html @@ -0,0 +1,156 @@ +{extend name="common/base" /} + +{block name="body"} +
+

分类

+ {if condition="$id eq 0"} + + + + + + + + + + + + + + + + + +
类型* + + +
父级菜单/节点* + + +
+ {else/} + + + + + + + + + + + + + + + + + + + + + + + +
父级菜单/节点* + + + 左侧菜单显示* + + + +
菜单/节点名称* + + + 操作日志名称* + + +
菜单/节点URL + + 菜单排序 + +
菜单图标 + + [查看图标] +
+ {/if} +
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/category/index.html b/app/admin/view/nk/category/index.html new file mode 100644 index 0000000..0c98ce6 --- /dev/null +++ b/app/admin/view/nk/category/index.html @@ -0,0 +1,84 @@ +{extend name="common/base"/} + +{block name="body"} +
+
+ +
+
+
+
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/party/article/index.html b/app/admin/view/nk/party/article/index.html index 68027e2..39a60f8 100644 --- a/app/admin/view/nk/party/article/index.html +++ b/app/admin/view/nk/party/article/index.html @@ -21,7 +21,7 @@ diff --git a/app/admin/view/nk/party/branch/index.html b/app/admin/view/nk/party/branch/index.html index d86d385..5c498c1 100644 --- a/app/admin/view/nk/party/branch/index.html +++ b/app/admin/view/nk/party/branch/index.html @@ -21,7 +21,7 @@ diff --git a/app/admin/view/nk/party/branch_pay_list/add.html b/app/admin/view/nk/party/branch_pay_list/add.html deleted file mode 100644 index a43c1ac..0000000 --- a/app/admin/view/nk/party/branch_pay_list/add.html +++ /dev/null @@ -1,53 +0,0 @@ -
- -
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - - - - - - - -
- -
- - -
-
-
diff --git a/app/admin/view/nk/party/branch_pay_list/edit.html b/app/admin/view/nk/party/branch_pay_list/edit.html deleted file mode 100644 index 0d66718..0000000 --- a/app/admin/view/nk/party/branch_pay_list/edit.html +++ /dev/null @@ -1,52 +0,0 @@ -
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - - - - - - - - - - - -
- -
- - -
-
-
diff --git a/app/admin/view/nk/party/branch_pay_list/index.html b/app/admin/view/nk/party/branch_pay_list/index.html deleted file mode 100644 index f72e3d4..0000000 --- a/app/admin/view/nk/party/branch_pay_list/index.html +++ /dev/null @@ -1,35 +0,0 @@ -
- {:build_heading()} - -
-
- - -
-
-
diff --git a/app/admin/view/nk/party/branch_pay_user/add.html b/app/admin/view/nk/party/branch_pay_user/add.html deleted file mode 100644 index 5ec9de4..0000000 --- a/app/admin/view/nk/party/branch_pay_user/add.html +++ /dev/null @@ -1,66 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
diff --git a/app/admin/view/nk/party/branch_pay_user/edit.html b/app/admin/view/nk/party/branch_pay_user/edit.html deleted file mode 100644 index 35504ce..0000000 --- a/app/admin/view/nk/party/branch_pay_user/edit.html +++ /dev/null @@ -1,71 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
diff --git a/app/admin/view/nk/party/branch_pay_user/index.html b/app/admin/view/nk/party/branch_pay_user/index.html deleted file mode 100644 index 0a53e6f..0000000 --- a/app/admin/view/nk/party/branch_pay_user/index.html +++ /dev/null @@ -1,35 +0,0 @@ -
- {:build_heading()} - -
-
- - -
-
-
diff --git a/app/admin/view/nk/party/branchpaylist/add.html b/app/admin/view/nk/party/branchpaylist/add.html new file mode 100644 index 0000000..e1aebc7 --- /dev/null +++ b/app/admin/view/nk/party/branchpaylist/add.html @@ -0,0 +1,110 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

添加

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
党支部* +
+ +
+
开始时间* + +
结束时间* + +
应收* + +
未收* + +
+
+ + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/party/branchpaylist/edit.html b/app/admin/view/nk/party/branchpaylist/edit.html new file mode 100644 index 0000000..0306376 --- /dev/null +++ b/app/admin/view/nk/party/branchpaylist/edit.html @@ -0,0 +1,120 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

编辑

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
党支部* +
+ +
+
开始时间* + +
结束时间* + +
应收* + +
未收* + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/party/branchpaylist/index.html b/app/admin/view/nk/party/branchpaylist/index.html new file mode 100644 index 0000000..0df5f3e --- /dev/null +++ b/app/admin/view/nk/party/branchpaylist/index.html @@ -0,0 +1,164 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+ +
+
+
+ + + + + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/party/branchpaylist/read.html b/app/admin/view/nk/party/branchpaylist/read.html new file mode 100644 index 0000000..6d68c66 --- /dev/null +++ b/app/admin/view/nk/party/branchpaylist/read.html @@ -0,0 +1,81 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

详情

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
党支部* +
+ +
+
开始时间* + +
结束时间* + +
应收* + +
未收* + +
+
+{/block} + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/party/branchpayuser/add.html b/app/admin/view/nk/party/branchpayuser/add.html new file mode 100644 index 0000000..f49ee6a --- /dev/null +++ b/app/admin/view/nk/party/branchpayuser/add.html @@ -0,0 +1,130 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

添加

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
党支部* +
+ +
+
清单* +
+ +
+
用户* +
+ +
+
开始时间* + +
几个月* + +
金额* + +
+
+ + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/party/branchpayuser/edit.html b/app/admin/view/nk/party/branchpayuser/edit.html new file mode 100644 index 0000000..03df438 --- /dev/null +++ b/app/admin/view/nk/party/branchpayuser/edit.html @@ -0,0 +1,140 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

编辑

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
党支部* +
+ +
+
清单* +
+ +
+
用户* +
+ +
+
开始时间* + +
几个月* + +
金额* + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/party/branchpayuser/index.html b/app/admin/view/nk/party/branchpayuser/index.html new file mode 100644 index 0000000..7026ba0 --- /dev/null +++ b/app/admin/view/nk/party/branchpayuser/index.html @@ -0,0 +1,169 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+ +
+
+
+ + + + + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/party/branchpayuser/read.html b/app/admin/view/nk/party/branchpayuser/read.html new file mode 100644 index 0000000..6d68c66 --- /dev/null +++ b/app/admin/view/nk/party/branchpayuser/read.html @@ -0,0 +1,81 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

详情

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
党支部* +
+ +
+
开始时间* + +
结束时间* + +
应收* + +
未收* + +
+
+{/block} + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/party/info/index.html b/app/admin/view/nk/party/info/index.html index a0104a9..7c0ae57 100644 --- a/app/admin/view/nk/party/info/index.html +++ b/app/admin/view/nk/party/info/index.html @@ -21,7 +21,7 @@ diff --git a/app/admin/view/nk/party/vote/index.html b/app/admin/view/nk/party/vote/index.html index a594176..5d67965 100644 --- a/app/admin/view/nk/party/vote/index.html +++ b/app/admin/view/nk/party/vote/index.html @@ -21,7 +21,7 @@ diff --git a/app/admin/view/nk/party/votecomment/index.html b/app/admin/view/nk/party/votecomment/index.html index f945ac2..f496804 100644 --- a/app/admin/view/nk/party/votecomment/index.html +++ b/app/admin/view/nk/party/votecomment/index.html @@ -21,7 +21,7 @@ diff --git a/app/admin/view/notice/add.html b/app/admin/view/notice/add.html new file mode 100644 index 0000000..f9b6c60 --- /dev/null +++ b/app/admin/view/notice/add.html @@ -0,0 +1,79 @@ +{extend name="common/base"/} + +{block name="body"} +
+

新建消息通知

+ + + + + + + + + + + + + + +
接收人* + + + + 状态* + + +
标题* + +
通知内容* + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/notice/datalist.html b/app/admin/view/notice/datalist.html new file mode 100644 index 0000000..f70fc04 --- /dev/null +++ b/app/admin/view/notice/datalist.html @@ -0,0 +1,148 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+ +
+
+
+ + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/notice/edit.html b/app/admin/view/notice/edit.html new file mode 100644 index 0000000..d493e30 --- /dev/null +++ b/app/admin/view/notice/edit.html @@ -0,0 +1,86 @@ +{extend name="common/base"/} + +{block name="body"} +
+

编辑消息通知

+ + + + + + + + + + + + + + + + + + + + +
接收人* + + 状态* + + +
标题* + +
是否查看 + + +
通知内容* + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/notice/read.html b/app/admin/view/notice/read.html new file mode 100644 index 0000000..3559414 --- /dev/null +++ b/app/admin/view/notice/read.html @@ -0,0 +1,38 @@ +{extend name="common/base"/} + +{block name="body"} +
+

消息通知详情

+ + + + + + + + + + + + + + +
接收人 + + 标题{$detail.title}创建时间{$detail.create_time}
状态 + {eq name="$detail.status" value="0"}禁用{/eq} + {eq name="$detail.status" value="1"}正常{/eq} + 是否查看 + {eq name="$detail.is_read" value="0"}否{/eq} + {eq name="$detail.is_read" value="1"}是{/eq} + 查看时间{$detail.read_time}
通知内容 + {$detail.content|raw} +
+
+{/block} + \ No newline at end of file