From d6f8fffd3ab4ae7410173e42a1f5feb84f63ab6a Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Tue, 19 Dec 2023 11:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E9=94=80=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/cost/CostBudgetController.php | 6 +- .../ExpenseReimbursementController.php | 108 ++++++++++++++ .../ExpenseReimbursementDetailController.php | 108 ++++++++++++++ ...seReimbursementInvoiceDetailController.php | 108 ++++++++++++++ .../contract/ProcurementContractLists.php | 2 +- .../ExpenseReimbursementDetailLists.php | 77 ++++++++++ ...ExpenseReimbursementInvoiceDetailLists.php | 77 ++++++++++ .../expense/ExpenseReimbursementLists.php | 77 ++++++++++ .../ExpenseReimbursementDetailLogic.php | 114 +++++++++++++++ ...ExpenseReimbursementInvoiceDetailLogic.php | 122 ++++++++++++++++ .../expense/ExpenseReimbursementLogic.php | 132 ++++++++++++++++++ .../ExpenseReimbursementDetailValidate.php | 100 +++++++++++++ ...enseReimbursementInvoiceDetailValidate.php | 102 ++++++++++++++ .../expense/ExpenseReimbursementValidate.php | 114 +++++++++++++++ .../model/expense/ExpenseReimbursement.php | 56 ++++++++ .../expense/ExpenseReimbursementDetail.php | 34 +++++ .../ExpenseReimbursementInvoiceDetail.php | 34 +++++ 17 files changed, 1367 insertions(+), 4 deletions(-) create mode 100644 app/adminapi/controller/expense/ExpenseReimbursementController.php create mode 100644 app/adminapi/controller/expense/ExpenseReimbursementDetailController.php create mode 100644 app/adminapi/controller/expense/ExpenseReimbursementInvoiceDetailController.php create mode 100644 app/adminapi/lists/expense/ExpenseReimbursementDetailLists.php create mode 100644 app/adminapi/lists/expense/ExpenseReimbursementInvoiceDetailLists.php create mode 100644 app/adminapi/lists/expense/ExpenseReimbursementLists.php create mode 100644 app/adminapi/logic/expense/ExpenseReimbursementDetailLogic.php create mode 100644 app/adminapi/logic/expense/ExpenseReimbursementInvoiceDetailLogic.php create mode 100644 app/adminapi/logic/expense/ExpenseReimbursementLogic.php create mode 100644 app/adminapi/validate/expense/ExpenseReimbursementDetailValidate.php create mode 100644 app/adminapi/validate/expense/ExpenseReimbursementInvoiceDetailValidate.php create mode 100644 app/adminapi/validate/expense/ExpenseReimbursementValidate.php create mode 100644 app/common/model/expense/ExpenseReimbursement.php create mode 100644 app/common/model/expense/ExpenseReimbursementDetail.php create mode 100644 app/common/model/expense/ExpenseReimbursementInvoiceDetail.php diff --git a/app/adminapi/controller/cost/CostBudgetController.php b/app/adminapi/controller/cost/CostBudgetController.php index 358774d84..857bb9cfc 100644 --- a/app/adminapi/controller/cost/CostBudgetController.php +++ b/app/adminapi/controller/cost/CostBudgetController.php @@ -16,9 +16,9 @@ namespace app\adminapi\controller\cost; -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\cost\CostBudgetLists; -use app\adminapi\logic\cost\CostBudgetLogic; +use app\adminapi\controller\BaseAdminController; +use app\adminapi\lists\cost\CostBudgetLists; +use app\adminapi\logic\cost\CostBudgetLogic; use app\adminapi\validate\cost\CostBudgetValidate; diff --git a/app/adminapi/controller/expense/ExpenseReimbursementController.php b/app/adminapi/controller/expense/ExpenseReimbursementController.php new file mode 100644 index 000000000..2ebb7580a --- /dev/null +++ b/app/adminapi/controller/expense/ExpenseReimbursementController.php @@ -0,0 +1,108 @@ +dataLists(new ExpenseReimbursementLists()); + } + + + /** + * @notes 添加 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function add() + { + $params = (new ExpenseReimbursementValidate())->post()->goCheck('add'); + $result = ExpenseReimbursementLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ExpenseReimbursementLogic::getError()); + } + + + /** + * @notes 编辑 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function edit() + { + $params = (new ExpenseReimbursementValidate())->post()->goCheck('edit'); + $result = ExpenseReimbursementLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ExpenseReimbursementLogic::getError()); + } + + + /** + * @notes 删除 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function delete() + { + $params = (new ExpenseReimbursementValidate())->post()->goCheck('delete'); + ExpenseReimbursementLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function detail() + { + $params = (new ExpenseReimbursementValidate())->goCheck('detail'); + $result = ExpenseReimbursementLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/expense/ExpenseReimbursementDetailController.php b/app/adminapi/controller/expense/ExpenseReimbursementDetailController.php new file mode 100644 index 000000000..8f3b90a4b --- /dev/null +++ b/app/adminapi/controller/expense/ExpenseReimbursementDetailController.php @@ -0,0 +1,108 @@ +dataLists(new ExpenseReimbursementDetailLists()); + } + + + /** + * @notes 添加 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public function add() + { + $params = (new ExpenseReimbursementDetailValidate())->post()->goCheck('add'); + $result = ExpenseReimbursementDetailLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ExpenseReimbursementDetailLogic::getError()); + } + + + /** + * @notes 编辑 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public function edit() + { + $params = (new ExpenseReimbursementDetailValidate())->post()->goCheck('edit'); + $result = ExpenseReimbursementDetailLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ExpenseReimbursementDetailLogic::getError()); + } + + + /** + * @notes 删除 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public function delete() + { + $params = (new ExpenseReimbursementDetailValidate())->post()->goCheck('delete'); + ExpenseReimbursementDetailLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public function detail() + { + $params = (new ExpenseReimbursementDetailValidate())->goCheck('detail'); + $result = ExpenseReimbursementDetailLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/expense/ExpenseReimbursementInvoiceDetailController.php b/app/adminapi/controller/expense/ExpenseReimbursementInvoiceDetailController.php new file mode 100644 index 000000000..2d210ae5e --- /dev/null +++ b/app/adminapi/controller/expense/ExpenseReimbursementInvoiceDetailController.php @@ -0,0 +1,108 @@ +dataLists(new ExpenseReimbursementInvoiceDetailLists()); + } + + + /** + * @notes 添加 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public function add() + { + $params = (new ExpenseReimbursementInvoiceDetailValidate())->post()->goCheck('add'); + $result = ExpenseReimbursementInvoiceDetailLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ExpenseReimbursementInvoiceDetailLogic::getError()); + } + + + /** + * @notes 编辑 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public function edit() + { + $params = (new ExpenseReimbursementInvoiceDetailValidate())->post()->goCheck('edit'); + $result = ExpenseReimbursementInvoiceDetailLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ExpenseReimbursementInvoiceDetailLogic::getError()); + } + + + /** + * @notes 删除 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public function delete() + { + $params = (new ExpenseReimbursementInvoiceDetailValidate())->post()->goCheck('delete'); + ExpenseReimbursementInvoiceDetailLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public function detail() + { + $params = (new ExpenseReimbursementInvoiceDetailValidate())->goCheck('detail'); + $result = ExpenseReimbursementInvoiceDetailLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/contract/ProcurementContractLists.php b/app/adminapi/lists/contract/ProcurementContractLists.php index 3595efd42..8d5c112db 100644 --- a/app/adminapi/lists/contract/ProcurementContractLists.php +++ b/app/adminapi/lists/contract/ProcurementContractLists.php @@ -66,7 +66,7 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch return Db::name('ProcurementContract')->alias('pc') ->where($this->searchWhere)->where($this->querySearch()) ->leftJoin('project p','p.id = pc.project_id') - ->field('pc.*, p.name as project_name') + ->field('pc.*, p.name as project_name, p.project_code') ->limit($this->limitOffset, $this->limitLength) ->order(['pc.id' => 'desc']) ->select()->each(function($item, $key){ diff --git a/app/adminapi/lists/expense/ExpenseReimbursementDetailLists.php b/app/adminapi/lists/expense/ExpenseReimbursementDetailLists.php new file mode 100644 index 000000000..5231b8a2d --- /dev/null +++ b/app/adminapi/lists/expense/ExpenseReimbursementDetailLists.php @@ -0,0 +1,77 @@ + ['expense_id', 'cost_subject_id'], + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public function lists(): array + { + return ExpenseReimbursementDetail::where($this->searchWhere) + ->field(['id', 'expense_id', 'cost_subject_id', 'use_to', 'amount', 'remark']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public function count(): int + { + return ExpenseReimbursementDetail::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/expense/ExpenseReimbursementInvoiceDetailLists.php b/app/adminapi/lists/expense/ExpenseReimbursementInvoiceDetailLists.php new file mode 100644 index 000000000..d415f89a1 --- /dev/null +++ b/app/adminapi/lists/expense/ExpenseReimbursementInvoiceDetailLists.php @@ -0,0 +1,77 @@ + ['expense_id', 'invoice_type', 'invoice_sn'], + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public function lists(): array + { + return ExpenseReimbursementInvoiceDetail::where($this->searchWhere) + ->field(['id', 'expense_id', 'invoice_type', 'invoice_sn', 'tax_rate', 'invoice_form', 'amount', 'tax', 'annex', 'remark']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public function count(): int + { + return ExpenseReimbursementInvoiceDetail::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/expense/ExpenseReimbursementLists.php b/app/adminapi/lists/expense/ExpenseReimbursementLists.php new file mode 100644 index 000000000..4867d1667 --- /dev/null +++ b/app/adminapi/lists/expense/ExpenseReimbursementLists.php @@ -0,0 +1,77 @@ + ['reimburser', 'reimbursement_date', 'customer_id', 'payee_name', 'payee_account'], + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function lists(): array + { + return ExpenseReimbursement::where($this->searchWhere) + ->field(['id', 'org_id', 'dept_id', 'approve_id', 'reimburser', 'reimbursement_date', 'customer_id', 'pay_type', 'reimbursement_amount', 'reimbursement_amount_daxie', 'payee_name', 'payee_bank', 'payee_account', 'remark', 'annex']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function count(): int + { + return ExpenseReimbursement::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/expense/ExpenseReimbursementDetailLogic.php b/app/adminapi/logic/expense/ExpenseReimbursementDetailLogic.php new file mode 100644 index 000000000..2e7ec1fec --- /dev/null +++ b/app/adminapi/logic/expense/ExpenseReimbursementDetailLogic.php @@ -0,0 +1,114 @@ + $params['expense_id'], + 'cost_subject_id' => $params['cost_subject_id'], + 'use_to' => $params['use_to'], + 'amount' => $params['amount'], + 'remark' => $params['remark'], + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ExpenseReimbursementDetail::where('id', $params['id'])->update([ + 'expense_id' => $params['expense_id'], + 'cost_subject_id' => $params['cost_subject_id'], + 'use_to' => $params['use_to'], + 'amount' => $params['amount'], + 'remark' => $params['remark'], + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public static function delete(array $params): bool + { + return ExpenseReimbursementDetail::destroy($params['id']); + } + + + /** + * @notes 获取详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public static function detail($params): array + { + return ExpenseReimbursementDetail::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/expense/ExpenseReimbursementInvoiceDetailLogic.php b/app/adminapi/logic/expense/ExpenseReimbursementInvoiceDetailLogic.php new file mode 100644 index 000000000..3dda846d2 --- /dev/null +++ b/app/adminapi/logic/expense/ExpenseReimbursementInvoiceDetailLogic.php @@ -0,0 +1,122 @@ + $params['expense_id'], + 'invoice_type' => $params['invoice_type'], + 'invoice_sn' => $params['invoice_sn'], + 'tax_rate' => $params['tax_rate'], + 'invoice_form' => $params['invoice_form'], + 'amount' => $params['amount'], + 'tax' => $params['tax'], + 'annex' => $params['annex'], + 'remark' => $params['remark'], + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ExpenseReimbursementInvoiceDetail::where('id', $params['id'])->update([ + 'expense_id' => $params['expense_id'], + 'invoice_type' => $params['invoice_type'], + 'invoice_sn' => $params['invoice_sn'], + 'tax_rate' => $params['tax_rate'], + 'invoice_form' => $params['invoice_form'], + 'amount' => $params['amount'], + 'tax' => $params['tax'], + 'annex' => $params['annex'], + 'remark' => $params['remark'], + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public static function delete(array $params): bool + { + return ExpenseReimbursementInvoiceDetail::destroy($params['id']); + } + + + /** + * @notes 获取详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public static function detail($params): array + { + return ExpenseReimbursementInvoiceDetail::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/expense/ExpenseReimbursementLogic.php b/app/adminapi/logic/expense/ExpenseReimbursementLogic.php new file mode 100644 index 000000000..c97b62e8a --- /dev/null +++ b/app/adminapi/logic/expense/ExpenseReimbursementLogic.php @@ -0,0 +1,132 @@ + $params['org_id'], + 'dept_id' => $params['dept_id'], + 'approve_id' => $params['approve_id'], + 'reimburser' => $params['reimburser'], + 'reimbursement_date' => $params['reimbursement_date'], + 'customer_id' => $params['customer_id'], + 'pay_type' => $params['pay_type'], + 'reimbursement_amount' => $params['reimbursement_amount'], + 'reimbursement_amount_daxie' => $params['reimbursement_amount_daxie'], + 'payee_name' => $params['payee_name'], + 'payee_bank' => $params['payee_bank'], + 'payee_account' => $params['payee_account'], + 'remark' => $params['remark'], + 'annex' => $params['annex'], + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ExpenseReimbursement::where('id', $params['id'])->update([ + 'org_id' => $params['org_id'], + 'dept_id' => $params['dept_id'], + 'approve_id' => $params['approve_id'], + 'reimburser' => $params['reimburser'], + 'reimbursement_date' => $params['reimbursement_date'], + 'customer_id' => $params['customer_id'], + 'pay_type' => $params['pay_type'], + 'reimbursement_amount' => $params['reimbursement_amount'], + 'reimbursement_amount_daxie' => $params['reimbursement_amount_daxie'], + 'payee_name' => $params['payee_name'], + 'payee_bank' => $params['payee_bank'], + 'payee_account' => $params['payee_account'], + 'remark' => $params['remark'], + 'annex' => $params['annex'], + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public static function delete(array $params): bool + { + return ExpenseReimbursement::destroy($params['id']); + } + + + /** + * @notes 获取详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public static function detail($params): array + { + return ExpenseReimbursement::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/expense/ExpenseReimbursementDetailValidate.php b/app/adminapi/validate/expense/ExpenseReimbursementDetailValidate.php new file mode 100644 index 000000000..70dc6bd0b --- /dev/null +++ b/app/adminapi/validate/expense/ExpenseReimbursementDetailValidate.php @@ -0,0 +1,100 @@ + 'require', + 'expense_id' => 'require', + 'cost_subject_id' => 'require', + 'amount' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'expense_id' => '报销id', + 'cost_subject_id' => '费用科目id', + 'amount' => '金额', + ]; + + + /** + * @notes 添加场景 + * @return ExpenseReimbursementDetailValidate + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public function sceneAdd() + { + return $this->only(['expense_id','cost_subject_id','amount']); + } + + + /** + * @notes 编辑场景 + * @return ExpenseReimbursementDetailValidate + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public function sceneEdit() + { + return $this->only(['id','expense_id','cost_subject_id','amount']); + } + + + /** + * @notes 删除场景 + * @return ExpenseReimbursementDetailValidate + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ExpenseReimbursementDetailValidate + * @author likeadmin + * @date 2023/12/19 11:10 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/adminapi/validate/expense/ExpenseReimbursementInvoiceDetailValidate.php b/app/adminapi/validate/expense/ExpenseReimbursementInvoiceDetailValidate.php new file mode 100644 index 000000000..3eb65d239 --- /dev/null +++ b/app/adminapi/validate/expense/ExpenseReimbursementInvoiceDetailValidate.php @@ -0,0 +1,102 @@ + 'require', + 'expense_id' => 'require', + 'invoice_type' => 'require', + 'invoice_sn' => 'require', + 'amount' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'expense_id' => '报销id', + 'invoice_type' => '发票类型', + 'invoice_sn' => '发票号', + 'amount' => '发票金额', + ]; + + + /** + * @notes 添加场景 + * @return ExpenseReimbursementInvoiceDetailValidate + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public function sceneAdd() + { + return $this->only(['expense_id','invoice_type','invoice_sn','amount']); + } + + + /** + * @notes 编辑场景 + * @return ExpenseReimbursementInvoiceDetailValidate + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public function sceneEdit() + { + return $this->only(['id','expense_id','invoice_type','invoice_sn','amount']); + } + + + /** + * @notes 删除场景 + * @return ExpenseReimbursementInvoiceDetailValidate + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ExpenseReimbursementInvoiceDetailValidate + * @author likeadmin + * @date 2023/12/19 11:09 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/adminapi/validate/expense/ExpenseReimbursementValidate.php b/app/adminapi/validate/expense/ExpenseReimbursementValidate.php new file mode 100644 index 000000000..8b3b22dfa --- /dev/null +++ b/app/adminapi/validate/expense/ExpenseReimbursementValidate.php @@ -0,0 +1,114 @@ + 'require', + 'org_id' => 'require', + 'dept_id' => 'require', + 'approve_id' => 'require', + 'reimburser' => 'require', + 'reimbursement_date' => 'require', + 'customer_id' => 'require', + 'pay_type' => 'require', + 'payee_name' => 'require', + 'payee_bank' => 'require', + 'payee_account' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'org_id' => '机构id', + 'dept_id' => '部门id', + 'approve_id' => '审批id', + 'reimburser' => '报销人', + 'reimbursement_date' => '报销日期', + 'customer_id' => '客户id', + 'pay_type' => '付款方式', + 'payee_name' => '收款人姓名', + 'payee_bank' => '收款银行', + 'payee_account' => '收款账号', + ]; + + + /** + * @notes 添加场景 + * @return ExpenseReimbursementValidate + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function sceneAdd() + { + return $this->only(['org_id','dept_id','approve_id','reimburser','reimbursement_date','customer_id','pay_type','payee_name','payee_bank','payee_account']); + } + + + /** + * @notes 编辑场景 + * @return ExpenseReimbursementValidate + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function sceneEdit() + { + return $this->only(['id','org_id','dept_id','approve_id','reimburser','reimbursement_date','customer_id','pay_type','payee_name','payee_bank','payee_account']); + } + + + /** + * @notes 删除场景 + * @return ExpenseReimbursementValidate + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ExpenseReimbursementValidate + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/common/model/expense/ExpenseReimbursement.php b/app/common/model/expense/ExpenseReimbursement.php new file mode 100644 index 000000000..748a56248 --- /dev/null +++ b/app/common/model/expense/ExpenseReimbursement.php @@ -0,0 +1,56 @@ +hasMany(\app\common\model\expense\ExpenseReimbursementDetail::class, 'expense_id', 'id'); + } + + /** + * @notes 关联invoice + * @return \think\model\relation\HasMany + * @author likeadmin + * @date 2023/12/19 11:12 + */ + public function invoice() + { + return $this->hasMany(\app\common\model\expense\ExpenseReimbursementInvoiceDetail::class, 'expense_id', 'id'); + } + +} \ No newline at end of file diff --git a/app/common/model/expense/ExpenseReimbursementDetail.php b/app/common/model/expense/ExpenseReimbursementDetail.php new file mode 100644 index 000000000..c4e2679bf --- /dev/null +++ b/app/common/model/expense/ExpenseReimbursementDetail.php @@ -0,0 +1,34 @@ +