From 8188d46c6d9ee6db6e90a3dc31b0eb22bc3e9445 Mon Sep 17 00:00:00 2001
From: yin5th <541304803@qq.com>
Date: Fri, 13 Jan 2023 14:21:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=90=8E=E5=8F=B0=E5=B7=A5=E5=9C=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86):=20=E5=AE=8C=E5=96=84=E5=B7=A5=E5=9C=B0?=
 =?UTF-8?q?=E6=94=AF=E5=87=BA=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/manager/Worksite.php                    | 10 +++++++++-
 .../js/worksite_outsource/worksite_outsource.js        |  3 ++-
 view/manager/worksite/outlay.html                      |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

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 @@
         <div class="layui-col-xs12 layui-col-md4">
 
             <div class="layui-card top-panel">
-                <div class="layui-card-header">总支出</div>
+                <div class="layui-card-header">工地总支出</div>
                 <div class="layui-card-body">
                     <div class="layui-row layui-col-space5">
                         <div class="layui-col-xs9 layui-col-md9 top-panel-number">
@@ -18,7 +18,7 @@
         <div class="layui-col-xs12 layui-col-md4">
 
             <div class="layui-card top-panel">
-                <div class="layui-card-header">工资支出</div>
+                <div class="layui-card-header">工地工资支出</div>
                 <div class="layui-card-body">
                     <div class="layui-row layui-col-space5">
                         <div class="layui-col-xs9 layui-col-md9 top-panel-number">