Merge branch 'init' of http://10.10.14.221/feiliming/oa-project-vue into init

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/scheduleRecord/scheduleRecord.vue

@@ -66,6 +66,7 @@
 <script>
     import TabComp from '../common/tabComp.vue';
     import DateChoose from '../common/dateChoose.vue';
+    import OfficeMenuConfig from '../../../../../../../../src/utils/officeMenuConfig';
     import {Spin,Progress,Modal,Icon} from 'ant-design-vue';
     import interConfig from './interConfig';
     import moment from 'moment';
@@ -78,7 +79,7 @@
                 showLoading: true,
                 tabArr: [
                     {title: "我的日程"},
-                    {title: "部门日程"}
+//                    {title: "部门日程"}
                 ],
                 tabIndex: 0,
                 begin_date: null,
@@ -98,9 +99,15 @@
                 showPanel:false,
                 depId:this.BaseConfig.person_info_my.dep_id,
                 depName:this.BaseConfig.person_info_my.dep_name,
+                depAdmin:false,
             }
         },
         created(){
+            //部门权限
+            this.depAdmin = OfficeMenuConfig.menuIsExist(["daliyOffice", "newSchedule", "schedule_statistics", "dept"]);
+            if (this.depAdmin) {
+                this.tabArr.push({title: "部门日程"});
+            }
             this.getNowTime();
         },
         computed:{

src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/summaryQuery/summaryQueryLarge.vue

@@ -78,7 +78,7 @@
                             </div>
                         </div>
                     </div>
-                    <div v-if="!showLoading" class="only-show-no-read-div"><span v-on:click="onlyShowNoRead()">只看未阅</span></div>
+                    <div v-if="!showLoading" class="only-show-no-read-div"><span v-on:click="onlyShowNoRead()">{{only_no_view == 1?'看全部':'只看未阅'}}</span></div>
                     <div class="bottom-div">
                         <div v-if="!showLoading" class="summary-progress-div">
                             <div class="progress-title">提交进度</div>
@@ -260,6 +260,7 @@
                     this.summaryList = [];
                     if (this.tabIndex > 0) {
                         this.dateType = "day";
+                        this.only_no_view = 0;
                         this.getNowTime();
                     } else {
                         this.dateType = "month";
@@ -291,7 +292,7 @@
                     isTestLogin: interConfig.listSuperfusionWorkSummary.isTestLogin,
                 }], (result) => {
                     this.showLoading = false;
-                    this.only_no_view = 0;
+                    //this.only_no_view = 0;
                     let resData = result[0].data;
                     if (result[0].status === 200) {
                         if (resData.code === 2000) {
@@ -446,6 +447,7 @@
                             this.dateType = "year";
                         }
                     }else {
+                        this.only_no_view = 0;
                         this.getListSuperfusionWorkSummary();
                     }
                 }
@@ -454,7 +456,8 @@
                 if (this.yearMonth != value) {
                     this.yearMonth = value;
                     if(this.tabIndex > 0){
-                        this.currentDate = this.yearMonth
+                        this.only_no_view = 0;
+                        this.currentDate = this.yearMonth;
                         this.getListSuperfusionWorkSummary();
                     }
                 }
@@ -477,7 +480,7 @@
                 this.getListSuperfusionWorkSummary();
             },
             onlyShowNoRead:function () {
-                this.only_no_view = 1;
+                this.only_no_view = this.only_no_view == 0?1:0;
                 this.getListSuperfusionWorkSummary();
             }
         },