批量填报日报：每日时长

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -423,7 +423,7 @@
                 },
                 res => {
                     if (res.code == "ok") {
-                        this.allActiveUsers = res.data.records.filter(u=>u.isActive == 1);
+                        this.allActiveUsers = res.data.records.filter(u=>u.isActive == 1 && u.id != this.user.id);
                     } else {
                         this.$message({
                         message: res.msg,

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

@@ -153,7 +153,7 @@
                     <el-date-picker v-model="workForm.createDate" :editable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
                     :style="'width:'+(isBatch==0?'200':'280')+'px;'" :type="isBatch==0?'date':'daterange'"
                     @change="changeMonth()" :clearable="false" placeholder="选择工作日期" :disabled="isDisable"></el-date-picker>
-                    <span v-if="reportTimeType.type == 3" style="margin-left:30px;">总时长:</span>
+                    <span v-if="reportTimeType.type == 3" style="margin-left:30px;">{{isBatch==0?'总':'每日'}}时长:</span>
                     <el-input-number :disabled="!canEdit" v-if="reportTimeType.type == 3" style="margin-left:10px;" @change="changeAllTime"
                         v-model="reportTimeType.allday" :precision="1" :step="0.5" :max="12" :min="0.5"></el-input-number>
                     <span v-if="reportTimeType.type == 3">小时</span>
@@ -654,7 +654,7 @@
                         ids += ',';
                     }
                 }
-                let day = this.choseDay > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
+                let day = (this.choseDay+1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 
                 this.http.post("/report/batchApproveReport", {ids:ids, date:this.date + day},
                 res => {
@@ -806,7 +806,7 @@
             
             // 获取部门列表
             getDepartment() {
-                let day = this.choseDay > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
+                let day = (this.choseDay+1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 var param = {date:this.date + day};
                 if (this.user.manageDeptId != 0) {
                     param.manageDeptId = this.user.manageDeptId;
@@ -1024,7 +1024,7 @@
             // 选择日期
             choseDate(i, item) {
                 this.choseDay = i;
-                let day = this.choseDay > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
+                let day = (this.choseDay +1)> 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 sessionStorage.msg = this.date + day,
                 this.getReportList();
                 this.getDepartment();
@@ -1090,7 +1090,7 @@
             //获取日报列表
             getReportList() {
                 this.listLoading = true;
-                let day = this.choseDay > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
+                let day = (this.choseDay + 1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 let param = {date: this.date + day};
                 if (this.deptId != null) {
                     param.deptId = this.deptId;
@@ -1254,7 +1254,7 @@
                 } else {
                     this.isDisable = true;
                 }
-                let day = this.choseDay > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
+                let day = (this.choseDay + 1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 this.isBatch = isBatch;
                 if (this.isBatch == 0) {
                     this.workForm.createDate = this.date + day; // 获取个人某天的日报
@@ -1491,14 +1491,14 @@
             },
             // 跳转
             junpToDeskTop(id) {
-                let day = this.choseDay > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
+                let day = (this.choseDay + 1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 this.$router.push("/desktop/" + id + "/" + this.date +day);
             },
 
             // 通过日报
             approve(id, item) {
                 this.logining = true;
-                let day = this.choseDay > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
+                let day = (this.choseDay + 1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
 
                 var ids = '';
                 var data = item.data;
@@ -1569,7 +1569,7 @@
             // 未通过日报
             deny(id,i, item) {
                 this.logining = true;
-                let day = this.choseDay > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
+                let day = (this.choseDay+1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 var ids = '';
                 var data = item.data;
                 data.forEach(element => {