供销

app/Http/Controllers/Api/CheckController.php

@@ -10,7 +10,7 @@ class CheckController extends BaseController
     public function checkAll(Request $request)
     {
         $service = new CheckService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->checkAll($request->all(),$userData);
 
         if($status){
@@ -22,7 +22,7 @@ class CheckController extends BaseController
 
     public function getOrderDetail(Request $request){
         $service = new CheckService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->getOrderDetail($request->all(),$userData);
 
         if($status){

app/Http/Controllers/Api/DimensionController.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Service\DimensionService;
+use Illuminate\Http\Request;
+
+class DimensionController extends BaseController
+{
+    public function dimensionEdit(Request $request)
+    {
+        $service = new DimensionService();
+        $user = $request->userData;
+        list($status,$data) = $service->dimensionEdit($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function dimensionAdd(Request $request)
+    {
+        $service = new DimensionService();
+        $user = $request->userData;
+        list($status,$data) = $service->dimensionAdd($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
+
+    public function dimensionDel(Request $request)
+    {
+        $service = new DimensionService();
+        $user = $request->userData;
+        list($status,$data) = $service->dimensionDel($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
+
+    public function dimensionList(Request $request)
+    {
+        $service = new DimensionService();
+        $user = $request->userData;
+        list($status,$data) = $service->dimensionList($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function dimensionDetail(Request $request)
+    {
+        $service = new DimensionService();
+        $user = $request->userData;
+        list($status,$data) = $service->dimensionDetail($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+}

app/Http/Controllers/Api/EmployeeController.php

@@ -8,7 +8,7 @@ use Illuminate\Http\Request;
 class EmployeeController extends BaseController
 {
     public function getLoginMan(Request $request){
-        $user = $request->userData->toArray();
+        $user = $request->userData;
 
         return $this->json_return(200,'',$user);
     }
@@ -16,7 +16,7 @@ class EmployeeController extends BaseController
     public function employeeEditOther(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->employeeEditOther($request->all(),$user);
 
         if($status){
@@ -29,7 +29,7 @@ class EmployeeController extends BaseController
     public function employeeEdit(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->employeeEdit($request->all(),$user);
 
         if($status){
@@ -42,7 +42,7 @@ class EmployeeController extends BaseController
     public function employeeAdd(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->employeeAdd($request->all(),$user);
 
         if($status){
@@ -55,7 +55,7 @@ class EmployeeController extends BaseController
     public function employeeDel(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->employeeDel($request->all());
 
         if($status){
@@ -68,8 +68,8 @@ class EmployeeController extends BaseController
     public function employeeDetail(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
-        list($status,$data) = $service->employeeDetail($request->all());
+        $user = $request->userData;
+        list($status,$data) = $service->employeeDetail($request->all(), $user);
 
         if($status){
             return $this->json_return(200,'',$data);
@@ -81,7 +81,7 @@ class EmployeeController extends BaseController
     public function employeeList(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->employeeList($request->all(),$user);
 
         if($status){
@@ -94,7 +94,7 @@ class EmployeeController extends BaseController
     public function roleEdit(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->roleEdit($request->all(),$user);
 
         if($status){
@@ -107,7 +107,7 @@ class EmployeeController extends BaseController
     public function roleAdd(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->roleAdd($request->all(),$user);
 
         if($status){
@@ -121,7 +121,7 @@ class EmployeeController extends BaseController
     public function roleDel(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->roleDel($request->all());
 
         if($status){
@@ -135,7 +135,7 @@ class EmployeeController extends BaseController
     public function roleList(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->roleList($request->all(),$user);
 
         if($status){
@@ -148,7 +148,7 @@ class EmployeeController extends BaseController
     public function roleMenu(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->roleMenu($request->all());
 
         if($status){
@@ -161,7 +161,7 @@ class EmployeeController extends BaseController
     public function roleDetail(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->roleDetail($request->all());
 
         if($status){
@@ -171,49 +171,10 @@ class EmployeeController extends BaseController
         }
     }
 
-    public function departSetIndex(Request $request)
-    {
-        $service = new EmployeeService();
-        $user = $request->userData->toArray();
-        list($status,$data) = $service->departSetIndex($request->all(),$user);
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-    }
-
-    public function departSetDaHuangFengID(Request $request)
-    {
-        $service = new EmployeeService();
-        $user = $request->userData->toArray();
-        list($status,$data) = $service->departSetDaHuangFengID($request->all(),$user);
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-    }
-
-    public function getDepartDaHuangFengID(Request $request)
-    {
-        $service = new EmployeeService();
-        $user = $request->userData->toArray();
-        list($status,$data) = $service->getDepartDaHuangFengID($request->all(),$user);
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-    }
-
     public function departEdit(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->departEdit($request->all(),$user);
 
         if($status){
@@ -226,7 +187,7 @@ class EmployeeController extends BaseController
     public function departAdd(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->departAdd($request->all(),$user);
 
         if($status){
@@ -240,7 +201,7 @@ class EmployeeController extends BaseController
     public function departDel(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->departDel($request->all());
 
         if($status){
@@ -254,7 +215,7 @@ class EmployeeController extends BaseController
     public function departList(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->departList($request->all(),$user);
 
         if($status){
@@ -268,7 +229,7 @@ class EmployeeController extends BaseController
     public function teamEdit(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->teamEdit($request->all());
 
         if($status){
@@ -282,7 +243,7 @@ class EmployeeController extends BaseController
     public function teamAdd(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->teamAdd($request->all(),$user);
 
         if($status){
@@ -295,7 +256,7 @@ class EmployeeController extends BaseController
     public function teamDel(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->teamDel($request->all());
 
         if($status){
@@ -308,7 +269,7 @@ class EmployeeController extends BaseController
     public function teamDetail(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->teamDetail($request->all());
 
         if($status){
@@ -321,7 +282,7 @@ class EmployeeController extends BaseController
     public function teamList(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->teamList($request->all());
 
         if($status){
@@ -335,7 +296,7 @@ class EmployeeController extends BaseController
     public function employeeDepart(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->employeeDepart($request->all());
 
         if($status){
@@ -348,7 +309,7 @@ class EmployeeController extends BaseController
     public function employeeTeam(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->employeeTeam($request->all());
 
         if($status){
@@ -362,7 +323,7 @@ class EmployeeController extends BaseController
     public function employeeRole(Request $request)
     {
         $service = new EmployeeService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->employeeRole($request->all());
 
         if($status){

app/Http/Controllers/Api/ExportFileController.php

@@ -10,7 +10,7 @@ class ExportFileController extends BaseController
     public function exportFile(Request $request)
     {
         $service = new ExportFileService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->exportAll($request->all(),$userData);
 
         if($status){

app/Http/Controllers/Api/FreightController.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Service\FreightService;
-use Illuminate\Http\Request;
-
-class FreightController extends BaseController
-{
-    public function freightEdit(Request $request)
-    {
-        $service = new FreightService();
-        $user = $request->userData->toArray();
-        list($status,$data) = $service->freightEdit($request->all(),$user);
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-    }
-
-    public function freightAdd(Request $request)
-    {
-        $service = new FreightService();
-        $user = $request->userData->toArray();
-        list($status,$data) = $service->freightAdd($request->all(),$user);
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-
-    }
-
-    public function freightDel(Request $request)
-    {
-        $service = new FreightService();
-        $user = $request->userData->toArray();
-        list($status,$data) = $service->freightDel($request->all());
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-
-    }
-
-    public function freightList(Request $request)
-    {
-        $service = new FreightService();
-        $user = $request->userData->toArray();
-        list($status,$data) = $service->freightList($request->all(),$user);
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-    }
-
-    public function freightDetail(Request $request)
-    {
-        $service = new FreightService();
-        $user = $request->userData->toArray();
-        list($status,$data) = $service->freightDetail($request->all(),$user);
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-    }
-}

app/Http/Controllers/Api/GiveOutController.php

@@ -10,7 +10,7 @@ class GiveOutController extends BaseController
     public function giveOutEdit(Request $request)
     {
         $service = new GiveOutService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->giveOutEdit($request->all(),$user);
 
         if($status){
@@ -23,7 +23,7 @@ class GiveOutController extends BaseController
     public function giveOutAdd(Request $request)
     {
         $service = new GiveOutService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->giveOutAdd($request->all(),$user);
 
         if($status){
@@ -37,7 +37,7 @@ class GiveOutController extends BaseController
     public function giveOutDel(Request $request)
     {
         $service = new GiveOutService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->giveOutDel($request->all());
 
         if($status){
@@ -51,7 +51,7 @@ class GiveOutController extends BaseController
     public function giveOutList(Request $request)
     {
         $service = new GiveOutService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->giveOutList($request->all(),$user);
 
         if($status){
@@ -64,7 +64,7 @@ class GiveOutController extends BaseController
     public function giveOutDetail(Request $request)
     {
         $service = new GiveOutService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->giveOutDetail($request->all(),$user);
 
         if($status){

app/Http/Controllers/Api/ImportController.php

@@ -10,7 +10,7 @@ class ImportController extends BaseController
     public function import(Request $request)
     {
         $service = new ImportService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->import($request->all(),$userData);
 
         if($status){
@@ -23,7 +23,7 @@ class ImportController extends BaseController
     public function getTableTitleXls(Request $request)
     {
         $service = new ImportService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->getTableTitleXls($request->all(),$userData);
 
         if($status){
@@ -36,7 +36,7 @@ class ImportController extends BaseController
     public function importAll(Request $request)
     {
         $service = new ImportService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->importAll($request->all(),$userData);
 
         if($status){

app/Http/Controllers/Api/OrganizationController.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Service\OrganizationService;
+use Illuminate\Http\Request;
+
+class OrganizationController extends BaseController
+{
+    public function organizationEdit(Request $request)
+    {
+        $service = new OrganizationService();
+        $user = $request->userData;
+        list($status,$data) = $service->organizationEdit($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function organizationAdd(Request $request)
+    {
+        $service = new OrganizationService();
+        $user = $request->userData;
+        list($status,$data) = $service->organizationAdd($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
+
+    public function organizationDel(Request $request)
+    {
+        $service = new OrganizationService();
+        $user = $request->userData;
+        list($status,$data) = $service->organizationDel($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
+
+    public function organizationList(Request $request)
+    {
+        $service = new OrganizationService();
+        $user = $request->userData;
+        list($status,$data) = $service->organizationList($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function organizationDetail(Request $request)
+    {
+        $service = new OrganizationService();
+        $user = $request->userData;
+        list($status,$data) = $service->organizationDetail($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+}

app/Http/Controllers/Api/ProductController.php

@@ -11,7 +11,7 @@ class ProductController extends BaseController
     public function productCategoryEdit(Request $request)
     {
         $service = new ProductService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->productCategoryEdit($request->all(),$user);
 
         if($status){
@@ -24,7 +24,7 @@ class ProductController extends BaseController
     public function productCategoryAdd(Request $request)
     {
         $service = new ProductService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->productCategoryAdd($request->all(),$user);
 
         if($status){
@@ -37,7 +37,7 @@ class ProductController extends BaseController
     public function productCategoryDel(Request $request)
     {
         $service = new ProductService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->productCategoryDel($request->all());
 
         if($status){
@@ -50,7 +50,7 @@ class ProductController extends BaseController
     public function productCategoryList(Request $request)
     {
         $service = new ProductService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->productCategoryList($request->all(),$user);
 
         if($status){
@@ -63,7 +63,7 @@ class ProductController extends BaseController
     public function productEdit(Request $request)
     {
         $service = new ProductService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->productEdit($request->all(),$user);
 
         if($status){
@@ -76,7 +76,7 @@ class ProductController extends BaseController
     public function productAdd(Request $request)
     {
         $service = new ProductService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->productAdd($request->all(),$user);
 
         if($status){
@@ -90,7 +90,7 @@ class ProductController extends BaseController
     public function productDel(Request $request)
     {
         $service = new ProductService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->productDel($request->all());
 
         if($status){
@@ -104,7 +104,7 @@ class ProductController extends BaseController
     public function productList(Request $request)
     {
         $service = new ProductService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->productList($request->all(),$user);
 
         if($status){
@@ -117,7 +117,7 @@ class ProductController extends BaseController
     public function productDetail(Request $request)
     {
         $service = new ProductService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->productDetail($request->all(),$user);
 
         if($status){

app/Http/Controllers/Api/StatisticsController.php

@@ -9,7 +9,7 @@ class StatisticsController extends BaseController
 {
     public function statisticsRevenueCost(Request $request){
         $service = new StatisticsService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->statisticsRevenueCost($request->all(),$userData);
 
         if($status){
@@ -21,7 +21,7 @@ class StatisticsController extends BaseController
 
     public function statisticsRevenueCostOne(Request $request){
         $service = new StatisticsService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->statisticsRevenueCostOneAndTwo($request->all(),$userData);
 
         if($status){
@@ -33,7 +33,7 @@ class StatisticsController extends BaseController
 
     public function statisticsRevenueCostTwo(Request $request){
         $service = new StatisticsService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->statisticsRevenueCostOneAndTwo($request->all(),$userData);
 
         if($status){
@@ -45,7 +45,7 @@ class StatisticsController extends BaseController
 
     public function statisticsRevenueCostThree(Request $request){
         $service = new StatisticsService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->statisticsRevenueCostThree($request->all(),$userData);
 
         if($status){
@@ -57,7 +57,7 @@ class StatisticsController extends BaseController
 
     public function statisticsRevenueCostThreeDetail(Request $request){
         $service = new StatisticsService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->statisticsRevenueCostThreeDetail($request->all(),$userData);
 
         if($status){
@@ -69,7 +69,7 @@ class StatisticsController extends BaseController
 
     public function statisticsProfit(Request $request){
         $service = new StatisticsService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->statisticsProfit($request->all(),$userData);
 
         if($status){
@@ -81,7 +81,7 @@ class StatisticsController extends BaseController
 
     public function statisticsEmployeeSalary(Request $request){
         $service = new StatisticsService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->statisticsEmployeeSalary($request->all(),$userData);
 
         if($status){
@@ -93,7 +93,7 @@ class StatisticsController extends BaseController
 
     public function statisticsFreightFee(Request $request){
         $service = new StatisticsService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->statisticsFreightFee($request->all(),$userData);
 
         if($status){
@@ -105,7 +105,7 @@ class StatisticsController extends BaseController
 
     public function statisticsFreightFeeDetail(Request $request){
         $service = new StatisticsService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->statisticsFreightFeeDetail($request->all(),$userData);
 
         if($status){

app/Http/Controllers/Api/SysMenuController.php

@@ -10,7 +10,7 @@ class SysMenuController extends BaseController
     public function add(Request $request)
     {
         $service = new SysMenuService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->add($request->all(),$user);
 
         if($status){
@@ -23,7 +23,7 @@ class SysMenuController extends BaseController
     public function edit(Request $request)
     {
         $service = new SysMenuService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->edit($request->all());
 
         if($status){
@@ -36,7 +36,7 @@ class SysMenuController extends BaseController
     public function del(Request $request)
     {
         $service = new SysMenuService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->del($request->all());
 
         if($status){
@@ -49,7 +49,7 @@ class SysMenuController extends BaseController
     public function menuList(Request $request)
     {
         $service = new SysMenuService();
-        $user = $request->userData->toArray();
+        $user = $request->userData;
         list($status,$data) = $service->menuList($request->all(),$user);
 
         if($status){

app/Http/Controllers/Api/TPlusController.php

@@ -13,7 +13,7 @@ class TPlusController extends BaseController
         $error = $service->getError();
         if(! empty($error)) return $this->json_return(201, $error);
 
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->synPersonDepart($request->all(),$userData);
 
         if($status){
@@ -29,7 +29,7 @@ class TPlusController extends BaseController
         $error = $service->getError();
         if(! empty($error)) return $this->json_return(201, $error);
 
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->synRevenueCost($request->all(),$userData);
 
         if($status){
@@ -45,7 +45,7 @@ class TPlusController extends BaseController
         $error = $service->getError();
         if(! empty($error)) return $this->json_return(201, $error);
 
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->synSalaryEmployee($request->all(),$userData);
 
         if($status){
@@ -61,7 +61,7 @@ class TPlusController extends BaseController
         $error = $service->getError();
         if(! empty($error)) return $this->json_return(201, $error);
 
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->synFreightFee($request->all(),$userData);
 
         if($status){

app/Http/Controllers/Api/TableHeadController.php

@@ -10,7 +10,7 @@ class TableHeadController extends BaseController
     public function tableHeadAdd(Request $request)
     {
         $service = new TableHeadService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->tableheadAdd($request->all(),$userData);
 
         if($status){
@@ -23,7 +23,7 @@ class TableHeadController extends BaseController
     public function tableHeadGet(Request $request)
     {
         $service = new TableHeadService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->tableheadGet($request->all(),$userData);
 
         if($status){
@@ -36,7 +36,7 @@ class TableHeadController extends BaseController
     public function filterAdd(Request $request)
     {
         $service = new TableHeadService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->filterAdd($request->all(),$userData);
 
         if($status){
@@ -49,7 +49,7 @@ class TableHeadController extends BaseController
     public function filterGet(Request $request)
     {
         $service = new TableHeadService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->filterGet($request->all(),$userData);
 
         if($status){
@@ -62,7 +62,7 @@ class TableHeadController extends BaseController
     public function tableSearchAdd(Request $request)
     {
         $service = new TableHeadService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->tableSearchAdd($request->all(),$userData);
 
         if($status){
@@ -75,7 +75,7 @@ class TableHeadController extends BaseController
     public function tableSearchGet(Request $request)
     {
         $service = new TableHeadService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->tableSearchGet($request->all(),$userData);
 
         if($status){

app/Http/Controllers/Api/WxController.php

@@ -49,7 +49,7 @@ class WxController extends BaseController
 
     public function saleOrderList(Request $request){
         $service = new SalesOrderService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->salesOrderListsalesOrderWxList($request->all(),$userData);
 
         if($status){
@@ -61,7 +61,7 @@ class WxController extends BaseController
 
     public function purchaseOrderList(Request $request){
         $service = new PurchaseOrderService();
-        $userData = $request->userData->toArray();
+        $userData = $request->userData;
         list($status,$data) = $service->getList($request->all(),$userData);
 
         if($status){

app/Http/Middleware/CheckLogin.php

@@ -2,8 +2,6 @@
 
 namespace App\Http\Middleware;
 
-use App\Model\Depart;
-use App\Model\ProductInventorySet;
 use App\Service\EmployeeService;
 use Closure;
 use App\Service\TokenService;

app/Model/Dimension.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Model;
+
+class Dimension extends UseScopeBaseModel
+{
+    protected $table = "dimension"; //指定表
+    const CREATED_AT = 'crt_time';
+    const UPDATED_AT = 'upd_time';
+    protected $dateFormat = 'U';
+
+    public static $field = ['title','id','code','type','crt_time','is_use','crt_id','sort'];
+
+    const type_one = 1;
+    const type_two = 2;
+    public static $type_name = [
+        self::type_one => '能力量化',
+        self::type_two => '合作现状量化',
+    ];
+
+    const is_use_zero = 0;
+    const is_use_one = 1;
+    public static $is_use_name = [
+        self::is_use_zero => '停用',
+        self::is_use_one => '启用',
+    ];
+}

app/Model/Employee.php

@@ -20,19 +20,14 @@ class Employee extends Model
     const NOT_USE = 2;
     const IS_ADMIN = 1;
     const IS_NOT_ADMIN = 0;
-    const SPECIAL_ADMIN = -1;
-    const IS_TECHNICAL = [
+    const SPECIAL_ADMIN = 1;
+    const IS_ADMIN_PC = [
         0 => '否',
         1 => '是'
     ];
-
-    //人员状态
-    const STATUS_ONE = 1;
-    const STATUS_TWO = 2;
-
-    const STATUS = [
-        1 => '正常',
-        2 => '停用'
+    const IS_WX_ADMIN_PC = [
+        0 => '否',
+        1 => '是'
     ];
 
     const AUTH_ONE = 1; // 我的

app/Model/Freight.php → app/Model/Organization.php

@@ -2,12 +2,12 @@
 
 namespace App\Model;
 
-class Freight extends UseScopeBaseModel
+class Organization extends UseScopeBaseModel
 {
-    protected $table = "freight"; //指定表
+    protected $table = "organization"; //指定表
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
 
-    public static $field = ['area','id','region','kilometer','min_freight_fee','one_and_five','greater_than_five','crt_id','crt_time','company'];
+    public static $field = ['area','id','region','kilometer','min_freight_fee','one_and_five','crt_id','crt_time'];
 }

app/Service/DimensionService.php

@@ -0,0 +1,159 @@
+<?php
+
+namespace App\Service;
+
+use App\Model\Dimension;
+use Illuminate\Support\Facades\DB;
+
+class DimensionService extends Service
+{
+    public function dimensionEdit($data,$user){
+        list($status,$msg) = $this->dimensionRule($data, $user, false);
+        if(!$status) return [$status,$msg];
+
+        try {
+            DB::beginTransaction();
+
+            $model = Dimension::where('id',$data['id'])->first();
+            $model->title = $data['title'] ?? '';
+            $model->code = $data['code'] ?? '';
+            $model->type = $data['type'] ?? 0;
+            $model->is_use = $data['is_use'] ?? 0;
+            $model->sort = $data['sort'] ?? 0;
+            $model->save();
+
+            DB::commit();
+        }catch (\Exception $exception){
+            DB::rollBack();
+            return [false,$exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    public function dimensionAdd($data,$user){
+        list($status,$msg) = $this->dimensionRule($data, $user);
+        if(!$status) return [$status,$msg];
+
+        try {
+            DB::beginTransaction();
+
+            $model = new Dimension();
+            $model->title = $data['title'] ?? '';
+            $model->code = $data['code'] ?? '';
+            $model->type = $data['type'] ?? 0;
+            $model->is_use = $data['is_use'] ?? 0;
+            $model->sort = $data['sort'] ?? 0;
+            $model->crt_id = $user['id'];
+            $model->save();
+
+            DB::commit();
+        }catch (\Exception $exception){
+            DB::rollBack();
+            return [false,$exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    public function dimensionDel($data){
+        if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
+
+        try {
+            DB::beginTransaction();
+            $time = time();
+
+            Dimension::where('del_time',0)
+                ->whereIn('id',$data['id'])
+                ->update(['del_time' => $time]);
+
+            DB::commit();
+        }catch (\Exception $exception){
+            DB::rollBack();
+            return [false,$exception->getMessage()];
+        }
+
+        return [true, ''];
+    }
+
+    public function dimensionDetail($data,$user){
+        if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
+        $customer = Dimension::where('del_time',0)
+            ->where('id',$data['id'])
+            ->first();
+        if(empty($customer)) return [false,'运费设置不存在或已被删除'];
+        $customer = $customer->toArray();
+
+        $customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('emp_name');
+        $customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
+
+        return [true, $customer];
+    }
+
+    public function dimensionCommon($data,$user, $field = []){
+        if(empty($field)) $field = Dimension::$field;
+
+        $model = Dimension::where('del_time',0)
+            ->select($field)
+            ->orderby('sort', 'desc');
+
+        if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
+        if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
+        if(! empty($data['id'])) $model->whereIn('id', $data['id']);
+        if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
+            $model->where('crt_time','>=',$return[0]);
+            $model->where('crt_time','<=',$return[1]);
+        }
+
+        return $model;
+    }
+
+    public function dimensionList($data,$user){
+        $model = $this->dimensionCommon($data, $user);
+        $list = $this->limit($model,'',$data);
+        $list = $this->fillData($list,$user);
+
+        return [true, $list];
+    }
+
+    public function dimensionRule(&$data, $user, $is_add = true){
+        if(empty($data['title'])) return [false, '维度选项不能为空'];
+        if(empty($data['code'])) return [false, '维度编码不能为空'];
+        if(empty($data['type'])) return [false, '类型不能为空'];
+        if(! isset(Dimension::$type_name[$data['type']])) return [false, '类型不能不存在'];
+        if(isset($data['sort'])){
+            $res = $this->checkNumber($data['sort'],0);
+            if(! $res['valid']) return [false,'排序：' . $res['error']];
+        }
+
+        if($is_add){
+            $bool = Dimension::where('code',$data['code'])
+                ->where('del_time',0)
+                ->exists();
+        }else{
+            if(empty($data['id'])) return [false,'ID不能为空'];
+            $bool = Dimension::where('code',$data['code'])
+                ->where('id','<>',$data['id'])
+                ->where('del_time',0)
+                ->exists();
+        }
+        if(! $bool) return [false,'维度编码已存在'];
+
+        return [true, $data];
+    }
+
+    public function fillData($data, $user){
+        if(empty($data['data'])) return $data;
+
+        $emp = (new EmployeeService())->getEmployeeMap(array_unique(array_column($data['data'],'id')));
+        foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
+            $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
+            $data['data'][$key]['is_use_title'] = Dimension::$is_use_name[$value['is_use']] ?? '';
+            $data['data'][$key]['type_title'] = Dimension::$type_name[$value['type']] ?? '';
+        }
+
+        return $data;
+    }
+}

app/Service/EmployeeService.php

@@ -74,6 +74,8 @@ class EmployeeService extends Service
             DB::beginTransaction();
             $model = new Employee();
             $model = $model->where('id',$data['id'])->first();
+            $model->emp_name = $data['emp_name'];
+            $model->mobile = $data['mobile'] ?? '';
             $model->is_admin = $data['is_admin'];
             $model->account = $data['number'];
             if($model->is_admin == 1){
@@ -86,11 +88,22 @@ class EmployeeService extends Service
             $model->save();
 
             $time = time();
+            EmployeeDepartPermission::where('employee_id',$data['id'])->delete();
+            if(! empty($data['depart'])){
+                $insert = [];
+                foreach ($data['depart'] as $value){
+                    $insert[] = [
+                        'employee_id' => $model->id,
+                        'depart_id' => $value,
+                    ];
+                }
+                EmployeeDepartPermission::insert($insert);
+            }
 
             EmployeeRole::where('employee_id',$data['id'])->update([
                 'del_time' => $time
             ]);
-            if(isset($data['role'])){
+            if(! empty($data['role'])){
                 $insert = [];
                 foreach ($data['role'] as $value){
                     $insert[] = [
@@ -103,13 +116,6 @@ class EmployeeService extends Service
                 EmployeeRole::insert($insert);
             }
 
-            if(! empty($data['index_array'])){
-                EmployeeIndex::where('del_time',0)
-                    ->where('employee_id', $data['id'])
-                    ->update(['del_time' => $time]);
-                EmployeeIndex::insert($data['index_array']);
-            }
-
             DB::commit();
         }catch (\Exception $exception){
             DB::rollBack();
@@ -131,16 +137,14 @@ class EmployeeService extends Service
 
         try{
             DB::beginTransaction();
-            $model = new Employee();
 
+            $model = new Employee();
             $model->number = $data['number'];
             $model->emp_name = $data['emp_name'];
             $model->mobile = $data['mobile'] ?? '';
-            $model->leave_time = $data['leave_time'] ?? '';
-            $model->entry_time = $data['entry_time'] ?? '';
-            $model->state = empty($data['leave_time']) ? Employee::USE : Employee::NOT_USE;
             $model->crt_id = $user['id'];
             $model->is_admin = $data['is_admin'];
+            $model->is_wx_admin = $data['is_wx_admin'];
             $model->account = $data['number'];
             if($model->is_admin == 1){
                 if($data['password'] !== '******'){
@@ -149,7 +153,7 @@ class EmployeeService extends Service
             }
             $model->save();
 
-            if(isset($data['depart'])){
+            if(! empty($data['depart'])){
                 $insert = [];
                 foreach ($data['depart'] as $value){
                     $insert[] = [
@@ -160,7 +164,7 @@ class EmployeeService extends Service
                 EmployeeDepartPermission::insert($insert);
             }
 
-            if(isset($data['role'])){
+            if(! empty($data['role'])){
                 $insert = [];
                 foreach ($data['role'] as $value){
                     $insert[] = [
@@ -210,40 +214,10 @@ class EmployeeService extends Service
         return [true,'删除成功'];
     }
 
-    public function employeeDetail($data){
-        if($this->isEmpty($data,'id')) return [false,'人员id不能为空'];
-        $user = Employee::where('id', $data['id'])->where('del_time',0)->first();
-        if(empty($user)) return [false, '人员不存在或已被删除'];
-        $user = $user->toArray();
-        if($user['is_admin']){
-            $user['password'] = "******";
-        }else{
-            $user['password'] = "";
-        }
-        $detail = EmployeeIndex::where('del_time',0)
-            ->where('employee_id',$user['id'])
-            ->select('employee_id','index','index_2','index_3','type','start_time','end_time')
-            ->get()->toArray();
-        $user['index_array'] = $detail;
-        $res = DB::table('employee_role as a')
-            ->leftJoin('role as b','a.role_id','=','b.id')
-            ->where('a.del_time',0)
-            ->where('b.del_time',0)
-            ->where("a.employee_id",$user['id'])
-            ->select('a.employee_id','b.title','b.id')
-            ->get()->toArray();
-        $role_name = "";
-        $role = [];
-        foreach ($res as $value){
-            if(empty($role_name)){
-                $role_name = $value->title;
-            }else{
-                $role_name .= ',' . $value->title;
-            }
-            $role[] = $value->id;
-        }
-        $user['role'] = $role;
-        $user['role_name'] = $role_name;
+    public function employeeDetail($data, $user){
+        if(empty($data['id'])) return [false,'人员id不能为空'];
+        list($status, $return) = $this->employeeList(['id' => $data['id']], $user);
+        $user = $return['data'][0] ?? [];
 
         return [true, $user];
     }
@@ -254,25 +228,24 @@ class EmployeeService extends Service
      * @param $user
      * @return array
      */
-    public function employeeList($data,$user){
+    public function employeeList($data, $user){
         $model = Employee::where('del_time',0)
-            ->select('number','mobile','emp_name','id','is_admin','state')
-            ->orderBy('state','asc');
+            ->select('number','mobile','emp_name','id','is_admin','is_wx_admin','crt_time')
+            ->orderBy('id','desc');
 
+        if(! empty($data['id'])) $model->where('id', $data['id']);
         if(! empty($data['number'])) $model->where('number', 'LIKE', '%'.$data['number'].'%');
         if(! empty($data['emp_name'])) $model->where('emp_name', 'LIKE', '%'.$data['emp_name'].'%');
-        if(! empty($data['state'])) $model->where('state',$data['state']);
         if(! empty($data['mobile'])) $model->where('mobile', 'LIKE', '%'.$data['mobile'].'%');
         if(! isset($data['all_emp'])) $model->where('id','<>',Employee::SPECIAL_ADMIN);
         if(isset($data['is_admin'])) $model->where('is_admin', $data['is_admin']);
+        if(isset($data['is_wx_admin'])) $model->where('is_wx_admin', $data['is_wx_admin']);
         if(! empty($data['role'])) {
             $emp = EmployeeRole::where('role_id',$data['role'])
                 ->where('del_time',0)
                 ->select('employee_id')->get()->toArray();
             $model->whereIn('id',array_column($emp,'employee_id'));
         }
-        if($user['id'] != Employee::SPECIAL_ADMIN) $model->where('is_manager',0);
-
         $list = $this->limit($model,'',$data);
 
         //组织数据
@@ -289,11 +262,33 @@ class EmployeeService extends Service
     public function organizationEmployeeData($data) {
         if (empty($data['data'])) return $data;
 
+        //获取部门 角色
+        list($status, $return) = $this->getEmployee(array_column($data['data'],'id'));
+        if($status) list($role, $role2, $depart_title, $depart_id) = $return;
+
+        foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['role'] = $role2[$value['id']] ?? [];
+            $data['data'][$key]['role_name'] = $role[$value['id']] ?? '';
+            $data['data'][$key]['depart'] = $depart_id[$value['id']] ?? [];
+            $data['data'][$key]['depart_title'] = $depart_title[$value['id']] ?? '';
+            $data['data'][$key]['is_wx_admin_title'] = Employee::IS_WX_ADMIN_PC[$value['is_wx_admin']] ?? "";
+            $data['data'][$key]['is_admin_title'] = Employee::IS_ADMIN_PC[$value['is_admin']] ?? "";
+            $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d",$value['crt_time']) : "";
+        }
+
+        return $data;
+    }
+
+    public function getEmployee($employee_ids){
+        if(empty($employee_ids)) return [false, ''];
+        if(! is_array($employee_ids)) $employee_ids = [$employee_ids];
+
+        //角色
         $res = DB::table('employee_role as a')
             ->leftJoin('role as b','a.role_id','=','b.id')
             ->where('a.del_time',0)
             ->where('b.del_time',0)
-            ->whereIn("a.employee_id",array_column($data['data'],'id'))
+            ->whereIn("a.employee_id", $employee_ids)
             ->select('a.employee_id','b.title','b.id')
             ->get()->toArray();
         $role = $role2 = [];
@@ -306,10 +301,11 @@ class EmployeeService extends Service
             $role2[$value->employee_id][] = $value->id;
         }
 
+        //部门
         $res = DB::table('employee_depart_permission as a')
             ->select('a.employee_id','b.title','b.id')
             ->join('depart as b','a.depart_id','=','b.id')
-            ->whereIn("a.employee_id",array_column($data['data'],'id'))
+            ->whereIn("a.employee_id",$employee_ids)
             ->orderBy('b.id')
             ->get()->toArray();
         $depart_title = $depart_id = [];
@@ -322,16 +318,16 @@ class EmployeeService extends Service
             $depart_id[$value->employee_id][] = $value->id;
         }
 
-        foreach ($data['data'] as $key => $value){
-            $data['data'][$key]['role'] = $role2[$value['id']] ?? [];
-            $data['data'][$key]['role_name'] = $role[$value['id']] ?? '';
-            $data['data'][$key]['depart'] = $depart_id[$value['id']] ?? [];
-            $data['data'][$key]['depart_title'] = $depart_title[$value['id']] ?? '';
-            $data['data'][$key]['state_title'] = $value['state'] == Employee::USE ? "启用" : "停用";
-            $data['data'][$key]['is_admin_title'] = $value['is_admin'] ? "是" : "否";
-        }
+        return [true, [$role, $role2, $depart_title, $depart_id]];
+    }
 
-        return $data;
+    public function getEmployeeMap($employee_ids){
+        if(empty($employee_ids)) return [];
+        if(! is_array($employee_ids)) $employee_ids = [$employee_ids];
+
+        return Employee::whereIn('id', $employee_ids)
+            ->pluck('emp_name', 'id')
+            ->toArray();
     }
 
     /**
@@ -341,79 +337,32 @@ class EmployeeService extends Service
      * @return array
      */
     public function employeeRule(&$data, $is_add = true){
-        if(! empty($data['index_array'])){
-            $typeIntervals = []; // 用于收集每个 type 的时间区间，用于后续不相交校验
-            foreach ($data['index_array'] as $key => $value){
-                if(empty($value['type'])) return [false, '人员指标类型不能为空'];
-                if(! isset(EmployeeIndex::$type_name[$value['type']])) return [false, '人员指标类型不存在'];
-                $name = EmployeeIndex::$type_name[$value['type']];
-                if(empty($value['crt_time'][0]) || empty($value['crt_time'][1]) || ! is_array($value['crt_time'])) return [false, $name . "：时间区间不能为空"];
-                list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($value['crt_time']);
-                $data['index_array'][$key]['start_time'] = $start_time;
-                $data['index_array'][$key]['end_time'] = $end_time;
-                $data['index_array'][$key]['employee_id'] = $data['id'];
-                $data['index_array'][$key]['mark'] = $value['mark'] ?? "";
-                unset($data['index_array'][$key]['crt_time']);
-                if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, $name . "：时间区间无效"];
-                // 收集每个 type 的时间区间，用于后续不相交校验
-                $type = $value['type'];
-                $typeIntervals[$type][] = [
-                    'start' => $start_time,
-                    'end' => $end_time,
-                    'index' => $key, // 用于报错定位
-                ];
-
-                if(! isset($value['index'])) return [false, 'index不存在'];
-                if(! isset($value['index_2'])) return [false, 'index_2不存在'];
-                if(! isset($value['index_3'])) return [false, 'index_3不存在'];
-                if(isset(EmployeeIndex::$positive[$value['type']])){
-                    $name_string = EmployeeIndex::$positive[$value['type']];
-                    $res = $this->checkNumber($value['index'],2,'non-negative');
-                    if(! $res['valid']) return [false, $name_string . "：" . $res['error']];
-                }elseif(isset(EmployeeIndex::$null[$value['type']])){
-                    $name_string = EmployeeIndex::$null[$value['type']];
-                    $res = $this->checkNumber($value['index']);
-                    if(! $res['valid']) return [false, $name_string . "：" . $res['error']];
-                }elseif(isset(EmployeeIndex::$positive_2[$value['type']])){
-                    $name_string = EmployeeIndex::$positive_2[$value['type']];
-                    $res = $this->checkNumber($value['index'],2,'positive');
-                    if(! $res['valid']) return [false, $name_string . "基数：" . $res['error']];
-                    $res = $this->checkNumber($value['index_2'],2,'positive');
-                    if(! $res['valid']) return [false, $name_string . "比例：" . $res['error']];
-                    $res = $this->checkNumber($value['index_3'],2,'positive');
-                    if(! $res['valid']) return [false, $name_string . "：" . $res['error']];
-                }
-            }
-
-            //在校验循环之后
-            foreach ($typeIntervals as $type => $intervals) {
-                if (count($intervals) < 2) continue;
-
-                usort($intervals, function($a, $b) {
-                    return $a['start'] <=> $b['start'];
-                });
-
-                for ($i = 1; $i < count($intervals); $i++) {
-                    $prev = $intervals[$i - 1];
-                    $curr = $intervals[$i];
-
-                    // 方式1：闭区间 [start, end] —— 推荐大多数场景
-                    if ($prev['end'] >= $curr['start']) {
-                        $typeName = EmployeeIndex::$type_name[$type] ?? $type;
-                        return [false, "{$typeName}的时间区间存在重叠,请检查"];
-                    }
-                }
-            }
-        }
+        if(empty($data['number'])) return [false,'工号不能为空'];
+        if(empty($data['emp_name'])) return [false,'姓名不能为空'];
+        if(empty($data['mobile'])) return [false,'手机号不能为空'];
 
+        $mobile = $data['mobile'];
+        $number = $data['number'] ?? "";
         if(! $is_add){
-            if(empty($data['id'])) return [false,'人员ID不能为空'];
-
+            if(empty($data['id'])) return [false,'ID不能为空！'];
             $bool = Employee::where('del_time',0)
-                ->where('id', $data['id'])
-                ->exists();
-            if(! $bool) return [false, '人员不存在或已被删除'];
+                ->where('id','<>',$data['id'])
+                ->where(function ($query) use ($mobile, $number){
+                    $query->where('number', $number);
+                    $query->when(! empty($mobile), function ($query) use ($mobile) {
+                        return $query->orWhere('mobile', $mobile);
+                    });
+                })->exists();
+        }else{
+            $bool = Employee::where('del_time',0)
+                ->where(function ($query) use ($mobile, $number){
+                    $query->where('number', $number);
+                    $query->when(! empty($mobile), function ($query) use ($mobile) {
+                        return $query->orWhere('mobile', $mobile);
+                    });
+                })->exists();
         }
+        if($bool) return [false,'工号或手机号码已存在'];
 
         return [true,''];
     }
@@ -1052,8 +1001,7 @@ class EmployeeService extends Service
 
         $res = reset($res);
         if(! Hash::check($data['password'], $res['password'])) return [false,'密码错误'];
-        if($res['is_admin'] != Employee::IS_ADMIN) return [false,'账号限制登录'];
-        if($res['state'] == Employee::NOT_USE) return [false,'账号已停用'];
+        if($res['is_admin'] != Employee::IS_ADMIN) return [false,'账号限制登录PC端'];
 
         return [true, ['id'=>$res['id'],'name'=>$res['emp_name'], 'number' => $res['number']]];
     }
@@ -1067,8 +1015,9 @@ class EmployeeService extends Service
         $res = Employee::where('id', $userId)
             ->where('del_time',0)
             ->where('is_admin',Employee::IS_ADMIN)
-            ->where('state',Employee::USE)->get()->first();
-        if(empty($res)) return [false, '该账号无法登录,请联系管理员！'];
+            ->first();
+        if(empty($res)) return [false, '账号限制登录PC端后台'];
+        $res = $res->toArray();
 
         return [true, $res];
     }

app/Service/ExportFileService.php

@@ -99,7 +99,7 @@ class ExportFileService extends Service
         $column = array_column($header_default,'key');
         $header = array_column($header_default,'value');
 
-        $service = new FreightService();
+        $service = new OrganizationService();
         $model = $service->freightCommon($ergs, $user);
         $model->chunk(500,function ($data) use(&$return,$column){
             $data = $data->toArray();

app/Service/ImportService.php

@@ -5,7 +5,7 @@ namespace App\Service;
 use App\Exports\TableHeadExport;
 use App\Import\ImportAll;
 use App\Model\Employee;
-use App\Model\Freight;
+use App\Model\Organization;
 use App\Model\GiveOut;
 use App\Model\Product;
 use Illuminate\Support\Facades\DB;
@@ -226,10 +226,10 @@ class ImportService extends Service
         }
 
         try{
-            Freight::where('del_time',0)
+            Organization::where('del_time',0)
                 ->update(['del_time' => $time]);
             //新增
-            if(! empty($insert)) Freight::insert($insert);
+            if(! empty($insert)) Organization::insert($insert);
 
             DB::commit();
         }catch (\Exception $e){

app/Service/FreightService.php → app/Service/OrganizationService.php

@@ -3,22 +3,19 @@
 namespace App\Service;
 
 use App\Model\Employee;
-use App\Model\Freight;
+use App\Model\Organization;
 use Illuminate\Support\Facades\DB;
 
-/**
- * 运费设置
- */
-class FreightService extends Service
+class OrganizationService extends Service
 {
-    public function freightEdit($data,$user){
-        list($status,$msg) = $this->freightRule($data, $user, false);
+    public function organizationEdit($data,$user){
+        list($status,$msg) = $this->organizationRule($data, $user, false);
         if(!$status) return [$status,$msg];
 
         try {
             DB::beginTransaction();
 
-            $model = Freight::where('id',$data['id'])->first();
+            $model = Organization::where('id',$data['id'])->first();
             $model->area = $data['area'] ?? '';
             $model->region = $data['region'] ?? '';
             $model->kilometer = $data['kilometer'] ?? 0;
@@ -37,14 +34,14 @@ class FreightService extends Service
         return [true, ''];
     }
 
-    public function freightAdd($data,$user){
-        list($status,$msg) = $this->freightRule($data, $user);
+    public function organizationAdd($data,$user){
+        list($status,$msg) = $this->organizationRule($data, $user);
         if(!$status) return [$status,$msg];
 
         try {
             DB::beginTransaction();
 
-            $model = new Freight();
+            $model = new Organization();
             $model->area = $data['area'] ?? '';
             $model->region = $data['region'] ?? '';
             $model->kilometer = $data['kilometer'] ?? 0;
@@ -64,14 +61,14 @@ class FreightService extends Service
         return [true, ''];
     }
 
-    public function freightDel($data){
+    public function organizationDel($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
         try {
             DB::beginTransaction();
             $time = time();
 
-            Freight::where('del_time',0)
+            Organization::where('del_time',0)
                 ->whereIn('id',$data['id'])
                 ->update(['del_time' => $time]);
 
@@ -84,9 +81,9 @@ class FreightService extends Service
         return [true, ''];
     }
 
-    public function freightDetail($data,$user){
+    public function organizationDetail($data,$user){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
-        $customer = Freight::where('del_time',0)
+        $customer = Organization::where('del_time',0)
             ->where('id',$data['id'])
             ->first();
         if(empty($customer)) return [false,'运费设置不存在或已被删除'];
@@ -98,10 +95,10 @@ class FreightService extends Service
         return [true, $customer];
     }
 
-    public function freightCommon($data,$user, $field = []){
-        if(empty($field)) $field = Freight::$field;
+    public function organizationCommon($data,$user, $field = []){
+        if(empty($field)) $field = Organization::$field;
 
-        $model = Freight::where('del_time',0)
+        $model = Organization::where('del_time',0)
             ->select($field)
             ->orderby('id', 'desc');
 
@@ -118,15 +115,15 @@ class FreightService extends Service
         return $model;
     }
 
-    public function freightList($data,$user){
-        $model = $this->freightCommon($data, $user);
+    public function organizationList($data,$user){
+        $model = $this->organizationCommon($data, $user);
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list,$user,$data);
 
         return [true, $list];
     }
 
-    public function freightRule(&$data, $user, $is_add = true){
+    public function organizationRule(&$data, $user, $is_add = true){
         if(empty($data['area'])) return [false, '所属区域不能为空'];
         if(empty($data['region'])) return [false, '区域不能为空'];
 
@@ -151,7 +148,7 @@ class FreightService extends Service
 
         }else{
             if(empty($data['id'])) return [false,'ID不能为空'];
-            $bool = Freight::where('id',$data['id'])
+            $bool = Organization::where('id',$data['id'])
                 ->where('del_time',0)
                 ->exists();
             if(! $bool) return [false,'运费设置不存在或已被删除'];

app/Service/RangeService.php

@@ -280,28 +280,6 @@ class RangeService extends Service
         return $return_id;
     }
 
-    //获取产品不可见数据
-    public static function productRangeNot($user,$search){
-        //不可见范围id
-        $return_id = Self::getRangeDataId($user,SeeRange::type_four);
-
-        //分社管理员
-        if(empty($user['is_all_depart']) && ! empty($user['is_manager'])) {
-            $depart = array_shift($user['rule_depart']);
-            $depart_id = $depart['depart_id'] ?? 0;
-            $id = DB::table('product')
-                ->where('del_time',0)
-                ->where('top_depart_id',$depart_id)
-                ->select('id')->get()->toArray();
-            $id = array_column($id,'id');
-            foreach ($return_id as $key => $value){
-                if(in_array($value,$id)) unset($return_id[$key]);
-            }
-        }
-
-        return $return_id;
-    }
-
     //获取采购单可见数据
     public static function purchaseRange($user,$search){
         //可见范围id

app/Service/Service.php

@@ -396,7 +396,7 @@ class Service
      *
      * @param mixed $number 要检查的值
      * @param int $decimals 允许的最大小数位数（默认 2）
-     * @param string|null $sign 要求的符号：'positive', 'negative', 'zero', 'non-negative', 'non-positive' null 表示不限制
+     * @param string|null $sign 要求的符号：'positive' 大于 0 , 'negative' 小于0, 'zero' 等于0, 'non-negative' 大于或等于 0, 'non-positive' 小于或等于 0 null 表示不限制
      * @param bool $strict 是否严格模式（不允许整数传字符串等）
      * @return array ['valid' => bool, 'error' => string|null, 'info' => array]
      */

app/Service/TPlusServerService.php

@@ -7,7 +7,7 @@ use App\Model\Depart;
 use App\Model\Employee;
 use App\Model\EmployeeDepartPermission;
 use App\Model\EmployeeIndex;
-use App\Model\Freight;
+use App\Model\Organization;
 use App\Model\FreightFee;
 use App\Model\Product;
 use App\Model\RevenueCost;
@@ -1214,7 +1214,7 @@ class TPlusServerService extends Service
                     return (array)$object;
                 })->toArray();
 
-                $freight = Freight::where('del_time',0)
+                $freight = Organization::where('del_time',0)
                     ->whereIn('region',array_column($dataArray,'area_hs'))
                     ->select('region','one_and_five','greater_than_five','min_freight_fee')
                     ->get()->toArray();

app/Service/TokenService.php

@@ -7,7 +7,7 @@ use Firebase\JWT\Key;
 
 class TokenService
 {
-    const key = "youfeng"; //签发人  可空
+    const key = "supply_marketing"; //签发人  可空
     const validity = 86400; //有效期
     const error = [
         -2 => "签名不正确",

config/header/62.php

@@ -8,50 +8,22 @@
 return [
     [
         'key' =>'code',
-        'value' => '存货编码',
+        'value' => '组织编码',
     ],
     [
         'key' =>'title',
-        'value' => '存货名称',
+        'value' => '组织名称',
     ],
     [
-        'key' =>'size',
-        'value' => '规格型号',
+        'key' =>'industry',
+        'value' => '行业名称',
     ],
     [
-        'key' =>'category',
-        'value' => '所属类别',
+        'key' =>'crt_name',
+        'value' => '创建人',
     ],
     [
-        'key' =>'unit',
-        'value' => '计量单位',
-    ],
-    [
-        'key' =>'cost',
-        'value' => '成本单价',
-    ],
-    [
-        'key' =>'business_cost',
-        'value' => '业务成本单价',
-    ],
-    [
-        'key' =>'major_client_settlement_price',
-        'value' => '大客户结算单价',
-    ],
-    [
-        'key' =>'write_off_price',
-        'value' => '核销单价',
-    ],
-    [
-        'key' => 'return_change_price',
-        'value' => '退货损耗单价',
-    ],
-    [
-        'key' => 'freight_price',
-        'value' => '运费单价',
-    ],
-    [
-        'key' => 'mark',
-        'value' => '备注',
+        'key' =>'crt_time',
+        'value' => '创建时间',
     ],
 ];

config/header/64.php

@@ -27,11 +27,11 @@ return [
         'value' => '联系方式',
     ],
     [
-        'key' =>'state_title',
-        'value' => '账号启用状态',
+        'key' =>'is_admin_title',
+        'value' => '是否允许登录PC端后台',
     ],
     [
-        'key' =>'is_admin_title',
-        'value' => '是否允许登录后台',
+        'key' =>'is_wx_admin_title',
+        'value' => '是否允许登录微信小程序',
     ],
 ];

config/header/77.php

@@ -7,86 +7,31 @@
 
 return [
     [
-        'key' =>'order_number',
-        'value' => '关联单据号',
+        'key' =>'code',
+        'value' => '编码',
     ],
     [
-        'key' =>'voucher_type_title',
-        'value' => '单据类型',
+        'key' =>'title',
+        'value' => '名称',
     ],
     [
-        'key' =>'customer_code',
-        'value' => '结算客户编码',
+        'key' =>'类型',
+        'value' => 'type_title',
     ],
     [
-        'key' =>'customer_title',
-        'value' => '结算客户',
+        'key' =>'sort',
+        'value' => '排序',
     ],
     [
-        'key' =>'channel_finance',
-        'value' => '渠道财务',
+        'key' =>'is_use_title',
+        'value' => '是否启用',
     ],
     [
-        'key' =>'customer_profit_rate',
-        'value' => '客户毛利率',
+        'key' =>'crt_name',
+        'value' => '创建人',
     ],
     [
-        'key' =>'product_code',
-        'value' => '存货编码',
-    ],
-    [
-        'key' =>'product_title',
-        'value' => '存货名称',
-    ],
-    [
-        'key' =>'product_size',
-        'value' => '规格型号',
-    ],
-    [
-        'key' =>'unit',
-        'value' => '计量单位',
-    ],
-    [
-        'key' =>'quantity',
-        'value' => '开票数量',
-        'sum' => 1,
-    ],
-    [
-        'key' =>'price_1',
-        'value' => '单价',
-    ],
-    [
-        'key' =>'payment_amount',
-        'value' => '回款金额',
-        'sum' => 1,
-    ],
-    [
-        'key' =>'price_1_total',
-        'value' => '开票金额',
-        'sum' => 1,
-    ],
-    [
-        'key' =>'price_4',
-        'value' => '业务成本单价',
-        'sum' => 1,
-    ],
-    [
-        'key' =>'price_4_total',
-        'value' => '业务成本金额',
-        'sum' => 1,
-    ],
-    [
-        'key' =>'profit',
-        'value' => '毛利',
-        'value1' => '回款金额 - 业务成本金额',
-        'sum' => 2,
-        'formula' => 'payment_amount - price_4_total',
-    ],
-    [
-        'key' =>'profit_rate',
-        'value' => '毛利率%',
-        'value1' => '毛利 / 回款金额',
-        'sum' => 2,
-        'formula' => 'profit / payment_amount * 100',
+        'key' =>'crt_time',
+        'value' => '创建时间',
     ],
 ];

routes/api.php

@@ -88,19 +88,19 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('employeeRole', 'Api\EmployeeController@employeeRole');
     $route->any('getEmployeeImg', 'Api\EmployeeController@getEmployeeImg');
 
-    //产品名称
-    $route->any('productList', 'Api\ProductController@productList');
-    $route->any('productEdit', 'Api\ProductController@productEdit');
-    $route->any('productAdd', 'Api\ProductController@productAdd');
-    $route->any('productDel', 'Api\ProductController@productDel');
-    $route->any('productDetail', 'Api\ProductController@productDetail');
-
-    //运费设置
-    $route->any('freightList', 'Api\FreightController@freightList');
-    $route->any('freightEdit', 'Api\FreightController@freightEdit');
-    $route->any('freightAdd', 'Api\FreightController@freightAdd');
-    $route->any('freightDel', 'Api\FreightController@freightDel');
-    $route->any('freightDetail', 'Api\FreightController@freightDetail');
+    //维度选项
+    $route->any('dimensionList', 'Api\DimensionController@dimensionList');
+    $route->any('dimensionEdit', 'Api\DimensionController@dimensionEdit');
+    $route->any('dimensionAdd', 'Api\DimensionController@dimensionAdd');
+    $route->any('dimensionDel', 'Api\DimensionController@dimensionDel');
+    $route->any('dimensionDetail', 'Api\DimensionController@dimensionDetail');
+
+    //组织
+    $route->any('organizationList', 'Api\OrganizationController@organizationList');
+    $route->any('organizationEdit', 'Api\OrganizationController@organizationEdit');
+    $route->any('organizationAdd', 'Api\OrganizationController@organizationAdd');
+    $route->any('organizationDel', 'Api\OrganizationController@organizationDel');
+    $route->any('organizationDetail', 'Api\OrganizationController@organizationDetail');
 
     //发放
     $route->any('giveOutList', 'Api\GiveOutController@giveOutList');