ad

app/admin/controller/Action.php

@@ -45,35 +45,47 @@ class Action extends BaseController
 
     public function ActionSave(){
         $post  =$this->request->post();
-        $actid = isset($post['id']) ? intval($post['id']) : "";
-        if($actid==""){
-            return error_show(1001,'功能id不能为空');
+        $actionid = isset($post['id']) ? intval($post['id']) : "";
+        if($actionid!=""){
+            $isf= Db::name("action_list")->where("id","=",$actionid)->find();
+            if($isf==false){
+                return error_show(1005,"未找到数据");
+            }
         }
-        $menuid = isset($post['menuid']) ? intval($post['menuid']) : "";
-        if($menuid==""){
-            return error_show(1001,'页面menuid不能为空');
+        $action = isset($post['action_name']) ? trim($post['action_name']) : "";
+        if($action==""){
+            return error_show(1003,'功能名称不能为空');
         }
+        $desc = isset($post['action_desc']) ? trim($post['action_desc']) : "";
+        $status = isset($post['status']) ? intval($post['status']) : 0;
+        $data=[
+            "action_name"=>$action,
+            "action_desc"=>$desc,
+            "action_code"=>"",
+        ];
 
-        $code = isset($post['action_code']) ? trim($post['action_code']) : "";
-        $status = isset($post['status']) ? intval($post['status']) : 1;
-        if($code==""){
-            return error_show(1002,'功能code不能为空');
-        }
-        $istrue =Db::name("action")->where(['menuid'=>$menuid,"action_code"=>$code])->find();
-        if($istrue && $istrue['id']!=$actid){
-            return error_show(1005,'此功能已存在');
+        $isTrue =  Db::name("action_list")->where(["action_name"=>$action])->find();
+        if($isTrue){
+            if($isTrue['id']!=$actionid || $actionid==""){
+                return error_show(1003,'功能名称不能重复');
+            }
         }
+
         try{
-            $data = ['action_code'=>$code,'status'=>$status,"updatetime"=>date("Y-m-d H:i:s")];
-            $result=Db::name("action")->where("id","=",$actid)->save($data);
-            if($result){
-                return app_show(0,"更新成功");
+            $message = "";
+            if($actionid==""){
+                $data['status']=$status;
+                $data['is_show']=1;
+                $message = "新建成功";
             }else{
-                return error_show(1004,"更新失败");
+                $data['status']=$status;
+                $data['id']=$actionid;
+                $message = "更新成功";
             }
-
+            Db::name("action_list")->save($data);
+            return app_show(0,$message);
         }catch (\Exception $e){
-            return error_show(1003,$e->getMessage());
+            return  error_show(1005,$e->getMessage());
         }
     }
 
@@ -130,4 +142,63 @@ class Action extends BaseController
         }
     }
 
+    /**
+     * @return \think\response\Json
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function index(){
+        $post  =$this->request->post();
+        $data = Db::name("admin_menu")->where(["pid"=>0,"status"=>1])->select();
+        $result = [];
+        if(empty($data)){
+            return app_show(0,"获取成功",$result);
+        }
+        foreach ($data as $key=>$val){
+            $val["child"]=[];
+            $result[$val['id']] =$val;
+        }
+
+        $child =Db::name("admin_menu")->where("pid","<>",0)->where('status',"=",1)->select();
+        foreach ($child as $k=>$value){
+            // $act = PasAction::all(['menuid'=>$value['id'],"status"=>1]);
+            $act =Db::name("action")->alias("a")->leftJoin("action_list l","a.action_code=l.action_code")->field
+            ("a.*,action_name")->where(['a.menuid'=>$value['id'],"a.status"=>1])->select();
+            $act_data = Db::name("action_field")->where(['menuid'=>$value['id'],"status"=>1])->select();
+            $value['action'] = $act;
+            $value['action_data'] = $act_data;
+            if(array_key_exists($value['pid'],$result)){
+                $result[$value['pid']]["child"][]=$value;
+            }
+        }
+
+        return app_show(0,"获取成功",array_values($result));
+    }
+
+    /**@param id menu 主键id
+     * @return \think\response\Json
+     * @throws \think\exception\DbException
+     */
+    public function ActionInfo(){
+        $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
+        $id = isset($post['id'])? intval($post['id']) :"";
+        if($id==""){
+            return error_show(1002,'功能id不能为空');
+        }
+        $menu =  Db::name("action_list")->where("id","=",$id)->find();
+        if(empty($menu)){
+            return error_show(1003,"未找到对应的数据");
+        }
+        return app_show(0,"获取成功！",$menu);
+    }
 }

app/admin/controller/Conf.php

@@ -0,0 +1,54 @@
+<?php
+
+
+namespace app\admin\controller;
+use app\BaseController;
+use think\App;
+use think\facade\Db;
+
+class Conf extends BaseController
+{
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+//        if($token==""){
+//            return error_show(101,'token不能为空');
+//
+//        }
+//        $effetc = VerifyTokens($token);
+//        if(!empty($effetc) && $effetc['code']!=0){
+//            return error_show($effetc['code'],$effetc['message']);
+//
+//        }
+    }
+
+    public function list(){
+            $post = $this->request->post();
+            $condition = [['is_del'=>0]];
+            $page = isset($post['page']) &&$post['page']!=='' ?intval($post['page']) :1;
+            $size = isset($post['size']) &&$post['size']!=='' ?intval($post['size']) :10;
+            $count = Db::name("config")->where($condition)->count();
+            $page>=ceil($count/$size) ? $page = ceil($count/$size): '';
+            $list = Db::name("config")->where($condition)->page($page,$size)->order("addtime desc")->select();
+            return  app_show(0,"获取成功",['list'=>$list,"count"=>$count]);
+    }
+
+    public  function info(){
+        $post = $this->request->post();
+        $id = isset($post['id']) && $post['id']!==''? intval($post['id']): '';
+        if($id==''){
+            return error_show(1004,'参数id 不能为空');
+        }
+        $condition = [['is_del'=>0],['id'=>$id]];
+        $info =  Db::name("config")->where($condition)->find();
+        if(empty($info)){
+            return error_show(1004,'未找到数据');
+        }
+        return  app_show(0,"获取成功",$info);
+    }
+
+    public  function add(){}
+
+}

app/admin/controller/Group.php

@@ -35,7 +35,7 @@ class Group extends BaseController
 
         $page = isset($post['page']) ? intval($post['page']): 1;
         $size = isset($post['size']) ? intval($post['size']):10;
-        $condition=[];
+        $condition=[['is_del'=>0]];
         $count = Db::name("role_group")->where($condition)->count();
         $page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
         $list =  Db::name("role_group")->where($condition)->page($page,$size)->select();

app/admin/controller/Role.php

@@ -82,9 +82,9 @@ class Role extends BaseController
             return error_show(1002,"角色名称已存在");
         }
         $role_code= isset($post['role_code'])&&$post['role_code']!=''?trim($post['role_code']) :"";
-        if($role_code==""){
-            return error_show(1002,"参数role_code 不能为空");
-        }
+//        if($role_code==""){
+//            return error_show(1002,"参数role_code 不能为空");
+//        }
         $isCode=Db::name("role")->where(['role_code'=>$role_code])->find();
         if($isCode){
             return error_show(1002,"角色编号已存在");
@@ -214,13 +214,13 @@ class Role extends BaseController
             return error_show(1002,"角色名已存在");
         }
         $role_code= isset($post['role_code'])&&$post['role_code']!=''?trim($post['role_code']) :"";
-        if($role_code==""){
-            return error_show(1002,"参数role_code 不能为空");
-        }
-        $isCode=Db::name("role")->where(['role_code'=>$role_code])->find();
-        if($isCode){
-            return error_show(1002,"角色编号已存在");
-        }
+//        if($role_code==""){
+//            return error_show(1002,"参数role_code 不能为空");
+//        }
+//        $isCode=Db::name("role")->where(['role_code'=>$role_code])->find();
+//        if($isCode){
+//            return error_show(1002,"角色编号已存在");
+//        }
         $item = isset($post['item']) ? trim($post['item']) : "";
         if($item==""){
             return error_show(1003,"参数item 不能为空");

app/admin/controller/User.php

@@ -3,10 +3,10 @@ declare (strict_types = 1);
 
 namespace app\admin\controller;
 
-use app\admin\model\AdminAccount;
 use app\BaseController;
+use think\App;
 use think\facade\Db;
-use think\Request;
+
 
 class User extends BaseController
 {
@@ -15,8 +15,9 @@ class User extends BaseController
      *
      * @return \think\Response
      */
-    public function list()
+    public function __construct(App $app)
     {
+        parent::__construct($app);
         $post  =$this->request->post();
         $token = isset($post['token']) ? trim($post['token']) : "";
         if($token==""){
@@ -26,12 +27,19 @@ class User extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return error_show($effetc['code'],$effetc['message']);
         }
+    }
+
+    public function list()
+    {
+        $post  =$this->request->post();
+
         $page = isset($post['page'])&& $post['page']!='' ? intval($post['page']) : 1;
         $size = isset($post['size'])&& $post['size']!='' ? intval($post['size']) : 10;
         $condition = ['page'=>$page,'size'=>$size];
-        $data = GetUserlist($token,$condition);
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        $data = Getlist($token,$condition);
         if(!empty($data) && $data['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
+            return error_show($data['code'],$data['message']);
         }
         $list=[];
         foreach($data['data']['list'] as $key=>$value){
@@ -53,14 +61,6 @@ class User extends BaseController
     public function userInfo(){
         $post  =$this->request->post();
         $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return app_show(101,'token不能为空');
-        }
-
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return app_show($effetc['code'],$effetc['message']);
-        }
         $userinfo=GetUserInfo($token);
         if(empty($userinfo)||$userinfo['code']!=0){
             return app_show(1002,"员工信息不存在");
@@ -114,13 +114,6 @@ class User extends BaseController
     public  function  userAll(){
         $post  =$this->request->post();
         $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return app_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return app_show($effetc['code'],$effetc['message']);
-        }
         $userinfo=GetAccountall($token);
 
         if(empty($userinfo)||$userinfo['code']!=0){
@@ -147,13 +140,6 @@ class User extends BaseController
     public  function  userList(){
         $post  =$this->request->post();
         $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return app_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return app_show($effetc['code'],$effetc['message']);
-        }
         $userinfo=GetList($token,$post);
         if(empty($userinfo)||$userinfo['code']!=0){
             return app_show($userinfo['code'],$userinfo['msg']);
@@ -174,13 +160,6 @@ class User extends BaseController
     public function setRole(){
         $post  =$this->request->post();
         $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return app_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return app_show($effetc['code'],$effetc['message']);
-        }
         $uid = isset($post['id'])&&$post['id']!=='' ? intval($post['id']) :"";
         if($uid===''){
             return error_show(1004,"参数id 不能为空");

app/admin/controller/WareHouse.php

@@ -56,6 +56,7 @@ class WareHouse extends BaseController
         }
         $position = isset($post['position'])&& $post['position']!='' ?trim($post['position']) :'';
         $data =[
+            'wsm_code'=>makeNo("WSM"),
             'name'=>$name,
             'wsm_type'=>$wsmtype,
             'supplierid'=>$supplier,
@@ -72,6 +73,11 @@ class WareHouse extends BaseController
     }
 
     public function list(){
+        $post  =$this->request->post();
+        $supplier = isset($post['supplierid'])&& $post['supplierid']!='' ?intval($post['supplierid']) :'';
+        if($supplier==''){
+            return error_show(1004,'参数supplierid 不能为空');
+        }
 
     }
 }

app/admin/model/ActionLog.php

@@ -0,0 +1,19 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\model;
+
+use think\Model;
+
+/**
+ * @mixin \think\Model
+ */
+class ActionLog extends Model
+{
+   public  function Add(){
+
+   }
+   public function  list(){}
+
+   public function info(){}
+}

app/admin/route/app.php

@@ -10,32 +10,39 @@
 // +----------------------------------------------------------------------
 use think\facade\Route;
 
-Route::rule('menu', 'Admin/Menu/list');
-Route::rule('menusave', 'Admin/Menu/MenuEdit');
-Route::rule('menudel', 'Admin/Menu/MenuDel');
-Route::rule('menustatus', 'Admin/Menu/MenuStatus');
-Route::rule('menustatus', 'Admin/Menu/MenuStatus');
-Route::rule("menulist","Admin/Menu/MenuAllList");
+Route::rule('menu', 'admin/Menu/list');
+Route::rule('menusave', 'admin/Menu/MenuEdit');
+Route::rule('menudel', 'admin/Menu/MenuDel');
+Route::rule('menustatus', 'admin/Menu/MenuStatus');
+Route::rule('menustatus', 'admin/Menu/MenuStatus');
+Route::rule("menulist","admin/Menu/MenuAllList");
 
-Route::rule('action', 'Admin/Action/ActionList');
-Route::rule('actionsave', 'Admin/Action/ActionSave');
-Route::rule('actionstatus', 'Admin/Action/ActionStatus');
-Route::rule('actionadd', 'Admin/Action/ActionAdd');
+Route::rule('menuaction', 'admin/Action/ActionList');
+Route::rule('menuactionsave', 'admin/Action/ActionSave');
+Route::rule('menuactionstatus', 'admin/Action/ActionStatus');
+Route::rule('menuactionadd', 'admin/Action/ActionAdd');
 
-Route::rule('grouplist', 'Admin/Group/GroupList');
-Route::rule('groupall', 'Admin/Group/GroupAll');
-Route::rule('groupinfo', 'Admin/Group/GroupInfo');
-Route::rule('groupadd', 'Admin/Group/GroupAdd');
-Route::rule('groupsave', 'Admin/Group/GroupSave');
-Route::rule('groupstatus', 'Admin/Group/GroupStatus');
+Route::rule("menuactionlist","admin/Action/index");
+Route::rule("actiondata","admin/Action/DataAction");
+Route::rule("actionsave","admin/Action/ActionSave");
+Route::rule("actionstatus","admin/Action/ActionStatus");
+Route::rule("actioninfo","admin/Action/ActionInfo");
+Route::rule("actionlist","admin/Action/ActionList");
 
-Route::rule('rolelist', 'Admin/Role/RoleList');
-Route::rule('roleall', 'Admin/Role/RoleAll');
-Route::rule('roleinfo', 'Admin/Role/RoleInfo');
-Route::rule('roleadd', 'Admin/Role/RoleAdd');
-Route::rule('rolesave', 'Admin/Role/RoleSave');
-Route::rule('rolestatus', 'Admin/Role/RoleStatus');
+Route::rule('grouplist', 'admin/Group/GroupList');
+Route::rule('groupall', 'admin/Group/GroupAll');
+Route::rule('groupinfo', 'admin/Group/GroupInfo');
+Route::rule('groupadd', 'admin/Group/GroupAdd');
+Route::rule('groupsave', 'admin/Group/GroupSave');
+Route::rule('groupstatus', 'admin/Group/GroupStatus');
 
-Route::rule('userlist', 'Admin/User/list');
-Route::rule('userinfo', 'Admin/User/userInfo');
-Route::rule('userall', 'Admin/User/userList');
+Route::rule('rolelist', 'admin/Role/RoleList');
+Route::rule('roleall', 'admin/Role/RoleAll');
+Route::rule('roleinfo', 'admin/Role/RoleInfo');
+Route::rule('roleadd', 'admin/Role/RoleAdd');
+Route::rule('rolesave', 'admin/Role/RoleSave');
+Route::rule('rolestatus', 'admin/Role/RoleStatus');
+
+Route::rule('userlist', 'admin/User/list');
+Route::rule('userinfo', 'admin/User/userInfo');
+Route::rule('userall', 'admin/User/userList');

app/common.php

@@ -200,5 +200,35 @@ function UploadImg($files){
 
         return $e->getMessage();
     }
+}
 
+/**
+ * @param $token
+ * @param $condition
+ * @return mixed
+ */
+ function resetpwd($token,$condition){
+     $host = Config::get("app");
+
+     $url = $host["api_host"]."/Api/passset";
+     $condition['token']=$token;
+     $response=curl_request($url,$condition);
+
+     return json_decode($response,true);
+ }
+
+/**
+ * @param $token
+ * @param $condition
+ * @return mixed
+ */
+function resetinfo($token,$condition){
+    $host = Config::get("app");
+
+    $url = $host["api_host"]."/Api/passset";
+    $condition['token']=$token;
+    $response=curl_request($url,$condition);
+
+    return json_decode($response,true);
 }
+

config/app.php

@@ -29,5 +29,5 @@ return [
     'error_message'    => '页面错误！请稍后再试～',
     // 显示错误信息
     'show_error_msg'   => false,
-    "api_host"=>"http://inv.sit.wanyuhengtong.com"
+    "api_host"=>"http://www.invoice.com"
 ];