Lijy %!s(int64=2) %!d(string=hai) anos
pai
achega
787e06cac4

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -298,7 +298,7 @@
             <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">
-                    <el-input style="float:left;" v-model="searchWord" class="input-with-select" :placeholder="$t('pleaseenterstaffsearch')" clearable="true" size="small">
+                    <el-input style="float:left;" v-if="user.userNameNeedTranslate != 1" v-model="searchWord" class="input-with-select" :placeholder="$t('pleaseenterstaffsearch')" clearable="true" size="small">
                         <el-button slot="append" @click="statistical()" icon="el-icon-search"></el-button>
                     </el-input>
                 </div>

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

@@ -470,12 +470,12 @@
             <div style="display: inline-block;width: 18%;margin-left:1%">
               <el-button size="small" @click="changeAltime(0)">{{ $t('volumeset') }}</el-button>
             </div>
-            <div style="display: inline-block;width: 26%">
-              <el-input style="float:left;" v-model="keywordAl" v-if="user.userNameNeedTranslate != 1" class="input-with-select" :placeholder="$t('pleaseenterhepersonnamesearch')" clearable="true" size="small" @clear="clearsearchAl()">
+            <div style="display: inline-block;width: 26%" v-if="user.userNameNeedTranslate != 1">
+              <el-input style="float:left;" v-model="keywordAl" class="input-with-select" :placeholder="$t('pleaseenterhepersonnamesearch')" 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: 32%;margin-left:12%">
+            <div style="display: inline-block;width: 32%;">
               <span style="display: inline-block;margin: 0 15px 0 20px;color: rgb(96, 98, 102);">{{ $t('screeningDepartment') }}</span>
               <el-cascader
                 ref="selectAl"