Commit 8c07820018ad060c9cfd18cdbb412a56d9c32957
1 parent
75d6ae05
物业相关功能基本测试完成
Showing
3 changed files
with
12 additions
and
12 deletions
src/views/community/adminRoomList.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | </div> |
| 8 | 8 | <div class="margin-top-xs margin-left-sm flex-grow"> |
| 9 | 9 | <el-card class="box-card"> |
| 10 | - <div slot="header" class="clearfix"> | |
| 10 | + <div slot="header" class="flex justify-between"> | |
| 11 | 11 | <span>{{ $t('adminRoom.search.title') }}</span> |
| 12 | 12 | </div> |
| 13 | 13 | <el-row :gutter="20"> |
| ... | ... | @@ -38,7 +38,7 @@ |
| 38 | 38 | </el-card> |
| 39 | 39 | |
| 40 | 40 | <el-card class="box-card margin-top"> |
| 41 | - <div slot="header" class="clearfix"> | |
| 41 | + <div slot="header" class="flex justify-between"> | |
| 42 | 42 | <span>{{ $t('adminRoom.list.title') }}</span> |
| 43 | 43 | </div> |
| 44 | 44 | <div class="table-wrapper"> | ... | ... |
src/views/iot/adminChargeMachineList.vue
| 1 | 1 | <template> |
| 2 | 2 | <div class="admin-charge-machine-container"> |
| 3 | - <el-row> | |
| 3 | + <el-row :gutter="20"> | |
| 4 | 4 | <el-col :span="4"> |
| 5 | 5 | <select-admin-community ref="selectCommunity" @changeCommunity="handleCommunityChange"></select-admin-community> |
| 6 | 6 | </el-col> |
| 7 | 7 | <el-col :span="20"> |
| 8 | 8 | <el-card class="box-card"> |
| 9 | - <div slot="header" class="clearfix"> | |
| 9 | + <div slot="header" class="flex justify-between"> | |
| 10 | 10 | <span>{{ $t('adminChargeMachine.search.title') }}</span> |
| 11 | 11 | </div> |
| 12 | 12 | <el-row :gutter="20"> |
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 | </el-card> |
| 28 | 28 | |
| 29 | 29 | <el-card class="box-card" style="margin-top: 20px;"> |
| 30 | - <div slot="header" class="clearfix"> | |
| 30 | + <div slot="header" class="flex justify-between"> | |
| 31 | 31 | <span>{{ $t('adminChargeMachine.list.title') }}</span> |
| 32 | 32 | </div> |
| 33 | 33 | <el-table v-loading="loading" :data="tableData" border style="width: 100%"> | ... | ... |
src/views/iot/adminChargeOrderList.vue
| ... | ... | @@ -6,10 +6,10 @@ |
| 6 | 6 | </el-col> |
| 7 | 7 | <el-col :span="20"> |
| 8 | 8 | <el-card class="search-card"> |
| 9 | - <div slot="header" class="clearfix flex justify-between"> | |
| 9 | + <div slot="header" class="flex justify-between"> | |
| 10 | 10 | <span>{{ $t('adminChargeOrder.search.title') }}</span> |
| 11 | 11 | </div> |
| 12 | - <el-form :inline="true" :model="searchForm" class="search-form"> | |
| 12 | + <el-form :inline="true" :model="searchForm" class="search-form text-left"> | |
| 13 | 13 | <el-form-item :label="$t('adminChargeOrder.search.orderId')"> |
| 14 | 14 | <el-input v-model="searchForm.orderId" :placeholder="$t('adminChargeOrder.search.orderIdPlaceholder')" |
| 15 | 15 | clearable /> |
| ... | ... | @@ -30,11 +30,8 @@ |
| 30 | 30 | <el-input v-model="searchForm.portName" :placeholder="$t('adminChargeOrder.search.portNamePlaceholder')" |
| 31 | 31 | clearable /> |
| 32 | 32 | </el-form-item> |
| 33 | - <el-form-item> | |
| 34 | - <el-button type="primary" @click="handleSearch">{{ $t('common.search') }}</el-button> | |
| 35 | - </el-form-item> | |
| 36 | - </el-form> | |
| 37 | - <el-form :inline="true" :model="searchForm" class="search-form"> | |
| 33 | + | |
| 34 | + | |
| 38 | 35 | <el-form-item :label="$t('adminChargeOrder.search.state')"> |
| 39 | 36 | <el-select v-model="searchForm.state" :placeholder="$t('adminChargeOrder.search.statePlaceholder')" |
| 40 | 37 | clearable> |
| ... | ... | @@ -49,6 +46,9 @@ |
| 49 | 46 | <el-date-picker v-model="searchForm.queryEndTime" type="datetime" |
| 50 | 47 | :placeholder="$t('adminChargeOrder.search.endTimePlaceholder')" value-format="yyyy-MM-dd HH:mm:ss" /> |
| 51 | 48 | </el-form-item> |
| 49 | + <el-form-item> | |
| 50 | + <el-button type="primary" @click="handleSearch">{{ $t('common.search') }}</el-button> | |
| 51 | + </el-form-item> | |
| 52 | 52 | </el-form> |
| 53 | 53 | </el-card> |
| 54 | 54 | ... | ... |