ggooalice пре 2 година
родитељ
комит
d4469a1b86

+ 12 - 8
fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -158,7 +158,7 @@
         <!-- 出差列表筛选 -->
                 <div class="flex">
                     <div>
-                        <el-select v-if="user.userNameNeedTranslate != 1" v-model="ownerIds" :placeholder="$t('pleaseselectbusinesstraveler')" clearable @change="billss(1)" style="width: 140px" size="small" filterable="true">
+                        <el-select v-if="user.userNameNeedTranslate != 1" v-model="ownerIds" :placeholder="$t('pleaseselectbusinesstraveler')" clearable @change="billss(1)" style="width: 140px;margin-left:10px" size="small" filterable="true">
                             <el-option
                             v-for="item in users"
                             :key="item.id"
@@ -168,8 +168,9 @@
                         </el-select>
                         <selectCat v-if="user.userNameNeedTranslate == 1" :size="'small'" :subject="users" :subjectId="ownerIds" :clearable="true" :filterable="false" :distinction="'1'" :other="'1'" @selectCal="selectCal"></selectCat>
                     </div>
-                    <div><span style="color: #606266">{{ $t('traffictools') }}</span>
-                        <el-select v-model="type" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="billss(1)" style="width: 140px;" size="small" filterable="true">
+                    <div>
+                        <!-- <span style="color: #606266">{{ $t('traffictools') }}</span> -->
+                        <el-select v-model="type" :placeholder="$t('defaultText.pleaseChoose') + $t('traffictools')" clearable @change="billss(1)" style="width: 140px;margin-left:10px" size="small" filterable="true">
                             <el-option :label="$t('plane')" :value="0"></el-option>
                             <el-option :label="$t('train')" :value="1"></el-option>
                             <el-option :label="$t('car')" :value="2"></el-option>
@@ -177,8 +178,9 @@
                             <el-option :label="$t('leave.other')" :value="4"></el-option>
                         </el-select>
                     </div>
-                    <div><span style="color: #606266">{{ $t('businessstate') }}</span>
-                        <el-select :disabled="falg" v-model="code" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="billss(1)" size="small" style="width: 140px" filterable="true">
+                    <div>
+                        <!-- <span style="color: #606266">{{ $t('businessstate') }}</span> -->
+                        <el-select :disabled="falg" v-model="code" :placeholder="$t('defaultText.pleaseChoose') + $t('businessstate')" clearable @change="billss(1)" size="small" style="width: 140px;margin-left:10px" filterable="true">
                             <el-option :label="$t('state.approved')" :value="0"></el-option>
                             <el-option :label="$t('state.WaitingAudit')" :value="1"></el-option>
                             <el-option :label="$t('btn.rejected')" :value="2"></el-option>
@@ -186,8 +188,9 @@
                         </el-select>
                         
                     </div>
-                    <div><span style="color: #606266">{{ $t('message.period') }}</span>
-                        <el-date-picker v-model="createDate" type="daterange" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" @change="billss(1)" value-format="yyyy-MM-dd" :placeholder="$t('optiondate')" size="small" clearable style="width:280px"></el-date-picker>
+                    <div>
+                        <!-- <span style="color: #606266">{{ $t('message.period') }}</span> -->
+                        <el-date-picker v-model="createDate" type="daterange" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" @change="billss(1)" value-format="yyyy-MM-dd" :placeholder="$t('optiondate')" size="small" clearable style="width:280px;margin-left:10px"></el-date-picker>
                     </div>
                     <div style="line-height: 32px;margin: 0 20px;">
                         <el-checkbox v-model="isOverTendays" @change="checkboxChange">{{ $t('morethantendays') }}</el-checkbox>
@@ -296,7 +299,7 @@
         <!-- 出差统计 -->
         <div class="tops" v-if="displayTable && apk == 1">
             <div class="ctons">
-            <div style="display: flex;align-items: center;padding-bottom: 20px;border-bottom: 1px solid #f2f2f2">
+            <div style="display: flex;align-items: center;justify-content: flex-start;padding-bottom: 20px;border-bottom: 1px solid #f2f2f2">
                 <div style="display: inline-block;width: 350px">
                     <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>
@@ -1903,6 +1906,7 @@ export default {
         }
         .flex {
             display: flex;
+            justify-content: flex-start;
             padding: 0 0 20px 0;
             border-bottom: 1px solid #f2f2f2;
             span {