From b7665dc6a45d70c79c942d45bc79a68a2bb97339 Mon Sep 17 00:00:00 2001 From: weiz Date: Thu, 28 Dec 2023 16:44:59 +0800 Subject: [PATCH 1/2] fixed 12-28-3 --- app/adminapi/logic/supplier/SupplierLogic.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/adminapi/logic/supplier/SupplierLogic.php b/app/adminapi/logic/supplier/SupplierLogic.php index fcddb95af..4e844e60f 100644 --- a/app/adminapi/logic/supplier/SupplierLogic.php +++ b/app/adminapi/logic/supplier/SupplierLogic.php @@ -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, From a2f26c4b37dc45f703f47e44904b0e514696b649 Mon Sep 17 00:00:00 2001 From: weiz Date: Thu, 28 Dec 2023 16:59:15 +0800 Subject: [PATCH 2/2] fixed 12-28-4 --- app/adminapi/lists/contract/SubcontractingContractLists.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/adminapi/lists/contract/SubcontractingContractLists.php b/app/adminapi/lists/contract/SubcontractingContractLists.php index 131f16902..d894e4f85 100644 --- a/app/adminapi/lists/contract/SubcontractingContractLists.php +++ b/app/adminapi/lists/contract/SubcontractingContractLists.php @@ -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'] = '付款单号';