Merge pull request 'zhangwei' (#89) from zhangwei into dev
Reviewed-on: #89
This commit is contained in:
commit
a65f837ad4
@ -73,6 +73,7 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea
|
||||
->limit($this->limitOffset, $this->limitLength)
|
||||
->order(['pc.id' => 'desc'])
|
||||
->select()->each(function($item, $key){
|
||||
$item['signing_date'] = date('Y-m-d',$item['signing_date']);
|
||||
//关联数据后续添加
|
||||
$item['supplier_name'] = '供应商名称';
|
||||
$item['approve_no'] = '付款单号';
|
||||
|
@ -44,7 +44,7 @@ class SupplierLogic extends BaseLogic
|
||||
'create_user_id' => $params['create_user_id'] ?? 0,
|
||||
'org_id' => $params['org_id'] ?? 0,
|
||||
'dept_id' => $params['dept_id'] ?? 0,
|
||||
'supplier_code' => $params['supplier_code'] ?? '',
|
||||
'supplier_code' => data_unique_code('SC'),
|
||||
'supplier_name' => $params['supplier_name'] ?? '',
|
||||
'supplier_introduction' => $params['supplier_introduction'] ?? '',
|
||||
'brand_category' => $params['brand_category'] ?? 0,
|
||||
@ -96,7 +96,6 @@ class SupplierLogic extends BaseLogic
|
||||
'create_user_id' => $params['create_user_id'] ?? 0,
|
||||
'org_id' => $params['org_id'] ?? 0,
|
||||
'dept_id' => $params['dept_id'] ?? 0,
|
||||
'supplier_code' => $params['supplier_code'] ?? '',
|
||||
'supplier_name' => $params['supplier_name'] ?? '',
|
||||
'supplier_introduction' => $params['supplier_introduction'] ?? '',
|
||||
'brand_category' => $params['brand_category'] ?? 0,
|
||||
|
Loading…
x
Reference in New Issue
Block a user