Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css

@@ -3,6 +3,7 @@
     width: 100%;
     height: 6.375rem;
     position: relative;
+    box-shadow: 0px 0px 0px #fff;
 }
 .navigationBarBack {
     width: 100%;
@@ -153,25 +154,46 @@
     text-align: center;
     font-size: 1.625rem !important;
     color: #595959;
+    position: relative;
 }
 .manContent img {
-    /* margin-top: 10.5625rem;
-    margin-bottom: 1.6875rem; */
-    margin-top: 16.25rem;
+    margin-top: 18.25rem;
     margin-bottom: 3.4375rem;
-    width: 12.875rem;
-    height: 12.875rem;
+    width: 9.875rem;
+    height: 9.875rem;
 }
 .manContent p {
-    font-size: 1.9375rem !important;
+    font-size: 1.75rem !important;
     color: #595959;
     font-weight: bold;
     word-spacing: .9375rem;
-    letter-spacing:.3125rem
+    letter-spacing:.3125rem;
 }
 .manContent span {
     color: #5e95f8;
 }
+.manConDD {
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    text-align: center;
+    position: absolute;
+    width: 256px;
+}
+.manConDD img {
+    width: 6rem !important;
+    height: 6rem !important;
+    margin-top: 0;
+    margin-bottom: 1.5625rem;
+}
+.manContent .manConDD p {
+    width: 100%;
+    text-align: center;
+    font-size: 20px !important;
+    font-weight: normal;
+    word-spacing: 0;
+    letter-spacing:0
+}
 /* 智能 */
 .smart {
     width: 100%;
@@ -697,7 +719,8 @@
 /* 尝试滚动 */
 .jiesao {
     /* height: 200vh; */
-    height: 125.8125rem;
+    /* height: 125.8125rem; */
+    height: 137.5rem;
     width: 100%;
 }
 .managements {
@@ -736,6 +759,7 @@ body {
     /* background: url(../image/backk.jpg) no-repeat;
     background-size: 100%; */
     background: #fff;
+    box-shadow: 1px 3px 5px 0px #ddd;
 }
 .abc .til {
     color: #fff !important;

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -97,8 +97,39 @@
             <!-- <div class="manImg"><img src="./image/gongshi.jpg" alt=""></div> -->
             <div class="connont">
                 <div class="manContent">
-                    <img id="jiesaoImg" src="./image/gsgj.png" alt="" style="padding-top: 300px;">
-                    <p id="jiesaoP" style="opacity: 0;">化繁为简  只需一个<span>工时管家</span></p>
+                    <!-- <img id="jiesaoImg" src="./image/gsgj.png" alt="" style="padding-top: 300px;"> -->
+                    <div style="position: relative;z-index: 2;">
+                        <img id="jiesaoImg" src="./image/gsgj.png" alt="">
+                        <p id="jiesaoP">化繁为简  只需一个<span>工时管家</span></p>
+                    </div>
+                    <div class="manConDD" id="manConDD1" style="left: 50%;margin-left: -128px;top: 30px;transform:translate(0,293px);">
+                        <img src="./image/dd1.png" alt="">
+                        <p id="manConDDp1" style="opacity: 0;">可集成到企业微信、钉钉</p>
+                    </div>
+                    <div class="manConDD" id="manConDD2" style="right: 160px;top: 200px;transform:translate(-362px,123px);">
+                        <img src="./image/dd2.png" alt="">
+                        <p id="manConDDp2" style="opacity: 0;">可以设置工时审批流</p>
+                    </div>
+                    <div class="manConDD" id="manConDD3" style="right: 160px;bottom: -60px;transform:translate(-362px,-141px);">
+                        <img src="./image/dd3.png" alt="">
+                        <p id="manConDDp3" style="opacity: 0;">多层级项目任务结构</p>
+                    </div>
+                    <div class="manConDD" id="manConDD4" style="right: 360px;bottom: -260px;transform:translate(-162px,-339px);">
+                        <img src="./image/dd4.png" alt="">
+                        <p id="manConDDp4" style="opacity: 0;">支持定制开发、私有化部署</p>
+                    </div>
+                    <div class="manConDD" id="manConDD5" style="left: 360px;bottom: -260px;transform:translate(162px,-339px);">
+                        <img src="./image/dd5.png" alt="">
+                        <p id="manConDDp5" style="opacity: 0;">图形化统计、Excel报表</p>
+                    </div>
+                    <div class="manConDD" id="manConDD6" style="left: 160px;bottom: -60px;transform:translate(362px,-141px);">
+                        <img src="./image/dd6.png" alt="">
+                        <p id="manConDDp6" style="opacity: 0;">模板可搭配、最高性价比</p>
+                    </div>
+                    <div class="manConDD" id="manConDD7" style="left: 160px;top: 200px;transform:translate(362px,123px);">
+                        <img src="./image/dd7.png" alt="">
+                        <p id="manConDDp7" style="opacity: 0;">自动下发漏填、待审核提醒</p>
+                    </div>
                 </div>
             </div>
         </div>

fhKeeper/formulahousekeeper/inva_4_tivo/js/index.js

@@ -37,7 +37,7 @@ $('.auss li').hover(function () {
 let screenHeight = $(window).height()
 // 系统智能的高度
 let jiesaoTop = $('.jiesao').offset().top
-
+ 
 // 智能引擎的高度
 let znyqTop = $('.znyq').offset().top
 
@@ -66,9 +66,24 @@ $(window).scroll(function () {
     // 系统管理滚动计算
     if (currentTop > jiesaoTop && currentTop < (jiesaoTop + screenHeight)) {
         let jiesaoopacity = (currentTop - jiesaoTop) / screenHeight
-        let jiesaopadding = (1 - jiesaoopacity) * 300 + 'px'
-        $('#jiesaoP').css({'opacity': jiesaoopacity})
-        $('#jiesaoImg').css({'padding-top': jiesaopadding})
+        // let jiesaopadding = (1 - jiesaoopacity) * 300 + 'px'
+        let jieMIngcs = jiesaoopacity > 0.8 ? jiesaoopacity : '0'
+        // 文字加透明
+        $('#manConDDp1').css({'opacity': jieMIngcs})
+        $('#manConDDp2').css({'opacity': jieMIngcs})
+        $('#manConDDp3').css({'opacity': jieMIngcs})
+        $('#manConDDp4').css({'opacity': jieMIngcs})
+        $('#manConDDp5').css({'opacity': jieMIngcs})
+        $('#manConDDp6').css({'opacity': jieMIngcs})
+        $('#manConDDp7').css({'opacity': jieMIngcs})
+        // 偏移
+        $('#manConDD1').css({'transform': `translate(0, ${(1 - jiesaoopacity) * 293}px)`})
+        $('#manConDD2').css({'transform': `translate(-${(1 - jiesaoopacity) * 362}px, ${(1 - jiesaoopacity) * 123}px)`})
+        $('#manConDD3').css({'transform': `translate(-${(1 - jiesaoopacity) * 362}px, -${(1 - jiesaoopacity) * 141}px)`})
+        $('#manConDD4').css({'transform': `translate(-${(1 - jiesaoopacity) * 162}px, -${(1 - jiesaoopacity) * 339}px)`})
+        $('#manConDD5').css({'transform': `translate(${(1 - jiesaoopacity) * 162}px, -${(1 - jiesaoopacity) * 339}px)`})
+        $('#manConDD6').css({'transform': `translate(${(1 - jiesaoopacity) * 362}px, -${(1 - jiesaoopacity) * 141}px)`})
+        $('#manConDD7').css({'transform': `translate(${(1 - jiesaoopacity) * 362}px, ${(1 - jiesaoopacity) * 123}px)`})
     }
     // 智能引擎滚动计算
     if(currentTop > znyqTop && currentTop < (znyqTop + screenHeight) && currentTop < 3000) {

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

@@ -1,6 +1,6 @@
 <template>
   <section id="section">
-    <div class="sidebars" ref="sidebars" :style="'width: 180px;display: block;background: #fff;height:'+hubs+ 'px'">
+    <div class="sidebars" ref="sidebars" :style="'width: 180px;display: block;overflow:hidden;background: #fff;height:'+hubs+ 'px'">
       <h3><i class="iconfont firerock-iconbaoxiao" style="padding-right: 10px"></i>请假管理</h3>
       <el-divider ></el-divider>
       <el-col :span="12">
@@ -124,7 +124,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <!-- 选择审批人 -->
-                <el-form-item label="审批人" style="width:300px" :prop="mustApprover">
+                <el-form-item label="审批人" style="width:300px" prop="projectAuditorJson">
                     <el-select style="display:inline-block;width:250px;" multiple v-model="addForm.projectAuditorJson" placeholder="请选择">
                       <el-option
                       v-for="item in approverList"
@@ -667,7 +667,7 @@ export default {
         tel: [{required: true, validator: checkTel, trigger: 'blur'}],
         timeDays: [{required: true, validator: checks, trigger: 'blur'}],
         leaveType: [{ required: true, message: "请选择请假类型", trigger: "blur" }],
-        approver: [{ required: true, message: "请选择审批人", trigger: "blur" }]
+        projectAuditorJson: [{ required: true, message: "请选择审批人", trigger: "blur" }]
       },
       user: JSON.parse(sessionStorage.getItem("user")),
       shuz: ['事假填报', '病假填报', '年假填报', '产假填报'],
@@ -813,7 +813,6 @@ export default {
       txselnum: 0,
 
       approverList: [],
-      mustApprover: '',
       isDingding: 0,
       vacationList: [],
       leaveTypeList: [],
@@ -987,8 +986,11 @@ export default {
       },res => {
         if(res.code == 'ok'){
           this.approverList = res.data
-          if(this.approverList.length != 0){
-            this.mustApprover = 'approver'
+          if(this.approverList.length == 0){
+            this.$message({
+              message: '当前无审批人，请联系管理员配置审批人',
+              type: 'warning'
+            })
           }
           // console.log('list',res.data);
         }else {

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

@@ -2348,7 +2348,8 @@ a {
                         taskGpIncharge: item.taskGpIncharge,
                         category:item.category,
                         projectDesc: item.projectDesc,
-                        projectMainId: item.projectMainId
+                        projectMainId: item.projectMainId,
+                        creatorId: item.creatorId
                     }
                     this.deleteVif = item.creatorId
                     console.log("handleadd",this.deleteVif,this.addForm.id)
@@ -2713,7 +2714,10 @@ a {
             this.getProjectBaseConfigList();
             this.getClfConfigList()
             this.yanjiuzx()
-            this.getMainProject()
+            if(this.user,timeType.mainProjectState == 1){
+                this.getMainProject()
+            }
+            
         }
     };
 </script>

fhKeeper/formulahousekeeper/timesheet/src/views/quanx/quanx.vue

@@ -31,7 +31,9 @@
                 <div>
                     <el-button size="small" @click="handleAdd('编辑角色', '立即修改', scope.row)" :style="scope.row.rolename != '超级管理员' ? '' : 'visibility:hidden;'">编辑角色</el-button>
                     <el-button type="primary" size="small" @click="shisha(scope.row.id), roleName = scope.row.rolename" v-if="scope.row.rolename !='超级管理员' || (scope.row.rolename =='超级管理员' && user.roleName == '超级管理员')">分配权限</el-button>
+                    
                     <el-button type="danger" size="small" @click="deteHand(scope.row)" v-if="scope.row.rolename != '超级管理员'">删除</el-button>
+                    <el-button size="small" @click="exportAuthority(scope.row)" v-if="scope.row.rolename != '超级管理员'" style="margin-left:30px">导出权限</el-button>
                 </div>
             </template>
         </el-table-column>
@@ -457,6 +459,30 @@ export default {
                   type: "error"
               });
           });
+      },
+      exportAuthority(row){ // 导出权限
+      console.log(row);
+        this.http.post('permission/exportData',{
+          role: row.id,
+          companyId: this.user.companyId
+        },res => {
+          if(res.code == 'ok'){
+            var a = document.createElement('a');
+            a.download = "权限数据统计.xls";
+            a.href = res.data;
+            a.click();
+          }else{
+            this.$message({
+              message: res.msg,
+              type: 'error'
+            })
+          }
+        },err => {
+          this.$message({
+            message: err,
+            type: 'error'
+          })
+        })
       }
   },
 };

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -206,7 +206,7 @@
         <p style="margin-left:10px;color:#666;">普通员工填报日报时间限制</p>
         <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
         <el-col :span="24" >
-            <div class="panel" style="height:60px;">
+            <div class="panel" style="height:120px;">
                 <el-form :inline="true" :model="timeType"  style="margin-top:10px;">
                  
                 <el-form-item label="补填时间" prop="fillMonths">
@@ -216,7 +216,7 @@
                     </el-select>
                     <span style="color:#666;margin-left:10px;">(说明：系统管理员为员工代填日报时不受补填时间的限制)</span>
                     <span class="lockworktime"><el-checkbox v-model="timeType.fillAhead" label="可提前填报" /></span>
-                </el-form-item>
+                </el-form-item><br>
                 <el-form-item label="员工填报及时日" prop="timeliness" v-if="user.company.packageProject">
                     <el-select v-model="timeType.timeliness">
                         <el-option label="当天" :value="0"></el-option>

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

@@ -4610,9 +4610,26 @@
 
             // 改变月份
             changeMonth() {
-                if (this.isBatch == 0 && !this.isSubstitude) {
+                if (this.isBatch == 0) {
+                    if(this.user.timeType.fillAhead == 0){
+                        let date_a = new Date(this.workForm.createDate)
+                        let date_b = new Date(sessionStorage.msg)
+                        if(date_a.getTime() > date_b.getTime()){
+                            this.workForm.createDate = sessionStorage.msg
+                        }
+                    }
                     //只有按天填报才能获取当天的日报
-                    this.getReport()
+                    if(!this.isSubstitude){
+                        this.getReport()
+                    }
+                }else {
+                    if(this.user.timeType.fillAhead == 0){
+                        let date_a = new Date(this.workForm.createDate[1])
+                        let date_b = new Date(sessionStorage.msg)
+                        if(date_a.getTime() > date_b.getTime()){
+                            this.workForm.createDate[1] = sessionStorage.msg
+                        }
+                    }
                 }
             },
             // 判断时间段