地区查询

app/adminapi/lists/asset/AssetLeaseLists.php

@@ -39,7 +39,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => [ 'is_pay'],
+            '=' => ['area_id','is_pay'],
             '%like%'=>['tenant_name','tenant_mobile'],
         ];
     }
@@ -272,6 +272,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
         if (!$assetLeaseInfo->isEmpty()) {
             return ['code' => 0, 'msg' => '租赁期内有未到期的租赁信息！','data'=>$assetLeaseInfo];
         }
+        $area_id = AssetInfo::where(['id'=>$params['a_id']])->value('area_id');
 
         AssetLeaseInfo::create([
             'a_id' => $params['a_id'],
@@ -288,6 +289,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
             'referee_uid' =>$params['referee_uid'],
             'approval_status'=>$params['approval_status']??1,
             'remark' => $params['remark'] ?? '',
+            'area_id' => $area_id ?? 0,
         ]);
         if(isset($params['remind_id'])){
             $remind_id = $params['remind_id'];

app/adminapi/lists/asset/AssetLists.php

@@ -38,7 +38,7 @@ class AssetLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => [ 'lease_status'],
+            '=' => ['area_id', 'lease_status'],
             '%like%'=>['name'],
         ];
     }
@@ -101,6 +101,7 @@ class AssetLists extends BaseAdminDataLists implements ListsSearchInterface
 //            'image' => $params['image'] ? FileService::setFileUrl($params['image']) : '',
             'lease_expiration_time'=>$params['lease_expiration_time'] ?? '',
             'status' => $params['status'] ?? 1,
+            'area_id' => $params['area_id'] ?? 0,
             'sort' => $params['sort'] ?? 0, // 排序
         ]);
     }
@@ -127,6 +128,7 @@ class AssetLists extends BaseAdminDataLists implements ListsSearchInterface
                 'status' => $params['status'] ?? 1,
                 'sort' => $params['sort'] ?? 0,
                 'content' => $params['content'] ?? '',
+                'area_id' => $params['area_id'] ?? 0,
             ]);
             return true;
         } catch (\Exception $e) {

app/adminapi/validate/asset/AssetLeaseValidate.php

@@ -64,8 +64,9 @@ class AssetLeaseValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->remove(['id'])
-            ->remove('id','require|checkAssetInfo');
+        return $this->remove(['id','is_pay'])
+            ->remove('id','require|checkAssetInfo')
+            ->remove('is_pay','require');
     }
 
     /**