diff --git a/app/adminapi/lists/bid/BidBiddingDecisionLists.php b/app/adminapi/lists/bid/BidBiddingDecisionLists.php index 0ca0a5f9a..80a71b8f6 100644 --- a/app/adminapi/lists/bid/BidBiddingDecisionLists.php +++ b/app/adminapi/lists/bid/BidBiddingDecisionLists.php @@ -67,6 +67,10 @@ class BidBiddingDecisionLists extends BaseAdminDataLists implements ListsSearchI $item['approve_no'] = '付款单号'; $item['approve_step'] = '流程步骤'; $item['approve_settle_status'] = 1; + $item['bidding_time'] = empty($item['bidding_time']) ? '' : date('Y-m-d H:i:s', $item['bidding_time']); + $item['buy_bid_document_date'] = empty($item['buy_bid_document_date']) ? '' : date('Y-m-d H:i:s', $item['buy_bid_document_date']); + $item['bid_opening_date'] = empty($item['bid_opening_date']) ? '' : date('Y-m-d H:i:s', $item['bid_opening_date']); + $item['margin_amount_return_date'] = empty($item['bid_opening_date']) ? '' : date('Y-m-d H:i:s', $item['margin_amount_return_date']); return $item; }) ->toArray(); diff --git a/app/adminapi/lists/bid/BidSecurityApplyLists.php b/app/adminapi/lists/bid/BidSecurityApplyLists.php index 42a67f7b3..824369d37 100644 --- a/app/adminapi/lists/bid/BidSecurityApplyLists.php +++ b/app/adminapi/lists/bid/BidSecurityApplyLists.php @@ -60,7 +60,7 @@ class BidSecurityApplyLists extends BaseAdminDataLists implements ListsSearchInt ->leftJoin('bid_bidding_decision bbd','bbd.id = bsa.bidding_decision_id') ->leftJoin('project p','p.id = bbd.project_id') ->leftJoin('custom ct','ct.id = p.custom_id') - ->field('bsa.*, bbd.project_id, p.name as project_name, p.project_code, ct.name as customer_name') + ->field('bsa.*, bbd.project_id, bbd.bidding_time, bbd.margin_amount, p.name as project_name, p.project_code, ct.name as customer_name') ->limit($this->limitOffset, $this->limitLength) ->order(['bsa.id' => 'desc']) ->select()->each(function($item, $key){ @@ -68,6 +68,7 @@ class BidSecurityApplyLists extends BaseAdminDataLists implements ListsSearchInt $item['approve_no'] = '付款单号'; $item['approve_step'] = '流程步骤'; $item['approve_settle_status'] = 1; + $item['bidding_time'] = empty($item['bidding_time']) ? '' : date('Y-m-d H:i:s', $item['bidding_time']); return $item; }) ->toArray();