Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -1671,6 +1671,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             Optional<LeaveSheet> leaveSheet = leaveSheetList.stream().filter(ls -> ls.getOwnerId().equals(u.getId()) &&
                     ((localDate.isAfter(ls.getStartDate()) || localDate.isEqual(ls.getStartDate())) && (localDate.isBefore(ls.getEndDate()) || localDate.isEqual(ls.getEndDate())))).findFirst();
             if(leaveSheet.isPresent()){
+                user.put("leaveType",leaveSheet.get().getLeaveType());
                 if(leaveSheet.get().getTimeType()==0){
                     user.put("leaveDays",leaveSheet.get().getTimeDays());
                 }else user.put("leaveTimes",leaveSheet.get().getTimeHours());

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

@@ -82,8 +82,10 @@
                             <span>工作日报 ({{curDate}})</span>
                             <span v-if="permissions.reportsCompany||user.manageDeptId != 0 || permissions.reportsDept">| {{depData != null ?depData.label:""}}
                             <span v-if="targetUid == null">
-                            - 已填写
-                            <el-link :underline="false" @click="showMembList(1)"><span style="margin-left:5px;margin-right:5px;color:green;">{{reportList.length}}</span></el-link>人，
+                            - 已提交
+                            <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>人，
+                            待提交
+                            <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>人，
                             未填写<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>人
                             </span>
                             </span>
@@ -821,7 +823,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" type="card">
+            <el-tabs v-model="isLeave" v-if="!isFill && (user.timeType.syncCorpwxTime == 1 || user.timeType.syncDingding == 1 || permissions.leaveFil)" 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>
@@ -838,7 +840,8 @@
                     <el-table :show-header="true" :data="fillMembList_leave" highlight-current-row :height="400" style="width: 100%;">
                     <el-table-column prop="label" label="姓名" >
                         <template slot-scope="scope">
-                            <span>{{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(请假' + scope.row.leaveDays + '天)' : '(请假' + scope.row.leaveTimes + 'h)') : scope.row.label}}</span>
+                            <!-- <span>{{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(请假' + scope.row.leaveDays + '天 - ' + leaveTypeName[scope.row.leaveType] + ')' : '(请假' + scope.row.leaveTimes + 'h - ' + leaveTypeName[scope.row.leaveType] + ')') : scope.row.label}}</span> -->
+                            <span>{{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(' + leaveTypeName[scope.row.leaveType] + ')' : '(' + leaveTypeName[scope.row.leaveType] + ')') : scope.row.label}}</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="deptName" label="部门" >
@@ -846,7 +849,7 @@
                     </el-table>
                 </el-tab-pane>
             </el-tabs>
-            <el-table :show-header="true" :data="fillMembList" highlight-current-row :height="400" style="width: 100%;" @selection-change="notifySel" v-if="isFill">
+            <el-table :show-header="true" :data="fillMembList" highlight-current-row :height="400" style="width: 100%;" @selection-change="notifySel" v-else>
             <el-table-column type="selection"></el-table-column>
             <el-table-column prop="label" label="姓名" ></el-table-column>
             <el-table-column prop="deptName" label="部门" >
@@ -1534,7 +1537,8 @@
                 departmentList: [],
 
                 approvalProcessDialog: false,
-                approvalProcessData: []
+                approvalProcessData: [],
+                leaveTypeName: ['事假','病假','年假','产假','婚假','丧假','调休假','陪产假','其他',],
             };
         },
         watch: {
@@ -2571,8 +2575,11 @@
                     }
                     this.fillMembList = unleaveList
                     this.fillMembList_leave = leaveList
-                } else {
-                    this.fillMembList = this.fillList;
+                } else if(fill == 1){
+                    this.fillMembList = this.fillList.filter(item => item.state != 3);
+                    this.isFill = true;
+                }else{
+                    this.fillMembList = this.fillList.filter(item => item.state == 3);
                     this.isFill = true;
                 }
             },
@@ -3275,12 +3282,12 @@
                             if (isFill == 0) {
                                 //获取未填的
                                 if (element.state == null) {
-                                    var obj = {id: element.id, label:element.name, deptId:element.departmentId, deptName: deptName,leaveDays: element.leaveDays, leaveTimes: element.leaveTimes};
+                                    var obj = {id: element.id, label:element.name, deptId:element.departmentId, deptName: deptName,leaveDays: element.leaveDays, leaveTimes: element.leaveTimes, leaveType: element.leaveType};
                                     membList.push(obj);
                                 }
                             } else {
                                 if (element.state != null) {
-                                    var obj = {id: element.id, label:element.name, deptId:element.departmentId, deptName: deptName};
+                                    var obj = {id: element.id, label:element.name, deptId:element.departmentId, deptName: deptName,state: element.state};
                                     membList.push(obj);
                                 }
                             }

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

@@ -190,11 +190,7 @@
                 <el-table :data="recordLists" style="width: 100%" height="400">
                     <el-table-column prop="userName" label="操作人" width="120"></el-table-column>
                     
-                    <el-table-column prop="indate" label="审核时间">
-                        <template slot-scope="scope">
-                            <span>{{tableIndateEdit(scope.row.indate)}}</span>
-                        </template>
-                    </el-table-column>
+                    <el-table-column prop="indate" label="审核时间"></el-table-column>
                     <el-table-column prop="result" label="审核结果" width="120"></el-table-column>
                     <el-table-column prop="date" label="员工/日期" width="200">
                         <template slot-scope="scope">
@@ -349,15 +345,6 @@
             }
         },
         methods: {
-            tableIndateEdit(row){
-                let indate = row[0] + '-' + (row[1] < 10 ? '0' + row[1] : row[1]) + '-' + (row[2] < 10 ? '0' + row[2] : row[2]) + ' ' + (row[3] < 10 ? '0' + row[3] : row[3]) + ':' + (row[4] < 10 ? '0' + row[4] : row[4])
-                if(row[5]){
-                    indate = indate + ':' + (row[5] < 10 ? '0' + row[5] : row[5])
-                }else{
-                    indate = indate + ':00'
-                }
-                return indate
-            },
             detailsClick(item, i) {
                 this.detailsDialog = true
                 this.detailsList = item.membdateList