Browse Source

2022.5.24

山水共长天一色 3 years ago
parent
commit
34b5f043ff

+ 3 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/centerManage/centerManage.vue

@@ -14,8 +14,9 @@
                     {{scope.$index + 1}}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="名称" ></el-table-column>
-            <el-table-column label="操作" width="150">
+            <el-table-column prop="name" label="名称" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="projects" label="相关项目" min-width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作" width="170">
                 <template slot-scope="scope" >
                     <el-button size="small" type="primary" @click="addNewSubProject(scope.row)">编辑</el-button>
                     <el-button size="small" type="danger" @click="deleteSubPro(scope.row)">删除</el-button>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -48,7 +48,7 @@
                     {{scope.row.projectName}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="inchargerName" label="负责人"  width="80">
+                <el-table-column prop="inchargerName" label="负责人"  width="130">
                   <template slot-scope="scope" >
                     {{scope.row.inchargerName}}
                   </template>

+ 37 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -526,6 +526,9 @@
                   </span> 
               </el-select>
             </div>
+            <div style="margin:0 10px 0 40px">
+              <el-button size="small" type="primary" @click="listSynchronize" :loading="synchronizeLoading">从钉钉同步</el-button>
+            </div>
             
           </div>
             <el-table key="apk2is8" v-loading="loading" :data="vacationList" style="width: 100%" height="90%">
@@ -817,7 +820,8 @@ export default {
       leaveTypeItem: '',
       departmentOptions: [],
       departmentSel: [],
-      userSelId: ''
+      userSelId: '',
+      synchronizeLoading: false
     };
   },
   computed: {},
@@ -847,7 +851,39 @@ export default {
   },
   filters: {},
   methods: {
+    // 从钉钉同步假期剩余表
+    listSynchronize(){
+      this.synchronizeLoading = true
+      this.http.post('/dingding/syncLeaveQuotaData',{
+        companyId: this.user.companyId
+      },res => {
+        if(res.code == 'ok'){
+          this.synchronizeLoading = false
+          this.$message({
+            message: '同步成功',
+            type: 'success'
+          })
+          this.getVacationList()
+          this.page = 1
+          this.departmentSel = []
+          this.userSelId = ''
+        }else {
+          this.synchronizeLoading = false
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          })
+        }
+      },err => {
+        this.synchronizeLoading = false
+        this.$message({
+          message: err,
+          type: 'error'
+        })
+      })
+    },
 
+    // 获取部门列表
     getDepartmentOptions(){
       this.http.post(this.port.manage.depList,{
       },res =>{

+ 4 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -9,6 +9,7 @@
             </el-radio-group></div>
         </el-col>
         <el-col :span="14" style="display: flex;flex-wrap: wrap;">
+            <div style="width:100%;display:flex">
             <el-date-picker v-show="user.timeType.fixMonthcost==0"
             v-model="dateRange" :editable="false" 
             format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
@@ -34,10 +35,12 @@
                 <el-radio-button label="人员"></el-radio-button>
                 <el-radio-button :label="namess" v-if="jichu.customDegreeActive == 1"></el-radio-button>
             </el-radio-group>
-
+            </div>
+            <div style="width:100%;display:flex">
             <el-select v-model="personnelValue" filterable clearable placeholder="请选择人员" style="margin-top: 10px;width: 350px" v-if="radio == '人员'" @change="personnel()">
                 <el-option v-for="item in hasReportUserList" :key="item.id" :label="item.name" :value="item.name"></el-option>
             </el-select>
+            </div>
         </el-col>
         <el-col :span="4">
             <el-button @click="showExportDialog">报表导出</el-button>

File diff suppressed because it is too large
+ 213 - 121
fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue


+ 16 - 25
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -20,7 +20,7 @@
                          <el-button style="margin-left:10px;" icon="iconfont firerock-icongongshitongji" size="mini"  @click="showWorkTime"></el-button>
                     </div> -->
                         <span v-for="(item,index) in allDate" :id="'day'+index" :class="index==choseDay?'chooseDate date_item':'date_item'"
-                        @click="choseDate(index, item)" :key="index" style="padding:0 6px;display: inline-block;width: 46px;text-align: center;">
+                        @click="choseDate(index, item)" :key="index" :style="'padding:0 6px;display: inline-block;width: 46px;text-align: center;' + (canClick(index,item) == false ? 'color:#c0c0c0;cursor:not-allowed;' : '') ">
                         <div :style="'display:inline-block;text-align: center;'+(item.state == null?'':'')" >
                             <div style="text-align:center;position:relative;"><span>{{item.showDate}}</span>
                             <br>
@@ -3200,7 +3200,18 @@
 
             // 选择日期
             choseDate(i, item) {
-                
+                if(this.canClick(i,item) == false){
+                    return
+                }
+                // console.log(nowDateYear,nowDateMonth,nowDateDay,'..',itemYear,itemMonth,itemDay);
+                this.choseDay = i;
+                let day = (this.choseDay +1)> 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
+                sessionStorage.msg = this.date + day,
+                this.getReportList();
+                this.getDepartment();
+                this.curDate = item.date;
+            },
+            canClick(i, item){
                 let nowDate = new Date()
                 let nowDateYear = nowDate.getFullYear()
                 let itemYear = parseInt(this.date.split('-')[0])
@@ -3209,36 +3220,16 @@
                 let nowDateDay = nowDate.getDate()
                 let itemDay = parseInt(item.showDate.split('.')[1])
                 if(nowDateYear < itemYear){
-                    this.$message({
-                        message: '无法填报',
-                        type: 'warning'
-                    })
-                    return
+                    return false
                 }else if(nowDateYear == itemYear){
                     if(nowDateMonth < itemMonth){
-                        this.$message({
-                            message: '无法填报',
-                            type: 'warning'
-                        })
-                        return
+                        return false
                     }else if(nowDateMonth == itemMonth){
                         if(nowDateDay < itemDay){
-                            this.$message({
-                                message: '无法填报',
-                                type: 'warning'
-                            })
-                            return
+                            return false
                         }
                     }
                 }
-
-                console.log(nowDateYear,nowDateMonth,nowDateDay,'..',itemYear,itemMonth,itemDay);
-                this.choseDay = i;
-                let day = (this.choseDay +1)> 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
-                sessionStorage.msg = this.date + day,
-                this.getReportList();
-                this.getDepartment();
-                this.curDate = item.date;
             },
 
             // 获取日期列表

File diff suppressed because it is too large
+ 1261 - 231
fhKeeper/formulahousekeeper/timesheet_h5/src/assets/style/font/demo_index.html


File diff suppressed because it is too large
+ 221 - 47
fhKeeper/formulahousekeeper/timesheet_h5/src/assets/style/font/iconfont.css


File diff suppressed because it is too large
+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/assets/style/font/iconfont.js


+ 413 - 105
fhKeeper/formulahousekeeper/timesheet_h5/src/assets/style/font/iconfont.json

@@ -1,163 +1,471 @@
 {
-  "id": "1456778",
-  "name": "苏打优选",
+  "id": "2390497",
+  "name": "seyaproject",
   "font_family": "iconfont",
-  "css_prefix_text": "icon-",
+  "css_prefix_text": "firerock-icon",
   "description": "",
   "glyphs": [
     {
-      "icon_id": "91804",
-      "name": "待收货",
-      "font_class": "daishouhuo",
-      "unicode": "e601",
-      "unicode_decimal": 58881
+      "icon_id": "15673407",
+      "name": "打卡记录",
+      "font_class": "dakajilu",
+      "unicode": "e6e1",
+      "unicode_decimal": 59105
     },
     {
-      "icon_id": "908503",
-      "name": "搜索",
-      "font_class": "sousuo",
-      "unicode": "e678",
-      "unicode_decimal": 59000
+      "icon_id": "5651484",
+      "name": "关联",
+      "font_class": "guanlian",
+      "unicode": "e674",
+      "unicode_decimal": 58996
     },
     {
-      "icon_id": "915611",
-      "name": "首页",
-      "font_class": "shouye",
-      "unicode": "e677",
-      "unicode_decimal": 58999
+      "icon_id": "14949575",
+      "name": "users",
+      "font_class": "users",
+      "unicode": "e70a",
+      "unicode_decimal": 59146
     },
     {
-      "icon_id": "1085722",
-      "name": "设置",
-      "font_class": "shezhi",
-      "unicode": "e65c",
-      "unicode_decimal": 58972
+      "icon_id": "736503",
+      "name": "权限",
+      "font_class": "quanxian1",
+      "unicode": "e615",
+      "unicode_decimal": 58901
     },
     {
-      "icon_id": "1110582",
-      "name": "购物车—线",
-      "font_class": "gouwuchexian",
-      "unicode": "e60d",
-      "unicode_decimal": 58893
+      "icon_id": "7987507",
+      "name": "系统",
+      "font_class": "xitong-",
+      "unicode": "e616",
+      "unicode_decimal": 58902
     },
     {
-      "icon_id": "1162363",
-      "name": "待发货",
-      "font_class": "1111113",
-      "unicode": "e60c",
-      "unicode_decimal": 58892
+      "icon_id": "11111002",
+      "name": "客户",
+      "font_class": "kehu",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
     },
     {
-      "icon_id": "1215021",
-      "name": "反馈",
-      "font_class": "iconfontfankui",
-      "unicode": "e6b4",
-      "unicode_decimal": 59060
+      "icon_id": "6517457",
+      "name": "文件-请假单",
+      "font_class": "wj-qjd",
+      "unicode": "e70e",
+      "unicode_decimal": 59150
     },
     {
-      "icon_id": "1382060",
-      "name": "礼物",
-      "font_class": "liwu",
-      "unicode": "e694",
-      "unicode_decimal": 59028
+      "icon_id": "5961300",
+      "name": "待办事项",
+      "font_class": "daibanshixiang",
+      "unicode": "ec4e",
+      "unicode_decimal": 60494
     },
     {
-      "icon_id": "1577002",
-      "name": "客服",
-      "font_class": "kefu",
-      "unicode": "e618",
-      "unicode_decimal": 58904
+      "icon_id": "11465003",
+      "name": "待办",
+      "font_class": "daiban",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
     },
     {
-      "icon_id": "1610138",
-      "name": "钱包",
-      "font_class": "qianbao",
+      "icon_id": "6023953",
+      "name": "工时统计",
+      "font_class": "gongshitongji",
       "unicode": "e614",
       "unicode_decimal": 58900
     },
     {
-      "icon_id": "1833855",
-      "name": "下箭头",
-      "font_class": "xiajiantou",
-      "unicode": "e733",
-      "unicode_decimal": 59187
+      "icon_id": "2318254",
+      "name": "审核通过",
+      "font_class": "shenhetongguo",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
     },
     {
-      "icon_id": "2076312",
-      "name": " 我的",
-      "font_class": "wode",
-      "unicode": "e8a0",
-      "unicode_decimal": 59552
+      "icon_id": "9144552",
+      "name": "审核驳回",
+      "font_class": "shenhebohui",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
     },
     {
-      "icon_id": "2392549",
-      "name": "打勾",
-      "font_class": "dagou",
-      "unicode": "e670",
-      "unicode_decimal": 58992
+      "icon_id": "17483402",
+      "name": "待办  等待 审核",
+      "font_class": "daibandengdaishenhe",
+      "unicode": "e612",
+      "unicode_decimal": 58898
+    },
+    {
+      "icon_id": "5149104",
+      "name": "建筑工程类",
+      "font_class": "jianzhugongchenglei",
+      "unicode": "e61e",
+      "unicode_decimal": 58910
+    },
+    {
+      "icon_id": "16187171",
+      "name": "甘特图",
+      "font_class": "gantetu",
+      "unicode": "e6a1",
+      "unicode_decimal": 59041
+    },
+    {
+      "icon_id": "3686260",
+      "name": "客户管理",
+      "font_class": "kehuguanli",
+      "unicode": "e60f",
+      "unicode_decimal": 58895
+    },
+    {
+      "icon_id": "1868952",
+      "name": "流程",
+      "font_class": "liucheng",
+      "unicode": "e634",
+      "unicode_decimal": 58932
+    },
+    {
+      "icon_id": "9651039",
+      "name": "长箭头",
+      "font_class": "right",
+      "unicode": "e60e",
+      "unicode_decimal": 58894
+    },
+    {
+      "icon_id": "17223736",
+      "name": "App_New_Line",
+      "font_class": "App_New_Line",
+      "unicode": "e6e3",
+      "unicode_decimal": 59107
+    },
+    {
+      "icon_id": "261001",
+      "name": "line",
+      "font_class": "0",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
+    {
+      "icon_id": "17197893",
+      "name": "Insert Line",
+      "font_class": "InsertLine",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
+    },
+    {
+      "icon_id": "19410111",
+      "name": "密 码",
+      "font_class": "mima",
+      "unicode": "e611",
+      "unicode_decimal": 58897
     },
     {
-      "icon_id": "2488741",
-      "name": "home",
-      "font_class": "home",
-      "unicode": "e641",
-      "unicode_decimal": 58945
+      "icon_id": "16842350",
+      "name": "密 码",
+      "font_class": "mima1",
+      "unicode": "e608",
+      "unicode_decimal": 58888
     },
     {
-      "icon_id": "3670096",
-      "name": "购物车",
-      "font_class": "tubiaolunkuo-",
+      "icon_id": "20915138",
+      "name": "验证码",
+      "font_class": "yanzhengma",
+      "unicode": "e60d",
+      "unicode_decimal": 58893
+    },
+    {
+      "icon_id": "11640993",
+      "name": "dot",
+      "font_class": "dot",
+      "unicode": "e60b",
+      "unicode_decimal": 58891
+    },
+    {
+      "icon_id": "9382963",
+      "name": "dot",
+      "font_class": "dot2",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    },
+    {
+      "icon_id": "7171606",
+      "name": "报表管理",
+      "font_class": "baobiao",
+      "unicode": "e636",
+      "unicode_decimal": 58934
+    },
+    {
+      "icon_id": "4426098",
+      "name": "组织架构",
+      "font_class": "zuzhijiagou1",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
+    {
+      "icon_id": "13100227",
+      "name": "填报",
+      "font_class": "tianbao1",
+      "unicode": "e60a",
+      "unicode_decimal": 58890
+    },
+    {
+      "icon_id": "4469651",
+      "name": "组织架构",
+      "font_class": "zuzhijiagou",
       "unicode": "e606",
       "unicode_decimal": 58886
     },
     {
-      "icon_id": "5294023",
-      "name": "红包",
-      "font_class": "hongbao",
-      "unicode": "e72f",
-      "unicode_decimal": 59183
+      "icon_id": "4231111",
+      "name": "组织结构",
+      "font_class": "zuzhijiegou",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "12860884",
+      "name": "权限",
+      "font_class": "quanxian",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "2101853",
+      "name": "报销",
+      "font_class": "baoxiao",
+      "unicode": "e788",
+      "unicode_decimal": 59272
+    },
+    {
+      "icon_id": "5207594",
+      "name": "报销单",
+      "font_class": "baoxiaodan",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "19236386",
+      "name": "填报",
+      "font_class": "tianbao",
+      "unicode": "e726",
+      "unicode_decimal": 59174
+    },
+    {
+      "icon_id": "12000587",
+      "name": "记录",
+      "font_class": "record",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "20147073",
+      "name": "导入",
+      "font_class": "daoru",
+      "unicode": "e613",
+      "unicode_decimal": 58899
     },
     {
-      "icon_id": "5452460",
-      "name": "缓存",
-      "font_class": "huancun",
+      "icon_id": "20154661",
+      "name": "导出",
+      "font_class": "daochu",
+      "unicode": "e6ab",
+      "unicode_decimal": 59051
+    },
+    {
+      "icon_id": "19441448",
+      "name": "export",
+      "font_class": "export",
+      "unicode": "e72d",
+      "unicode_decimal": 59181
+    },
+    {
+      "icon_id": "8796451",
+      "name": "启动",
+      "font_class": "qidong",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "19037188",
+      "name": "完 成 ",
+      "font_class": "wancheng",
+      "unicode": "e610",
+      "unicode_decimal": 58896
+    },
+    {
+      "icon_id": "20134686",
+      "name": "菜单",
+      "font_class": "caidan",
+      "unicode": "e6b7",
+      "unicode_decimal": 59063
+    },
+    {
+      "icon_id": "8524192",
+      "name": "审核",
+      "font_class": "shenhe",
       "unicode": "e604",
       "unicode_decimal": 58884
     },
     {
-      "icon_id": "5460006",
-      "name": "定位",
-      "font_class": "yuejuan_Location",
-      "unicode": "e619",
-      "unicode_decimal": 58905
+      "icon_id": "3590688",
+      "name": "里程碑",
+      "font_class": "icon-",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
     },
     {
-      "icon_id": "5849780",
-      "name": "右箭头",
-      "font_class": "iconfontyoujiantou-copy-copy-copy-copy",
-      "unicode": "e600",
-      "unicode_decimal": 58880
+      "icon_id": "5112963",
+      "name": "任务",
+      "font_class": "renwu",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "10368440",
+      "name": "风险",
+      "font_class": "fengxian",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
+    {
+      "icon_id": "17156568",
+      "name": "ok",
+      "font_class": "normal-ico-ok",
+      "unicode": "e70f",
+      "unicode_decimal": 59151
+    },
+    {
+      "icon_id": "1161198",
+      "name": "棱形",
+      "font_class": "icon2",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
+    {
+      "icon_id": "10202911",
+      "name": "file",
+      "font_class": "file",
+      "unicode": "e60c",
+      "unicode_decimal": 58892
+    },
+    {
+      "icon_id": "2078615",
+      "name": "excel",
+      "font_class": "ex",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "4073514",
+      "name": "Zip",
+      "font_class": "Zip",
+      "unicode": "e9ec",
+      "unicode_decimal": 59884
     },
     {
-      "icon_id": "7400719",
-      "name": "退货",
-      "font_class": "tuihuo",
-      "unicode": "e624",
-      "unicode_decimal": 58916
+      "icon_id": "4863362",
+      "name": "JPG",
+      "font_class": "JPG",
+      "unicode": "e6ed",
+      "unicode_decimal": 59117
     },
     {
-      "icon_id": "9031364",
-      "name": "标准待分享2",
-      "font_class": "biaozhundaifenxiang",
+      "icon_id": "5173010",
+      "name": "audio",
+      "font_class": "audio",
       "unicode": "e602",
       "unicode_decimal": 58882
     },
     {
-      "icon_id": "9173301",
-      "name": "下箭头",
-      "font_class": "xiajiantou-copy",
-      "unicode": "e8a1",
-      "unicode_decimal": 59553
+      "icon_id": "8469709",
+      "name": "txt",
+      "font_class": "txt",
+      "unicode": "e741",
+      "unicode_decimal": 59201
+    },
+    {
+      "icon_id": "19705514",
+      "name": "video",
+      "font_class": "video",
+      "unicode": "e771",
+      "unicode_decimal": 59249
+    },
+    {
+      "icon_id": "20213818",
+      "name": "PDF",
+      "font_class": "PDF",
+      "unicode": "e61a",
+      "unicode_decimal": 58906
+    },
+    {
+      "icon_id": "20651005",
+      "name": "word",
+      "font_class": "word",
+      "unicode": "eecf",
+      "unicode_decimal": 61135
+    },
+    {
+      "icon_id": "17781647",
+      "name": "上 传",
+      "font_class": "shangchuan",
+      "unicode": "e6fd",
+      "unicode_decimal": 59133
+    },
+    {
+      "icon_id": "7337849",
+      "name": "秒表",
+      "font_class": "miaobiao",
+      "unicode": "ecfa",
+      "unicode_decimal": 60666
+    },
+    {
+      "icon_id": "8659928",
+      "name": "task",
+      "font_class": "task",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "13530978",
+      "name": "time",
+      "font_class": "meditor-time",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "9339879",
+      "name": "tree",
+      "font_class": "tree",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "807967",
+      "name": "统计",
+      "font_class": "tongji",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    },
+    {
+      "icon_id": "1778691",
+      "name": "项目",
+      "font_class": "xiangmu",
+      "unicode": "e617",
+      "unicode_decimal": 58903
+    },
+    {
+      "icon_id": "14417643",
+      "name": "财务",
+      "font_class": "caiwu",
+      "unicode": "e89c",
+      "unicode_decimal": 59548
+    },
+    {
+      "icon_id": "11673579",
+      "name": "setting",
+      "font_class": "setting",
+      "unicode": "e672",
+      "unicode_decimal": 58994
     }
   ]
 }

BIN
fhKeeper/formulahousekeeper/timesheet_h5/src/assets/style/font/iconfont.ttf


BIN
fhKeeper/formulahousekeeper/timesheet_h5/src/assets/style/font/iconfont.woff


BIN
fhKeeper/formulahousekeeper/timesheet_h5/src/assets/style/font/iconfont.woff2


+ 27 - 0
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -3,8 +3,15 @@
         <van-nav-bar title="填写日报" left-text="返回" @click-left="back" fixed left-arrow/>
 
         <van-form class="login_form" @submit="submitReport">
+            <div>
             <van-field readonly clickable name="datetimePicker" :value="form.createDate" label="时间选择" placeholder="点击选择时间" 
             @click="showPicker = true" :rules="rules.createDate" />
+                <div v-if="report.time" class="attendanceRecord">
+                    <i class="iconfont firerock-icondakajilu" style="font-size:0.35rem;margin-right:0.12rem"></i>
+                    <span v-if="user.timeType.syncDingding==1&&!report.time">暂无考勤记录</span>
+                    <span v-else>{{report.time.startTime}}-{{report.time.endTime}}, {{report.time.workHours}}小时</span>
+                </div>
+            </div>
             <van-popup v-model="showPicker" position="bottom">
                 <van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="changeTime" @cancel="showPicker = false"/>
             </van-popup>
@@ -1214,6 +1221,7 @@
                         }
                     }
                 }
+                
                 // return
                 const toast = this.$toast.loading({
                     forbidClick: true,
@@ -1264,6 +1272,16 @@
                         return;
                     }
                 }
+                if (this.reportTimeType.type == 1 && this.report.time) {
+                            var totalTime = 0;
+                            for (var t=0;t<this.form.domains.length; t++) {
+                                totalTime += parseFloat(this.form.domains[t].workingTime);
+                            }
+                            if (this.report.time.workHours && totalTime > parseFloat(this.report.time.workHours)) {
+                                this.$toast.fail("填报工时之和"+(totalTime)+"h不能超过考勤总工时("+this.report.time.workHours.toFixed(1)+"h)");
+                                return;
+                            }
+                        }
                 
                 //填字段
                 for(var i in this.form.domains) {
@@ -1543,6 +1561,15 @@
     }
     .login_form {
         margin-top: 46px;
+        position: relative;
+    }
+    .attendanceRecord{
+        position: absolute;
+        top: 0.26667rem;
+        right: 0.42667rem;
+        color: #969799;
+        font-size: 0.35rem;
+        line-height: 0.64rem;
     }
 
     .form_domains {