Переглянути джерело

修复工作日报中未填人员数量不正确问题

seyason 2 роки тому
батько
коміт
d69703004d

+ 4 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -112,13 +112,13 @@
                                     <span v-if="targetUid == null">
                                     <!-- - 已提交 -->
                                     -{{$t('state.hasBeenSubmitted')}}
-                                    <el-link :underline="false" @click="showMembList(1)"><span style="margin-left:5px;margin-right:5px;color:green;">{{reportList.filter(item => item.state != 3).length}}</span></el-link>{{$t('other.people')}},
+                                    <el-link :underline="false" @click="showMembList(1)"><span style="margin-left:5px;margin-right:5px;color:green;">{{fillList.filter(item => item.state != 3).length}}</span></el-link>{{$t('other.people')}},
                                     <!-- 待提交 -->
                                     {{$t('state.waitingsubmit')}}
-                                    <el-link :underline="false" @click="showMembList(2)"><span style="margin-left:5px;margin-right:5px;color:green;">{{reportList.filter(item => item.state == 3).length}}</span></el-link>{{$t('other.people')}},
+                                    <el-link :underline="false" @click="showMembList(2)"><span style="margin-left:5px;margin-right:5px;color:green;">{{fillList.filter(item => item.state == 3).length}}</span></el-link>{{$t('other.people')}},
                                     <!-- 未填写 -->
                                     {{$t('state.DidNotFillIn')}}
-                                    <el-link :underline="false" @click="showMembList(0)"><span style="margin-left:5px;margin-right:5px;color:red;">{{(depData == null?data[0].membCount:(depData.isUser == 1?1:depData.membCount))-reportList.length | numbers}}</span></el-link>{{$t('other.people')}}
+                                    <el-link :underline="false" @click="showMembList(0)"><span style="margin-left:5px;margin-right:5px;color:red;">{{unFillList.length | numbers}}</span></el-link>{{$t('other.people')}}
                                     <span v-if="leaveAllNum">{{'(全天请假' + leaveAllNum + '人)'}}</span>
                                     </span>
                                     </span>
@@ -3495,7 +3495,7 @@
                         for(let i in this.unFillList){
                             if(this.unFillList[i].leaveDays >= 1 || this.unFillList[i].leaveTimes >= this.user.timeType.allday){
                                 this.leaveAllNum += 1
-                            }
+                            } 
                         }
                         this.stateChange()
                     } else {