diff --git a/src/api/synthesize-query/person-count.js b/src/api/synthesize-query/person-count.js index c1044e6..dda9775 100644 --- a/src/api/synthesize-query/person-count.js +++ b/src/api/synthesize-query/person-count.js @@ -8,3 +8,30 @@ export const getPersonCountListAPI = (data) => { params: data, }) } + +// 综合查询 获取人员统计详情 +export const getPersonCountDetailAPI = (data) => { + return request({ + url: '/bmw/workerStatistics/getWorkerDetail', + method: 'GET', + params: data, + }) +} + +// 综合查询 获取人员统计详情考勤信息 +export const getPersonCountDetailAttendanceInfoAPI = (data) => { + return request({ + url: '/bmw/workerStatistics/getWorkerEinDayRecordDetail', + method: 'GET', + params: data, + }) +} + +// 综合查询 获取人员统计详情工资信息 +export const getPersonCountDetailWageInfoAPI = (data) => { + return request({ + url: '/bmw/workerStatistics/getMonthTableDetail', + method: 'GET', + params: data, + }) +} diff --git a/src/api/synthesize-query/three-and-one.js b/src/api/synthesize-query/three-and-one.js index cc36533..b33515c 100644 --- a/src/api/synthesize-query/three-and-one.js +++ b/src/api/synthesize-query/three-and-one.js @@ -103,8 +103,8 @@ export const saveThreeAndOneMonthlyWagePaymentAPI = (data) => { // 综合查询 三表一册 农名工工资支付表 更新操作 export const updateThreeAndOneMonthlyWagePaymentAPI = (data) => { return request({ - url: '/bmw/pmProject/updateSalary', - method: 'POST', - data, + url: '/bmw/pmProject/updateThreeTableOneRoster', + method: 'GET', + params: data, }) } diff --git a/src/views/synthesize-query/person-count/detail/components/attInfo.vue b/src/views/synthesize-query/person-count/detail/components/attInfo.vue index 99cadaf..f3cd7e8 100644 --- a/src/views/synthesize-query/person-count/detail/components/attInfo.vue +++ b/src/views/synthesize-query/person-count/detail/components/attInfo.vue @@ -18,8 +18,11 @@ > @@ -63,11 +66,30 @@ + > + +
@@ -84,61 +106,67 @@ @@ -164,9 +222,9 @@ export default { .data-label { padding: 16px 20px; - font-size: 16px; - color: #6b7280; - font-weight: 500; + font-size: 14px; + color: #352e2e; + font-weight: 600; background: #f8f9fa; } diff --git a/src/views/synthesize-query/person-count/detail/components/person-details.vue b/src/views/synthesize-query/person-count/detail/components/person-details.vue index 0af3507..700a4cb 100644 --- a/src/views/synthesize-query/person-count/detail/components/person-details.vue +++ b/src/views/synthesize-query/person-count/detail/components/person-details.vue @@ -5,12 +5,15 @@ 人员信息
- - - - - - + + + + + + @@ -31,12 +34,32 @@ export default { AttInfo, WageInfo, }, - data() { - return {} + props: { + workerId: { + type: [Number, String], + default: '', + }, + }, + data() { + return { + bmWorkerEinProRecordList: [], + bmWorkerContractList: [], + bmWorkerWageCard: [], + } + }, + + methods: { + // 初始化人员信息 + initPersonDetailsData( + bmWorkerEinProRecordList, + bmWorkerContractList, + bmWorkerWageCard, + ) { + this.bmWorkerEinProRecordList = bmWorkerEinProRecordList + this.bmWorkerContractList = bmWorkerContractList + this.bmWorkerWageCard = bmWorkerWageCard + }, }, - created() {}, - watch: {}, - methods: {}, } diff --git a/src/views/synthesize-query/person-count/detail/components/wageCard.vue b/src/views/synthesize-query/person-count/detail/components/wageCard.vue index 5402a69..90e4d2b 100644 --- a/src/views/synthesize-query/person-count/detail/components/wageCard.vue +++ b/src/views/synthesize-query/person-count/detail/components/wageCard.vue @@ -11,7 +11,7 @@
+ > + +
@@ -35,49 +52,38 @@ @@ -136,6 +181,7 @@ export default { .table-container { padding: 0; + padding-bottom: 20px; ::v-deep .el-table { border: none; diff --git a/src/views/synthesize-query/person-count/detail/index.vue b/src/views/synthesize-query/person-count/detail/index.vue index 2e2dd77..9f70633 100644 --- a/src/views/synthesize-query/person-count/detail/index.vue +++ b/src/views/synthesize-query/person-count/detail/index.vue @@ -1,6 +1,6 @@ @@ -11,6 +11,21 @@ export default { components: { PersonDetails, }, + data() { + return { + workerId: null, + } + }, + watch: { + $route: { + handler(newVal) { + const { workerId } = newVal.query + this.workerId = workerId + }, + immediate: true, + deep: true, + }, + }, } diff --git a/src/views/synthesize-query/person-count/index.vue b/src/views/synthesize-query/person-count/index.vue index 9076f8b..3f4b5bf 100644 --- a/src/views/synthesize-query/person-count/index.vue +++ b/src/views/synthesize-query/person-count/index.vue @@ -9,13 +9,13 @@ :columnsList="columnsList" :request-api="getPersonCountListAPI" > -