diff --git a/app/controller/manager/Worksite.php b/app/controller/manager/Worksite.php index 4578d3d..f9987f4 100644 --- a/app/controller/manager/Worksite.php +++ b/app/controller/manager/Worksite.php @@ -7,6 +7,7 @@ namespace app\controller\manager; use app\model\Account; use app\model\Account as AccountModel; use app\model\AccountWorksite; +use app\model\PayMonthLog; use Exception; use app\model\Log; use think\Collection; @@ -371,9 +372,16 @@ class Worksite extends Base */ public function outlay(): View { - $id = input('id'); + $id = input('worksite_id/d'); + $pay = PayMonthLog::where('worksite_id', $id)->where('status', '>', PayMonthLog::COMMON_OFF)->sum('paid_amount'); + $outsource = \app\model\WorksiteOutsource::where('worksite_id', $id)->sum('amount'); + $item['total'] = $pay + $outsource; + $item['pay'] = $pay; + $item['outsource'] = $outsource; + + $this->data['item'] = $item; return $this->view(); } } \ No newline at end of file diff --git a/public/static/manager/js/worksite_outsource/worksite_outsource.js b/public/static/manager/js/worksite_outsource/worksite_outsource.js index 3a5ed28..9272035 100644 --- a/public/static/manager/js/worksite_outsource/worksite_outsource.js +++ b/public/static/manager/js/worksite_outsource/worksite_outsource.js @@ -44,7 +44,8 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect', 'laydate' {field: 'id', title: '记录ID', minWidth: 100}, {field: 'name', title: '项目名称', minWidth: 100}, {field: 'outsource_name', title: '分包单位', minWidth: 100}, - {field: 'worksite_name', title: '工地(项目)', minWidth: 250}, + {field: 'worksite_name', title: '工地', minWidth: 250}, + {field: 'amount', title: '支出金额', minWidth: 100}, {field: 'log_time', title: '支出时间'}, {field: 'created_at', title: '创建时间'}, {templet: '#row-operate', width: 280, align: 'center', title: '操作'} diff --git a/view/manager/worksite/outlay.html b/view/manager/worksite/outlay.html index 1825d81..dcff6ac 100644 --- a/view/manager/worksite/outlay.html +++ b/view/manager/worksite/outlay.html @@ -4,7 +4,7 @@