筛选部门人员

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -10476,8 +10476,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         //比对userCorpwxTimeList和reportList，找出工时未填满的记录
         List<Map<String, Object>> resultList = new ArrayList<>();
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        System.out.println("reportList size=" + reportList.size());
-        System.out.println("userCorpwxTimeList size=" + userCorpwxTimeList.size());
         for (UserCorpwxTime corpwxTime : userCorpwxTimeList) {
             boolean isMatch = true;
             double reportTime = 0;

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

@@ -1724,7 +1724,7 @@
             </div>
             <div>
                 <div style="margin-top:10px;">
-                    <el-cascader v-if="user.userNameNeedTranslate != 1" :size="'small'" v-model="deptIdForNoReport" :placeholder="$t('qing-xuan-ze-bu-men')" :options="departmentList" :props="{ checkStrictly: true, value: 'id' }" clearable style="width: 200px;" @change="showReportTimeLessThanCardTimeList()"></el-cascader>
+                    <el-cascader v-if="user.userNameNeedTranslate != 1" :size="'small'" v-model="deptIdForHasReport" :placeholder="$t('qing-xuan-ze-bu-men')" :options="departmentList" :props="{ checkStrictly: true, value: 'id' }" clearable style="width: 200px;" @change="showReportTimeLessThanCardTimeList()"></el-cascader>
                     <vueCascader :size="'small'" :widthStr="'200'" :clearable="true" :subject="trandepartmentList" :radios="true" :distinction="'17'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1" :selectNameChuan="$t('other.allDepartments')"></vueCascader>
                     <el-input style="width:200px;margin-left: 15px" v-if="user.userNameNeedTranslate != '1'" @keyup.enter.native="searchScreen(2)" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
                         <el-button slot="append" @click="searchScreen(2)" icon="el-icon-search"></el-button>
@@ -2296,6 +2296,8 @@
         },
         data() {
             return {
+                notFullData:[],
+                notFullOriginList:[],
                 singleDate:1,
                 subFillProjectList:[],
                 curAuditNode: 1,
@@ -2765,6 +2767,7 @@
                     if (res.code == "ok") {
                         this.tbload = false
                         this.notFullData = res.data;
+                        this.notFullOriginList = res.data;
                     }
                     },
                     (error) => {
@@ -3458,12 +3461,11 @@
                     }
                 } else if (e == 2) {
                     this.monthWorkDataS1 = []
-                    for (let i = 0; i < this.notFullData.length; i++) {
-                        if(this.notFullData[i].name.indexOf(this.searchKeyword) != -1){
-                            this.monthWorkDataS1.push(this.notFullData[i])
+                    for (let i = 0; i < this.notFullOriginList.length; i++) {
+                        if(this.notFullOriginList[i].name.indexOf(this.searchKeyword) != -1){
+                            this.monthWorkDataS1.push(this.notFullOriginList[i])
                         }
                     }
-                    console.log(this.monthWorkDataS1);
                     if (this.monthWorkDataS1.length > 50) {
                         this.notFullData = this.monthWorkDataS1.slice(0,50);
                     }else{