Commit ebd22d8b authored by zhengke's avatar zhengke

修改

parent f9919ecc
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
overflow: scroll; overflow: scroll;
} }
.makeTable tr td { .makeTable th,
.makeTable td {
border: 1px solid #d1d1d1;
height: 40px; height: 40px;
min-width: 150px; min-width: 150px;
color: #000; background-color: #fff;
border: 1px solid #d1d1d1;
} }
.makeTable tr th { .makeTable tr th {
...@@ -42,13 +43,35 @@ ...@@ -42,13 +43,35 @@
right: 0; right: 0;
background: #fff; background: #fff;
} }
.makeTable th:nth-last-child(2){
/* td第一个粘性定位 */
position: sticky;
right: 150px;
}
.makeTable td:nth-last-child(2){
/* td第一个粘性定位 */
position: sticky;
right: 150px;
background: #fff;
}
.makeOutDiv { .makeOutDiv {
position: relative; position: relative;
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
} }
.makeTable th:nth-last-child(3){
/* td第一个粘性定位 */
position: sticky;
right: 300px;
}
.makeTable td:nth-last-child(3){
/* td第一个粘性定位 */
position: sticky;
right: 300px;
background: #fff;
border-left:1px solid #d1d1d1;
border-right:1px solid #d1d1d1;
}
.makeOutDiv::-webkit-scrollbar { .makeOutDiv::-webkit-scrollbar {
width: 3px; width: 3px;
height: 8px; height: 8px;
...@@ -81,10 +104,10 @@ ...@@ -81,10 +104,10 @@
<div class="page-body"> <div class="page-body">
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3 Sysuser_Date"> <div class="col-4 Sysuser_Date">
<q-field filled> <q-field filled>
 <template v-slot:control>  <template v-slot:control>
<el-date-picker v-model="dateList" type="daterange" :picker-options="pickerOptions0" align="right" <el-date-picker v-model="dateList" type="daterange" style="width:100%" :picker-options="pickerOptions0" align="right"
value-format="yyyy-MM-dd" @change="getData" unlink-panels range-separator="至" start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="getData" unlink-panels range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
...@@ -152,12 +175,32 @@ ...@@ -152,12 +175,32 @@
dateList: [], dateList: [],
dataList: [], dataList: [],
EmployeeList: [], EmployeeList: [],
pickerOptions0: {
disabledDate(time) {
return time.getTime() > Date.now() - 8.64e6
}
}
}; };
}, },
created() { created() {
}, },
mounted() { mounted() {
var now = new Date();
var strLink = "-";
var year = now.getFullYear();
var month = now.getMonth() + 1;
var day = now.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (day >= 1 && day <= 9) {
day = "0" + day;
}
this.msg.startTime = year + strLink + month + strLink + '01';
this.msg.endTime = year + strLink + month + strLink + day;
this.dateList.push(year + strLink + month + strLink + '01');
this.dateList.push(year + strLink + month + strLink + day);
this.getEmployeeList(); this.getEmployeeList();
this.getData(); this.getData();
}, },
...@@ -191,7 +234,7 @@ ...@@ -191,7 +234,7 @@
getEmployeeList() { getEmployeeList() {
var qMsg = { var qMsg = {
IsLeave: 1, IsLeave: 1,
Dept_Id: 0, Dept_Id: 4
}; };
queryEmployee(qMsg).then(res => { queryEmployee(qMsg).then(res => {
this.EmployeeList = res.Data; this.EmployeeList = res.Data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment