@@ -148,13 +148,11 @@ class DischargeTaskController extends Controller
{
$this->gate('人事管理-卸货-结算报表-查询');
- $dischargeTasks = DischargeTask::query()->with(['facilitator', 'owner', 'warehouse'])->filter($filters)->orderByDesc('id')->get();
-
+ $dischargeTasks = DischargeTask::query()->with(['facilitator', 'owner', 'warehouse'])->filter($filters)->orderByDesc('income_at')->get();
$row = ['日期', '客户名称', '仓库', '作业名称', '入库单号', '数量', '单位', '收入单价', '收入合计', '装卸队', '数量', '单位', '支出单价', '支出合计', '状态', '收入备注', '支出备注'];
$json = app('DischargeTaskService')->getStatementsJson($dischargeTasks);
return Export::make($row, $json, "卸货结算报表");
- //return app(ExportService::class)->json($row, $json, "卸货结算报表");
}
public function receipt(Request $request)
@@ -123,13 +123,9 @@ class DischargeTaskService
$json = [];
foreach ($dischargeTasks as $dischargeTask) {
/** @var DischargeTask $dischargeTask */
- /** @var Carbon $date */
- $date = $dischargeTask['created_at'];
$json[] = [
- $date->toDateTimeString() , // 日期
+ $dischargeTask['income_at'], // 日期
$dischargeTask->owner->name ?? '', // 客户名称
$dischargeTask->warehouse->name ?? '', // 仓库
DischargeTask::types[$dischargeTask['type']] ?? '', // 作业名称
@@ -65,8 +65,8 @@
placeholder: ['货主', '定位或多选货主'],
data: _this.owners
},
- {name: 'created_at_start', type: 'dateTime', tip: '创建开始日期'},
- {name: 'created_at_end', type: 'dateTime', tip: '创建结束日期'},
+ {name: 'income_at_start', type: 'dateTime', tip: '创建开始日期'},
+ {name: 'income_at_end', type: 'dateTime', tip: '创建结束日期'},
{name: 'numbers', type: 'input', tip: '可支持多入库单号,模糊搜索可在两侧增加百分号(%)进行', placeholder: '入库单号'},
{name: 'status', type: 'select', tip: '状态', data: status, placeholder: '状态'},
], [