暂存

app/admin/common/User.php

@@ -26,6 +26,12 @@ class User
         "userlistbycompany" => 'userlistbycompany',
         "useradd" => 'useradd',
         "userDelete" => 'userDelete',//删除
+
+
+        'userCompanyBasicList' => 'userCompanyBasicList',//【公司账号管理-列表】
+        'userCompanyBasicAdd' => 'userCompanyBasicAdd',//【公司账号管理-添加】
+        'userCompanyBasicDelete' => 'userCompanyBasicDelete',//【公司账号管理-删除】
+        'userCompanyBasicUpdate' => 'userCompanyBasicUpdate',//【公司账号管理-修改】
     ];
 
     public function __construct()
@@ -132,11 +138,18 @@ class User
     {
         return $this->post($this->host . $this->api['userDelete'], $param);
     }
-    
+
     //修改
-    public function userSave(array $param=[]){
+    public function userSave(array $param = [])
+    {
         return $this->post($this->host . $this->api['usersave'], $param);
     }
 
+    //通用
+    public function handle(string $key = '', array $param = [])
+    {
+        return $this->post($this->host . $this->api[$key], $param);
+    }
+
 
 }

app/admin/controller/Base.php

@@ -33,7 +33,7 @@ class Base extends \app\BaseController
         //这个地方不能用return json_show()方法，无法阻止代码继续执行
         $val = Validate::rule([
             'token'=>'require',
-            'supplierNo'=>'length:18',
+//            'supplierNo'=>'length:18',
         ]);
 
         if(!$val->check($this->post)) return error_show(1004,$val->getError());
@@ -44,10 +44,11 @@ class Base extends \app\BaseController
 //        }
         $effetc = VerifyTokens($this->post['token']);
         if(!empty($effetc) && $effetc['code']!=0) return error_show($effetc['code'], $effetc['message']);
-        if(($this->post['supplierNo'] !='') && !in_array($this->post['supplierNo'],array_column($effetc['data']['company_relaton'],'companyCode'))) return error_show(1004,'该企业尚未关联');
+        if(($this->post['supplierNo'] !='') && !in_array($this->post['supplierNo'],array_column($effetc['data']['company_relaton'],'companyCode'))) return error_show(1004,'尚未关联企业');
 
         $this->uid=isset($effetc['data']['id']) ?$effetc['data']['id']:"";
         $this->uname=isset($effetc['data']['nickname']) ?$effetc['data']['nickname']:"";
+
         $role = Db::name('user_role')
             ->alias('a')
             ->field('a.id,a.status,a.roleid,b.role_name,b.level')

app/admin/controller/UserCompanyBasic.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\admin\common\User as UserCommon;
+use think\facade\Validate;
+
+//【公司账号管理】
+class UserCompanyBasic extends Base
+{
+    //列表
+    public function getList()
+    {
+        $param = $this->request->only(['nickname' => '', 'username' => '', 'status' => '','page' => 1, 'size' => 10], 'post', 'trim');
+
+        $userCommon = new UserCommon();
+
+        $rs = json_decode($userCommon->handle('userCompanyBasicList',$param), true);
+
+        return json_show($rs['code'], $rs['message'], $rs['data']);
+    }
+
+    //注册
+    public function add()
+    {
+        $param = $this->request->only(['nickname', 'mobile', 'email' => '', 'companyArr' => []], 'post', 'trim');
+
+        $val = Validate::rule([
+            'nickname|真实姓名' => 'require|min:2|max:200',
+            'mobile|手机号' => 'require|number|length:11|mobile',
+            'email|邮箱' => 'email',
+            'companyArr|关联业务公司' => 'array|max:100',
+        ]);
+
+        if (!$val->check($param)) return json_show(1004, $val->getError());
+
+        $val_company = Validate::rule([
+            'companyCode|公司编码' => 'require|length:18',
+            'companyName|公司名称' => 'require',
+            'company_type|公司类型' => 'require|number',
+            'is_main|是否默认公司' => 'require|in:0,1',
+        ]);
+
+        foreach ($param['companyArr'] as $company) {
+            if (!$val_company->check($company)) {
+                return json_show(1004, $val_company->getError());
+                break;
+            }
+        }
+
+        $userCommon = new UserCommon();
+        $rs = json_decode($userCommon->handle('userCompanyBasicAdd',$param), true);
+
+        return json_show($rs['code'], $rs['message'], $rs['data']);
+    }
+
+    //删除
+    public function delete()
+    {
+        $param = $this->request->only(['ids'], 'post', 'trim');
+
+        $val=Validate::rule(['ids|账号ID'=>'require|array|max:100']);
+        if(!$val->check($param)) return json_show(1004,$val->getError());
+
+        $userCommon = new UserCommon();
+        $rs = json_decode($userCommon->handle('userCompanyBasicDelete',$param), true);
+
+        return json_show($rs['code'], $rs['message'], $rs['data']);
+    }
+
+    //编辑
+    public function update()
+    {
+        $param = $this->request->only(['id','nickname', 'mobile','sex'=>'','portrait'=>'', 'email' => '', 'companyArr' => []], 'post', 'trim');
+        $param = $this->request->only(['id','nickname', 'mobile', 'email' => '', 'companyArr' => []], 'post', 'trim');
+
+        $val = Validate::rule([
+            'id' => 'require|number|gt:0',
+            'nickname|真实姓名' => 'require|min:2|max:200',
+            'mobile|手机号' => 'require|number|length:11|mobile',
+            'email|邮箱' => 'email',
+            'companyArr|关联业务公司' => 'array|max:100',
+        ]);
+
+        if (!$val->check($param)) return json_show(1004, $val->getError());
+
+        $val_company = Validate::rule([
+            'companyCode|公司编码' => 'require|length:18',
+            'companyName|公司名称' => 'require',
+            'company_type|公司类型' => 'require|number',
+            'is_main|是否默认公司' => 'require|in:0,1',
+        ]);
+
+        foreach ($param['companyArr'] as $company) {
+            if (!$val_company->check($company)) {
+                return json_show(1004, $val_company->getError());
+                break;
+            }
+        }
+
+        $userCommon = new UserCommon();
+        $rs = json_decode($userCommon->handle('userCompanyBasicUpdate',$param), true);
+
+        return json_show($rs['code'], $rs['message'], $rs['data']);
+    }
+
+
+}

app/admin/route/app.php

@@ -144,8 +144,10 @@ Route::rule("passset", "admin/User/setPwd");
 Route::rule("userinfobyid", "admin/User/info");
 Route::rule("usergetinfo", "admin/User/getinfo");
 
-//【公司账号】
-Route::rule("userCompanyAdd", "admin/UserCompany/add");
+//【公司账号管理】
+Route::rule('userCompanyBasicAdd', 'admin/UserCompanyBasic/add');
+Route::rule('userCompanyBasicList', 'admin/UserCompanyBasic/getList');
+Route::rule('userCompanyBasicDelete', 'admin/UserCompanyBasic/delete');
 
 
 Route::rule("sharelist", "admin/Share/index");