Commit ab9b555fd729642dcf43ad09322b339047b37e72
1 parent
9c8438ca
v1.9 测试组织下相关功能,解决一些国际化问题
Showing
7 changed files
with
11 additions
and
13 deletions
src/components/org/dataPrivilegeDiv.vue
src/components/role/RoleStaff.vue
| ... | ... | @@ -104,7 +104,7 @@ export default { |
| 104 | 104 | this.$refs.deleteRoleStaff.show(staff, this.pgId) |
| 105 | 105 | }, |
| 106 | 106 | viewDetail(staff) { |
| 107 | - this.$router.push(`/staff/detail/${staff.userId}`) | |
| 107 | + this.$router.push(`/views/staff/staffDetail?staffId=${staff.userId}`) | |
| 108 | 108 | }, |
| 109 | 109 | handleSizeChange(size) { |
| 110 | 110 | this.page.size = size | ... | ... |
src/views/org/classesManageList.vue
| ... | ... | @@ -27,10 +27,7 @@ |
| 27 | 27 | <div slot="header" class="flex justify-between "> |
| 28 | 28 | <span>{{ $t('classesManage.list.title') }}</span> |
| 29 | 29 | <div style="float: right"> |
| 30 | - <el-button type="primary" size="small" @click="handleShowDocument"> | |
| 31 | - <i class="el-icon-document"></i> | |
| 32 | - {{ $t('common.document') }} | |
| 33 | - </el-button> | |
| 30 | + | |
| 34 | 31 | <el-button type="primary" size="small" @click="handleAdd"> |
| 35 | 32 | <i class="el-icon-plus"></i> |
| 36 | 33 | {{ $t('common.add') }} |
| ... | ... | @@ -158,14 +155,14 @@ export default { |
| 158 | 155 | handleEnable(row) { |
| 159 | 156 | this.$refs.classesState.open({ |
| 160 | 157 | classesId: row.classesId, |
| 161 | - stateName: this.$t('common.enable'), | |
| 158 | + stateName: this.$t('common.enabled'), | |
| 162 | 159 | state: '1001' |
| 163 | 160 | }) |
| 164 | 161 | }, |
| 165 | 162 | handleDisable(row) { |
| 166 | 163 | this.$refs.classesState.open({ |
| 167 | 164 | classesId: row.classesId, |
| 168 | - stateName: this.$t('common.disable'), | |
| 165 | + stateName: this.$t('common.disabled'), | |
| 169 | 166 | state: '2002' |
| 170 | 167 | }) |
| 171 | 168 | }, | ... | ... |
src/views/org/orgLang.js
| ... | ... | @@ -28,6 +28,7 @@ export const messages = { |
| 28 | 28 | confirmDeleteOrg: 'Are you sure to delete this organization?', |
| 29 | 29 | confirmDeleteOrgRel: 'Are you sure to delete this organization relationship?', |
| 30 | 30 | staffTitle: 'Staff', |
| 31 | + selectOrgFirst: 'Please select an organization first', | |
| 31 | 32 | staff: { |
| 32 | 33 | name: 'Name', |
| 33 | 34 | phone: 'Phone', |
| ... | ... | @@ -66,6 +67,7 @@ export const messages = { |
| 66 | 67 | confirmDeleteOrg: '确定删除组织管理', |
| 67 | 68 | confirmDeleteOrgRel: '确定删除组织关系', |
| 68 | 69 | staffTitle: '员工', |
| 70 | + selectOrgFirst: '请先选择一个组织', | |
| 69 | 71 | staff: { |
| 70 | 72 | name: '员工名称', |
| 71 | 73 | phone: '员工电话', | ... | ... |
src/views/org/scheduleClassesList.vue
| ... | ... | @@ -156,14 +156,14 @@ export default { |
| 156 | 156 | handleEnable(row) { |
| 157 | 157 | this.$refs.stateDialog.open({ |
| 158 | 158 | scheduleId: row.scheduleId, |
| 159 | - stateName: this.$t('common.enable'), | |
| 159 | + stateName: this.$t('common.enabled'), | |
| 160 | 160 | state: '1001' |
| 161 | 161 | }) |
| 162 | 162 | }, |
| 163 | 163 | handleDisable(row) { |
| 164 | 164 | this.$refs.stateDialog.open({ |
| 165 | 165 | scheduleId: row.scheduleId, |
| 166 | - stateName: this.$t('common.disable'), | |
| 166 | + stateName: this.$t('common.disabled'), | |
| 167 | 167 | state: '2002' |
| 168 | 168 | }) |
| 169 | 169 | }, | ... | ... |
src/views/org/scheduleClassesPageList.vue
| ... | ... | @@ -200,6 +200,7 @@ export default { |
| 200 | 200 | } |
| 201 | 201 | await exportData(params) |
| 202 | 202 | this.$message.success(this.$t('common.operationSuccess')) |
| 203 | + this.$router.push('/pages/property/downloadTempFile?tab=下载中心') | |
| 203 | 204 | } catch (error) { |
| 204 | 205 | console.error('导出失败:', error) |
| 205 | 206 | this.$message.error(this.$t('common.exportFailed')) | ... | ... |
src/views/staff/staffCommunityList.vue
| ... | ... | @@ -29,13 +29,13 @@ |
| 29 | 29 | </el-col> |
| 30 | 30 | <el-col :span="20"> |
| 31 | 31 | <el-card class="box-card"> |
| 32 | - <div class="text-right" v-if="staffCommunityInfo.curStaffId"> | |
| 32 | + <div class="text-right margin-bottom" v-if="staffCommunityInfo.curStaffId" > | |
| 33 | 33 | <el-button type="primary" size="small" @click="openAddModal"> |
| 34 | 34 | {{ $t('staffCommunity.linkCommunity') }} |
| 35 | 35 | </el-button> |
| 36 | 36 | </div> |
| 37 | 37 | |
| 38 | - <el-table :data="staffCommunityInfo.communitys" border style="width: 100%" v-loading="loading"> | |
| 38 | + <el-table :data="staffCommunityInfo.communitys" border style="width: 100%" v-loading="loading"> | |
| 39 | 39 | <el-table-column prop="staffName" :label="$t('staffCommunity.staffName')" align="center" /> |
| 40 | 40 | <el-table-column prop="staffId" :label="$t('staffCommunity.staffId')" align="center" /> |
| 41 | 41 | <el-table-column prop="communityId" :label="$t('staffCommunity.communityId')" align="center" /> |
| ... | ... | @@ -197,7 +197,6 @@ export default { |
| 197 | 197 | padding: 10px; |
| 198 | 198 | text-align: center; |
| 199 | 199 | cursor: pointer; |
| 200 | - border-bottom: 1px solid #eee; | |
| 201 | 200 | |
| 202 | 201 | &:hover { |
| 203 | 202 | background-color: #f5f7fa; | ... | ... |