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

update

Browse Source
This commit is contained in:
weiz 2024-03-28 11:13:22 +08:00
parent ab005f90c1
commit 32b287b856
2 changed files with 266 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/adminapi/lists/project/ProjectExpenseReimbursementInvoiceDetailLists.php
View File

@ -17,11 +17,10 @@ namespace app\adminapi\lists\project;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsExcelInterface;
use app\common\lists\ListsSearchInterface;
use app\common\model\project\Project; use app\common\model\project\Project;
use app\common\model\project\ProjectExpenseReimbursement; use app\common\model\project\ProjectExpenseReimbursement;
use app\common\model\project\ProjectExpenseReimbursementInvoiceDetail; use app\common\model\project\ProjectExpenseReimbursementInvoiceDetail;
use app\common\lists\ListsSearchInterface;
use think\helper\Str;
/** /**
@ -71,7 +70,7 @@ class ProjectExpenseReimbursementInvoiceDetailLists extends BaseAdminDataLists i
$where[] = ['expense_reimbursement_id', 'in', $expense_reimbursement_ids]; $where[] = ['expense_reimbursement_id', 'in', $expense_reimbursement_ids];
} }
return ProjectExpenseReimbursementInvoiceDetail::where($this->searchWhere)->where($where) return ProjectExpenseReimbursementInvoiceDetail::where($this->searchWhere)->where($where)
->field(['id', 'expense_reimbursement_id', 'invoice_type', 'invoice_sn', 'tax_rate', 'invoice_form', 'invoice_amount', 'tax_amount', 'remark']) ->field(['id', 'expense_reimbursement_id', 'invoice_type', 'invoice_sn', 'tax_rate', 'invoice_form', 'invoice_amount', 'tax_amount', 'remark', 'annex'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($data) { ->select()->each(function ($data) {

4
app/adminapi/lists/project/ProjectTravelReimbursementInvoiceDetailLists.php
View File

@ -17,10 +17,10 @@ namespace app\adminapi\lists\project;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsExcelInterface;
use app\common\lists\ListsSearchInterface;
use app\common\model\project\Project; use app\common\model\project\Project;
use app\common\model\project\ProjectTravelReimbursement; use app\common\model\project\ProjectTravelReimbursement;
use app\common\model\project\ProjectTravelReimbursementInvoiceDetail; use app\common\model\project\ProjectTravelReimbursementInvoiceDetail;
use app\common\lists\ListsSearchInterface;
use app\common\model\project\ProjectTripApply; use app\common\model\project\ProjectTripApply;
@ -76,7 +76,7 @@ class ProjectTravelReimbursementInvoiceDetailLists extends BaseAdminDataLists im
$where[] = ['travel_reimbursement_id', 'in', $travel_reimbursement_ids]; $where[] = ['travel_reimbursement_id', 'in', $travel_reimbursement_ids];
} }
return ProjectTravelReimbursementInvoiceDetail::where($this->searchWhere)->where($where) return ProjectTravelReimbursementInvoiceDetail::where($this->searchWhere)->where($where)
->field(['id', 'travel_reimbursement_id', 'invoice_type', 'invoice_sn', 'tax_rate', 'invoice_form', 'invoice_amount', 'tax_amount', 'remark']) ->field(['id', 'travel_reimbursement_id', 'invoice_type', 'invoice_sn', 'tax_rate', 'invoice_form', 'invoice_amount', 'tax_amount', 'remark', 'annex'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($data) { ->select()->each(function ($data) {