mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 2024/2/3

Browse Source
This commit is contained in:
weiz 2024-02-03 14:57:40 +08:00
parent 41ca64f735
commit 11add7ae0a
31 changed files with 158 additions and 39 deletions

2
app/adminapi/controller/contract/ContractNegotiationController.php

@ -52,7 +52,7 @@ class ContractNegotiationController extends BaseAdminController
public function add()
{
$params = (new ContractNegotiationValidate())->post()->goCheck('add');
$result = ContractNegotiationLogic::add($params);
$result = ContractNegotiationLogic::add($params,$this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/contract/SubcontractingContractNegotiationController.php

@ -52,7 +52,7 @@ class SubcontractingContractNegotiationController extends BaseAdminController
public function add()
{
$params = (new SubcontractingContractNegotiationValidate())->post()->goCheck('add');
$result = SubcontractingContractNegotiationLogic::add($params);
$result = SubcontractingContractNegotiationLogic::add($params,$this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/finance/FinanceInvoiceApplyController.php

@ -52,7 +52,7 @@ class FinanceInvoiceApplyController extends BaseAdminController
public function add()
{
$params = (new FinanceInvoiceApplyValidate())->post()->goCheck('add');
$result = FinanceInvoiceApplyLogic::add($params);
$result = FinanceInvoiceApplyLogic::add($params,$this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/finance/FinancePaymentApplyController.php

@ -52,7 +52,7 @@ class FinancePaymentApplyController extends BaseAdminController
public function add()
{
$params = (new FinancePaymentApplyValidate())->post()->goCheck('add');
$result = FinancePaymentApplyLogic::add($params);
$result = FinancePaymentApplyLogic::add($params,$this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/finance/FinancePaymentPlanController.php

@ -52,7 +52,7 @@ class FinancePaymentPlanController extends BaseAdminController
public function add()
{
$params = (new FinancePaymentPlanValidate())->post()->goCheck('add');
$result = FinancePaymentPlanLogic::add($params);
$result = FinancePaymentPlanLogic::add($params,$this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/finance/FinanceReceiptRecordController.php

@ -52,7 +52,7 @@ class FinanceReceiptRecordController extends BaseAdminController
public function add()
{
$params = (new FinanceReceiptRecordValidate())->post()->goCheck('add');
$result = FinanceReceiptRecordLogic::add($params);
$result = FinanceReceiptRecordLogic::add($params,$this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

8
app/adminapi/controller/finance/FinanceRefundApplyController.php

@ -16,9 +16,9 @@
namespace app\adminapi\controller\finance;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\finance\FinanceRefundApplyLists;
use app\adminapi\logic\finance\FinanceRefundApplyLogic;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\finance\FinanceRefundApplyLists;
use app\adminapi\logic\finance\FinanceRefundApplyLogic;
use app\adminapi\validate\finance\FinanceRefundApplyValidate;
@ -52,7 +52,7 @@ class FinanceRefundApplyController extends BaseAdminController
public function add()
{
$params = (new FinanceRefundApplyValidate())->post()->goCheck('add');
$result = FinanceRefundApplyLogic::add($params);
$result = FinanceRefundApplyLogic::add($params,$this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/finance/FinanceRefundRecordController.php

@ -52,7 +52,7 @@ class FinanceRefundRecordController extends BaseAdminController
public function add()
{
$params = (new FinanceRefundRecordValidate())->post()->goCheck('add');
$result = FinanceRefundRecordLogic::add($params);
$result = FinanceRefundRecordLogic::add($params,$this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/finance/FinanceReturnedMoneyController.php

@ -52,7 +52,7 @@ class FinanceReturnedMoneyController extends BaseAdminController
public function add()
{
$params = (new FinanceReturnedMoneyValidate())->post()->goCheck('add');
$result = FinanceReturnedMoneyLogic::add($params);
$result = FinanceReturnedMoneyLogic::add($params,$this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/controller/finance/FinanceReturnedRecordController.php

@ -52,7 +52,7 @@ class FinanceReturnedRecordController extends BaseAdminController
public function add()
{
$params = (new FinanceReturnedRecordValidate())->post()->goCheck('add');
$result = FinanceReturnedRecordLogic::add($params);
$result = FinanceReturnedRecordLogic::add($params,$this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

2
app/adminapi/logic/bid/BidDocumentExaminationLogic.php

@ -80,7 +80,7 @@ class BidDocumentExaminationLogic extends BaseLogic
}
}
//添加审批信息
$res2 = addApprove(
addApprove(
'标书审查',
$res->id,
'app\common\model\bid\BidDocumentExamination',

14
app/adminapi/logic/contract/ContractNegotiationLogic.php

@ -42,14 +42,14 @@ class ContractNegotiationLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/04 21:26
*/
public static function add(array $params): bool
public static function add(array $params,$admin_id): bool
{
$contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty();
$profit = $params['negotiation_amount'] - (($params['labor_costs']?:0) + ($params['material_costs']?:0));
$profit_rate = $profit / $params['negotiation_amount'];
Db::startTrans();
try {
ContractNegotiation::create([
$res = ContractNegotiation::create([
'org_id' => $params['org_id'],
'dept_id' => $params['dept_id'],
'project_id' => $contract['project_id'],
@ -69,6 +69,16 @@ class ContractNegotiationLogic extends BaseLogic
'negotiation_quotation' => !empty($params['negotiation_quotation']) ? $params['negotiation_quotation'] : null,
'negotiation_basis' => !empty($params['negotiation_basis']) ? $params['negotiation_basis'] : null,
]);
//添加审批信息
addApprove(
'项目合同洽商',
$res->id,
'app\common\model\contract\ContractNegotiation',
'app\adminapi\logic\contract\ContractNegotiationLogic',
$params['approve_detail']['flow_type'],
$params['approve_detail']['flow_path'],
$admin_id
);
Db::commit();
return true;
} catch (\Exception $e) {

14
app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php

@ -38,12 +38,12 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/12 17:21
*/
public static function add(array $params): bool
public static function add(array $params,$admin_id): bool
{
$subcontracting_contract = SubcontractingContract::field('project_id')->where('id',$params['subcontracting_contract_id'])->findOrEmpty();
Db::startTrans();
try {
SubcontractingContractNegotiation::create([
$res = SubcontractingContractNegotiation::create([
'project_id' => $subcontracting_contract['project_id'],
'subcontracting_contract_id' => $params['subcontracting_contract_id'],
'sign_date' => strtotime($params['sign_date']),
@ -58,6 +58,16 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
'negotiation_quotation' => $params['negotiation_quotation'] ? json_encode($params['negotiation_quotation']) : null,
'negotiation_basis' => $params['negotiation_basis'] ? json_encode($params['negotiation_basis']) : null,
]);
//添加审批信息
addApprove(
'分包合同洽商',
$res->id,
'app\common\model\contract\SubcontractingContractNegotiation',
'app\adminapi\logic\contract\SubcontractingContractNegotiationLogic',
$params['approve_detail']['flow_type'],
$params['approve_detail']['flow_path'],
$admin_id
);
Db::commit();
return true;
} catch (\Exception $e) {

15
app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php

@ -23,7 +23,6 @@ use app\common\logic\BaseLogic;
use app\common\model\finance\FinanceReturnedRecord;
use app\common\model\project\Project;
use app\common\model\custom\Custom;
use app\common\model\bid\BidBuyBiddingDocument;
use think\facade\Db;
@ -43,13 +42,13 @@ class FinanceInvoiceApplyLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/13 15:01
*/
public static function add(array $params): bool
public static function add(array $params,$admin_id): bool
{
$contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty();
$tax_rate = DictData::where('type_value','tax_rate')->column('name','value');
Db::startTrans();
try {
FinanceInvoiceApply::create([
$res = FinanceInvoiceApply::create([
'project_id' => $contract['project_id'],
'contract_id' => $params['contract_id'],
'invoicing_code' => data_unique_code('开票申请'),
@ -76,6 +75,16 @@ class FinanceInvoiceApplyLogic extends BaseLogic
'mailing_type' => $params['mailing_type'] ?? '',
'mailing_no' => $params['mailing_no'] ?? '',
]);
//添加审批信息
addApprove(
'开票申请',
$res->id,
'app\common\model\finance\FinanceInvoiceApply',
'app\adminapi\logic\finance\FinanceInvoiceApplyLogic',
$params['approve_detail']['flow_type'],
$params['approve_detail']['flow_path'],
$admin_id
);
Db::commit();
return true;
} catch (\Exception $e) {

14
app/adminapi/logic/finance/FinancePaymentApplyLogic.php

@ -42,7 +42,7 @@ class FinancePaymentApplyLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/15 13:47
*/
public static function add(array $params): bool
public static function add(array $params,$admin_id): bool
{
if($params['contract_cate'] == 1){
$contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
@ -54,7 +54,7 @@ class FinancePaymentApplyLogic extends BaseLogic
}
Db::startTrans();
try {
FinancePaymentApply::create([
$res = FinancePaymentApply::create([
'payment_apply_code' => data_unique_code('付款申请'),
'supplier_id' => $params['supplier_id'],
'project_id' => $contract['project_id'],
@ -75,6 +75,16 @@ class FinancePaymentApplyLogic extends BaseLogic
'payee_account' => $params['payee_account'],
'bank_account_id' => $params['bank_account_id'],
]);
//添加审批信息
addApprove(
'付款申请',
$res->id,
'app\common\model\finance\FinancePaymentApply',
'app\adminapi\logic\finance\FinancePaymentApplyLogic',
$params['approve_detail']['flow_type'],
$params['approve_detail']['flow_path'],
$admin_id
);
Db::commit();
return true;
} catch (\Exception $e) {

14
app/adminapi/logic/finance/FinancePaymentPlanLogic.php

@ -40,7 +40,7 @@ class FinancePaymentPlanLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/15 11:14
*/
public static function add(array $params): bool
public static function add(array $params,$admin_id): bool
{
if($params['contract_cate'] == 1){
$contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
@ -52,7 +52,7 @@ class FinancePaymentPlanLogic extends BaseLogic
}
Db::startTrans();
try {
FinancePaymentPlan::create([
$res = FinancePaymentPlan::create([
'supplier_id' => $params['supplier_id'],
'project_id' => $contract['project_id'],
'contract_id' => $params['contract_id'],
@ -65,6 +65,16 @@ class FinancePaymentPlanLogic extends BaseLogic
'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]);
//添加审批信息
addApprove(
'付款计划',
$res->id,
'app\common\model\finance\FinancePaymentPlan',
'app\adminapi\logic\finance\FinancePaymentPlanLogic',
$params['approve_detail']['flow_type'],
$params['approve_detail']['flow_path'],
$admin_id
);
Db::commit();
return true;
} catch (\Exception $e) {

14
app/adminapi/logic/finance/FinanceReceiptRecordLogic.php

@ -41,7 +41,7 @@ class FinanceReceiptRecordLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/15 10:20
*/
public static function add(array $params): bool
public static function add(array $params,$admin_id): bool
{
if($params['contract_cate'] == 1){
$contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
@ -54,7 +54,7 @@ class FinanceReceiptRecordLogic extends BaseLogic
$tax_rate = DictData::where('type_value','tax_rate')->column('name','value');
Db::startTrans();
try {
FinanceReceiptRecord::create([
$res = FinanceReceiptRecord::create([
'supplier_id' => $params['supplier_id'],
'project_id' => $contract['project_id'],
'contract_id' => $params['contract_id'],
@ -71,6 +71,16 @@ class FinanceReceiptRecordLogic extends BaseLogic
'remark' => $params['remark'] ?? '',
'annex' => $params['annex']? json_encode($params['annex']) : null,
]);
//添加审批信息
addApprove(
'收票记录',
$res->id,
'app\common\model\finance\FinanceReceiptRecord',
'app\adminapi\logic\finance\FinanceReceiptRecordLogic',
$params['approve_detail']['flow_type'],
$params['approve_detail']['flow_path'],
$admin_id
);
Db::commit();
return true;
} catch (\Exception $e) {

14
app/adminapi/logic/finance/FinanceRefundApplyLogic.php

@ -40,12 +40,12 @@ class FinanceRefundApplyLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/14 16:58
*/
public static function add(array $params): bool
public static function add(array $params,$admin_id): bool
{
$contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty();
Db::startTrans();
try {
FinanceRefundApply::create([
$res = FinanceRefundApply::create([
'refund_code' => data_unique_code('退款申请'),
'project_id' => $contract['project_id'],
'contract_id' => $params['contract_id'],
@ -60,6 +60,16 @@ class FinanceRefundApplyLogic extends BaseLogic
'collection_account' => $params['collection_account'],
'bank_account_id' => $params['bank_account_id'],
]);
//添加审批信息
addApprove(
'项目退款申请',
$res->id,
'app\common\model\finance\FinanceRefundApply',
'app\adminapi\logic\finance\FinanceRefundApplyLogic',
$params['approve_detail']['flow_type'],
$params['approve_detail']['flow_path'],
$admin_id
);
Db::commit();
return true;
} catch (\Exception $e) {

14
app/adminapi/logic/finance/FinanceRefundRecordLogic.php

@ -41,7 +41,7 @@ class FinanceRefundRecordLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/15 14:41
*/
public static function add(array $params): bool
public static function add(array $params,$admin_id): bool
{
if($params['contract_cate'] == 1){
$contract = ProcurementContract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty()->toArray();
@ -53,7 +53,7 @@ class FinanceRefundRecordLogic extends BaseLogic
}
Db::startTrans();
try {
FinanceRefundRecord::create([
$res = FinanceRefundRecord::create([
'supplier_id' => $params['supplier_id'],
'project_id' => $contract['project_id'],
'contract_type' => $params['contract_cate'],
@ -66,6 +66,16 @@ class FinanceRefundRecordLogic extends BaseLogic
'annex' => $params['annex']? json_encode($params['annex']) : null,
'bank_account_id' => $params['bank_account_id'],
]);
//添加审批信息
addApprove(
'退款记录',
$res->id,
'app\common\model\finance\FinanceRefundRecord',
'app\adminapi\logic\finance\FinanceRefundRecordLogic',
$params['approve_detail']['flow_type'],
$params['approve_detail']['flow_path'],
$admin_id
);
Db::commit();
return true;
} catch (\Exception $e) {

14
app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php

@ -40,12 +40,12 @@ class FinanceReturnedMoneyLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/13 15:38
*/
public static function add(array $params): bool
public static function add(array $params,$admin_id): bool
{
$contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty();
Db::startTrans();
try {
FinanceReturnedMoney::create([
$res = FinanceReturnedMoney::create([
'project_id' => $contract['project_id'],
'contract_id' => $params['contract_id'],
'return_date' => strtotime($params['return_date']),
@ -56,6 +56,16 @@ class FinanceReturnedMoneyLogic extends BaseLogic
'remark' => $params['remark'] ?? '',
'annex' => $params['annex']? json_encode($params['annex']) : null,
]);
//添加审批信息
addApprove(
'项目回款计划',
$res->id,
'app\common\model\finance\FinanceReturnedMoney',
'app\adminapi\logic\finance\FinanceReturnedMoneyLogic',
$params['approve_detail']['flow_type'],
$params['approve_detail']['flow_path'],
$admin_id
);
Db::commit();
return true;
} catch (\Exception $e) {

14
app/adminapi/logic/finance/FinanceReturnedRecordLogic.php

@ -41,12 +41,12 @@ class FinanceReturnedRecordLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/13 16:28
*/
public static function add(array $params): bool
public static function add(array $params,$admin_id): bool
{
$contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty();
Db::startTrans();
try {
FinanceReturnedRecord::create([
$res = FinanceReturnedRecord::create([
'project_id' => $contract['project_id'],
'contract_id' => $params['contract_id'],
'finance_returned_money_id' => $params['finance_returned_money_id'],
@ -61,6 +61,16 @@ class FinanceReturnedRecordLogic extends BaseLogic
'annex' => $params['annex']? json_encode($params['annex']) : null,
'bank_account_id' => $params['bank_account_id'],
]);
//添加审批信息
addApprove(
'项目回款记录',
$res->id,
'app\common\model\finance\FinanceReturnedRecord',
'app\adminapi\logic\finance\FinanceReturnedRecordLogic',
$params['approve_detail']['flow_type'],
$params['approve_detail']['flow_path'],
$admin_id
);
Db::commit();
return true;
} catch (\Exception $e) {

4
app/adminapi/validate/contract/ContractNegotiationValidate.php

@ -47,7 +47,8 @@ class ContractNegotiationValidate extends BaseValidate
'warranty_amount' => 'float|egt:0',
'warranty_expire_date' => 'dateFormat:Y-m-d',
'negotiation_quotation' => 'checkAnnex',
'negotiation_basis' => 'checkAnnex'
'negotiation_basis' => 'checkAnnex',
'approve_detail' => 'require|checkApproveDetail',
];
protected $message = [
@ -67,6 +68,7 @@ class ContractNegotiationValidate extends BaseValidate
'warranty_amount.float' => '洽商质保金额值必须是数字',
'warranty_amount.egt' => '洽商质保金额值必须大于等于0',
'warranty_expire_date.dateFormat' => '洽商质保到期时间数据格式错误',
'approve_detail.require' => '请填写审批流程信息',
];

4
app/adminapi/validate/contract/SubcontractingContractNegotiationValidate.php

@ -43,6 +43,7 @@ class SubcontractingContractNegotiationValidate extends BaseValidate
'warranty_expire_date' => 'dateFormat:Y-m-d',
'negotiation_quotation' => 'checkAnnex',
'negotiation_basis' => 'checkAnnex',
'approve_detail' => 'require|checkApproveDetail',
];
@ -58,7 +59,8 @@ class SubcontractingContractNegotiationValidate extends BaseValidate
'negotiation_amount' => '洽商金额',
'negotiation_type' => '洽商类别',
'warranty_amount' => '洽商质保金额',
'warranty_expire_date' => '洽商质保到期时间'
'warranty_expire_date' => '洽商质保到期时间',
'approve_detail' => '审批流程'
];

2
app/adminapi/validate/finance/FinanceInvoiceApplyValidate.php

@ -42,6 +42,7 @@ class FinanceInvoiceApplyValidate extends BaseValidate
'invoice_type' => 'require|checkInvoiceType',
'invoicing_amount' => 'require|float|gt:0',
'annex' => 'checkAnnex',
'approve_detail' => 'require|checkApproveDetail',
];
@ -58,6 +59,7 @@ class FinanceInvoiceApplyValidate extends BaseValidate
'tax_rate' => '税率',
'invoice_type' => '发票类型',
'invoicing_amount' => '开票金额(含税)',
'approve_detail' => '审批流程'
];

2
app/adminapi/validate/finance/FinancePaymentApplyValidate.php

@ -52,6 +52,7 @@ class FinancePaymentApplyValidate extends BaseValidate
'payee_account_name' => 'require',
'payee_account' => 'require',
'bank_account_id' => 'require|checkBankAccount',
'approve_detail' => 'require|checkApproveDetail',
];
@ -74,6 +75,7 @@ class FinancePaymentApplyValidate extends BaseValidate
'payee_account_name' => '收款人开户名称',
'payee_account' => '收款人账号',
'bank_account_id' => '付款银行账户id',
'approve_detail' => '审批流程'
];

2
app/adminapi/validate/finance/FinancePaymentPlanValidate.php

@ -44,6 +44,7 @@ class FinancePaymentPlanValidate extends BaseValidate
'amount' => 'require|float|gt:0',
'status' => 'require|checkStatus',
'annex' => 'checkAnnex',
'approve_detail' => 'require|checkApproveDetail',
];
@ -60,6 +61,7 @@ class FinancePaymentPlanValidate extends BaseValidate
'pay_date' => '计划付款日期',
'amount' => '金额',
'status' => '状态',
'approve_detail' => '审批流程'
];

2
app/adminapi/validate/finance/FinanceReceiptRecordValidate.php

@ -44,6 +44,7 @@ class FinanceReceiptRecordValidate extends BaseValidate
'invoice_tax_rate' => 'require|checkInvoiceTaxRate',
'receipt_date' => 'require|dateFormat:Y-m-d',
'annex' => 'checkAnnex',
'approve_detail' => 'require|checkApproveDetail',
];
@ -61,6 +62,7 @@ class FinanceReceiptRecordValidate extends BaseValidate
'invoice_amount' => '发票金额',
'invoice_tax_rate' => '发票税率',
'receipt_date' => '收票日期',
'approve_detail' => '审批流程'
];

4
app/adminapi/validate/finance/FinanceRefundApplyValidate.php

@ -44,6 +44,7 @@ class FinanceRefundApplyValidate extends BaseValidate
'collection_bank' => 'require',
'collection_account' => 'require',
'bank_account_id' => 'require|checkBankAccount',
'approve_detail' => 'require|checkApproveDetail',
];
@ -60,7 +61,8 @@ class FinanceRefundApplyValidate extends BaseValidate
'refund_type' => '退款方式',
'collection_bank' => '收款银行',
'collection_account' => '收款账号',
'bank_account_id' => '付款银行账号'
'bank_account_id' => '付款银行账号',
'approve_detail' => '审批流程'
];

2
app/adminapi/validate/finance/FinanceRefundRecordValidate.php

@ -45,6 +45,7 @@ class FinanceRefundRecordValidate extends BaseValidate
'refund_type' => 'require|checkRefundType',
'annex' => 'checkAnnex',
'bank_account_id' => 'require|checkBankAccount',
'approve_detail' => 'require|checkApproveDetail',
];
@ -61,6 +62,7 @@ class FinanceRefundRecordValidate extends BaseValidate
'refund_date' => '退款日期',
'refund_type' => '退款方式',
'bank_account_id' => '收款账户id',
'approve_detail' => '审批流程'
];

4
app/adminapi/validate/finance/FinanceReturnedMoneyValidate.php

@ -41,7 +41,8 @@ class FinanceReturnedMoneyValidate extends BaseValidate
'amount' => 'require|float|gt:0',
'return_status' => 'require|checkReturnStatus',
'return_duty_id' => 'require|checkReturnDuty',
'annex' => 'checkAnnex'
'annex' => 'checkAnnex',
'approve_detail' => 'require|checkApproveDetail',
];
@ -57,6 +58,7 @@ class FinanceReturnedMoneyValidate extends BaseValidate
'amount' => '金额',
'return_status' => '回款状态',
'return_duty_id' => '回款责任人',
'approve_detail' => '审批流程'
];

2
app/adminapi/validate/finance/FinanceReturnedRecordValidate.php

@ -45,6 +45,7 @@ class FinanceReturnedRecordValidate extends BaseValidate
'pay_type' => 'require|checkPayType',
'annex' => 'checkAnnex',
'bank_account_id' => 'require|checkBankAccount',
'approve_detail' => 'require|checkApproveDetail',
];
@ -62,6 +63,7 @@ class FinanceReturnedRecordValidate extends BaseValidate
'invoice_status' => '开票状态',
'pay_type' => '付款方式',
'bank_account_id' => '银行账号',
'approve_detail' => '审批流程'
];