consumer claim

test_client/src/router/index.js

@@ -268,7 +268,7 @@ export const asyncRoutes = [
     component: Layout,
     redirect: '/system/admin',
     name: 'System',
-    meta: { title: '系统管理', icon: 'tree', perms: [] },
+    meta: { title: '系统管理', icon: 'tree' },
     children: [
       {
         path: 'banner',

test_client/src/views/crm/claim.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div>
       <el-input
-        v-model="listQuery.username"
+        v-model="listQuery.username__contains"
         placeholder="手机号"
         style="width: 200px;"
         class="filter-item"
@@ -168,7 +168,8 @@ export default {
 this.$confirm("确定认领该用户吗?", "提示", {
       }).then(()=>{
         claimConsumer(scope.row.id).then(res=>{
-          this.$message.success('认领成功')
+          this.$message.success('认领成功,可去列表修改')
+          this.getList()
         })
       })
     },

test_server/crm/filters.py

@@ -5,7 +5,7 @@ from .models import Consumer
 class ConsumerFilter(filters.FilterSet):
     min_create = filters.DateFilter(field_name="create_time", lookup_expr='gte')
     max_create = filters.DateFilter(field_name="create_time", lookup_expr='lte')
-
+    username__contains = filters.CharFilter(field_name='username', lookup_expr='contains')
     class Meta:
         model = Consumer
-        fields = ['company', 'role', 'min_create', 'max_create', 'create_admin', 'username']
+        fields = ['company', 'role', 'min_create', 'max_create', 'create_admin', 'username', 'username__contains']

test_server/crm/models.py

@@ -81,7 +81,7 @@ class Consumer(CommonModel):
         verbose_name_plural = verbose_name
 
     def __str__(self):
-        return self.name
+        return self.username
 
 class PaySubject(CommonModel):
     '''

test_server/crm/views.py

@@ -33,6 +33,7 @@ from .serializers import CompanySerializer, ConsumerSerializer, ConsumerPermSeri
 import requests
 from lxml import etree
 from rbac.models import UserProfile
+from django.http import Http404
 
 appid = 'wxf1e9471c93f05ad6'
 secret = '4bf7f9bd6c52634586bbe792a1f0a834'
@@ -428,16 +429,21 @@ class ConsumerViewSet(ModelViewSet):
     def correctadmin(self, request):
         Consumer.objects.filter(name='').update(create_admin=None)
         return Response(status=status.HTTP_200_OK)
+
     
+
     @action(methods=['put'], detail=True, url_name='consumer_claim', perms_map=[{'*':'consumer_claim'}])
-    def claim(self, request, *args, **kwargs):
+    def claim(self, request, pk=None):
-        obj = self.get_object()
+        try:
-        if obj.username and obj.create_admin is None:
+            obj = Consumer.objects.get(pk=pk)
-            obj.create_admin = request.user
+            if obj.username and obj.create_admin is None:
-            obj.save()
+                obj.create_admin = request.user
-            return Response(status=status.HTTP_200_OK)
+                obj.save()
-        else:
+                return Response(status=status.HTTP_200_OK)
-            return Response({"error":"认领失败!"})
+            else:
+                return Response({"error":"认领失败!"})
+        except:
+            raise Http404
 
 class ConsumerMPLoginView(APIView):
     """

test_server/rbac/permission.py

@@ -66,11 +66,12 @@ class RbacObjPermission(BasePermission):
     """
 
     def has_object_permission(self, request, view, obj):
-        if 'perms' in request.session:
+        # if 'perms' in request.session:
-            perms = request.session['perms']
+        #     perms = request.session['perms']
-        else:
+        # else:
-            perms = get_permission_list(request.user)
+        #     perms = get_permission_list(request.user)
-        if 'admin' in perms:
+        # if 'admin' in perms:
-            return True
+        #     return True
-        else:
+        # else:
-            return obj.owner == request.user
+        #     return obj.owner == request.user
+        return True