手机端驳回

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

@@ -2839,7 +2839,6 @@
                     let sdate = new Date(this.workForm.createDate[0]);
                     let edate = new Date(this.workForm.createDate[1]);
                     let days = (edate.getTime() - sdate.getTime())/(24*3600*1000) + 1;
-                    console.log('days===', days)
                     if (days < 0) {
                         return;
                     } 
@@ -2880,9 +2879,7 @@
                 if (selectPid && domainItem.extraField1) {
                     //是否非项目
                     var isPublic = domainItem.isPublic;//this.fillProjectList.filter(p=>p.id == selectPid)[0].isPublic;
-                    console.log('==========','isPublic=='+isPublic);
                     var filteredRespList = this.jobResponseList.filter(j=>j.timeType == (isPublic?this.$t('fei-xiang-mu-gong-shi'):this.$t('xiangMuGongShi')) && j.role == (this.roleList.filter(r=>r.value==domainItem.extraField1)[0].label));
-                    console.log(filteredRespList);
                     domainItem.filteredRespList = filteredRespList;
                 }
                 
@@ -3107,13 +3104,11 @@
             },
             
             handlePictureCardPreview(file, index) {
-                console.log(file, index)
                 let arr = []
                 let imgArr = this.workForm.domains[index].imgListUrl
                 for(var i in imgArr) {
                     arr.push(imgArr[i].url)
                 }
-                console.log(arr, '图片数据')
                 const $viewer = this.$viewerApi({
                     images: arr
                 });
@@ -3121,7 +3116,6 @@
             },
             // 图片上传
             addImg(e, index) {
-                console.log(e, '数据')
                 let formData = new FormData()
                 formData.append('multipartFile', e.file)
                 this.http.uploadFile('/common/uploadFile', formData,
@@ -3140,7 +3134,6 @@
                     } else {
                         this.$message({message: res.msg,type: "error"});
                     }
-                    console.log(this.workForm.domains[index])
                 },
                 error => {this.$message({message: error,type: "error"});
                 });
@@ -3148,7 +3141,6 @@
 
             // 删除图片
             delImg(file,fileList, index) {
-                console.log(file, fileList)
                 let idx = 0
                 for(let i in fileList) {
                     if(fileList[i].uid == file.uid) {
@@ -3157,7 +3149,6 @@
                 }
                 this.workForm.domains[index].imgList.splice(idx, 1)
                 this.workForm.domains[index].imgListUrl.splice(idx, 1)
-                console.log(this.workForm.domains[index])
             },
             test(){
                 console.log('test',this.workForm.domains);
@@ -3332,7 +3323,6 @@
                             }
                         }
                         this.approvalProcessData = res.data
-                        console.log(this.approvalProcessData, '数据卡看')
                     }else{
                         this.$message({
                             message: res.msg,
@@ -3483,7 +3473,6 @@
                     lastMonth = month - 1;
                 }
                 this.ratioYmonth = lastMonthYear+''+(lastMonth < 10 ? '0' + lastMonth : lastMonth)
-                console.log('赋值 ==>', this.ratioYmonth)
             },
             confirmDownloadRatio() {
                 this.startRatioExporting = true;
@@ -3836,7 +3825,6 @@
                 }
             },
             seleChn(e,domain) {
-                console.log('===========修改时间==========');
                 if(e == 1) {
                     for(var i in this.workForm.domains) {
                         if(this.workForm.domains[i].timeType == 0) {
@@ -3848,15 +3836,12 @@
                 }
                 var quanbu = 0 
                 var spl = this.workForm.domains
-                console.log(spl)
                 var zhi = ''
                 for(var i in spl) {
                     var sp = +spl[i].workingTime + 0
-                    console.log('this.jsDay==='+this.jsDay);
                     zhi = this.jsDay * sp
                     quanbu = +quanbu + zhi
                 }
-                console.log('quanbu========'+quanbu);
                 this.jsTime = quanbu
                 this.totalReportHours = quanbu
                 let worktime = this.jsTime
@@ -4633,7 +4618,6 @@
                     res => {
                         if (res.code == "ok") {
                             this.$set(this.workForm,'time', res.data);
-                            console.log(res.data);
                         } 
                     },
                     error => {
@@ -4811,7 +4795,6 @@
                     let sdate = new Date(this.workForm.createDate[0]);
                     let edate = new Date(this.workForm.createDate[1]);
                     let days = (edate.getTime() - sdate.getTime())/(24*3600*1000) + 1;
-                    console.log('days===', days)
                     if (days < 0) {
                         days = 0;
                     }
@@ -4858,7 +4841,6 @@
                 if(this.yonghuUser.customDegreeActive == 1) {
                     this.selectDegreeId(domain, index)
                 }
-                // console.log('projectId===',domain.projectId);
                 domain.projectName = this.fillProjectList.filter(p=>p.id == domain.projectId)[0].projectName;
                 domain.isPublic = this.fillProjectList.filter(p=>p.id == domain.projectId)[0].isPublic;
                 this.http.post('/sub-project/list',{
@@ -4908,10 +4890,8 @@
                     domain.projectAuditorName = null;
                     domain.auditUserList = null;
                 }
-                console.log('this.reportTimeType.type==='+this.reportTimeType.type);
                 if (this.reportTimeType.type == 3) {
                     //新增项目时，自动计算
-                    console.log('===time====='+this.reportTimeType.allday * domain.progress/100);
                     domain.workingTime = (this.reportTimeType.allday * domain.progress/100).toFixed(1);
                 }
                 //加载昱众的工作职责
@@ -5297,9 +5277,7 @@
                     this.dataLoading = false
                 }
                 // return
-                console.log(textList, '<=== textList')
                 this.seluserforTextin(this.seluserText, newData, textList)
-                console.log(newData, 'Data')
                 this.data = newData;
                 this.calculateMembCount(this.data);
                 this.data[0].membCount = this.membCount;//总人数
@@ -5343,7 +5321,6 @@
                 localStorage.setItem('nodeModelDataKey', JSON.stringify(this.nodeModelData))
             },
             nodeChangeCollapse(data) {
-                console.log(this.nodeModelData)
                 this.nodeModelData.some((item, i) => {
                     if (item === data.id) {
                         this.nodeModelData.length = i
@@ -5438,7 +5415,6 @@
                                 this.setUserToDept(noAllData);
                                 this.deptMembData = noAllData;
                                 this.deptMembDataBackups = JSON.parse(JSON.stringify(this.deptMembData))
-                                console.log(this.deptMembData, '代填人员数据')
                             } else {
                                 this.$message({
                                     message: res.msg,
@@ -5460,9 +5436,7 @@
                 res => {
                     if (res.code == "ok") {
                         var list1 = JSON.parse(JSON.stringify(res.data));
-                        
                         this.deptOptionList = this.changeArr(list1);
-                        console.log(this.deptOptionList, '部门')
                     } else {
                         this.$message({
                             message: res.msg,
@@ -6016,8 +5990,6 @@
                 }
                 param.stateKey = this.stateKey
                 // param.departmentId = this.user.departmentId
-                console.log(param, '《=== 导出传的参数');
-                console.log('开始调用exportReport接口');
                 this.http.post(this.port.report.export, param,
                 res => {
                     this.exportingData = false;
@@ -6157,8 +6129,6 @@
                             }
                         }
                         this.projectList = res.data;
-                        
-                        console.log("项目列表",this.projectList);
                     } else {
                         this.$message({
                             message: res.msg,
@@ -6448,7 +6418,6 @@
                                 time: list.time,
                                 showRefresh: list.showRefresh
                             }
-                            console.log('workForm', this.workForm)
                         } else {
                             this.workForm = {
                                 createDate: this.workForm.createDate,
@@ -6522,7 +6491,6 @@
                 } else {
                     this.falsss = true
                 }
-                console.log('this.isSubstitude=='+this.isSubstitude);
                 if (this.isSubstitude) {
                     this.getSubstitudeUserDeptList();
                 } else {
@@ -6589,7 +6557,6 @@
 
             //按周填报的弹窗口中编辑单项目相关数据
             setWeekFormReportItem(reportId, i, names, row,sss) {
-                console.log(sss)
                 this.http.post('/report/getReportById', {
                     reportId: reportId
                 },
@@ -6669,7 +6636,6 @@
                 sss.progress = item.progress
                 sss.time = item.time
                 sss.content = item.content;
-                console.log('333', sss.content)
                 if (sss.time == '' && this.reportTimeType.type == 2) {
                     //取已填时间范围中最大的一个作为开始时间
                     var startTime = '09:00';
@@ -6708,7 +6674,6 @@
                     sss.subProjectList = item.subProjectList
                     sss.stages = item.stages
                     sss.taskGroups = item.taskGroups;
-                    console.log(sss.taskGroups, '33333');
                     sss.auditUserList = obj.auditUserList;
                     sss.degreeId = item.degreeId;
                     sss.customData = item.customData;
@@ -6728,7 +6693,6 @@
                     this.$forceUpdate();
 
                     this.getWeeklyTaskList(sss)
-                    console.log('最后的周报 ===>', this.zhoBao)
                 } else {
                     //第一次打开，获取数据
                     if (sss.id == -1) {
@@ -7371,7 +7335,6 @@
                         this.dateAr = []
                         var alp = []
                         var zhis = zhi[i]
-                        console.log(zhis)
                         for(var j in zhis) {
                             if(j != 'zhoDataTime' && j != 'he' && zhis[j].time != null && zhis[j].time != 'null' && zhis[j].time != '') {
                                 let objs = {}
@@ -7381,7 +7344,6 @@
                                 alp.push(objs)
                             } 
                         }
-                        console.log(alp)
                         this.dateAr = alp
                         if (this.reportTimeType.timeCanOverlap == 0) {
                             let str = this.$t('message.Filledtimeperiodsoverlap')
@@ -8760,10 +8722,6 @@
                 this.isDenying = false;
                 let day = (this.choseDay+1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 var ids = item.id;
-                // var data = item.data;
-                // data.forEach(element => {
-                //     ids +=(element.id+',');
-                // });
                 this.denyForm = {id: id ,i:i, date: this.date +day, reportIds: ids, reason:null};
             },
             // 未通过日报
@@ -8827,7 +8785,6 @@
                 this.workForm.domains[obj.idx].projectAuditorId = obj.id
             },
             vueCasader(obj) {
-                console.log(obj, '看看值', this.departmentList)
                 if(obj.distinction == 1 && obj.item) {
                     let arr = []
                     arr.push(obj.item.value)
@@ -8888,7 +8845,6 @@
             },
             //景昱变更提醒
             changeReminder(item){
-                console.log("============",item)
                 let parameter={
                     startDate: this.WorktimeDatepickValue[0],
                     endDate: this.WorktimeDatepickValue[1],
@@ -8966,7 +8922,6 @@
                 }
             },
             handleThreeData(userList) {
-                console.log(userList, '人员数据')
                 let deptMembDataBackups = JSON.parse(JSON.stringify(this.deptMembDataBackups))
                 this.deptMembData = this.filterTreeNodes(deptMembDataBackups, userList)
             },
@@ -9023,7 +8978,6 @@
                 })
             },
             changeTreeNodeStatus(node) {
-                console.log(node)
                 let allZt = true
                 node.expanded = allZt
                 for (let i = 0; i < node.childNodes.length; i++) {
@@ -9035,16 +8989,13 @@
             },
             // 按周填报获取相关任务
             async getWeeklyTaskList(item) {
-                console.log(item, '<=== 数据')
                 const { projectId, groupId, stage, taskId } = item
-                console.log(projectId, groupId, stage)
                 let parms = { projectId, isSubstitude: 0 }
                 groupId ? parms.groupId = groupId : ''
                 stage ? parms.stage = stage : ''
                 const { data } = await this.postData('/task/getRecentTask', parms)
                 this.zhoBao.taskId = taskId
                 this.$set(this.zhoBao, 'taskList', data)
-                console.log(this.zhoBao)
             },
             // 封装 post 请求
             postData(url, params) {
@@ -9064,7 +9015,6 @@
             },
             // 自定义事件
             selectCal(obj) {
-                console.log(obj, '传数据来源')
                 if(obj.distinction == '1') {
                     this.zhoBao.projectAuditorId = obj.id
                 } else if(obj.distinction == '2') {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -46,7 +46,7 @@
                         <van-button icon="replay" native-type="button" type="default" size="mini"
                             style="height:0.6rem;padding:0 0.16667rem;" :loading="cardRefLoading" loading-size="0.26667rem"
                             @click.stop.native="cardtimeRefresh(form.createDate)"
-                            v-if="user.timeType.syncCorpwxTime == 1 && (user.timeType.syncDingding == 1 || user.timeType.syncCorpwxTime == 1)"></van-button>
+                            v-if="!substitute && user.timeType.syncCorpwxTime == 1 && (user.timeType.syncDingding == 1 || user.timeType.syncCorpwxTime == 1)"></van-button>
                     </template>
                 </van-cell>
                 <!-- <div v-if="report.time" class="attendanceRecord">
@@ -645,7 +645,7 @@ export default {
                 createDate: [{ required: true, message: '请选择填报日期' }],
             },
             project: [],
-            report: "",
+            report: {},
 
             loading: false,
             finished: false,
@@ -906,6 +906,7 @@ export default {
                 const { id, name } = this.auditor.item
                 this.fillingAgent = { id, name }
                 this.getProject(this.fillingAgent.id);
+                this.getTargetUserCardTime();
             }
         },
         getAllUsersList() {
@@ -1425,6 +1426,22 @@ export default {
                 this.showPickerHours = true;
             }
         },
+        getTargetUserCardTime() {
+            if (this.user.timeType.showCorpwxCardtime && this.form.createDate && this.fillingAgent.name) {
+                //获取代填人的考勤
+                var that = this;
+                this.$axios.post('/user-corpwx-time/getUserCardTime', {userId: this.fillingAgent.id, date: this.form.createDate})
+                .then(res => {
+                    if (res.code == "ok") {
+                        // that.report.time = res.data;
+                        this.$set(that.report, 'time', res.data);
+                    } else {
+                        this.$toast.clear();
+                        this.$toast.fail(res.msg);
+                    }
+                }).catch(err => { this.$toast.clear(); });
+            }
+        },
         getTimeType() {
             this.$axios.post('/time-type/getCompanyTimeSetting', { companyId: this.user.companyId })
                 .then(res => {
@@ -1824,12 +1841,51 @@ export default {
                 }).catch(err => { this.$toast.clear(); });
         },
 
+        initFormData() {
+            this.totalReportHours = 0
+            this.canCancel = false;
+            this.canEdit = true;
+            var shuzhi = this.user.timeType.allday + '';
+            var t = this.user.timeType;
+            //没有填报的可以点击提交
+            this.form.domains = [{
+                id: null,
+                projectId: "",
+                projectName: "",
+                // workingTime: t.type==3?(t.allday).toFixed(1):"8.0",
+                workingTime: t.type == 3 ? (t.allday).toFixed(1) : shuzhi.indexOf('.') == '-1' ? shuzhi + '.0' : shuzhi,
+                content: "",
+                state: 2,
+                progress: 100,
+                isOvertime: false,
+                professionProgress: [],
+                multiWorktime: t.multiWorktime,
+                worktimeList: [{}],
+                canEdit: true,
+                auditorFirst: { name: '', id: '' },
+                auditorSec: { name: '', id: '' },
+                auditorThird: { name: '', id: '' },
+                ccUserid: { name: '', id: '' }
+            }]
+            if (this.isWeekend && this.user.timeType.lockWorktime != 1) {
+                this.$set(this.form.domains[0], 'isOvertime', true)
+                if (t.type != 2 && t.type != 0) {
+                    this.$set(this.form.domains[0], 'overtimeHours', t.allday.toFixed(0))
+                }
+            }
+            this.canEdit = true;
+            this.setTotalReportHours()
+        },
         // 改变时间
         changeTime(time) {
             this.form.createDate = this.format(new Date(time), "yyyy-MM-dd");
             this.currentDate = time;
             this.showPicker = false;
-            this.getReport();
+            if (this.substitute) {
+                this.getTargetUserCardTime();
+            } else {
+                this.getReport();
+            }
         },
 
         //点击选择审核人
@@ -2239,6 +2295,20 @@ export default {
                                     }).catch(() => { })
                                 }
                             }).catch(err => { this.$toast.clear(); });
+                        } else if (this.user.companyId == 469) {
+                            //校验填报的与考勤时长
+                            if (this.totalReportHours > this.report.time.workHours) {
+                                this.$toast('填报工时不得超过考勤时长')
+                            } else if (this.totalReportHours < this.report.time.workHours) {
+                                this.$dialog.confirm({
+                                    title: '提示',
+                                    message: '还剩余'+(this.report.time.workHours-this.totalReportHours).toFixed(1)+'h考勤时长尚未分配,是否确定提交'
+                                }).then(() => {
+                                    this.submitReportSon()
+                                }).catch(() => { })
+                            } else {
+                                this.submitReportSon()
+                            }
                         } else {
                             //提交时，做工时时长不足的提醒
                             if (this.totalReportHours < this.user.timeType.allday) {
@@ -2781,7 +2851,14 @@ export default {
             this.form.createDate = this.$route.query.date;
         }
 
-        this.getReport();
+        if (this.substitute) {
+            //代填日报
+            this.initFormData();
+        } else {
+            //个人自己填报
+            this.getReport();
+        }
+        
         this.getAllUsersList()
         this.getTimeType();
 
@@ -2799,12 +2876,6 @@ export default {
         if(this.user.timeType.userWithMultiDept) {
             this.getReportDeptList()
         }
-
-        // if(localStorage.getItem("formVal")) {
-        //     var obj = localStorage.getItem("formVal")
-        //     this.form = JSON.parse(obj)
-        //     localStorage.removeItem('formVal')
-        // }
     },
     beforeDestroy() {
         localStorage.removeItem('formVal')

fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/index.vue

@@ -74,7 +74,7 @@
                 <van-checkbox v-model="isAllChecked" :disabled="report.length == 0" @click="allChecked" shape="square" style="padding-left:3vw"></van-checkbox>
                 <div style="padding:1vh 2vw">
                 <van-button @click="batchAgree(true)" :disabled="!isCanAgree || report.length == 0" type="info" size="small" style="margin-right:6vw">批量通过</van-button>
-                <van-button @click="batchAgree(false)" :disabled="!isCanAgree || report.length == 0" type="danger" size="small" style="margin-left:2vw">批量驳回</van-button>
+                <van-button @click="showBatchDenyDialog()" :disabled="!isCanAgree || report.length == 0" type="danger" size="small" style="margin-left:2vw">批量驳回</van-button>
                 </div>
             </div>
             <van-skeleton  v-for="(item,index) in report" :key="index" title avatar :row="3" :loading="false">
@@ -181,8 +181,8 @@
                         </div>
                     </div>
                     <div class="form_btn" slot="footer">
-                        <van-button size="small" type="info" @click="approve(item.id, item)" style="margin-right: 4vw;">通过</van-button>
-                        <van-button size="small" type="danger" @click="showDenyDialog(item.id,0,item.dateStr, item)">驳回</van-button>
+                        <van-button size="small" type="info" @click="approve(item.userId, item)" style="margin-right: 4vw;">通过</van-button>
+                        <van-button size="small" type="danger" @click="showDenyDialog(item.userId,0,item.dateStr, item)">驳回</van-button>
                     </div>
                     <van-popup v-model="imgShow" position="bottom" closeable >
                         <van-swipe class="my-swipe"  indicator-color="white">
@@ -198,7 +198,7 @@
                 <van-field class="form_input"
                     v-model="denyForm.reason" name="reason" type="textarea" :placeholder="'请输入您决定'+(denyForm.i==0?'驳回':'撤销')+'的原因'"
                     rows="3" autosize  />
-                <van-button style="width:100%;" type="info" @click="deny()">提交</van-button>
+                <van-button style="width:100%;" type="info" @click="deny()" :disabled="this.user.timeType.forceRejectReason && !denyForm.reason">提交</van-button>
             </van-popup>
             <van-popup v-model="approveinDialog" v-if="approveinDialog" position="bottom" closeable >
                 <van-cell>请输入通过评价</van-cell>
@@ -217,6 +217,7 @@
     export default {
         data() {
             return {
+                isBatchDeny: false,
                 yuzhongCompId: 3385,
                 roleList:[{value: 1,label: 'CRC&LM'},{value: 2,label: 'PM'}],
                 isAllChecked: false,
@@ -349,7 +350,6 @@
                 this.isCanAgree = iscan
             },
             batchAgree(bol){
-                
                 let ids = ''
                 for(let i in this.report){
                     if(this.report[i].checked){
@@ -382,28 +382,7 @@
                         }
                     })
                     .catch(() => {});
-                }else{
-                    const toast = this.$toast.loading({
-                        forbidClick: true,
-                        duration: 0
-                    });
-                    let that = this
-                    this.$axios.post('/report/batchDenyReport', {
-                        ids: ids
-                    }).then(res => {
-                        if(res.code == "ok") {
-                            this.$toast.clear();
-                            setTimeout(function() {
-                                that.$toast.success('审核成功');
-                            }, 300);
-                            this.getReport();
-                        } else {
-                            this.$toast.clear();
-                            this.$toast.fail('批量操作失败:'+res.msg);
-                        }
-                    }).catch(err=> {this.$toast.clear();});
                 }
-                
             },
             batchApproveinfun(){
                 let that = this
@@ -498,7 +477,6 @@
             },
 
             approve(id, item) {
-                console.log(item, '<==== 点击')
                 Dialog.confirm({
                     message: `确认通过${item.dateStr}的日报吗？`
                 })
@@ -550,8 +528,8 @@
             },
 
             showDenyDialog(id,i,date, item) {
-                console.log(id, i, date, item)
                 this.denyReasonDialog = true;
+                this.isBatchDeny = false;
                 var ids = '';
                 var data = item.data;
                 data.forEach(element => {
@@ -560,7 +538,22 @@
                     }
                 });
                 this.denyForm = {id: id ,i:i, date: date, reportIds: ids, reason:null};
-                console.log(this.denyForm)
+            },
+            showBatchDenyDialog() {
+                this.isBatchDeny = true;
+                let ids = ''
+                for(let i in this.report){
+                    if(this.report[i].checked){
+                        for(let m in this.report[i].data){
+                            ids += this.report[i].data[m].id + ','
+                        }
+                    }
+                }
+                if(ids.length > 0){
+                    ids = ids.substring(0, ids.length-1);
+                }
+                this.denyForm = {reportIds: ids, reason:null};
+                this.denyReasonDialog = true;
             },
 
             deny() {
@@ -569,24 +562,43 @@
                     duration: 0
                 });
                 let that = this;
-                this.$axios.post("/report/deny", this.denyForm)
-                .then(res => {
-                    if(res.code == "ok") {
-                        this.$toast.clear();
-                        setTimeout(function() {
-                            that.$toast.success(that.denyForm.i==0?'驳回成功':'撤销成功');
-                        }, 300);
-                        
-                        this.getReport();
-                        this.denyReasonDialog = false;
-                    } else {
-                        this.$toast.clear();
-                        setTimeout(function() {
-                            that.$toast.fail(that.denyForm.i==0?'驳回失败':'撤销失败');
-                        }, 300);
-                        
-                    }
-                }).catch(err=> {this.$toast.clear();});
+                if (this.isBatchDeny) {
+                    this.$axios.post('/report/batchDenyReport', {
+                        ids: this.denyForm.reportIds
+                    }).then(res => {
+                        if(res.code == "ok") {
+                            this.$toast.clear();
+                            setTimeout(function() {
+                                that.$toast.success('审核成功');
+                            }, 300);
+                            that.getReport();
+                            that.denyReasonDialog = false;
+                        } else {
+                            that.$toast.clear();
+                            that.$toast.fail('批量操作失败:'+res.msg);
+                        }
+                    }).catch(err=> {this.$toast.clear();});
+                } else {
+                    this.$axios.post("/report/deny", this.denyForm)
+                    .then(res => {
+                        if(res.code == "ok") {
+                            this.$toast.clear();
+                            setTimeout(function() {
+                                that.$toast.success(that.denyForm.i==0?'驳回成功':'撤销成功');
+                            }, 300);
+                            
+                            this.getReport();
+                            this.denyReasonDialog = false;
+                        } else {
+                            this.$toast.clear();
+                            setTimeout(function() {
+                                that.$toast.fail(that.denyForm.i==0?'驳回失败':'撤销失败');
+                            }, 300);
+                            
+                        }
+                    }).catch(err=> {this.$toast.clear();});
+                }
+                
             }
         },