2022.7.22

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -827,7 +827,7 @@
         </el-dialog>
         <!--人员列表 -->
         <el-dialog  :title="(isFill?'已填':'未填')+'人员列表'" v-if="membListVisible" :visible.sync="membListVisible"  width="500px" class="membListClass">
-            <el-tabs v-model="isLeave" v-if="!isFill && (user.timeType.syncCorpwxTime == 1 || user.timeType.syncDingding == 1 || permissions.leaveFil)" type="card">
+            <el-tabs v-model="isLeave" v-if="!isFill && (user.timeType.syncCorpwxTime == 1 || user.timeType.syncDingding == 1 || user.company.packageOa == 1)" type="card">
                 <el-tab-pane :label="'当日未填(' + fillMembList.length +'人)'" :name="0">
                     <el-table :show-header="true" :data="fillMembList" highlight-current-row :height="400" style="width: 100%;" @selection-change="notifySel">
                     <el-table-column type="selection"></el-table-column>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/count/count.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <div style="position:">
     <!-- <van-cell>
         <template #default>
             <div style="text-align:center">团队填报统计</div>
@@ -33,7 +34,7 @@
     </div>
 
 
-    <div id="main" style="width:300px;height:300px;margin:0 auto"></div>
+    <div id="main" style="width:250px;height:250px;margin:0 auto"></div>
 
     <van-tabbar v-model="stateActive" :fixed="false" @change="stateChange" class="stateActiveClass">
         <van-tabbar-item name="submit">已提交
@@ -41,7 +42,7 @@
                 <span style="color:#409eff;font-size:0.58rem">{{submitList.length}}</span><span style="font-size:0.32rem;color:#333">人</span>
             </template>
         </van-tabbar-item>
-        <van-tabbar-item name="unsubmit">未提交
+        <van-tabbar-item name="unsubmit">待提交
             <template #icon>
                 <span style="color:#ffa366;font-size:0.58rem">{{unSubmitList.length}}</span><span style="font-size:0.32rem;color:#333">人</span>
             </template>
@@ -52,7 +53,7 @@
             </template>
         </van-tabbar-item>
     </van-tabbar>
-    <van-cell v-if="stateActive == 'unfill' && (user.timeType.syncCorpwxTime == 1 || user.timeType.syncDingding == 1 || leaveFil)">
+    <van-cell v-if="stateActive == 'unfill' && (user.timeType.syncCorpwxTime == 1 || user.timeType.syncDingding == 1 || user.company.packageOa == 1)">
         <template #default>
             <van-tabs type="card" @change="unfillSelect" v-model="unfillSelKey" color="#20a0ff">
                 <van-tab title="当天未填" :name="0"></van-tab>
@@ -60,6 +61,7 @@
             </van-tabs>
         </template>
     </van-cell>
+    </div>
     <van-cell-group v-if="showList.length">
         <van-cell v-for="item in showList" :key="item.id" :title="item.name" :value="item.department" title-style="color:#666"></van-cell>
     </van-cell-group>
@@ -83,7 +85,6 @@ export default {
     data() {
         return{
             user: JSON.parse(localStorage.userInfo),
-            leaveFil: false,
             reportsCompany: false,
             reportsDept: false,
 
@@ -134,7 +135,7 @@ export default {
             }else{
                 this.dateChange(1)
             }
-            console.log('当前月份',this.dateArray);
+            // console.log('当前月份',this.dateArray);
         },
 
         dateChange(name){
@@ -142,7 +143,7 @@ export default {
             let nyear = this.monthDatetime.getFullYear()
             let nmonth = this.monthDatetime.getMonth() + 1
             this.nowLookDate = nyear + '-' + (nmonth < 10 ? '0' + nmonth : nmonth) + '-' + (name < 10 ? '0' + name : name) 
-            console.log('日期切换',this.nowLookDate,this.nowDay)
+            // console.log('日期切换',this.nowLookDate,this.nowDay)
             this.getCountData()
         },
         stateChange(active){
@@ -207,7 +208,7 @@ export default {
                                 this.submitList.push(element)
                             }
                         }else{  //未填写
-                            if((element.leaveDays >= 1 || element.leaveTimes >= this.user.timeType.allday) && (this.user.timeType.syncCorpwxTime == 1 || this.user.timeType.syncDingding == 1 || this.leaveFil)){
+                            if((element.leaveDays >= 1 || element.leaveTimes >= this.user.timeType.allday) && (this.user.timeType.syncCorpwxTime == 1 || this.user.timeType.syncDingding == 1 || this.user.company.packageOa == 1)){
                                 this.unFillLeaveList.push(element)  //全天请假
                             }else{
                                 this.unFillList.push(element)   //非全天请假
@@ -240,17 +241,14 @@ export default {
         
         this.monthChange(new Date())
         for(let i in this.user.functionList){
-            if(this.user.functionList[i].name == '请假填报'){
-                this.leaveFil = true
-            }
             if(this.user.functionList[i].name == '查看全公司工时'){
-                    this.reportsCompany = true
-                }
-                if(this.user.functionList[i].name == '查看本部门工时'){
-                    this.reportsDept = true
-                }
+                this.reportsCompany = true
+            }
+            if(this.user.functionList[i].name == '查看本部门工时'){
+                this.reportsDept = true
+            }
         }
-        console.log('请假填报',this.leaveFil);
+        // console.log('请假填报',this.leaveFil);
     }
 }
 </script>