|
|
@@ -28,7 +28,7 @@ class Procuremen extends Backend
|
|
|
/**
|
|
|
* 顶部快速搜索(多列 OR LIKE);字段须为真实列名且带别名 a/b,列不宜过多以免 SQL 异常
|
|
|
*/
|
|
|
- protected $searchFields = 'a.ID,b.CCYDH,b.CYJMC,b.CCLBMMC,a.CGYMC,a.CDW,b.czlyq,a.CDF,a.cGzzxMc,a.MBZ,b.cywyxm';
|
|
|
+ protected $searchFields = 'a.ID,b.CCYDH,b.CYJMC,b.CCLBMMC,a.CGYMC,a.CDW,b.czlyq,a.CDF,a.cGzzxMc,a.MBZ,b.cywyxm,b.order_batch_no,a.issue_time';
|
|
|
|
|
|
/**
|
|
|
* Procuremen模型对象
|
|
|
@@ -1744,6 +1744,8 @@ class Procuremen extends Backend
|
|
|
}
|
|
|
}
|
|
|
$pool = $this->procuremenPoolFromPurchaseOrderDbRows(is_array($dbRows) ? $dbRows : []);
|
|
|
+ /* audit/confirm 列表需先填充 issue_time 再搜索,否则搜索不到下发时间 */
|
|
|
+ $this->hydrateProcuremenListIssueSortTimes($pool);
|
|
|
if ($wffTab === 'confirm' && $pool === []) {
|
|
|
Log::write('协助审批列表 pool 为空 ym=' . $ym . ' wffTab=' . $wffTab, 'warning');
|
|
|
}
|
|
|
@@ -11486,7 +11488,7 @@ class Procuremen extends Backend
|
|
|
public function rfqlist()
|
|
|
{
|
|
|
$this->relationSearch = false;
|
|
|
- $this->searchFields = 'CCYDH,CYJMC,CGYMC,CCLBMMC,cywyxm,notify_salesman,pick_company_name,cGzzxMc,MBZ';
|
|
|
+ $this->searchFields = 'CCYDH,CYJMC,CGYMC,CCLBMMC,cywyxm,notify_salesman,pick_company_name,cGzzxMc,MBZ,order_batch_no';
|
|
|
$this->request->filter(['strip_tags', 'trim']);
|
|
|
$this->ensurePurchaseOrderNotifySalesmanColumn();
|
|
|
$this->ensurePurchaseOrderRfqSalesmanNotifiedColumn();
|