Browse Source

Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

seyason 3 years ago
parent
commit
a0a70ac2fa
1 changed files with 8 additions and 7 deletions
  1. 8 7
      fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

+ 8 - 7
fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -389,12 +389,15 @@
     <div v-if="displayTable && apk && apk2 == 6" class="tops">
       <div class="ctons">
         <div style="display: flex;align-items: center;padding-bottom: 20px;border-bottom: 1px solid #f2f2f2">
-            <div style="display: inline-block;width: 350px">
+            <div style="display: inline-block;width: 18%;margin-left:1%">
+              <el-button size="small" @click="changeAltime(0)" type="primary">批量设置</el-button>
+            </div>
+            <div style="display: inline-block;width: 30%">
               <el-input style="float:left;" v-model="keywordAl" class="input-with-select" placeholder="请输入人员姓名搜索" clearable="true" size="small" @clear="clearsearchAl()">
                   <el-button slot="append" @click="searchAl()" icon="el-icon-search"></el-button>
               </el-input>
             </div>
-            <div style="display: inline-block;width: 340px;margin-left:100px">
+            <div style="display: inline-block;width: 300px;margin-left:14%">
               <span style="display: inline-block;margin: 0 15px 0 20px;color: rgb(96, 98, 102);">按部门筛选</span>
               <el-cascader
                 ref="selectAl"
@@ -410,12 +413,10 @@
                 :show-all-levels="false">
               </el-cascader>
             </div>
-            <div style="display: inline-block;width: 224px;margin-left:100px">
-              <el-button size="small" @click="changeAltime(0)" type="primary">批量设置</el-button>
-            </div>
+            
         </div>
         <div>
-          <el-table v-loading="loading" :data="iAlDataS" height="780px" style="width: 99%;" @selection-change="selPchg">
+          <el-table v-loading="loading" :data="iAlDataS" height="480" style="width: 99%;" @selection-change="selPchg">
             <el-table-column type="selection"></el-table-column>
               <el-table-column prop="userName" label="姓名" width="200">
                 <template slot-scope="scope">
@@ -452,7 +453,7 @@
       </div>
       <el-dialog title="请设置年假时限" v-if="Alshow" :visible.sync="Alshow" width="500px">
         <el-form label-width="120px">
-          <el-form-item label="设置年假天数" >
+          <el-form-item label="设置每年年假天数" >
             <el-input v-model="Alchange.yearDays" type="number" min="0" placeholder="请输入天数"></el-input>
           </el-form-item>
         </el-form>