From 7a68aee7193d975b801f5d863903c4f6a4384f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Sat, 27 Feb 2021 00:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dvadmin-backend/apps/permission/models/post.py | 10 +++++----- dvadmin-backend/apps/permission/views.py | 2 +- dvadmin-ui/src/api/permission/post.js | 14 +++++++------- dvadmin-ui/src/views/permission/post/index.vue | 18 +++++++++--------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dvadmin-backend/apps/permission/models/post.py b/dvadmin-backend/apps/permission/models/post.py index 0fde398..2e7a784 100644 --- a/dvadmin-backend/apps/permission/models/post.py +++ b/dvadmin-backend/apps/permission/models/post.py @@ -4,10 +4,10 @@ from apps.op_drf.models import CoreModel class Post(CoreModel): - name = CharField(null=False, max_length=64, verbose_name="岗位名称") - web_path = CharField(max_length=32, verbose_name="岗位编码") - orderNum = IntegerField(verbose_name="岗位顺序") - status = BooleanField(default=False, verbose_name="岗位状态") + postName = CharField(null=False, max_length=64, verbose_name="岗位名称") + postCode = CharField(max_length=32, verbose_name="岗位编码") + postSort = IntegerField(verbose_name="岗位顺序") + status = CharField(max_length=8, verbose_name="岗位状态") remark = TextField(verbose_name="备注", help_text="备注", null=True) class Meta: @@ -15,4 +15,4 @@ class Post(CoreModel): verbose_name_plural = verbose_name def __str__(self): - return f"{self.name}" + return f"{self.postName}" diff --git a/dvadmin-backend/apps/permission/views.py b/dvadmin-backend/apps/permission/views.py index 896066b..5fe787a 100644 --- a/dvadmin-backend/apps/permission/views.py +++ b/dvadmin-backend/apps/permission/views.py @@ -96,7 +96,7 @@ class PostModelViewSet(CustomModelViewSet): # destroy_extra_permission_classes = (IsManagerPermission,) # create_extra_permission_classes = (IsManagerPermission,) search_fields = ('name',) - ordering = 'create_datetime' # 默认排序 + ordering = ['postSort','create_datetime'] # 默认排序 class RoleModelViewSet(CustomModelViewSet): diff --git a/dvadmin-ui/src/api/permission/post.js b/dvadmin-ui/src/api/permission/post.js index 434cd35..359836f 100755 --- a/dvadmin-ui/src/api/permission/post.js +++ b/dvadmin-ui/src/api/permission/post.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询岗位列表 export function listPost(query) { return request({ - url: '/system/post/list', + url: '/permission/post/', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listPost(query) { // 查询岗位详细 export function getPost(postId) { return request({ - url: '/system/post/' + postId, + url: '/permission/post/' + postId + '/', method: 'get' }) } @@ -20,7 +20,7 @@ export function getPost(postId) { // 新增岗位 export function addPost(data) { return request({ - url: '/system/post', + url: '/permission/post/', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addPost(data) { // 修改岗位 export function updatePost(data) { return request({ - url: '/system/post', + url: '/permission/post/' + data.id + '/', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updatePost(data) { // 删除岗位 export function delPost(postId) { return request({ - url: '/system/post/' + postId, + url: '/permission/post/' + postId + '/', method: 'delete' }) } @@ -46,8 +46,8 @@ export function delPost(postId) { // 导出岗位 export function exportPost(query) { return request({ - url: '/system/post/export', + url: '/permission/post/export/', method: 'get', params: query }) -} \ No newline at end of file +} diff --git a/dvadmin-ui/src/views/permission/post/index.vue b/dvadmin-ui/src/views/permission/post/index.vue index 1be8905..dadaeb0 100755 --- a/dvadmin-ui/src/views/permission/post/index.vue +++ b/dvadmin-ui/src/views/permission/post/index.vue @@ -83,7 +83,7 @@ - + @@ -216,8 +216,8 @@ export default { getList() { this.loading = true; listPost(this.queryParams).then(response => { - this.postList = response.rows; - this.total = response.total; + this.postList = response.data.results; + this.total = response.data.count; this.loading = false; }); }, @@ -233,7 +233,7 @@ export default { // 表单重置 reset() { this.form = { - postId: undefined, + id: undefined, postCode: undefined, postName: undefined, postSort: 0, @@ -254,7 +254,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.postId) + this.ids = selection.map(item => item.id) this.single = selection.length!=1 this.multiple = !selection.length }, @@ -267,8 +267,8 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { this.reset(); - const postId = row.postId || this.ids - getPost(postId).then(response => { + const id = row.id || this.ids + getPost(id).then(response => { this.form = response.data; this.open = true; this.title = "修改岗位"; @@ -278,7 +278,7 @@ export default { submitForm: function() { this.$refs["form"].validate(valid => { if (valid) { - if (this.form.postId != undefined) { + if (this.form.id != undefined) { updatePost(this.form).then(response => { this.msgSuccess("修改成功"); this.open = false; @@ -296,7 +296,7 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const postIds = row.postId || this.ids; + const postIds = row.id || this.ids; this.$confirm('是否确认删除岗位编号为"' + postIds + '"的数据项?', "警告", { confirmButtonText: "确定", cancelButtonText: "取消",