Browse Source

feat: [用户管理] 角色变更历史

lkf
memorylkf 2 months ago
parent
commit
92921e8ce2
5 changed files with 75 additions and 7 deletions
  1. +15
    -0
      src/api/system/user.js
  2. +1
    -1
      src/lang/en.js
  3. +4
    -1
      src/lang/en/system/user.js
  4. +4
    -1
      src/lang/zh/system/user.js
  5. +51
    -4
      src/views/system/user/index.vue

+ 15
- 0
src/api/system/user.js View File

@ -160,3 +160,18 @@ export function studyUser(query) {
params: query params: query
}) })
} }
export function roleChangeList(query) {
return request({
url: '/system/business/roleChange/list',
method: 'get',
params: query
})
}
export function roleChangeExport(data) {
return request({
url: '/system/business/roleChange/export',
method: 'post',
data
})
}

+ 1
- 1
src/lang/en.js View File

@ -102,7 +102,7 @@ export default {
signerUser: 'Signed User', signerUser: 'Signed User',
signerPsw: 'Password', signerPsw: 'Password',
qmyy: 'Meaning of Signature', qmyy: 'Meaning of Signature',
signTime: '签名时间',
signTime: 'Date',
remark: 'Comment', remark: 'Comment',
reason: 'Reason', reason: 'Reason',
modify: 'Modify', modify: 'Modify',

+ 4
- 1
src/lang/en/system/user.js View File

@ -17,5 +17,8 @@ export default {
history: 'Role History', history: 'Role History',
addUser: 'Create', addUser: 'Create',
modifyUser: 'Edit'
modifyUser: 'Edit',
bgqjs: 'Role Before Change',
bghjs: 'Role After Change'
} }

+ 4
- 1
src/lang/zh/system/user.js View File

@ -18,5 +18,8 @@ export default {
addUser: '新增角色', addUser: '新增角色',
modifyUser: '编辑角色', modifyUser: '编辑角色',
phoneError: '请输入正确的手机号码'
phoneError: '请输入正确的手机号码',
bgqjs: '变更前角色',
bghjs: '变更后角色'
} }

+ 51
- 4
src/views/system/user/index.vue View File

@ -99,7 +99,7 @@
type="text" type="text"
@click="handleStatusChange(scope.row)" @click="handleStatusChange(scope.row)"
v-hasPermi="['system:user:edit']"
v-hasPermi="['system:user:enable']"
v-if="scope.row.status==='0'" v-if="scope.row.status==='0'"
>{{$t('page.system.user.disable')}}</el-button> >{{$t('page.system.user.disable')}}</el-button>
@ -107,7 +107,7 @@
type="text" type="text"
@click="handleStatusChange(scope.row)" @click="handleStatusChange(scope.row)"
v-hasPermi="['system:user:edit']"
v-hasPermi="['system:user:enable']"
v-if="scope.row.status==='1'" v-if="scope.row.status==='1'"
>{{$t('page.system.user.enable')}}</el-button> >{{$t('page.system.user.enable')}}</el-button>
@ -115,7 +115,7 @@
type="text" type="text"
@click="showRoleChange(scope.row)" @click="showRoleChange(scope.row)"
v-hasPermi="['system:user:edit']"
v-hasPermi="['system:user:roleChange']"
>{{$t('page.system.user.history')}}</el-button> >{{$t('page.system.user.history')}}</el-button>
<el-button type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button> <el-button type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
@ -261,11 +261,29 @@
</el-dialog> </el-dialog>
<Sign ref="signRef" @callback="doUpdate" /> <Sign ref="signRef" @callback="doUpdate" />
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="$t('page.system.user.history')" :visible.sync="changeDialog.visible" width="70%" append-to-body>
<el-table v-loading="changeDialog.loading" :data="changeDialog.list">
<el-table-column :label="$t('form.signer')" prop="qmrMc" width="150" />
<el-table-column :label="$t('form.qmyy')" :prop="$i18n.locale === 'zh_CN'?'jcmc':'jcmcEn'" width="150" />
<el-table-column :label="$t('form.signTime')" prop="createTime" width="150" />
<el-table-column :label="$t('page.system.user.bgqjs')" prop="bgq" />
<el-table-column :label="$t('page.system.user.bgqjs')" prop="bgh" />
</el-table>
<pagination
v-show="changeDialog.total>0"
:total="changeDialog.total"
:page.sync="changeDialog.searchForm.pageNum"
:limit.sync="changeDialog.searchForm.pageSize"
@pagination="getChangeList"
/>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect,roleChangeList,roleChangeExport } from "@/api/system/user"
import { getToken } from "@/utils/auth" import { getToken } from "@/utils/auth"
import Treeselect from "@riophae/vue-treeselect" import Treeselect from "@riophae/vue-treeselect"
import "@riophae/vue-treeselect/dist/vue-treeselect.css" import "@riophae/vue-treeselect/dist/vue-treeselect.css"
@ -394,6 +412,19 @@ export default {
// ] // ]
}, },
oldRoleIdList:[], oldRoleIdList:[],
changeDialog:{
visible:false,
searchForm:{
userId:'',
pageSize:10,
pageNum:1
},
loading:false,
total:0,
list:[]
}
} }
}, },
watch: { watch: {
@ -669,6 +700,22 @@ export default {
}, },
showRoleChange(row){ showRoleChange(row){
this.saveSimpleLog({name:row.nickName,nameEn:row.nickName,jcmc:this.$t('page.system.user.history','zh_CN'),jcmcEn:this.$t('page.system.user.history','en_US')}) this.saveSimpleLog({name:row.nickName,nameEn:row.nickName,jcmc:this.$t('page.system.user.history','zh_CN'),jcmcEn:this.$t('page.system.user.history','en_US')})
this.changeDialog.searchForm = {
userId:row.userId,
pageNum:1,
pageSize:10
}
this.changeDialog.visible = true
this.getChangeList()
},
getChangeList(){
this.changeDialog.loading = true;
roleChangeList(this.changeDialog.searchForm).then(response => {
this.changeDialog.list = response.rows;
this.changeDialog.total = response.total;
}).finally(()=>{
this.changeDialog.loading = false;
})
} }
} }
} }

Loading…
Cancel
Save