diff --git a/app/adminapi/logic/custom_follow/CustomFollowLogic.php b/app/adminapi/logic/custom_follow/CustomFollowLogic.php index 18f277aeb..bafa2c5f8 100644 --- a/app/adminapi/logic/custom_follow/CustomFollowLogic.php +++ b/app/adminapi/logic/custom_follow/CustomFollowLogic.php @@ -41,16 +41,16 @@ class CustomFollowLogic extends BaseLogic Db::startTrans(); try { CustomFollow::create([ - 'custom_id' => $params['custom_id'], - 'contacts' => $params['contacts'], + 'custom_id' => $params['custom_id'] ?? 0, + 'contacts' => $params['contacts'] ?? '', 'date' => strtotime($params['date']), - 'types' => $params['types'], - 'admin_id' => $params['admin_id'], - 'description' => $params['description'], - 'annex' => $params['annex'], - 'coordinate' => $params['coordinate'], + 'types' => $params['types'] ?? 0, + 'admin_id' => $params['admin_id'] ?? 0, + 'description' => $params['description'] ?? '', + 'annex' => $params['annex'] ?? '', + 'coordinate' => $params['coordinate'] ?? 0, 'next_follow_date' => strtotime($params['next_follow_date']), - 'status' => $params['status'] + 'status' => $params['status'] ?? 0 ]); Db::commit(); @@ -75,16 +75,16 @@ class CustomFollowLogic extends BaseLogic Db::startTrans(); try { CustomFollow::where('id', $params['id'])->update([ - 'custom_id' => $params['custom_id'], - 'contacts' => $params['contacts'], + 'custom_id' => $params['custom_id'] ?? 0, + 'contacts' => $params['contacts'] ?? '', 'date' => strtotime($params['date']), - 'types' => $params['types'], - 'admin_id' => $params['admin_id'], - 'description' => $params['description'], - 'annex' => $params['annex'], - 'coordinate' => $params['coordinate'], + 'types' => $params['types'] ?? 0, + 'admin_id' => $params['admin_id'] ?? 0, + 'description' => $params['description'] ?? '', + 'annex' => $params['annex'] ?? '', + 'coordinate' => $params['coordinate'] ?? 0, 'next_follow_date' => strtotime($params['next_follow_date']), - 'status' => $params['status'] + 'status' => $params['status'] ?? 0 ]); Db::commit(); diff --git a/app/adminapi/logic/custom_service/CustomServiceLogic.php b/app/adminapi/logic/custom_service/CustomServiceLogic.php index 6202f0756..79fe53a3b 100644 --- a/app/adminapi/logic/custom_service/CustomServiceLogic.php +++ b/app/adminapi/logic/custom_service/CustomServiceLogic.php @@ -41,20 +41,20 @@ class CustomServiceLogic extends BaseLogic Db::startTrans(); try { CustomService::create([ - 'project_id' => $params['project_id'], - 'custom_id' => $params['custom_id'], - 'approve_id' => $params['approve_id'], - 'contacts' => $params['contacts'], - 'phone' => $params['phone'], + 'project_id' => $params['project_id'] ?? 0, + 'custom_id' => $params['custom_id'] ?? 0, + 'approve_id' => $params['approve_id'] ?? 0, + 'contacts' => $params['contacts'] ?? '', + 'phone' => $params['phone'] ?? '', 'date' => strtotime($params['date']), - 'classification' => $params['classification'], - 'urgency' => $params['urgency'], - 'receiver' => $params['receiver'], - 'processed_admin_id' => $params['processed_admin_id'], - 'name' => $params['name'], - 'description' => $params['description'], - 'notes' => $params['notes'], - 'annex' => $params['annex'] + 'classification' => $params['classification'] ?? 0, + 'urgency' => $params['urgency'] ?? 0, + 'receiver' => $params['receiver'] ?? '', + 'processed_admin_id' => $params['processed_admin_id'] ?? 0, + 'name' => $params['name'] ?? '', + 'description' => $params['description'] ?? 0, + 'notes' => $params['notes'] ?? '', + 'annex' => $params['annex'] ?? '' ]); Db::commit(); @@ -79,20 +79,20 @@ class CustomServiceLogic extends BaseLogic Db::startTrans(); try { CustomService::where('id', $params['id'])->update([ - 'project_id' => $params['project_id'], - 'custom_id' => $params['custom_id'], - 'approve_id' => $params['approve_id'], - 'contacts' => $params['contacts'], - 'phone' => $params['phone'], + 'project_id' => $params['project_id'] ?? 0, + 'custom_id' => $params['custom_id'] ?? 0, + 'approve_id' => $params['approve_id'] ?? 0, + 'contacts' => $params['contacts'] ?? '', + 'phone' => $params['phone'] ?? '', 'date' => strtotime($params['date']), - 'classification' => $params['classification'], - 'urgency' => $params['urgency'], - 'receiver' => $params['receiver'], - 'processed_admin_id' => $params['processed_admin_id'], - 'name' => $params['name'], - 'description' => $params['description'], - 'notes' => $params['notes'], - 'annex' => $params['annex'] + 'classification' => $params['classification'] ?? 0, + 'urgency' => $params['urgency'] ?? 0, + 'receiver' => $params['receiver'] ?? '', + 'processed_admin_id' => $params['processed_admin_id'] ?? 0, + 'name' => $params['name'] ?? '', + 'description' => $params['description'] ?? 0, + 'notes' => $params['notes'] ?? '', + 'annex' => $params['annex'] ?? '' ]); Db::commit(); diff --git a/app/adminapi/logic/quotation/QuotationLogic.php b/app/adminapi/logic/quotation/QuotationLogic.php index b744a044b..600de9e4b 100644 --- a/app/adminapi/logic/quotation/QuotationLogic.php +++ b/app/adminapi/logic/quotation/QuotationLogic.php @@ -42,20 +42,20 @@ class QuotationLogic extends BaseLogic Db::startTrans(); try { $quotation = Quotation::create([ - 'customer_id' => $params['customer_id'], - 'approve_id' => $params['approve_id'], - 'quotation_date' => $params['quotation_date'], - 'contacts' => $params['contacts'], - 'contacts_phone' => $params['contacts_phone'], - 'create_user' => $params['create_user'], - 'invoice_type' => $params['invoice_type'], - 'amount_including_tax' => $params['amount_including_tax'], - 'freight' => $params['freight'], - 'other_fee' => $params['other_fee'], - 'total_amount' => $params['total_amount'], - 'customer_require' => $params['customer_require'], - 'remark' => $params['remark'], - 'annex' => $params['annex'] + 'customer_id' => $params['customer_id'] ?? 0, + 'approve_id' => $params['approve_id'] ?? 0, + 'quotation_date' => $params['quotation_date'] ?? '', + 'contacts' => $params['contacts'] ?? '', + 'contacts_phone' => $params['contacts_phone'] ?? '', + 'create_user' => $params['create_user'] ?? '', + 'invoice_type' => $params['invoice_type'] ?? 0, + 'amount_including_tax' => $params['amount_including_tax'] ?? 0, + 'freight' => $params['freight'] ?? 0, + 'other_fee' => $params['other_fee'] ?? 0, + 'total_amount' => $params['total_amount'] ?? 0, + 'customer_require' => $params['customer_require'] ?? '', + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ?? '', ]); foreach ($params['product'] as $item) { @@ -89,20 +89,20 @@ class QuotationLogic extends BaseLogic Db::startTrans(); try { Quotation::where('id', $params['id'])->update([ - 'customer_id' => $params['customer_id'], - 'approve_id' => $params['approve_id'], - 'quotation_date' => $params['quotation_date'], - 'contacts' => $params['contacts'], - 'contacts_phone' => $params['contacts_phone'], - 'create_user' => $params['create_user'], - 'invoice_type' => $params['invoice_type'], - 'amount_including_tax' => $params['amount_including_tax'], - 'freight' => $params['freight'], - 'other_fee' => $params['other_fee'], - 'total_amount' => $params['total_amount'], - 'customer_require' => $params['customer_require'], - 'remark' => $params['remark'], - 'annex' => $params['annex'] + 'customer_id' => $params['customer_id'] ?? 0, + 'approve_id' => $params['approve_id'] ?? 0, + 'quotation_date' => $params['quotation_date'] ?? '', + 'contacts' => $params['contacts'] ?? '', + 'contacts_phone' => $params['contacts_phone'] ?? '', + 'create_user' => $params['create_user'] ?? '', + 'invoice_type' => $params['invoice_type'] ?? 0, + 'amount_including_tax' => $params['amount_including_tax'] ?? 0, + 'freight' => $params['freight'] ?? 0, + 'other_fee' => $params['other_fee'] ?? 0, + 'total_amount' => $params['total_amount'] ?? 0, + 'customer_require' => $params['customer_require'] ?? '', + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ?? '', ]); QuotationDetail::where('quotation_id', $params['id'])->delete(); foreach ($params['product'] as $item) diff --git a/app/adminapi/validate/custom_follow/CustomFollowValidate.php b/app/adminapi/validate/custom_follow/CustomFollowValidate.php index 914481253..73c3e9764 100644 --- a/app/adminapi/validate/custom_follow/CustomFollowValidate.php +++ b/app/adminapi/validate/custom_follow/CustomFollowValidate.php @@ -32,6 +32,7 @@ class CustomFollowValidate extends BaseValidate */ protected $rule = [ 'id' => 'require', + 'custom_id' => 'require', ]; @@ -64,7 +65,7 @@ class CustomFollowValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id']); + return $this->only(['id', 'custom_id']); } diff --git a/app/adminapi/validate/custom_service/CustomServiceValidate.php b/app/adminapi/validate/custom_service/CustomServiceValidate.php index 5e6276347..873f8347f 100644 --- a/app/adminapi/validate/custom_service/CustomServiceValidate.php +++ b/app/adminapi/validate/custom_service/CustomServiceValidate.php @@ -32,6 +32,12 @@ class CustomServiceValidate extends BaseValidate */ protected $rule = [ 'id' => 'require', + 'project_id' => 'require', + 'custom_id' => 'require', + 'approve_id' => 'require', + 'receiver' => 'require', + 'processed_admin_id' => 'require', + 'name' => 'require', ]; diff --git a/app/adminapi/validate/quotation/QuotationValidate.php b/app/adminapi/validate/quotation/QuotationValidate.php index 5e5418da3..1e8a5aa36 100644 --- a/app/adminapi/validate/quotation/QuotationValidate.php +++ b/app/adminapi/validate/quotation/QuotationValidate.php @@ -32,6 +32,8 @@ class QuotationValidate extends BaseValidate */ protected $rule = [ 'id' => 'require', + 'customer_id' => 'require', + 'approve_id' => 'require', 'product' => 'require|array|checkProduct', ]; @@ -56,7 +58,6 @@ class QuotationValidate extends BaseValidate return $this->remove('id', true); } - /** * @notes 编辑场景 * @return QuotationValidate @@ -65,7 +66,7 @@ class QuotationValidate extends BaseValidate */ public function sceneEdit() { - return $this->only(['id', 'product']); + return $this->only(['id', 'customer_id', 'approve_id', 'product']); } diff --git a/app/common/model/custom_follow/CustomFollow.php b/app/common/model/custom_follow/CustomFollow.php index da260370c..c9f312d21 100644 --- a/app/common/model/custom_follow/CustomFollow.php +++ b/app/common/model/custom_follow/CustomFollow.php @@ -30,5 +30,10 @@ class CustomFollow extends BaseModel protected $name = 'custom_follow'; protected $deleteTime = 'delete_time'; + public function getDateAttr($value) + { + return empty($value) ? '' : date('Y-m-d H:i:s', $value); + } + } \ No newline at end of file diff --git a/app/common/model/custom_service/CustomService.php b/app/common/model/custom_service/CustomService.php index 9fb7a5951..4a4151c71 100644 --- a/app/common/model/custom_service/CustomService.php +++ b/app/common/model/custom_service/CustomService.php @@ -30,5 +30,9 @@ class CustomService extends BaseModel protected $name = 'custom_service'; protected $deleteTime = 'delete_time'; - + public function getDateAttr($value) + { + return empty($value) ? '' : date('Y-m-d H:i:s', $value); + } + } \ No newline at end of file