Commit dc3c5a73caf5826c1c2dc5bc62a9b7c7e80ba7df
1 parent
96361cb7
优化代码
Showing
8 changed files
with
89 additions
and
160 deletions
src/components/owner/SearchOwner.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog | ||
| 3 | - :title="$t('searchOwner.title')" | ||
| 4 | - :visible.sync="visible" | ||
| 5 | - width="80%" | ||
| 6 | - > | 2 | + <el-dialog :title="$t('searchOwner.title')" :visible.sync="visible" width="80%"> |
| 7 | 3 | ||
| 8 | - <el-row :gutter="20"> | ||
| 9 | - <el-col :span="8"> | ||
| 10 | - <el-input | ||
| 11 | - v-model="searchOwnerInfo.roomName" | ||
| 12 | - :placeholder="$t('searchOwner.roomPlaceholder')" | ||
| 13 | - clearable | ||
| 14 | - ></el-input> | ||
| 15 | - </el-col> | ||
| 16 | - <el-col :span="8"> | ||
| 17 | - <el-input | ||
| 18 | - v-model="searchOwnerInfo._currentOwnerName" | ||
| 19 | - :placeholder="$t('searchOwner.ownerPlaceholder')" | ||
| 20 | - clearable | ||
| 21 | - ></el-input> | ||
| 22 | - </el-col> | ||
| 23 | - <el-col :span="8"> | ||
| 24 | - <el-button type="primary" @click="searchOwners"> | ||
| 25 | - <i class="el-icon-search"></i>{{ $t('common.search') }} | ||
| 26 | - </el-button> | ||
| 27 | - <el-button type="primary" @click="resetOwners"> | ||
| 28 | - {{ $t('common.reset') }} | ||
| 29 | - </el-button> | ||
| 30 | - </el-col> | ||
| 31 | - </el-row> | 4 | + <el-row :gutter="20"> |
| 5 | + <el-col :span="8"> | ||
| 6 | + <el-input v-model="searchOwnerInfo.roomName" :placeholder="$t('searchOwner.roomPlaceholder')" | ||
| 7 | + clearable></el-input> | ||
| 8 | + </el-col> | ||
| 9 | + <el-col :span="8"> | ||
| 10 | + <el-input v-model="searchOwnerInfo._currentOwnerName" :placeholder="$t('searchOwner.ownerPlaceholder')" | ||
| 11 | + clearable></el-input> | ||
| 12 | + </el-col> | ||
| 13 | + <el-col :span="8"> | ||
| 14 | + <el-button type="primary" @click="searchOwners"> | ||
| 15 | + <i class="el-icon-search"></i>{{ $t('common.search') }} | ||
| 16 | + </el-button> | ||
| 17 | + <el-button type="primary" @click="resetOwners"> | ||
| 18 | + {{ $t('common.reset') }} | ||
| 19 | + </el-button> | ||
| 20 | + </el-col> | ||
| 21 | + </el-row> | ||
| 32 | 22 | ||
| 33 | - <div class="table-responsive" style="margin-top:15px"> | ||
| 34 | - <el-table :data="searchOwnerInfo.owners" border> | ||
| 35 | - <el-table-column prop="memberId" :label="$t('searchOwner.ownerId')" align="center"></el-table-column> | ||
| 36 | - <el-table-column prop="name" :label="$t('searchOwner.name')" align="center"></el-table-column> | ||
| 37 | - <el-table-column prop="personTypeName" :label="$t('searchOwner.personType')" align="center"></el-table-column> | ||
| 38 | - <el-table-column prop="personRoleName" :label="$t('searchOwner.personRole')" align="center"></el-table-column> | ||
| 39 | - <el-table-column prop="idCard" :label="$t('searchOwner.idCard')" align="center"></el-table-column> | ||
| 40 | - <el-table-column prop="link" :label="$t('searchOwner.contact')" align="center"></el-table-column> | ||
| 41 | - <el-table-column :label="$t('common.operation')" align="center" width="100"> | ||
| 42 | - <template slot-scope="scope"> | ||
| 43 | - <el-button | ||
| 44 | - type="primary" | ||
| 45 | - size="mini" | ||
| 46 | - @click="chooseOwner(scope.row)" | ||
| 47 | - >{{ $t('common.select') }}</el-button> | ||
| 48 | - </template> | ||
| 49 | - </el-table-column> | ||
| 50 | - </el-table> | ||
| 51 | - </div> | 23 | + <div class="table-responsive" style="margin-top:15px"> |
| 24 | + <el-table :data="searchOwnerInfo.owners" border> | ||
| 25 | + <el-table-column prop="memberId" :label="$t('searchOwner.ownerId')" align="center"></el-table-column> | ||
| 26 | + <el-table-column prop="name" :label="$t('searchOwner.name')" align="center"></el-table-column> | ||
| 27 | + <el-table-column prop="personTypeName" :label="$t('searchOwner.personType')" align="center"></el-table-column> | ||
| 28 | + <el-table-column prop="personRoleName" :label="$t('searchOwner.personRole')" align="center"></el-table-column> | ||
| 29 | + <el-table-column prop="idCard" :label="$t('searchOwner.idCard')" align="center"></el-table-column> | ||
| 30 | + <el-table-column prop="link" :label="$t('searchOwner.contact')" align="center"></el-table-column> | ||
| 31 | + <el-table-column :label="$t('common.operation')" align="center" width="100"> | ||
| 32 | + <template slot-scope="scope"> | ||
| 33 | + <el-button type="primary" size="mini" @click="chooseOwner(scope.row)">{{ $t('common.select') }}</el-button> | ||
| 34 | + </template> | ||
| 35 | + </el-table-column> | ||
| 36 | + </el-table> | ||
| 37 | + </div> | ||
| 52 | 38 | ||
| 53 | - <el-pagination | ||
| 54 | - @size-change="handleSizeChange" | ||
| 55 | - @current-change="handleCurrentChange" | ||
| 56 | - :current-page="page.current" | ||
| 57 | - :page-sizes="[10, 20, 30]" | ||
| 58 | - :page-size="page.size" | ||
| 59 | - layout="total, sizes, prev, pager, next, jumper" | ||
| 60 | - :total="page.total" | ||
| 61 | - style="margin-top: 20px;" | ||
| 62 | - ></el-pagination> | 39 | + <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page.current" |
| 40 | + :page-sizes="[10, 20, 30]" :page-size="page.size" layout="total, sizes, prev, pager, next, jumper" | ||
| 41 | + :total="page.total" style="margin-top: 20px;"></el-pagination> | ||
| 63 | 42 | ||
| 64 | </el-dialog> | 43 | </el-dialog> |
| 65 | </template> | 44 | </template> |
| @@ -102,7 +81,7 @@ export default { | @@ -102,7 +81,7 @@ export default { | ||
| 102 | roomName: this.searchOwnerInfo.roomName.trim(), | 81 | roomName: this.searchOwnerInfo.roomName.trim(), |
| 103 | ownerTypeCd: this.searchOwnerInfo.ownerTypeCd | 82 | ownerTypeCd: this.searchOwnerInfo.ownerTypeCd |
| 104 | } | 83 | } |
| 105 | - | 84 | + |
| 106 | const res = await queryOwners(params) | 85 | const res = await queryOwners(params) |
| 107 | this.searchOwnerInfo.owners = res.data | 86 | this.searchOwnerInfo.owners = res.data |
| 108 | this.page.total = res.records | 87 | this.page.total = res.records |
src/views/community/communitySpaceConfirmList.vue
| @@ -58,7 +58,7 @@ | @@ -58,7 +58,7 @@ | ||
| 58 | 58 | ||
| 59 | <el-col :span="18"> | 59 | <el-col :span="18"> |
| 60 | <el-card class="search-card"> | 60 | <el-card class="search-card"> |
| 61 | - <div slot="header" class="clearfix"> | 61 | + <div slot="header" class="flex justify-between"> |
| 62 | <span>{{ $t('communitySpaceConfirm.searchCondition') }}</span> | 62 | <span>{{ $t('communitySpaceConfirm.searchCondition') }}</span> |
| 63 | </div> | 63 | </div> |
| 64 | <el-row :gutter="20"> | 64 | <el-row :gutter="20"> |
src/views/community/communitySpaceManageList.vue
| 1 | <template> | 1 | <template> |
| 2 | - <div class="community-space-manage"> | ||
| 3 | - <el-row :gutter="20"> | 2 | + <div class="community-space-manage padding"> |
| 3 | + <el-row :gutter="10"> | ||
| 4 | <el-col :span="4"> | 4 | <el-col :span="4"> |
| 5 | <el-card class="venue-list"> | 5 | <el-card class="venue-list"> |
| 6 | <div class="button-group"> | 6 | <div class="button-group"> |
| @@ -295,8 +295,8 @@ export default { | @@ -295,8 +295,8 @@ export default { | ||
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | .venue-items li.active { | 297 | .venue-items li.active { |
| 298 | - background-color: #ecf5ff; | ||
| 299 | - color: #409eff; | 298 | + background-color:#409eff; |
| 299 | + color: #ecf5ff; | ||
| 300 | font-weight: bold; | 300 | font-weight: bold; |
| 301 | } | 301 | } |
| 302 | 302 |
src/views/community/reportCommunitySpaceList.vue
| 1 | <template> | 1 | <template> |
| 2 | <div class="app-container"> | 2 | <div class="app-container"> |
| 3 | - <el-row :gutter="20"> | 3 | + <el-row :gutter="10"> |
| 4 | <el-col :span="4"> | 4 | <el-col :span="4"> |
| 5 | <el-card class="box-card"> | 5 | <el-card class="box-card"> |
| 6 | <div class="filter-container"> | 6 | <div class="filter-container"> |
| @@ -9,8 +9,8 @@ | @@ -9,8 +9,8 @@ | ||
| 9 | </div> | 9 | </div> |
| 10 | <el-scrollbar class="venue-scrollbar"> | 10 | <el-scrollbar class="venue-scrollbar"> |
| 11 | <ul class="venue-items"> | 11 | <ul class="venue-items"> |
| 12 | - <li v-for="(item, index) in venues" :key="index" :class="{ 'active': queryParams.venueId === item.venueId }" | ||
| 13 | - @click="selectVenue(item)"> | 12 | + <li v-for="(item, index) in venues" :key="index" |
| 13 | + :class="{ 'active': queryParams.venueId === item.venueId }" @click="selectVenue(item)"> | ||
| 14 | {{ item.name }} | 14 | {{ item.name }} |
| 15 | </li> | 15 | </li> |
| 16 | </ul> | 16 | </ul> |
| @@ -21,7 +21,8 @@ | @@ -21,7 +21,8 @@ | ||
| 21 | <el-col :span="20"> | 21 | <el-col :span="20"> |
| 22 | <el-card class="box-card"> | 22 | <el-card class="box-card"> |
| 23 | <el-table :data="tableData" border style="width: 100%"> | 23 | <el-table :data="tableData" border style="width: 100%"> |
| 24 | - <el-table-column prop="time" :label="$t('reportCommunitySpace.appointmentTime')" width="100" align="center" /> | 24 | + <el-table-column prop="time" :label="$t('reportCommunitySpace.appointmentTime')" width="100" |
| 25 | + align="center" /> | ||
| 25 | <template v-if="communitySpaces.length > 0"> | 26 | <template v-if="communitySpaces.length > 0"> |
| 26 | <el-table-column v-for="space in communitySpaces" :key="space.spaceId" :label="space.name" align="center"> | 27 | <el-table-column v-for="space in communitySpaces" :key="space.spaceId" :label="space.name" align="center"> |
| 27 | <template slot-scope="{ $index }"> | 28 | <template slot-scope="{ $index }"> |
| @@ -186,8 +187,8 @@ export default { | @@ -186,8 +187,8 @@ export default { | ||
| 186 | } | 187 | } |
| 187 | 188 | ||
| 188 | .venue-items li.active { | 189 | .venue-items li.active { |
| 189 | - background-color: #ecf5ff; | ||
| 190 | - color: #409eff; | 190 | + background-color: #409eff; |
| 191 | + color:#ecf5ff ; | ||
| 191 | font-weight: bold; | 192 | font-weight: bold; |
| 192 | } | 193 | } |
| 193 | 194 |
src/views/dev/cacheList.vue
| 1 | <template> | 1 | <template> |
| 2 | - <div class="cache-container"> | 2 | + <div class="cache-container padding"> |
| 3 | <div class="list-wrapper"> | 3 | <div class="list-wrapper"> |
| 4 | <div class="list-header"> | 4 | <div class="list-header"> |
| 5 | <div class="list-title">{{ $t('cache.list.title') }}</div> | 5 | <div class="list-title">{{ $t('cache.list.title') }}</div> |
src/views/fee/addOwnerInvoiceList.vue
| 1 | <template> | 1 | <template> |
| 2 | <div class="app-container"> | 2 | <div class="app-container"> |
| 3 | <el-card shadow="never"> | 3 | <el-card shadow="never"> |
| 4 | - <div slot="header" class="clearfix"> | 4 | + <div slot="header" class="flex justify-between"> |
| 5 | <span>{{ $t('addOwnerInvoice.title') }}</span> | 5 | <span>{{ $t('addOwnerInvoice.title') }}</span> |
| 6 | - <el-button class="float-right" type="text" @click="$router.go(-1)"> | 6 | + <el-button size="small" type="text" @click="$router.go(-1)"> |
| 7 | {{ $t('addOwnerInvoice.back') }} | 7 | {{ $t('addOwnerInvoice.back') }} |
| 8 | </el-button> | 8 | </el-button> |
| 9 | </div> | 9 | </div> |
| 10 | 10 | ||
| 11 | - <el-form ref="form" :model="formData" :rules="rules" label-width="150px" label-position="right"> | 11 | + <el-form ref="form" :model="formData" :rules="rules" class="text-left" label-width="150px" label-position="right"> |
| 12 | <el-form-item :label="$t('addOwnerInvoice.owner')" prop="ownerName"> | 12 | <el-form-item :label="$t('addOwnerInvoice.owner')" prop="ownerName"> |
| 13 | <el-input v-model="formData.ownerName" :placeholder="$t('addOwnerInvoice.placeholder.owner')" disabled | 13 | <el-input v-model="formData.ownerName" :placeholder="$t('addOwnerInvoice.placeholder.owner')" disabled |
| 14 | style="width: 70%" /> | 14 | style="width: 70%" /> |
| @@ -54,7 +54,7 @@ | @@ -54,7 +54,7 @@ | ||
| 54 | :placeholder="$t('addOwnerInvoice.placeholder.remarks')" style="width: 100%" /> | 54 | :placeholder="$t('addOwnerInvoice.placeholder.remarks')" style="width: 100%" /> |
| 55 | </el-form-item> | 55 | </el-form-item> |
| 56 | 56 | ||
| 57 | - <el-form-item> | 57 | + <el-form-item class="text-right"> |
| 58 | <el-button type="primary" @click="submitForm"> | 58 | <el-button type="primary" @click="submitForm"> |
| 59 | {{ $t('addOwnerInvoice.save') }} | 59 | {{ $t('addOwnerInvoice.save') }} |
| 60 | </el-button> | 60 | </el-button> |
src/views/owner/addOwnerCommitteeList.vue
| @@ -11,29 +11,17 @@ | @@ -11,29 +11,17 @@ | ||
| 11 | </el-button> | 11 | </el-button> |
| 12 | </div> | 12 | </div> |
| 13 | </div> | 13 | </div> |
| 14 | - <el-form | ||
| 15 | - ref="form" | ||
| 16 | - :model="addOwnerCommitteeInfo" | ||
| 17 | - :rules="rules" | ||
| 18 | - label-width="120px" | ||
| 19 | - label-position="right" | ||
| 20 | - > | 14 | + <el-form ref="form" :model="addOwnerCommitteeInfo" :rules="rules" label-width="120px" label-position="right"> |
| 21 | <el-row> | 15 | <el-row> |
| 22 | <el-col :span="12"> | 16 | <el-col :span="12"> |
| 23 | <el-form-item :label="$t('addOwnerCommittee.name')" prop="name"> | 17 | <el-form-item :label="$t('addOwnerCommittee.name')" prop="name"> |
| 24 | - <el-input | ||
| 25 | - v-model="addOwnerCommitteeInfo.name" | ||
| 26 | - :placeholder="$t('addOwnerCommittee.requiredName')" | ||
| 27 | - /> | 18 | + <el-input v-model="addOwnerCommitteeInfo.name" :placeholder="$t('addOwnerCommittee.requiredName')" /> |
| 28 | </el-form-item> | 19 | </el-form-item> |
| 29 | </el-col> | 20 | </el-col> |
| 30 | <el-col :span="12"> | 21 | <el-col :span="12"> |
| 31 | <el-form-item :label="$t('addOwnerCommittee.sex')" prop="sex"> | 22 | <el-form-item :label="$t('addOwnerCommittee.sex')" prop="sex"> |
| 32 | - <el-select | ||
| 33 | - v-model="addOwnerCommitteeInfo.sex" | ||
| 34 | - :placeholder="$t('addOwnerCommittee.requiredSex')" | ||
| 35 | - style="width:100%" | ||
| 36 | - > | 23 | + <el-select v-model="addOwnerCommitteeInfo.sex" :placeholder="$t('addOwnerCommittee.requiredSex')" |
| 24 | + style="width:100%"> | ||
| 37 | <el-option disabled value="">{{ $t('addOwnerCommittee.requiredSex') }}</el-option> | 25 | <el-option disabled value="">{{ $t('addOwnerCommittee.requiredSex') }}</el-option> |
| 38 | <el-option value="B">{{ $t('addOwnerCommittee.male') }}</el-option> | 26 | <el-option value="B">{{ $t('addOwnerCommittee.male') }}</el-option> |
| 39 | <el-option value="G">{{ $t('addOwnerCommittee.female') }}</el-option> | 27 | <el-option value="G">{{ $t('addOwnerCommittee.female') }}</el-option> |
| @@ -45,18 +33,13 @@ | @@ -45,18 +33,13 @@ | ||
| 45 | <el-row> | 33 | <el-row> |
| 46 | <el-col :span="12"> | 34 | <el-col :span="12"> |
| 47 | <el-form-item :label="$t('addOwnerCommittee.phone')" prop="link"> | 35 | <el-form-item :label="$t('addOwnerCommittee.phone')" prop="link"> |
| 48 | - <el-input | ||
| 49 | - v-model="addOwnerCommitteeInfo.link" | ||
| 50 | - :placeholder="$t('addOwnerCommittee.requiredPhone')" | ||
| 51 | - /> | 36 | + <el-input v-model="addOwnerCommitteeInfo.link" :placeholder="$t('addOwnerCommittee.requiredPhone')" /> |
| 52 | </el-form-item> | 37 | </el-form-item> |
| 53 | </el-col> | 38 | </el-col> |
| 54 | <el-col :span="12"> | 39 | <el-col :span="12"> |
| 55 | <el-form-item :label="$t('addOwnerCommittee.idCard')" prop="idCard"> | 40 | <el-form-item :label="$t('addOwnerCommittee.idCard')" prop="idCard"> |
| 56 | - <el-input | ||
| 57 | - v-model="addOwnerCommitteeInfo.idCard" | ||
| 58 | - :placeholder="$t('addOwnerCommittee.requiredIdCard')" | ||
| 59 | - /> | 41 | + <el-input v-model="addOwnerCommitteeInfo.idCard" |
| 42 | + :placeholder="$t('addOwnerCommittee.requiredIdCard')" /> | ||
| 60 | </el-form-item> | 43 | </el-form-item> |
| 61 | </el-col> | 44 | </el-col> |
| 62 | </el-row> | 45 | </el-row> |
| @@ -64,18 +47,14 @@ | @@ -64,18 +47,14 @@ | ||
| 64 | <el-row> | 47 | <el-row> |
| 65 | <el-col :span="12"> | 48 | <el-col :span="12"> |
| 66 | <el-form-item :label="$t('addOwnerCommittee.address')" prop="address"> | 49 | <el-form-item :label="$t('addOwnerCommittee.address')" prop="address"> |
| 67 | - <el-input | ||
| 68 | - v-model="addOwnerCommitteeInfo.address" | ||
| 69 | - :placeholder="$t('addOwnerCommittee.requiredAddress')" | ||
| 70 | - /> | 50 | + <el-input v-model="addOwnerCommitteeInfo.address" |
| 51 | + :placeholder="$t('addOwnerCommittee.requiredAddress')" /> | ||
| 71 | </el-form-item> | 52 | </el-form-item> |
| 72 | </el-col> | 53 | </el-col> |
| 73 | <el-col :span="12"> | 54 | <el-col :span="12"> |
| 74 | <el-form-item :label="$t('addOwnerCommittee.position')" prop="position"> | 55 | <el-form-item :label="$t('addOwnerCommittee.position')" prop="position"> |
| 75 | - <el-input | ||
| 76 | - v-model="addOwnerCommitteeInfo.position" | ||
| 77 | - :placeholder="$t('addOwnerCommittee.requiredPosition')" | ||
| 78 | - /> | 56 | + <el-input v-model="addOwnerCommitteeInfo.position" |
| 57 | + :placeholder="$t('addOwnerCommittee.requiredPosition')" /> | ||
| 79 | </el-form-item> | 58 | </el-form-item> |
| 80 | </el-col> | 59 | </el-col> |
| 81 | </el-row> | 60 | </el-row> |
| @@ -83,18 +62,13 @@ | @@ -83,18 +62,13 @@ | ||
| 83 | <el-row> | 62 | <el-row> |
| 84 | <el-col :span="12"> | 63 | <el-col :span="12"> |
| 85 | <el-form-item :label="$t('addOwnerCommittee.post')" prop="post"> | 64 | <el-form-item :label="$t('addOwnerCommittee.post')" prop="post"> |
| 86 | - <el-input | ||
| 87 | - v-model="addOwnerCommitteeInfo.post" | ||
| 88 | - :placeholder="$t('addOwnerCommittee.requiredPost')" | ||
| 89 | - /> | 65 | + <el-input v-model="addOwnerCommitteeInfo.post" :placeholder="$t('addOwnerCommittee.requiredPost')" /> |
| 90 | </el-form-item> | 66 | </el-form-item> |
| 91 | </el-col> | 67 | </el-col> |
| 92 | <el-col :span="12"> | 68 | <el-col :span="12"> |
| 93 | <el-form-item :label="$t('addOwnerCommittee.postDesc')"> | 69 | <el-form-item :label="$t('addOwnerCommittee.postDesc')"> |
| 94 | - <el-input | ||
| 95 | - v-model="addOwnerCommitteeInfo.postDesc" | ||
| 96 | - :placeholder="$t('addOwnerCommittee.optionalPostDesc')" | ||
| 97 | - /> | 70 | + <el-input v-model="addOwnerCommitteeInfo.postDesc" |
| 71 | + :placeholder="$t('addOwnerCommittee.optionalPostDesc')" /> | ||
| 98 | </el-form-item> | 72 | </el-form-item> |
| 99 | </el-col> | 73 | </el-col> |
| 100 | </el-row> | 74 | </el-row> |
| @@ -102,18 +76,14 @@ | @@ -102,18 +76,14 @@ | ||
| 102 | <el-row> | 76 | <el-row> |
| 103 | <el-col :span="12"> | 77 | <el-col :span="12"> |
| 104 | <el-form-item :label="$t('addOwnerCommittee.appointTime')" prop="appointTime"> | 78 | <el-form-item :label="$t('addOwnerCommittee.appointTime')" prop="appointTime"> |
| 105 | - <el-input | ||
| 106 | - v-model="addOwnerCommitteeInfo.appointTime" | ||
| 107 | - :placeholder="$t('addOwnerCommittee.requiredAppointTime')" | ||
| 108 | - /> | 79 | + <el-input v-model="addOwnerCommitteeInfo.appointTime" |
| 80 | + :placeholder="$t('addOwnerCommittee.requiredAppointTime')" /> | ||
| 109 | </el-form-item> | 81 | </el-form-item> |
| 110 | </el-col> | 82 | </el-col> |
| 111 | <el-col :span="12"> | 83 | <el-col :span="12"> |
| 112 | <el-form-item :label="$t('addOwnerCommittee.curTime')" prop="curTime"> | 84 | <el-form-item :label="$t('addOwnerCommittee.curTime')" prop="curTime"> |
| 113 | - <el-input | ||
| 114 | - v-model="addOwnerCommitteeInfo.curTime" | ||
| 115 | - :placeholder="$t('addOwnerCommittee.requiredCurTime')" | ||
| 116 | - /> | 85 | + <el-input v-model="addOwnerCommitteeInfo.curTime" |
| 86 | + :placeholder="$t('addOwnerCommittee.requiredCurTime')" /> | ||
| 117 | </el-form-item> | 87 | </el-form-item> |
| 118 | </el-col> | 88 | </el-col> |
| 119 | </el-row> | 89 | </el-row> |
| @@ -121,11 +91,8 @@ | @@ -121,11 +91,8 @@ | ||
| 121 | <el-row> | 91 | <el-row> |
| 122 | <el-col :span="12"> | 92 | <el-col :span="12"> |
| 123 | <el-form-item :label="$t('addOwnerCommittee.state')" prop="state"> | 93 | <el-form-item :label="$t('addOwnerCommittee.state')" prop="state"> |
| 124 | - <el-select | ||
| 125 | - v-model="addOwnerCommitteeInfo.state" | ||
| 126 | - :placeholder="$t('addOwnerCommittee.requiredState')" | ||
| 127 | - style="width:100%" | ||
| 128 | - > | 94 | + <el-select v-model="addOwnerCommitteeInfo.state" :placeholder="$t('addOwnerCommittee.requiredState')" |
| 95 | + style="width:100%"> | ||
| 129 | <el-option disabled value="">{{ $t('addOwnerCommittee.requiredState') }}</el-option> | 96 | <el-option disabled value="">{{ $t('addOwnerCommittee.requiredState') }}</el-option> |
| 130 | <el-option value="1000">{{ $t('addOwnerCommittee.onJob') }}</el-option> | 97 | <el-option value="1000">{{ $t('addOwnerCommittee.onJob') }}</el-option> |
| 131 | <el-option value="2000">{{ $t('addOwnerCommittee.leaveJob') }}</el-option> | 98 | <el-option value="2000">{{ $t('addOwnerCommittee.leaveJob') }}</el-option> |
| @@ -134,11 +101,8 @@ | @@ -134,11 +101,8 @@ | ||
| 134 | </el-col> | 101 | </el-col> |
| 135 | <el-col :span="12"> | 102 | <el-col :span="12"> |
| 136 | <el-form-item :label="$t('addOwnerCommittee.remark')"> | 103 | <el-form-item :label="$t('addOwnerCommittee.remark')"> |
| 137 | - <el-input | ||
| 138 | - v-model="addOwnerCommitteeInfo.remark" | ||
| 139 | - type="textarea" | ||
| 140 | - :placeholder="$t('addOwnerCommittee.optionalRemark')" | ||
| 141 | - /> | 104 | + <el-input v-model="addOwnerCommitteeInfo.remark" type="textarea" |
| 105 | + :placeholder="$t('addOwnerCommittee.optionalRemark')" /> | ||
| 142 | </el-form-item> | 106 | </el-form-item> |
| 143 | </el-col> | 107 | </el-col> |
| 144 | </el-row> | 108 | </el-row> |
| @@ -147,7 +111,7 @@ | @@ -147,7 +111,7 @@ | ||
| 147 | </el-col> | 111 | </el-col> |
| 148 | </el-row> | 112 | </el-row> |
| 149 | 113 | ||
| 150 | - <el-row :gutter="20" class="margin-top"> | 114 | + <el-row :gutter="20" class=""> |
| 151 | <el-col :span="24"> | 115 | <el-col :span="24"> |
| 152 | <el-card class="ibox"> | 116 | <el-card class="ibox"> |
| 153 | <div slot="header" class="flex justify-between"> | 117 | <div slot="header" class="flex justify-between"> |
| @@ -161,43 +125,27 @@ | @@ -161,43 +125,27 @@ | ||
| 161 | <el-table :data="addOwnerCommitteeInfo.contracts" border style="width: 100%"> | 125 | <el-table :data="addOwnerCommitteeInfo.contracts" border style="width: 100%"> |
| 162 | <el-table-column :label="$t('addOwnerCommittee.contactRelationship')" align="center"> | 126 | <el-table-column :label="$t('addOwnerCommittee.contactRelationship')" align="center"> |
| 163 | <template slot-scope="scope"> | 127 | <template slot-scope="scope"> |
| 164 | - <el-input | ||
| 165 | - v-model="scope.row.relName" | ||
| 166 | - :placeholder="$t('addOwnerCommittee.requiredRelationship')" | ||
| 167 | - /> | 128 | + <el-input v-model="scope.row.relName" :placeholder="$t('addOwnerCommittee.requiredRelationship')" /> |
| 168 | </template> | 129 | </template> |
| 169 | </el-table-column> | 130 | </el-table-column> |
| 170 | <el-table-column :label="$t('addOwnerCommittee.contactName')" align="center"> | 131 | <el-table-column :label="$t('addOwnerCommittee.contactName')" align="center"> |
| 171 | <template slot-scope="scope"> | 132 | <template slot-scope="scope"> |
| 172 | - <el-input | ||
| 173 | - v-model="scope.row.name" | ||
| 174 | - :placeholder="$t('addOwnerCommittee.requiredName')" | ||
| 175 | - /> | 133 | + <el-input v-model="scope.row.name" :placeholder="$t('addOwnerCommittee.requiredName')" /> |
| 176 | </template> | 134 | </template> |
| 177 | </el-table-column> | 135 | </el-table-column> |
| 178 | <el-table-column :label="$t('addOwnerCommittee.contactPhone')" align="center"> | 136 | <el-table-column :label="$t('addOwnerCommittee.contactPhone')" align="center"> |
| 179 | <template slot-scope="scope"> | 137 | <template slot-scope="scope"> |
| 180 | - <el-input | ||
| 181 | - v-model="scope.row.link" | ||
| 182 | - :placeholder="$t('addOwnerCommittee.requiredPhone')" | ||
| 183 | - /> | 138 | + <el-input v-model="scope.row.link" :placeholder="$t('addOwnerCommittee.requiredPhone')" /> |
| 184 | </template> | 139 | </template> |
| 185 | </el-table-column> | 140 | </el-table-column> |
| 186 | <el-table-column :label="$t('addOwnerCommittee.contactAddress')" align="center" width="250"> | 141 | <el-table-column :label="$t('addOwnerCommittee.contactAddress')" align="center" width="250"> |
| 187 | <template slot-scope="scope"> | 142 | <template slot-scope="scope"> |
| 188 | - <el-input | ||
| 189 | - v-model="scope.row.address" | ||
| 190 | - :placeholder="$t('addOwnerCommittee.requiredAddress')" | ||
| 191 | - /> | 143 | + <el-input v-model="scope.row.address" :placeholder="$t('addOwnerCommittee.requiredAddress')" /> |
| 192 | </template> | 144 | </template> |
| 193 | </el-table-column> | 145 | </el-table-column> |
| 194 | <el-table-column :label="$t('common.operation')" align="center" width="100"> | 146 | <el-table-column :label="$t('common.operation')" align="center" width="100"> |
| 195 | <template slot-scope="scope"> | 147 | <template slot-scope="scope"> |
| 196 | - <el-button | ||
| 197 | - type="danger" | ||
| 198 | - size="mini" | ||
| 199 | - @click="deleteContract(scope.row)" | ||
| 200 | - > | 148 | + <el-button type="danger" size="mini" @click="deleteContract(scope.row)"> |
| 201 | {{ $t('common.delete') }} | 149 | {{ $t('common.delete') }} |
| 202 | </el-button> | 150 | </el-button> |
| 203 | </template> | 151 | </template> |
| @@ -313,7 +261,7 @@ export default { | @@ -313,7 +261,7 @@ export default { | ||
| 313 | } | 261 | } |
| 314 | }, | 262 | }, |
| 315 | generateUUID() { | 263 | generateUUID() { |
| 316 | - return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { | 264 | + return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { |
| 317 | const r = Math.random() * 16 | 0 | 265 | const r = Math.random() * 16 | 0 |
| 318 | const v = c === 'x' ? r : (r & 0x3 | 0x8) | 266 | const v = c === 'x' ? r : (r & 0x3 | 0x8) |
| 319 | return v.toString(16) | 267 | return v.toString(16) |
| @@ -322,10 +270,10 @@ export default { | @@ -322,10 +270,10 @@ export default { | ||
| 322 | async saveOwnerCommitteeInfo() { | 270 | async saveOwnerCommitteeInfo() { |
| 323 | try { | 271 | try { |
| 324 | await this.$refs.form.validate() | 272 | await this.$refs.form.validate() |
| 325 | - | 273 | + |
| 326 | this.addOwnerCommitteeInfo.communityId = getCommunityId() | 274 | this.addOwnerCommitteeInfo.communityId = getCommunityId() |
| 327 | const response = await saveOwnerCommittee(this.addOwnerCommitteeInfo) | 275 | const response = await saveOwnerCommittee(this.addOwnerCommitteeInfo) |
| 328 | - | 276 | + |
| 329 | if (response.code === 0) { | 277 | if (response.code === 0) { |
| 330 | this.$message.success(this.$t('addOwnerCommittee.saveSuccess')) | 278 | this.$message.success(this.$t('addOwnerCommittee.saveSuccess')) |
| 331 | this.goBack() | 279 | this.goBack() |
src/views/owner/ownerCommitteeDetailList.vue
| @@ -92,7 +92,7 @@ | @@ -92,7 +92,7 @@ | ||
| 92 | <el-col :span="12"> | 92 | <el-col :span="12"> |
| 93 | <div class="detail-item"> | 93 | <div class="detail-item"> |
| 94 | <label>{{ $t('ownerCommitteeDetail.state') }}:</label> | 94 | <label>{{ $t('ownerCommitteeDetail.state') }}:</label> |
| 95 | - <span>{{ ownerCommitteeDetailInfo.state == '1000' ? $t('common.inService') : $t('common.leave') | 95 | + <span>{{ ownerCommitteeDetailInfo.state == '1000' ? $t('addOwnerCommittee.onJob') : $t('addOwnerCommittee.leaveJob') |
| 96 | }}</span> | 96 | }}</span> |
| 97 | </div> | 97 | </div> |
| 98 | </el-col> | 98 | </el-col> |
| @@ -109,7 +109,7 @@ | @@ -109,7 +109,7 @@ | ||
| 109 | </el-col> | 109 | </el-col> |
| 110 | </el-row> | 110 | </el-row> |
| 111 | 111 | ||
| 112 | - <el-row :gutter="20" class="mt-20"> | 112 | + <el-row :gutter="20" class=""> |
| 113 | <el-col :span="24"> | 113 | <el-col :span="24"> |
| 114 | <el-card class="box-card"> | 114 | <el-card class="box-card"> |
| 115 | <div slot="header" class="clearfix"> | 115 | <div slot="header" class="clearfix"> |
| @@ -231,6 +231,7 @@ export default { | @@ -231,6 +231,7 @@ export default { | ||
| 231 | margin-bottom: 15px; | 231 | margin-bottom: 15px; |
| 232 | display: flex; | 232 | display: flex; |
| 233 | justify-content: flex-start; | 233 | justify-content: flex-start; |
| 234 | + text-align: left; | ||
| 234 | 235 | ||
| 235 | label { | 236 | label { |
| 236 | min-width: 100px; | 237 | min-width: 100px; |