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

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -190,6 +190,7 @@
         },
         data() {
             return {
+                totalTime111: 0,
                 allListData: [],
                 page: 1,
                 size: 50,
@@ -478,6 +479,13 @@
                     var _this = this;
                     this.hasReportUserList = [];
                     if (res.code == "ok") {
+                        let alltime = 0
+                        for(let i in res.data.list){
+                            for(let m in res.data.list[i].project){
+                                alltime += parseFloat(res.data.list[i].project[m].time)
+                            }
+                        }
+                        this.totalTime111 = alltime
                         // 
                             
                         //
@@ -522,9 +530,11 @@
                 var _this = this;
                 this.hasReportUserList = data.userList;
                 this.total = data.list.length
+
+                var totalHours = 0.0;
                 var xList = [] , yList = [] , list = data.list.slice(0+50*(this.page-1),49+50*(this.page-1)), array = [] , series = [];
                 var totalMoneyCost = data.totalCostMoney;
-                var totalHours = 0.0;
+                
                 for(var i in list) {
                     if(i>20) {
                         this.widthHtval = +this.widthHtval + 60
@@ -563,7 +573,7 @@
                                         }
                                         if(this.permissions.countHours){
                                             item.cost = project[k].time
-                                            totalHours += parseFloat(project[k].time);
+                                            // totalHours += parseFloat(project[k].time);
                                         }
                                         dataList.push(item)
                                         
@@ -598,7 +608,7 @@
                     
                     
                     var myChart = echarts.init(document.getElementById("container"));
-                    totalHours = totalHours.toFixed(1);
+                    totalHours = this.totalTime111.toFixed(1);
                     // 设置宽度
                     myChart.resize({
                         width: this.widthHtval
@@ -813,6 +823,28 @@
                 this.http.post(url, param,
                 res => {
                     if (res.code == "ok") {
+                        let alltime = 0
+                        if(this.radio==this.$t('other.project') || this.radio == this.$t('zhu-xiang-mu') || this.radio==this.$t('projectclassification')){
+                            for(let i in res.data.costList){
+                                alltime += parseFloat(res.data.costList[i].cost)
+                            }
+                        }else if(this.radio==this.$t('lable.department')){
+                            for(let i in res.data.costList){
+                                alltime += parseFloat(res.data.costList[i].costTime)
+                            }
+                        }else if(this.radio == this.namess){
+                            for(let i in res.data){
+                                alltime += parseFloat(res.data[i].cost)
+                            }
+                        }else if(this.theCustomListFlg){
+                            for(let i in res.data.list){
+                                alltime += parseFloat(res.data.list[i].cost)
+                            }
+                        }
+                        this.totalTime111 = alltime
+
+
+
                         // additionName // 未转译的数据另外存储一份，用作 DOM 上渲染
                         if(this.user.userNameNeedTranslate == '1') {
                             for(var i in res.data.costList) {
@@ -1029,7 +1061,7 @@
                                 
                             }
                         }
-                        totalHours = totalHours.toFixed(1);
+                        totalHours = this.totalTime111.toFixed(1);
                         var myChart = echarts.init(document.getElementById("container"));
                         myChart.resize({
                             width: this.widthHtval
@@ -1363,7 +1395,7 @@
     }
     .poss {
         position: fixed;
-        bottom: -10px;
+        bottom: 10px;
         right: 1%;
         box-sizing: border-box;
     }

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

@@ -89,7 +89,7 @@
                     <el-form-item>
                         <div style="color:#999;font-size:13px;">{{ $t('gong') }}<span :style="total>user.company.staffCountMax?'color:red;':''">{{total}}</span>{{ $t('other.people') }}
                         <span v-if="depData == null || depData.id == -1">({{ $t('shangxian') }}{{user.company.staffCountMax}}{{$t('other.people')}})</span>
-                        <el-link style="font-size:13px;margin-left:10px" type="primary" :underline="false" @click="recordMsgDialog = true" v-if="recordMsg.result == 1">同步日志</el-link>
+                        <!-- <el-link style="font-size:13px;margin-left:10px" type="primary" :underline="false"  @click="recordMsgDialog = true" v-if="recordMsg.result == 0">同步日志</el-link> -->
                         </div>
                         
                     </el-form-item>
@@ -1013,13 +1013,13 @@ export default {
             datestr += '-'
             datestr += date[1] < 10 ? '0' + date[1] : date[1]
             datestr += '-'
-            datestr += date[2] < 10 ? '0' + date[1] : date[2]
+            datestr += date[2] < 10 ? '0' + date[2] : date[2]
             datestr += '\u3000'
-            datestr += date[3] < 10 ? '0' + date[1] : date[3]
+            datestr += date[3] < 10 ? '0' + date[3] : date[3]
             datestr += ':'
-            datestr += date[4] < 10 ? '0' + date[1] : date[4]
+            datestr += date[4] < 10 ? '0' + date[4] : date[4]
             datestr += ':'
-            datestr += date[5] < 10 ? '0' + date[1] : date[5]
+            datestr += date[5] < 10 ? '0' + date[5] : date[5]
             return datestr
     },
     getRecordMsg(){

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

@@ -729,6 +729,7 @@
             </div>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="cancel(workForm.domains,true)" v-if="canCancelInDialog" style="float:left;">{{$t('btn.withdraw')}}</el-button>
+                <span style="margin-right:20px">合计工时：{{totalReportHours}}小时</span>
                 <el-button @click="deleteReport"  v-if="workForm.domains[0].id != null && canEdit && reportCanDelete">{{$t('btn.delete')}}</el-button>
                 <el-button @click="dialogVisible = false">{{$t('btn.cancel')}}</el-button>
                 <el-button v-if="!isSubstitude" @click="submitReport(1)" :loading="submitingReport" :disabled="workForm.domains.length==0?true:(canEdit?false:true)">{{$t('btn.temporaryStorage')}}</el-button>
@@ -1928,6 +1929,18 @@
             },
             
         },
+        computed: {
+            totalReportHours(){
+                let domains = this.workForm.domains
+                let hours = 0
+                for(let i in domains){
+                    if(domains[i].projectId){
+                        hours += domains[i].workingTime ? parseFloat(domains[i].workingTime) : 0
+                    }
+                }
+                return hours.toFixed(1)
+            },
+        },
         mounted() {
             var now = new Date();
             var t = util.formatDate.format(now, 'yyyy-MM-dd');
@@ -5591,7 +5604,24 @@
                 this.isDraft = isDraft;
                 this.$refs.workForm.validate(valid => {
                     if (valid) {
-                        this.dateAr = []
+                        
+                if(this.totalReportHours < this.user.timeType.allday){
+                    this.$confirm('当日工时不足8.0小时，是否确定提交?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        this.submitReportSon()
+                    }).catch(() => {
+                    });
+                }else{
+                    this.submitReportSon()
+                }
+                    }
+                });
+            },
+            submitReportSon() {
+                this.dateAr = []
                         let alp = []
                         if(this.user.timeType.multiWorktime != 1) {
                             for(var p in this.workForm.domains) {
@@ -5999,11 +6029,6 @@
                                 type: "error"
                             });
                         });
-                    }
-                });
-            },
-            cli() {
-                
             },
             // 判断是展示那个工时导入
             imports() {