From 8c14b714ac4b95ee87b4ac70abfb49ebc4efbc39 Mon Sep 17 00:00:00 2001
From: zhusiyu <410827992@qq.com>
Date: Thu, 25 Aug 2022 09:04:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E7=BB=93=E7=BB=9F=E8=AE=A1-=E6=95=B4?=
 =?UTF-8?q?=E7=90=86=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/summaryRecord/deptLargeSummary.vue     |   2 +-
 .../oa/summaryRecord/largeSummaryTable.vue    | 119 +-----------------
 .../oa/summaryRecord/myLargeSummary.vue       |  21 +++-
 .../oa/summaryRecord/summaryRecord.vue        |  11 --
 .../oa/summaryRecord/summaryRecordLarge.vue   |  15 +--
 .../oa/summaryRecord/tabComponent.vue         |   3 +-
 6 files changed, 20 insertions(+), 151 deletions(-)

diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/deptLargeSummary.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/deptLargeSummary.vue
index 284e8bc..2445f85 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/deptLargeSummary.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/deptLargeSummary.vue
@@ -44,7 +44,7 @@
     </div>
 </template>
 <script>
-    import {Icon, Row, Col, Spin, Select} from 'ant-design-vue';
+    import {Spin,} from 'ant-design-vue';
     import interConfig from './interConfig';
     import moment from 'moment';
     export default{
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/largeSummaryTable.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/largeSummaryTable.vue
index 65ed593..a3fb8e0 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/largeSummaryTable.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/largeSummaryTable.vue
@@ -10,127 +10,13 @@
     </div>
 </template>
 <script>
-    import {Icon, Row, Col, Spin, Table} from 'ant-design-vue';
+    import {Spin, Table} from 'ant-design-vue';
     export default{
         data(){
             return {
                 showPage: true,
                 listScroll: this.StaticParams.scrollOption,
                 spinning: false,
-                dataSource: [
-                    {
-                        key: '1',
-                        goodsName: '胡彦斌',
-                        collectTimes: 32,
-                        collectNum: '88',
-                        delay: '11',
-                        empty: '2',
-                    },
-                    {
-                        key: '2',
-                        goodsName: '胡彦斌',
-                        collectTimes: 32,
-                        collectNum: '88',
-                        delay: '11',
-                        empty: '2',
-                    },
-                    {
-                        key: '3',
-                        goodsName: '胡彦斌',
-                        collectTimes: 32,
-                        collectNum: '88',
-                        delay: '11',
-                        empty: '2',
-                    },
-                    {
-                        key: '4',
-                        goodsName: '胡彦斌',
-                        collectTimes: 32,
-                        collectNum: '88',
-                        delay: '11',
-                        empty: '2',
-                    },
-                    {
-                        key: '5',
-                        goodsName: '胡彦斌',
-                        collectTimes: 32,
-                        collectNum: '88',
-                        delay: '11',
-                        empty: '2',
-                    },
-                    {
-                        key: '6',
-                        goodsName: '胡彦斌',
-                        collectTimes: 32,
-                        collectNum: '88',
-                        delay: '11',
-                        empty: '2',
-                    },
-                    {
-                        key: '7',
-                        goodsName: '胡彦斌',
-                        collectTimes: 32,
-                        collectNum: '88',
-                        delay: '11',
-                        empty: '2',
-                    },
-                    {
-                        key: '8',
-                        goodsName: '胡彦斌',
-                        collectTimes: 32,
-                        collectNum: '88',
-                        delay: '11',
-                        empty: '2',
-                    },
-                    {
-                        key: '9',
-                        goodsName: '胡彦斌',
-                        collectTimes: 32,
-                        collectNum: '88',
-                        delay: '11',
-                        empty: '2',
-                    },
-                    {
-                        key: '10',
-                        goodsName: '胡彦斌',
-                        collectTimes: 32,
-                        collectNum: '88',
-                        delay: '11',
-                        empty: '2',
-                    },
-                ],
-                columns: [
-                    {
-                        title: '姓名',
-                        dataIndex: 'goodsName',
-                        key: 'goodsName',
-                        align: 'center',
-                    },
-                    {
-                        title: '应交',
-                        dataIndex: 'collectTimes',
-                        key: 'collectTimes',
-                        align: 'center',
-                    },
-                    {
-                        title: '已交',
-                        dataIndex: 'collectNum',
-                        key: 'collectNum',
-                        align: 'center',
-                    },
-                    {
-                        title: '延期',
-                        dataIndex: 'delay',
-                        key: 'delay',
-                        align: 'center',
-                    },
-                    {
-                        title: '空缺',
-                        dataIndex: 'empty',
-                        key: 'empty',
-                        align: 'center',
-                    },
-                ],
             }
         },
         props: {
@@ -144,9 +30,6 @@
             }
         },
         components: {
-            AIcon: Icon,
-            ARow: Row,
-            ACol: Col,
             ASpin: Spin,
             ATable: Table,
 
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/myLargeSummary.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/myLargeSummary.vue
index 25048b7..46927c5 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/myLargeSummary.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/myLargeSummary.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="mySummaryRow">
+        <a-spin class="brandCreat" :spinning="spinning">
         <span class="mySummaryCol">
             <div class="mySummaryDiv">
                 <span class="mySummaryCol-title">日</span>
@@ -17,7 +18,7 @@
                 </span>
             </div>
         </span>
-        <span class="mySummaryCol">
+            <span class="mySummaryCol">
             <div class="mySummaryDiv">
                 <span class="mySummaryCol-title">周</span>
                 <span class="mySummaryCol-default">
@@ -34,7 +35,7 @@
                 </span>
             </div>
         </span>
-        <span class="mySummaryCol">
+            <span class="mySummaryCol">
             <div class="mySummaryDiv">
                 <span class="mySummaryCol-title">月</span>
                 <span class="mySummaryCol-default">
@@ -50,7 +51,7 @@
                     <span class="mySummaryCol-warning-pink">空缺&nbsp;&nbsp;{{totalRecordJson.empty_month_summary}}</span>
                 </span>
             </div></span>
-        <span class="mySummaryCol">
+            <span class="mySummaryCol">
             <div class="mySummaryDiv">
                 <span class="mySummaryCol-title">期</span>
                 <span class="mySummaryCol-default">
@@ -67,7 +68,7 @@
                 </span>
             </div>
         </span>
-        <span class="mySummaryCol">
+            <span class="mySummaryCol">
             <div class="mySummaryDiv">
                 <span class="mySummaryCol-title">年</span>
                 <span class="mySummaryCol-default">
@@ -84,9 +85,11 @@
                 </span>
             </div>
         </span>
+        </a-spin>
     </div>
 </template>
 <script>
+    import {Spin} from 'ant-design-vue';
     import interConfig from './interConfig';
     import moment from 'moment';
     export default{
@@ -96,6 +99,7 @@
                 end_date: "",
                 searchTime: "",
                 totalRecordJson: {},
+                spinning: true,
             }
         },
         mounted() {
@@ -158,13 +162,20 @@
                     }
                 })
             },
-        }
+        },
+        components: {
+            ASpin: Spin,
+        },
     }
 </script>
 <style scoped lang="scss">
     .mySummaryRow {
         width: 100%;
         margin-top: -15px;
+        .brandCreat {
+            width: 100%;
+            height: 100%;
+        }
         .mySummaryCol {
             height: 3.95rem;
             background: #28338A;
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 fed5137..5b48a55 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecord.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecord.vue
@@ -73,17 +73,6 @@
                     }
                 })
             },
-//            tabChange: function (param) {
-//                if (this.tabIndex != param.index) {
-//                    this.tabIndex = param.index;
-//                    this.pageType = param.cbName;
-//                }
-//                if (param.index == 0 || param.index == 2) {
-//                    this.deptSelect = false
-//                } else if (param.index == 1) {
-//                    this.deptSelect = true
-//                }
-//            },
             flushDate: function (param) {
                 this.begin_date = param.beginDate;
                 this.end_date = param.endDate;
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 675ed94..99c6281 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue
@@ -48,7 +48,6 @@
             <a-col :span="13" v-if="tabIndex==1">
                 <bgBox :largeBgTitle="submit">
                     <submitInfo :type="tabIndex" :searchTime="searchTime" :largeSummary="true"></submitInfo>
-                    <!--<org-dept-summary :pageType="pageType"></org-dept-summary>-->
                 </bgBox>
             </a-col>
             <a-col style="width: calc(29% - 10px) !important;" v-if="tabIndex==2||tabIndex==3">
@@ -70,7 +69,7 @@
     </div>
 </template>
 <script>
-    import {Icon, Row, Col, Spin, Select} from 'ant-design-vue';
+    import {Row, Col, Select} from 'ant-design-vue';
     import tabComponent from './tabComponent.vue'
     import bgBox from './bgBox.vue'
     import DateChoose from '../common/dateChoose.vue'
@@ -80,12 +79,8 @@
     import submitInfo from './submitInfo.vue';
     import deptLargeSummary from './deptLargeSummary.vue';
     import LargeSummaryTable from './largeSummaryTable.vue';
-    import submitLargeInfo from './submitLargeInfo.vue';
-
-    import TabComp from '../common/tabComp.vue';
     import OfficeMenuConfig from '../../../../../../../../src/utils/officeMenuConfig';
     import MySummary from './mySummary.vue';
-    import OrgDeptSummary from './orgDeptSummary.vue';
     export default{
         data(){
             return {
@@ -224,7 +219,6 @@
                 tabArr: [
                     {title: "我的总结", type: 1}
                 ],
-//                tabIndex: 0,
                 pageType: 1,
                 largeBgTitle: '总结概览',
             }
@@ -308,15 +302,11 @@
             },
         },
         components: {
-            AIcon: Icon,
             ARow: Row,
             ACol: Col,
-            ASpin: Spin,
             ASelect: Select,
             ASelectOption: Select.Option,
-            TabComp,
             MySummary,
-            OrgDeptSummary,
             bgBox,
             tabComponent,
             DateChoose,
@@ -324,7 +314,6 @@
             submitInfo,
             deptLargeSummary,
             LargeSummaryTable,
-            submitLargeInfo,
         }
     }
 </script>
@@ -333,8 +322,6 @@
         width: 100%;
         min-height: 30rem;
         padding: 0.5rem;
-        /*display: flex;*/
-        /*justify-content: space-between;*/
         position: relative;
         .titleRow {
             width: 100%;
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/tabComponent.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/tabComponent.vue
index e8114a6..e9488cc 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/tabComponent.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/tabComponent.vue
@@ -19,7 +19,7 @@
     </div>
 </template>
 <script>
-    import {Row, Col, Spin} from 'ant-design-vue';
+    import {Row, Col} from 'ant-design-vue';
     export default{
         props: ['largeBgTitle'],
         data(){
@@ -51,7 +51,6 @@
         components: {
             ARow: Row,
             ACol: Col,
-            ASpin: Spin,
         }
     }
 </script>