Browse Source

'调整工时报告日期,解决系统设置样式问题'

Lljy-ai 4 years ago
parent
commit
f0cedd6960

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -9,7 +9,7 @@
                 </el-form-item>
             </el-form>
         </el-col>
-        <p style="padding-top:80px;margin-left:10px;color:#666;">员工时薪录入方式设置</p>
+        <p style="padding-top:80px;margin: 0 0 10px 10px;color:#666;">员工时薪录入方式设置</p>
         <div class="panel" style="height:120px;margin-left:20px;margin-right:20px;">
         <el-radio v-model="timeType.hourCostInputType" :label="0" style="width:100%;margin-left:10px;">方式一: 录入月成本,自动计算时薪<span class="tip">(适合企业全职员工)</span>
             <el-form ref="form0" :inline="true" :model="timeType" label-width="150px" style="margin-top:10px;">

+ 32 - 9
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -11,14 +11,14 @@
 
         <!--列表-->
         <div>
-            <el-card class="box-card daily" shadow="never" >
-                <div slot="header" class="clearfix">
-                    <el-date-picker size="small" v-model="date" :editable="false" format="yyyy-MM" value-format="yyyy-MM" @change="changeMonthOut" :clearable="false" type="month" placeholder="选择月份"></el-date-picker>
-                    <span >
-                    <span>日期:</span>
-                    <span v-for="(item,index) in allDate" :id="'day'+index" :class="index==choseDay?'chooseDate date_item':'date_item'" 
-                    @click="choseDate(index, item)" :key="index">{{item}}</span>
-                    </span>
+            <el-card class="box-card daily" shadow="never">
+                <div slot="header" class="clearfix" id="clearfix" style="padding-left: 260px;">
+                    <div class="jjk" style="display:inline-block;position:fixed;top:70px;background:#fff;left:250px;">
+                        <el-date-picker size="small" v-model="date" :editable="false" format="yyyy-MM" value-format="yyyy-MM" @change="changeMonthOut" :clearable="false" type="month" placeholder="选择月份"></el-date-picker>
+                        <span>日期:</span>
+                    </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">{{item}}</span>
                 </div>
                 <div style="display:flex;">
                 <div v-if="user.role > 0 || user.manageDeptId != 0">
@@ -337,10 +337,31 @@
                 },
                 isNew: false,
                 selected: false,
-                valuet: new Date()
+                valuet: new Date(),
+                domObj: null
             };
         },
         methods: {
+            scrollFunction () {
+                this.domObj = document.getElementById('clearfix') // 通过id获取要设置的div
+                if (this.domObj.attachEvent) { // IE
+                this.domObj.attachEvent('onmousewheel', this.mouseScroll)
+                } else if (this.domObj.addEventListener) {
+                this.domObj.addEventListener('DOMMouseScroll', this.mouseScroll, false)
+                }
+                this.domObj.onmousewheel = this.domObj.onmousewheel = this.mouseScroll
+            },
+
+            mouseScroll(event) { // google 浏览器下
+                let detail = event.wheelDelta || event.detail
+                let moveForwardStep = -1
+                let moveBackStep = 1
+                let step = 0
+                step = detail > 0 ? moveForwardStep * 100 : moveBackStep * 100
+                event.preventDefault() // 阻止浏览器默认事件
+                this.domObj.scrollLeft = this.domObj.scrollLeft + step
+            },
+
             // 是否加班的单机事件
             check() {
                 this.selected = !this.selected
@@ -1284,6 +1305,7 @@
             this.getProjectList();
             this.getTimeType();
             this.getDepartment();
+            this.scrollFunction()
         }
     };
 </script>
@@ -1299,6 +1321,7 @@
         overflow-x: auto;
         white-space: nowrap;
         padding: 15px 0;
+        // overflow-y: hidden;
         .date_item {
             padding: 0 15px;
             cursor: pointer;