up 字段

app/api/lists/property/PropertyCommissionLists.php

@@ -41,6 +41,14 @@ class PropertyCommissionLists extends BaseApiDataLists implements ListsSearchInt
                 ['work_id', '=', $item['work_id']],
                 ['payment_type', 'IN', [0,1]]
             ])->find())['orderGoods'][0];
+            $item['work_title'] = $item['propertyWork']?$item['propertyWork']['title']:'';
+            $item['work_create_time'] = $item['propertyWork']?$item['propertyWork']['create_time']:'';
+            $item['worker_price'] = $item['propertyWork']?$item['propertyWork']['worker_price']:'';
+            $item['work_amount'] = $item['propertyWork']?$item['propertyWork']['work_amount']:'';
+            $item['work_total'] = $item['propertyWork']?$item['propertyWork']['work_total']:'';
+            $item['service_fee'] = $item['propertyWork']?$item['propertyWork']['service_fee']:'';
+            $item['work_sn'] = $item['propertyWork']?$item['propertyWork']['work_sn']:'';
+            $item['goods_image'] = $item['orderGoods']?$item['orderGoods']['goods_image']:'';
         }
         return $lists;
     }

app/api/lists/property/PropertyOrderLists.php

@@ -36,6 +36,12 @@ class PropertyOrderLists extends BaseApiDataLists implements ListsSearchInterfac
             ->order('create_time desc')
             ->select()
             ->toArray();
+        foreach ($lists as &$item){
+            $item['householder_name'] = $item['propertyUser']?$item['propertyUser']['householder_name']:'';
+            $item['householder_mobile'] = $item['propertyUser']?$item['propertyUser']['householder_name']:'';
+            $item['work_address'] = $item['propertyWork']?$item['propertyWork']['address']:'';
+            $item['work_create_time'] = $item['propertyWork']?$item['propertyWork']['create_time']:'';
+        }
         return $lists;
     }
 

app/api/lists/property/PropertySurplusLogLists.php

@@ -52,6 +52,7 @@ class PropertySurplusLogLists extends BaseApiDataLists implements ListsSearchInt
                 $item['work_title'] = ServiceWork::where('id',$work_id)->value('title');
             }
             $item['surplus_sn'] = date('YmdHis',strtotime($item['create_time']));
+            $item['head_bank_card'] = $item['propertyHead']?$item['propertyHead']['head_bank_card']:'';
         }
         return $lists;
     }

app/common/model/property/PropertyCommission.php

@@ -32,16 +32,16 @@ class PropertyCommission extends BaseModel
     public function propertyHead()
     {
         return $this->hasOne(PropertyHead::class, 'id', 'property_head_id')
-            ->field('id,property_name,village_name,head_name');
+            ->field('*');
     }
     public function propertyUser()
     {
         return $this->hasOne(PropertyUser::class, 'id', 'property_user_id')
-            ->field('id,householder_name,householder_mobile');
+            ->field('*');
     }
     public function propertyWork()
     {
         return $this->hasOne(ServiceWork::class, 'id', 'work_id')
-            ->field('id,work_sn,real_name,mobile,address,user_confirm_status,service_fee,work_total,work_amount,worker_price,create_time');
+            ->field('*');
     }
 }