提交

app/Http/Controllers/Api/AssetController.php

@@ -48,6 +48,19 @@ class AssetController extends BaseController
         }
     }
 
+    public function assetOtherList(Request $request)
+    {
+        $service = new AssetService();
+        $userData = $request->userData->toArray();
+        list($status,$data) = $service->assetOtherList($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
     public function assetList(Request $request)
     {
         $service = new AssetService();

app/Model/AssetOther.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AssetOther extends Model
+{
+    protected $guarded = [];
+    protected $table = "asset_other"; //指定表
+    const CREATED_AT = 'crt_time';
+    const UPDATED_AT = 'upd_time';
+    protected $dateFormat = 'U';
+}

app/Service/AssetService.php

@@ -5,6 +5,7 @@ namespace App\Service;
 
 use App\Jobs\AssetDeviceJob;
 use App\Model\Asset;
+use App\Model\AssetOther;
 use App\Model\InventoryOrderAsset;
 use App\Model\Settings;
 
@@ -74,11 +75,7 @@ class AssetService extends Service
     public function del($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
 
-        $bool = InventoryOrderAsset::where('del_time',0)
-            ->where('asset_id',$data['id'])
-            ->exists();
-        if($bool) return [false,'资产已录入盘点单，删除失败！'];
-        Asset::where('id',$data['id'])->update([
+        AssetOther::where('id',$data['id'])->update([
             'del_time' => time()
         ]);
 
@@ -116,12 +113,12 @@ class AssetService extends Service
         if($this->isEmpty($data,'singleCode')) return [false,'资产唯一码不能为空！'];
 
         if($is_check){
-            $bool = Asset::where('del_time',0)
+            $bool = AssetOther::where('del_time',0)
                 ->where('singleCode',$data['singleCode'])
                 ->exists();
         }else{
             if($this->isEmpty($data,'id')) return [false,'数据ID不能为空！'];
-            $bool = Asset::where('del_time',0)
+            $bool = AssetOther::where('del_time',0)
                 ->where('id','<>',$data['id'])
                 ->where('singleCode',$data['singleCode'])
                 ->exists();
@@ -192,4 +189,30 @@ class AssetService extends Service
 
         return explode(',',$allowedIPs->value);
     }
+
+    public function assetOtherList($data){
+        $model = AssetOther::where('del_time',0)
+            ->select('*')
+            ->orderby('id', 'desc');
+        if(! empty($data['name'])) $model->where('name', 'LIKE', '%'.$data['name'].'%');
+        if(! empty($data['singleCode'])) $model->where('singleCode', 'LIKE', '%'.$data['singleCode'].'%');
+        if(! empty($data['located'])) $model->where('located', 'LIKE', '%'.$data['located'].'%');
+        if(! empty($data['useDept'])) $model->where('useDept', 'LIKE', '%'.$data['useDept'].'%');
+
+        $list = $this->limit($model,'',$data);
+        $list = $this->fillOtherData($list);
+
+        return [true,$list];
+    }
+
+    public function fillOtherData($data){
+        if(empty($data['data'])) return $data;
+
+        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]['upd_time'] = $value['upd_time'] ? date('Y-m-d H:i:s',$value['upd_time']) : '';
+        }
+
+        return $data;
+    }
 }

routes/api.php

@@ -51,10 +51,13 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('roleDel', 'Api\EmployeeController@roleDel');
     $route->any('roleList', 'Api\EmployeeController@roleList');
 
-    //资产
+    //资产(主动新增的)
     $route->any('assetAdd', 'Api\AssetController@add');
     $route->any('assetEdit', 'Api\AssetController@edit');
     $route->any('assetDel', 'Api\AssetController@del');
+    $route->any('assetOtherList', 'Api\AssetController@assetOtherList');
+
+    //资产(外部传递的)
     $route->any('assetList', 'Api\AssetController@assetList');
     //区域和部门
     $route->any('getDepAndArea','Api\AssetController@getDepAndArea');