ggooalice 2 years ago
parent
commit
299c0af1ef

+ 7 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -27,11 +27,14 @@
                 <div class="grand flex">
                     <div class="left-laowang" style="flex: 0 0 210px;overflow: hidden;" v-if="permissions.reportsCompany || user.manageDeptId != 0 || permissions.reportsDept">
                         <div v-if="permissions.reportsCompany || user.manageDeptId != 0 || permissions.reportsDept" :style="'overflow-x:hidden;overflow-y:auto;height:' + tableHeight + 'px;'">
-                            <el-input placeholder="请输入姓名" size="small" style="width: 100%;box-sizing: border-box;padding-right: 10px;margin-bottom:10px" v-model="seluserText" clearable>
-                                <el-button slot="append" icon="el-icon-search" @click="seluserforText()"></el-button>
-                            </el-input>
+                            <!-- <div style="width: 100%;box-sizing: border-box;padding-right: 10px;margin-bottom:10px">
+                            
+                            </div> -->
                             <div style="width: 100%;box-sizing: border-box;padding-right: 10px;">
-                                <el-select v-model="selectState" size="small" @change="stateChange" style="100%">
+                                <el-input placeholder="请输入姓名" size="small" v-model="seluserText" style="width:100%;margin-bottom:10px" clearable>
+                                    <el-button slot="append" icon="el-icon-search" @click="seluserforText()"></el-button>
+                                </el-input>
+                                <el-select v-model="selectState" size="small" @change="stateChange" style="width:100%">
                                 <el-option value="-1" :label="$t('state.allState')">{{$t('state.allState')}}</el-option>
                                 <el-option value="-2" :label="$t('state.DidNotFillIn')">{{$t('state.DidNotFillIn')}}</el-option>
                                 <el-option value="1" :label="$t('state.alreadyPassed')">{{$t('state.alreadyPassed')}}</el-option>