|
|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
- <section>
|
|
|
- <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff">
|
|
|
+ <section id="section">
|
|
|
+ <div class="sidebars" ref="sidebars" :style="'width: 180px;display: block;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">
|
|
|
@@ -87,7 +87,7 @@
|
|
|
<!-- 上面部分 -->
|
|
|
<div v-if="!displayTable && apk == false" class="tops">
|
|
|
<!-- 公共 -->
|
|
|
- <div class="ctons">
|
|
|
+ <div class="ctons" :style="'width: '+kuanBl+'px'">
|
|
|
<!-- 表单 -->
|
|
|
<el-form ref="addForm" :model="addForm" label-width="80px" :rules="addFormRules">
|
|
|
<!-- 请假类型 -->
|
|
|
@@ -172,10 +172,10 @@
|
|
|
<!-- 下面部分 -->
|
|
|
<div v-if="displayTable && apk == false" class="tops">
|
|
|
<!-- 公共 -->
|
|
|
- <div class="ctons">
|
|
|
+ <div class="ctons" :style="'width: '+kuanBl+'px'">
|
|
|
<div class="flex">
|
|
|
<div>
|
|
|
- <el-select v-model="ownerIds" placeholder="请选择请假人" clearable @change="chufas()" style="width: 180px" size="small" v-show="permissions.leaveAll" filterable="true">
|
|
|
+ <el-select v-model="ownerIds" placeholder="请选择请假人" clearable @change="chufas()" style="width: 160px" size="small" v-show="permissions.leaveAll" filterable="true">
|
|
|
<span v-for="(item, index) in users" :key="index">
|
|
|
<el-option :label="item.name" :value="item.id"></el-option>
|
|
|
</span>
|
|
|
@@ -183,7 +183,7 @@
|
|
|
</div>
|
|
|
<div>
|
|
|
<span style="color: #606266">请假类型</span>
|
|
|
- <el-select v-model="type" placeholder="请选择请假类型" clearable @change="chufas()" style="width: 180px;" size="small" filterable="true">
|
|
|
+ <el-select v-model="type" placeholder="请选择请假类型" clearable @change="chufas()" style="width: 160px;" size="small" filterable="true">
|
|
|
<span v-for="(item, index) in typess" :key="index">
|
|
|
<el-option :label="item.name" :value="item.id"></el-option>
|
|
|
</span>
|
|
|
@@ -191,12 +191,12 @@
|
|
|
</div>
|
|
|
<div>
|
|
|
<span style="color: #606266">请假状态</span>
|
|
|
- <el-select v-if="falg == 0" v-model="code" placeholder="请选择请假状态" clearable @change="chufas()" size="small" style="width: 180px" filterable="true">
|
|
|
+ <el-select v-if="falg == 0" v-model="code" placeholder="请选择请假状态" clearable @change="chufas()" size="small" style="width: 160px" filterable="true">
|
|
|
<span v-for="(item, index) in statuss" :key="index">
|
|
|
<el-option :label="item.name" :value="item.id"></el-option>
|
|
|
</span>
|
|
|
</el-select>
|
|
|
- <el-select v-if="falg == 1" disabled v-model="code" placeholder="请选择请假类型" clearable @change="chufas()" size="small" style="width: 180px" filterable="true">
|
|
|
+ <el-select v-if="falg == 1" disabled v-model="code" placeholder="请选择请假类型" clearable @change="chufas()" size="small" style="width: 160px" filterable="true">
|
|
|
<span v-for="(item, index) in statuss" :key="index">
|
|
|
<el-option :label="item.name" :value="item.id"></el-option>
|
|
|
</span>
|
|
|
@@ -291,7 +291,7 @@
|
|
|
<!-- 统计部分 -->
|
|
|
<div v-if="displayTable && apk && apk2 == 4" class="tops">
|
|
|
<!-- 公共 -->
|
|
|
- <div class="ctons">
|
|
|
+ <div class="ctons" :style="'width: '+kuanBl+'px'">
|
|
|
<div style="display: flex;align-items: center;padding-bottom: 20px;border-bottom: 1px solid #f2f2f2">
|
|
|
<div style="display: inline-block;width: 350px">
|
|
|
<el-input style="float:left;" v-model="keyword" class="input-with-select" placeholder="请输入人员搜索" clearable="true" size="small">
|
|
|
@@ -356,7 +356,7 @@
|
|
|
<!-- 审批流 -->
|
|
|
<div v-if="displayTable && apk && apk2 == 5" class="tops">
|
|
|
|
|
|
- <div class="ctons">
|
|
|
+ <div class="ctons" :style="'width: '+kuanBl+'px'">
|
|
|
<el-col :span="6" >
|
|
|
<el-scrollbar style="height:100%;border:1px solid #dddddd;margin-left:15px;" >
|
|
|
<div class="tree" :style="'height:'+ (tableHeight-120) + 'px'">
|
|
|
@@ -420,7 +420,7 @@
|
|
|
</div>
|
|
|
<!-- 年假管理 -->
|
|
|
<div v-if="displayTable && apk && apk2 == 6" class="tops">
|
|
|
- <div class="ctons">
|
|
|
+ <div class="ctons" :style="'width: '+kuanBl+'px'">
|
|
|
<div style="display: flex;align-items: center;padding-bottom: 20px;border-bottom: 1px solid #f2f2f2">
|
|
|
<div style="display: inline-block;width: 18%;margin-left:1%">
|
|
|
<el-button size="small" @click="changeAltime(0)">批量设置</el-button>
|
|
|
@@ -496,7 +496,7 @@
|
|
|
|
|
|
<div v-if="displayTable && apk && apk2 == 8" class="tops">
|
|
|
<!-- 公共 -->
|
|
|
- <div class="ctons">
|
|
|
+ <div class="ctons" :style="'width: '+ kuanBl +'px'">
|
|
|
<div class="flex">
|
|
|
<div>
|
|
|
<span>请假类型</span>
|
|
|
@@ -821,12 +821,17 @@ export default {
|
|
|
departmentOptions: [],
|
|
|
departmentSel: [],
|
|
|
userSelId: '',
|
|
|
- synchronizeLoading: false
|
|
|
+ synchronizeLoading: false,
|
|
|
+ kuanBl: 0,
|
|
|
+ hubs: 0
|
|
|
};
|
|
|
},
|
|
|
computed: {},
|
|
|
watch: {},
|
|
|
created() {
|
|
|
+ let widTHBul = document.documentElement.clientWidth - 440
|
|
|
+ this.kuanBl = widTHBul
|
|
|
+ this.hubs = document.documentElement.clientHeight || document.body.clientHeight
|
|
|
let height = window.innerHeight;
|
|
|
this.tableHeight = height - 195;
|
|
|
const that = this;
|
|
|
@@ -838,19 +843,32 @@ export default {
|
|
|
},
|
|
|
|
|
|
mounted() {
|
|
|
+ // this.watchSize()
|
|
|
if(this.isDingding){
|
|
|
this.bills(false,2)
|
|
|
this.staffs(7,['7'])
|
|
|
this.getUsers()
|
|
|
}else{
|
|
|
this.getUsers() // 获取人员信息
|
|
|
- this.getDepartment();
|
|
|
- this.getAl();
|
|
|
- this.getApproverList()
|
|
|
+ this.getDepartment();
|
|
|
+ this.getAl();
|
|
|
+ this.getApproverList()
|
|
|
}
|
|
|
},
|
|
|
filters: {},
|
|
|
methods: {
|
|
|
+ // 监听元素
|
|
|
+ // watchSize() {
|
|
|
+ // const _this = this;
|
|
|
+ // var erd = elementResizeDetectorMaker();
|
|
|
+ // erd.listenTo(this.$refs.section, (element) => { // 这里的this.$refs.fan指定要监听的元素对象，对应的是<div ref="fan"></div>
|
|
|
+ // var width = element.offsetWidth;
|
|
|
+ // var height = element.offsetHeight;
|
|
|
+ // _this.$nextTick(() => { // 这里填写监听改变后的操做
|
|
|
+ // console.log('触发监听')
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ // },
|
|
|
// 从钉钉同步假期剩余表
|
|
|
listSynchronize(){
|
|
|
this.synchronizeLoading = true
|
|
|
@@ -2018,10 +2036,10 @@ export default {
|
|
|
position: absolute;
|
|
|
background: #f7f7f7;
|
|
|
box-sizing: border-box;
|
|
|
- padding: 20px 0 0 220px;
|
|
|
+ padding: 20px 0 0 200px;
|
|
|
}
|
|
|
.ctons {
|
|
|
- width: 86%;
|
|
|
+ /* width: 86%; */
|
|
|
height: 92%;
|
|
|
overflow: hidden;
|
|
|
background: #fff;
|
Lijy