报表

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -1446,5 +1446,7 @@
   "can-yu-ren-ci": "Number of participants",
   "chu-cha-de-tian-shu": "Days of business trip",
   "xiang-mu-chuang-jian-shi-jian-duan": "Project Creation Period",
-  "dao-chu-jia-qi": "Export holidays"
+  "dao-chu-jia-qi": "Export holidays",
+  "an-ji-du-dao-chu": "export by quarter",
+  "han-qing-jia": "（including leave）"
 }

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -1446,5 +1446,7 @@
   "can-yu-ren-ci": "参与人次",
   "chu-cha-de-tian-shu": "出差的天数",
   "xiang-mu-chuang-jian-shi-jian-duan": "项目创建时间段",
-  "dao-chu-jia-qi": "导出假期"
+  "dao-chu-jia-qi": "导出假期",
+  "an-ji-du-dao-chu": "按季度导出",
+  "han-qing-jia": "（含请假）"
 }

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

@@ -134,7 +134,7 @@
       </div>
       <p :style="ins == 9 ? 'float: right;margin-right: 25px;width:20%' : 'float: right;margin-right: 25px;width:10%'" >
         <el-button type="primary" @click="exportExcel" size="mini">{{ $t('reporderived') }}</el-button>
-        <el-button type="primary" @click="exportExcelByQuarter" size="mini" v-if="ins == 9 && user.companyId == 876">按季度导出</el-button>
+        <el-button type="primary" @click="exportExcelByQuarter" size="mini" v-if="ins == 9 && user.companyId == 876">{{ $t('an-ji-du-dao-chu') }}</el-button>
       </p>
       
     </div>
@@ -593,6 +593,18 @@
                     <span v-else>{{scope.row.timelinessRate}}</span>
                   </template>
                 </el-table-column>
+                <el-table-column prop="timelinessRate" :label="$t('timelyreportingrate')" min-width="200" align="center">
+                  <template slot="header">
+                    <span>{{ $t('timelyreportingrate') + $t('han-qing-jia') }}</span>
+                    <el-tooltip effect="dark" :content="'请假计为填报及时'" placement="top-start">
+                        <i class="el-icon-question" style="color:#606266"></i>
+                    </el-tooltip>
+                  </template>
+                  <template slot-scope="scope">
+                    <el-link v-if="scope.row.dataList != null" style="color:#409eff;" @click="timelyDetail(scope.row.dataList)">{{scope.row.timelinessRateWithLeave}}</el-link>
+                    <span v-else>{{scope.row.timelinessRateWithLeave}}</span>
+                  </template>
+                </el-table-column>
                 <!-- <el-table-column prop="dataList" label="详情" width="100" fixed="right" align="center">
                   <template slot-scope="scope">
                     <el-button @click="timelyDetail(scope.row.dataList)">详情</el-button>

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

@@ -5606,7 +5606,7 @@
                     if (valid) {
                         
                 if(this.totalReportHours < this.user.timeType.allday){
-                    this.$confirm('当日工时不足8.0小时，是否确定提交?', '提示', {
+                    this.$confirm('当日工时不足' + this.user.timeType.allday.toFixed(1) + '小时，是否确定提交?', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
                         type: 'warning'

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

@@ -1513,7 +1513,25 @@ import timetoolVue from '../timetool/timetool.vue';
                 this.$refs.loginForm.validate().then(
                 ()=>{
                 // 验证通过
-                    this.dateAr = []
+                    if(this.totalReportHours < this.user.timeType.allday){
+                        this.$dialog.confirm({
+                            title: '提示',
+                            message: '当日工时不足' + this.user.timeType.allday.toFixed(1) + '小时，是否确定提交?'
+                        }).then(()=>{
+                            this.submitReportSon()
+                        }).catch(()=>{})
+                    }else{
+                        this.submitReportSon()
+                    }
+                }).catch(()=>{
+                //验证失败
+                console.log('验证失败');
+                    return
+                })
+                
+            },
+            submitReportSon(){
+                this.dateAr = []
                     let alp = []
                     if(this.user.timeType.multiWorktime == 1) {
                         for(var p in this.form.domains) {
@@ -1827,12 +1845,6 @@ import timetoolVue from '../timetool/timetool.vue';
                             this.$toast.fail((this.isDraft==0?'提交失败':'暂存失败')+'：'+res.msg);
                         }
                     }).catch(err=> {this.$toast.clear(); this.flgLg = true});
-                }).catch(()=>{
-                //验证失败
-                console.log('验证失败');
-                    return
-                })
-                
             },
             //初始化参数
             initWxConfig() {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/projectInside.vue

@@ -42,6 +42,7 @@
                                 <span v-else></span>
                             </div>
                             <div class="task_button">
+                                <van-button size="small" type="danger" v-if="user.id == item.creatorId || user.id == projectDetail.creatorId ||user.id == projectDetail.inchargerId || projectManagement" @click="taskDelete(item)">删除</van-button>
                                 <van-button size="small" type="info" @click="toEditask(item.id)">编辑</van-button>
                                 <van-button size="small" type="primary" @click="taskStatus(item.id,0,item)" v-if="item.taskStatus == 0">完成</van-button>
                                 <van-button size="small" color="#e6a23c" @click="taskStatus(item.id,1,item)" v-if="item.taskStatus == 1">重启</van-button>
@@ -329,6 +330,22 @@ export default {
                 }
             }).catch(err=> {this.$toast.clear();console.log(err)});
         },
+        taskDelete(taskitem){
+            this.$dialog.confirm({
+                title: '提示',
+                message: taskitem.subTaskList.length > 0 ? '您确定删除当前任务及其子任务吗？' : '您确定删除当前任务吗？'
+            }).then(()=>{
+                this.$axios.post("/task/delete", {id: taskitem.id})
+                .then(res => {
+                    if(res.code == "ok") {
+                        this.$toast.success('删除成功');
+                        this.inside.taskList = this.inside.taskList.filter(item => item.id != taskitem.id)
+                    } else {
+                        this.$toast.fail('操作失败');
+                    }
+                }).catch(err=> {this.$toast.clear();console.log(err)});
+            }).catch(()=>{})
+        },
         
         openProject(){
             if(this.active == 1 && (this.projectManagement || this.user.id==this.projectDetail.inchargerId || this.user.id==this.projectDetail.creatorId)){