综合查询页面完善

src/views/synthesize-query/person-count/detail/components/attInfo.vue

@@ -114,6 +114,14 @@ export default {
             type: [Number, String],
             default: '',
         },
+        subId: {
+            type: [Number, String],
+            default: '',
+        },
+        proId: {
+            type: [Number, String],
+            default: '',
+        },
     },
     data() {
         return {
@@ -125,6 +133,8 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 workerId: this.workerId,
+                subId: this.subId,
+                proId: this.proId,
             },
             attInfoData: [],
             columnData: [
@@ -200,13 +210,13 @@ export default {
         },
         // 导出
         handleExport() {
-            // this.download(
+            this.download(
-            //     '/bmw/workerLight/attExportByWorker',
+                '/bmw/workerStatistics/exportWorkerEinDayRecordDetail',
-            //     {
+                {
-            //         ...this.attInfoQueryParams,
+                    workerId: this.workerId,
-            //     },
+                },
-            //     '考勤信息.xlsx',
+                '考勤信息.xlsx',
-            // )
+            )
         },
         // 获取考勤信息
         async getAttInfoData() {

src/views/synthesize-query/person-count/detail/components/idCard.vue

@@ -41,6 +41,14 @@ export default {
             type: [Number, String],
             default: '',
         },
+        subId: {
+            type: [Number, String],
+            default: '',
+        },
+        proId: {
+            type: [Number, String],
+            default: '',
+        },
     },
     data() {
         return {
@@ -115,6 +123,8 @@ export default {
         async getPersonCountDetail() {
             const res = await getPersonCountDetailAPI({
                 workerId: this.workerId,
+                subId: this.subId,
+                proId: this.proId,
             })
 
             const personInfo = res.data

src/views/synthesize-query/person-count/detail/components/person-details.vue

@@ -7,13 +7,15 @@
 
         <IdCard
             :workerId="workerId"
+            :subId="subId"
+            :proId="proId"
             @initPersonDetailsData="initPersonDetailsData"
         />
         <EntryExit :bmWorkerEinProRecordList="bmWorkerEinProRecordList" />
         <Contract :bmWorkerContractList="bmWorkerContractList" />
         <WageCard :bmWorkerWageCard="bmWorkerWageCard" />
-        <AttInfo :workerId="workerId" />
+        <AttInfo :subId="subId" :proId="proId" :workerId="workerId" />
-        <WageInfo :workerId="workerId" />
+        <WageInfo :subId="subId" :proId="proId" :workerId="workerId" />
     </div>
 </template>
 
@@ -39,6 +41,14 @@ export default {
             type: [Number, String],
             default: '',
         },
+        subId: {
+            type: [Number, String],
+            default: '',
+        },
+        proId: {
+            type: [Number, String],
+            default: '',
+        },
     },
     data() {
         return {

src/views/synthesize-query/person-count/detail/components/wageInfo.vue

@@ -70,6 +70,14 @@ export default {
             type: [Number, String],
             default: '',
         },
+        subId: {
+            type: [Number, String],
+            default: '',
+        },
+        proId: {
+            type: [Number, String],
+            default: '',
+        },
     },
     data() {
         return {
@@ -79,6 +87,8 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 workerId: this.workerId,
+                subId: this.subId,
+                proId: this.proId,
             },
             columnData: [
                 {

src/views/synthesize-query/person-count/detail/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-        <PersonDetails :workerId="workerId" />
+        <PersonDetails :workerId="workerId" :subId="subId" :proId="proId" />
     </div>
 </template>
 
@@ -14,13 +14,17 @@ export default {
     data() {
         return {
             workerId: null,
+            subId: null,
+            proId: null,
         }
     },
     watch: {
         $route: {
             handler(newVal) {
-                const { workerId } = newVal.query
+                const { workerId, subId, proId } = newVal.query
                 this.workerId = workerId
+                this.subId = subId
+                this.proId = proId
             },
             immediate: true,
             deep: true,

src/views/synthesize-query/person-count/index.vue

@@ -9,6 +9,17 @@
             :columnsList="columnsList"
             :request-api="getPersonCountListAPI"
         >
+            <template slot="btn" slot-scope="{ queryParams }">
+                <el-button
+                    plain
+                    size="mini"
+                    type="success"
+                    icon="el-icon-download"
+                    @click="onHandleExport(queryParams)"
+                >
+                    导出
+                </el-button>
+            </template>
             <template slot="handle" slot-scope="{ data }">
                 <el-button
                     plain
@@ -49,9 +60,22 @@ export default {
                 name: 'PersonCountDetail',
                 query: {
                     workerId: data.workerId,
+                    subId: '',
+                    proId: '',
                 },
             })
         },
+
+        // 导出
+        onHandleExport(queryParams) {
+            // this.download(
+            //     '/bmw/workerStatistics/exportWorkerList',
+            //     {
+            //         ...queryParams,
+            //     },
+            //     '人员统计.xlsx',
+            // )
+        },
     },
 }
 </script>

src/views/synthesize-query/project-count/detail/components/personInfo-card.vue

@@ -541,7 +541,17 @@ export default {
         },
 
         // 查看人员详情
-        onHandleCheckUserName(workerId) {},
+        onHandleCheckUserName(workerId) {
+            this.dialogConfig.outerVisible = false
+            this.$router.push({
+                name: 'PersonCountDetail',
+                query: {
+                    workerId,
+                    proId: this.proId,
+                    subId: '',
+                },
+            })
+        },
 
         /**
          * 格式化货币显示

src/views/synthesize-query/sub-count/detail/components/personInfo-card.vue

@@ -541,7 +541,17 @@ export default {
         },
 
         // 查看人员详情
-        onHandleCheckUserName(workerId) {},
+        onHandleCheckUserName(workerId) {
+            this.dialogConfig.outerVisible = false
+            this.$router.push({
+                name: 'PersonCountDetail',
+                query: {
+                    workerId,
+                    subId: this.subId,
+                    proId: '',
+                },
+            })
+        },
 
         /**
          * 格式化货币显示