From d3f22c72dd2e6beb0a7aa9bb8da5e4b97e0974c5 Mon Sep 17 00:00:00 2001
From: zhusiyu <410827992@qq.com>
Date: Fri, 2 Sep 2022 09:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E7=BB=93=E7=BB=9F=E8=AE=A1=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleCom/oa/summaryRecord/submitInfo.vue |   9 +-
 .../oa/summaryRecord/summaryRecord.vue        |   9 +-
 .../oa/summaryRecord/summaryRecordLarge.vue   | 174 ++++++++++++++++--
 .../oa/summaryRecord/totalRecord.vue          |  10 +-
 4 files changed, 177 insertions(+), 25 deletions(-)

diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/submitInfo.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/submitInfo.vue
index e621553..3e6f380 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/submitInfo.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/submitInfo.vue
@@ -457,6 +457,7 @@
                     }
                 }
                 this.getWorkSummaryDeptPersonOverview()
+                // this.getWorkSummaryPersonCycleStatistics()
             },
             removeTab: function (num) {
                 let index = this.centerIndex + num;
@@ -481,7 +482,7 @@
                         isTestLogin: interConfig.getWorkSummaryPersonCycleStatistics.isTestLogin,
                     }], (result) => {
                         let resData = result[0].data;
-                        // console.log('个人总结提交', resData)
+                        // console.log('个人总结-提交情况', resData)
                         if (resData.code === 2000) {
                             this.dayList = resData.data.day_list;
                             this.weekList = resData.data.week_list;
@@ -514,7 +515,6 @@
                             this.dataSourceDept = dataSource
                             this.spinning2 = false
                             this.changeType();
-                            //this.buildWeekEchart(personList);
                         }
                     })
                 }
@@ -536,11 +536,11 @@
                         isTestLogin: interConfig.getWorkSummaryOrgDeptOverview.isTestLogin,
                     }], (result) => {
                         let resData = result[0].data;
+                        //console.log('小块机构表格', resData)
                         if (resData.code === 2000) {
                             this.dataSourceOrg = resData.data.dept_list;
                             this.spinning3 = false
                             this.changeType();
-                            //this.buildWeekEchart(personList);
                         }
                     })
                 }
@@ -561,9 +561,6 @@
                 if (this.selectType !== type) {
                     this.selectType = type;
                     this.paneKey = type;
-//                    this.$nextTick(function () {
-//                        this.buildDayEchart();
-//                    })
                 }
             }
         },
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecord.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecord.vue
index f7316c6..51d9543 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecord.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecord.vue
@@ -1,7 +1,8 @@
 <template>
     <div class="summary-record-div">
         <TabComp :tabArr="tabArr" showName="title" @tabChange="tabChange" cbName="type"></TabComp>
-        <DateChoose @flushDate="flushDate" :begin_date="begin_date" :end_date="end_date"></DateChoose>
+        <DateChoose @flushDate="flushDate" :deptSelect="deptSelect" :begin_date="begin_date"
+                    :end_date="end_date"></DateChoose>
         <TotalRecord :type="pageType" :searchTime="searchTime"/>
         <SubmitInfo :type="pageType" :searchTime="searchTime"/>
     </div>
@@ -32,6 +33,7 @@
                 tabIndex: 0,
                 totalRecordJson: {},
                 searchTime: "",
+                deptSelect: false,
             }
         },
         created() {
@@ -74,6 +76,11 @@
                     this.tabIndex = param.index;
                     this.pageType = param.cbName;
                 }
+                if (param.index == 1) {
+                    this.deptSelect = true
+                } else {
+                    this.deptSelect = false
+                }
             },
             flushDate: function (param) {
                 this.begin_date = param.beginDate;
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue
index 347dd98..5f4923e 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue
@@ -57,12 +57,12 @@
             </a-col>
             <a-col style="width: calc(33% - 10px) !important;" v-if="tabIndex==1">
                 <bgBox :largeBgTitle="deptSummary">
-                        <LargeSummaryTable :dataSource="dataSourceDept" :columns="columnsDept"/>
+                    <LargeSummaryTable :dataSource="dataSourceDept" :columns="columnsDept"/>
                 </bgBox>
             </a-col>
             <a-col style="width: calc(33% - 10px) !important;" v-if="tabIndex==2">
                 <bgBox :largeBgTitle="memberSummary">
-                    <LargeSummaryTable :dataSource="dataSourceOrg" :columns="columnsDept"/>
+                    <LargeSummaryTable :dataSource="dataSourceOrg" :columns="columnsOrg"/>
                 </bgBox>
             </a-col>
             <a-col style="width: calc(33% - 10px) !important;" v-if="tabIndex==1||tabIndex==2">
@@ -103,7 +103,147 @@
                 value1: 'jack',
                 tabIndexNum: false,
                 selectTabIndex: 1,
-                columnsYear: [
+                columnsYearOrg: [
+                    {
+                        title: '姓名',
+                        dataIndex: 'dept_name',
+                        key: 'dept_name',
+                        align: 'center',
+                    }, {
+                        title: '应交',
+                        dataIndex: 'should_year_summary',
+                        key: 'should_year_summary',
+                        align: 'center',
+                    }, {
+                        title: '已交',
+                        dataIndex: 'total_year_summary',
+                        key: 'total_year_summary',
+                        align: 'center',
+                    }, {
+                        title: '延期',
+                        dataIndex: 'delay_year_summary',
+                        key: 'delay_year_summary',
+                        align: 'center',
+                    }, {
+                        title: '空缺',
+                        dataIndex: 'empty_year_summary',
+                        key: 'empty_year_summary',
+                        align: 'center',
+                    },
+                ],
+                columnsTermOrg: [
+                    {
+                        title: '姓名',
+                        dataIndex: 'dept_name',
+                        key: 'dept_name',
+                        align: 'center',
+                    }, {
+                        title: '应交',
+                        dataIndex: 'should_term_summary',
+                        key: 'should_term_summary',
+                        align: 'center',
+                    }, {
+                        title: '已交',
+                        dataIndex: 'total_term_summary',
+                        key: 'total_term_summary',
+                        align: 'center',
+                    }, {
+                        title: '延期',
+                        dataIndex: 'delay_term_summary',
+                        key: 'delay_term_summary',
+                        align: 'center',
+                    }, {
+                        title: '空缺',
+                        dataIndex: 'empty_term_summary',
+                        key: 'empty_term_summary',
+                        align: 'center',
+                    },
+                ],
+                columnsMonthOrg: [
+                    {
+                        title: '姓名',
+                        dataIndex: 'dept_name',
+                        key: 'dept_name',
+                        align: 'center',
+                    }, {
+                        title: '应交',
+                        dataIndex: 'should_month_summary',
+                        key: 'should_month_summary',
+                        align: 'center',
+                    }, {
+                        title: '已交',
+                        dataIndex: 'total_month_summary',
+                        key: 'total_month_summary',
+                        align: 'center',
+                    }, {
+                        title: '延期',
+                        dataIndex: 'delay_month_summary',
+                        key: 'delay_month_summary',
+                        align: 'center',
+                    }, {
+                        title: '空缺',
+                        dataIndex: 'empty_month_summary',
+                        key: 'empty_month_summary',
+                        align: 'center',
+                    },
+                ],
+                columnsWeekOrg: [
+                    {
+                        title: '姓名',
+                        dataIndex: 'dept_name',
+                        key: 'dept_name',
+                        align: 'center',
+                    }, {
+                        title: '应交',
+                        dataIndex: 'should_week_summary',
+                        key: 'should_week_summary',
+                        align: 'center',
+                    }, {
+                        title: '已交',
+                        dataIndex: 'total_week_summary',
+                        key: 'total_week_summary',
+                        align: 'center',
+                    }, {
+                        title: '延期',
+                        dataIndex: 'delay_week_summary',
+                        key: 'delay_week_summary',
+                        align: 'center',
+                    }, {
+                        title: '空缺',
+                        dataIndex: 'empty_week_summary',
+                        key: 'empty_week_summary',
+                        align: 'center',
+                    },
+                ],
+                columnsDayOrg: [
+                    {
+                        title: '姓名',
+                        dataIndex: 'dept_name',
+                        key: 'dept_name',
+                        align: 'center',
+                    }, {
+                        title: '应交',
+                        dataIndex: 'should_day_summary',
+                        key: 'should_day_summary',
+                        align: 'center',
+                    }, {
+                        title: '已交',
+                        dataIndex: 'total_day_summary',
+                        key: 'total_day_summary',
+                        align: 'center',
+                    }, {
+                        title: '延期',
+                        dataIndex: 'delay_day_summary',
+                        key: 'delay_day_summary',
+                        align: 'center',
+                    }, {
+                        title: '空缺',
+                        dataIndex: 'empty_day_summary',
+                        key: 'empty_day_summary',
+                        align: 'center',
+                    },
+                ],
+                columnsYearDept: [
                     {
                         title: '姓名',
                         dataIndex: 'person_name',
@@ -131,7 +271,7 @@
                         align: 'center',
                     },
                 ],
-                columnsTerm: [
+                columnsTermDept: [
                     {
                         title: '姓名',
                         dataIndex: 'person_name',
@@ -159,7 +299,7 @@
                         align: 'center',
                     },
                 ],
-                columnsMonth: [
+                columnsMonthDept: [
                     {
                         title: '姓名',
                         dataIndex: 'person_name',
@@ -187,7 +327,7 @@
                         align: 'center',
                     },
                 ],
-                columnsWeek: [
+                columnsWeekDept: [
                     {
                         title: '姓名',
                         dataIndex: 'person_name',
@@ -215,7 +355,7 @@
                         align: 'center',
                     },
                 ],
-                columnsDay: [
+                columnsDayDept: [
                     {
                         title: '姓名',
                         dataIndex: 'person_name',
@@ -263,7 +403,8 @@
             }
         },
         created() {
-            this.columnsDept = this.columnsDay
+            this.columnsOrg = this.columnsDayOrg
+            this.columnsDept = this.columnsDayDept
             //部门权限
             this.depAdmin = OfficeMenuConfig.menuIsExist(["daliyOffice", "newPlanConclusion", "plan_summary_statistics", "dept"]);
             if (this.depAdmin) {
@@ -283,27 +424,32 @@
                     case 1:
                         this.selectedItemDay = true
                         this.selectedItemWeek = this.selectedItemMon = this.selectedItemTerm = this.selectedItemYear = false
-                        this.columnsDept = this.columnsDay
+                        this.columnsOrg = this.columnsDayOrg
+                        this.columnsDept = this.columnsDayDept
                         break;
                     case 2:
                         this.selectedItemWeek = true
                         this.selectedItemDay = this.selectedItemMon = this.selectedItemTerm = this.selectedItemYear = false
-                        this.columnsDept = this.columnsWeek
+                        this.columnsOrg = this.columnsWeekOrg
+                        this.columnsDept = this.columnsWeekDept
                         break;
                     case 3:
                         this.selectedItemMon = true
                         this.selectedItemDay = this.selectedItemWeek = this.selectedItemTerm = this.selectedItemYear = false
-                        this.columnsDept = this.columnsMonth
+                        this.columnsOrg = this.columnsMonthOrg
+                        this.columnsDept = this.columnsMonthDept
                         break;
                     case 4:
                         this.selectedItemTerm = true
                         this.selectedItemDay = this.selectedItemWeek = this.selectedItemMon = this.selectedItemYear = false
-                        this.columnsDept = this.columnsTerm
+                        this.columnsOrg = this.columnsTermOrg
+                        this.columnsDept = this.columnsTermDept
                         break;
                     case 5:
                         this.selectedItemYear = true
                         this.selectedItemDay = this.selectedItemWeek = this.selectedItemMon = this.selectedItemTerm = false
-                        this.columnsDept = this.columnsYear
+                        this.columnsOrg = this.columnsYearOrg
+                        this.columnsDept = this.columnsYearDept
                         break;
                 }
                 this.getWorkSummaryDeptPersonOverview()
@@ -397,7 +543,7 @@
                         if (result[0].data.code === 2000) {
                             let resData = result[0].data;
                             this.dataSourceOrg = resData.data.dept_list;
-                            // console.log('机构成员总结统计', this.dataSourceOrg)
+                            // console.log('机构成员总结统计', result[0].data)
                         }
                     })
                 }
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/totalRecord.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/totalRecord.vue
index a7d32b9..4c78917 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/totalRecord.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/totalRecord.vue
@@ -50,12 +50,13 @@
     import interConfig from './interConfig';
     import moment from 'moment';
     import {Spin} from 'ant-design-vue';
-    export default{
+
+    export default {
         props: {
             type: Number,
             searchTime: String,
         },
-        data(){
+        data() {
             return {
                 title: "",
                 totalRecordJson: {},
@@ -64,7 +65,7 @@
         },
         watch: {
             type: {
-                handler (val) {
+                handler(val) {
                     if (val === 1) {
                         this.title = "总结概览";
                     } else if (val === 2) {
@@ -78,7 +79,7 @@
                 immediate: true
             },
             searchTime: {
-                handler(time){
+                handler(time) {
                     if (time !== "") {
                         this.searchTime = time;
                         this.getRecordData();
@@ -125,6 +126,7 @@
                     }], (result) => {
                         this.showLoading = false;
                         let resData = result[0].data;
+                        //console.log('我的总结-总结概览', resData.data)
                         if (result[0].status === 200) {
                             if (resData.code === 2000) {
                                 this.spinning = false;