From 1b47f5c2f5b0d59639371877ca1161985379ffaa Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Sat, 11 Oct 2025 16:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E7=BB=9F=E8=AE=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/synthesize-query/wage-count.js        | 16 ++++
 .../wage-count/components/projectCount.vue    | 84 +++++++++++--------
 .../wage-count/components/subCount.vue        | 76 +++++++++--------
 .../wage-count/components/wage-details.vue    |  2 -
 4 files changed, 104 insertions(+), 74 deletions(-)

diff --git a/src/api/synthesize-query/wage-count.js b/src/api/synthesize-query/wage-count.js
index e9afe0e..af66154 100644
--- a/src/api/synthesize-query/wage-count.js
+++ b/src/api/synthesize-query/wage-count.js
@@ -8,3 +8,19 @@ export const getWageCountCompanyAndSubCompanyListAPI = (data) => {
         params: data,
     })
 }
+// 综合查询 工资统计 工程统计
+export const getWageCountProjectListAPI = (data) => {
+    return request({
+        url: '/bmw/salaryStatistics/getSalaryStatisticsProTable',
+        method: 'GET',
+        params: data,
+    })
+}
+// 综合查询 工资统计 分包统计
+export const getWageCountSubListAPI = (data) => {
+    return request({
+        url: '/bmw/salaryStatistics/getSalaryStatisticsSubTable',
+        method: 'GET',
+        params: data,
+    })
+}
diff --git a/src/views/synthesize-query/wage-count/components/projectCount.vue b/src/views/synthesize-query/wage-count/components/projectCount.vue
index 0a40482..922dcaf 100644
--- a/src/views/synthesize-query/wage-count/components/projectCount.vue
+++ b/src/views/synthesize-query/wage-count/components/projectCount.vue
@@ -16,10 +16,11 @@
                     :model="projectCountQueryParams"
                     style="margin-top: 20px; padding-left: 20px"
                 >
-                    <el-form-item label="考勤日期">
+                    <el-form-item label="工程名称">
                         <el-input
-                            v-model="projectCountQueryParams.entryTime"
+                            clearable
                             placeholder="请输入工程名称"
+                            v-model="projectCountQueryParams.proName"
                         />
                     </el-form-item>
                     <el-form-item>
@@ -72,7 +73,7 @@
                 <div style="padding-right: 20px">
                     <pagination
                         :total="total"
-                        @pagination="getAttInfoData"
+                        @pagination="getProjectCountData"
                         :page.sync="projectCountQueryParams.pageNum"
                         :limit.sync="projectCountQueryParams.pageSize"
                     />
@@ -83,57 +84,59 @@
 </template>
 
 <script>
+import { getWageCountProjectListAPI } from '@/api/synthesize-query/wage-count'
 export default {
     name: 'ProjectCount',
-    props: {},
+    props: {
+        queryParams: {
+            type: Object,
+            default: () => {},
+        },
+    },
+    watch: {
+        queryParams: {
+            handler(newVal) {
+                Object.assign(this.projectCountQueryParams, newVal)
+                this.getProjectCountData()
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
     data() {
         return {
-            total: 100,
+            total: 0,
             projectCountQueryParams: {
-                entryTime: '',
+                proName: '',
+                pageNum: 1,
+                pageSize: 10,
             },
-            projectCountData: [
-                {
-                    entryTime: '2025-01-01',
-                    exitTime: '2025-01-01',
-                    contractName: '工程1',
-                    subcontractorName: '分包1',
-                    totalEntryCount: 10,
-                },
-                {
-                    entryTime: '2025-01-01',
-                    exitTime: '2025-01-01',
-                    contractName: '工程1',
-                    subcontractorName: '分包1',
-                    totalEntryCount: 10,
-                },
-            ],
+            projectCountData: [],
             columnData: [
                 {
                     label: '工程名称',
-                    prop: 'entryTime',
+                    prop: 'proName',
                 },
                 {
                     label: '所属分公司',
-                    prop: 'exitTime',
+                    prop: 'subCompanyName',
                 },
                 {
                     label: '分包数量',
-                    prop: 'contractName',
+                    prop: 'subNum',
                 },
                 {
                     label: '实发工资(元)',
-                    prop: 'subcontractorName',
+                    prop: 'netSalary',
                 },
                 {
                     label: '累计支付工资(元)',
-                    prop: 'totalEntryCount',
+                    prop: 'allSalary',
                 },
             ],
         }
     },
-    created() {},
-    watch: {},
+
     methods: {
         // 表格头部样式
         tableHeaderStyle() {
@@ -150,19 +153,20 @@ export default {
             return {
                 fontSize: '14px',
                 color: '#606266',
-                padding: '12px 8px',
+                padding: '12px 0',
             }
         },
 
         // 查询
         handleQuery() {
-            // this.getAttInfoData()
+            this.getProjectCountData()
         },
         // 重置
         resetQuery() {
-            this.attInfoQueryParams = {
-                entryTime: '',
-            }
+            this.projectCountQueryParams.proName = ''
+            this.projectCountQueryParams.pageNum = 1
+            this.projectCountQueryParams.pageSize = 10
+            this.getProjectCountData()
         },
         // 导出
         handleExport() {
@@ -174,9 +178,15 @@ export default {
             //     '考勤信息.xlsx',
             // )
         },
-        // 获取考勤信息
-        getAttInfoData() {
-            // this.getAttInfoData()
+        // 获取工程统计列表
+        async getProjectCountData() {
+            const res = await getWageCountProjectListAPI(
+                this.projectCountQueryParams,
+            )
+            if (res.code === 200) {
+                this.projectCountData = res.rows
+                this.total = res.total
+            }
         },
     },
 }
diff --git a/src/views/synthesize-query/wage-count/components/subCount.vue b/src/views/synthesize-query/wage-count/components/subCount.vue
index f2fa4e3..1dd8e3f 100644
--- a/src/views/synthesize-query/wage-count/components/subCount.vue
+++ b/src/views/synthesize-query/wage-count/components/subCount.vue
@@ -16,10 +16,11 @@
                     :model="subCountQueryParams"
                     style="margin-top: 20px; padding-left: 20px"
                 >
-                    <el-form-item label="考勤日期">
+                    <el-form-item label="分包名称">
                         <el-input
-                            v-model="subCountQueryParams.entryTime"
-                            placeholder="请输入工程名称"
+                            clearable
+                            placeholder="请输入分包名称"
+                            v-model="subCountQueryParams.subName"
                         />
                     </el-form-item>
                     <el-form-item>
@@ -83,55 +84,55 @@
 </template>
 
 <script>
+import { getWageCountSubListAPI } from '@/api/synthesize-query/wage-count'
 export default {
     name: 'SubCount',
-    props: {},
+    props: {
+        queryParams: {
+            type: Object,
+            default: () => {},
+        },
+    },
     data() {
         return {
             total: 100,
             subCountQueryParams: {
-                entryTime: '',
+                subName: '',
                 pageNum: 1,
                 pageSize: 10,
             },
-            subCountData: [
-                {
-                    entryTime: '2025-01-01',
-                    exitTime: '2025-01-01',
-                    contractName: '工程1',
-                    subcontractorName: '分包1',
-                    totalEntryCount: 10,
-                },
-                {
-                    entryTime: '2025-01-01',
-                    exitTime: '2025-01-01',
-                    contractName: '工程1',
-                    subcontractorName: '分包1',
-                    totalEntryCount: 10,
-                },
-            ],
+            subCountData: [],
             columnData: [
                 {
                     label: '分包名称',
-                    prop: 'entryTime',
+                    prop: 'subName',
                 },
                 {
                     label: '工程数量',
-                    prop: 'exitTime',
+                    prop: 'proNum',
                 },
                 {
                     label: '实发工资(元)',
-                    prop: 'subcontractorName',
+                    prop: 'netSalary',
                 },
                 {
                     label: '累计支付工资(元)',
-                    prop: 'totalEntryCount',
+                    prop: 'allSalary',
                 },
             ],
         }
     },
-    created() {},
-    watch: {},
+
+    watch: {
+        queryParams: {
+            handler(newVal) {
+                Object.assign(this.subCountQueryParams, newVal)
+                this.getSubCountData()
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
     methods: {
         // 表格头部样式
         tableHeaderStyle() {
@@ -148,19 +149,20 @@ export default {
             return {
                 fontSize: '14px',
                 color: '#606266',
-                padding: '12px 8px',
+                padding: '12px 0',
             }
         },
 
         // 查询
         handleQuery() {
-            // this.getAttInfoData()
+            this.getSubCountData()
         },
         // 重置
         resetQuery() {
-            this.attInfoQueryParams = {
-                entryTime: '',
-            }
+            this.subCountQueryParams.subName = ''
+            this.subCountQueryParams.pageNum = 1
+            this.subCountQueryParams.pageSize = 10
+            this.getSubCountData()
         },
         // 导出
         handleExport() {
@@ -172,9 +174,13 @@ export default {
             //     '考勤信息.xlsx',
             // )
         },
-        // 获取考勤信息
-        getSubCountData() {
-            // this.getAttInfoData()
+        // 获取分包统计列表
+        async getSubCountData() {
+            const res = await getWageCountSubListAPI(this.subCountQueryParams)
+            if (res.code === 200) {
+                this.subCountData = res.rows
+                this.total = res.total
+            }
         },
     },
 }
diff --git a/src/views/synthesize-query/wage-count/components/wage-details.vue b/src/views/synthesize-query/wage-count/components/wage-details.vue
index a6375ce..4bc848c 100644
--- a/src/views/synthesize-query/wage-count/components/wage-details.vue
+++ b/src/views/synthesize-query/wage-count/components/wage-details.vue
@@ -40,8 +40,6 @@ export default {
             subCompanyCountData: [],
         }
     },
-    created() {},
-    watch: {},
     methods: {
         handelSettingSubCompanyCountData(data) {
             this.subCompanyCountData = data