diff --git a/docs/国检集团审核费发放管理办法(最终)20190311修改.doc b/docs/国检集团审核费发放管理办法(最终)20190311修改.doc new file mode 100644 index 0000000..b6e56bc Binary files /dev/null and b/docs/国检集团审核费发放管理办法(最终)20190311修改.doc differ diff --git a/server/apps/system/filters.py b/server/apps/system/filters.py index 9d1814d..4199790 100644 --- a/server/apps/system/filters.py +++ b/server/apps/system/filters.py @@ -7,5 +7,5 @@ class UserFilter(filters.FilterSet): model = User fields = { 'name': ['exact', 'contains'], - 'is_active': ['exact'] + 'is_active': ['exact'], } diff --git a/server/apps/system/views.py b/server/apps/system/views.py index ba2e2d8..7033ae0 100644 --- a/server/apps/system/views.py +++ b/server/apps/system/views.py @@ -90,7 +90,7 @@ class PositionViewSet(ModelViewSet): queryset = Position.objects.all() serializer_class = PositionSerializer pagination_class = None - search_fields = ['^name'] + search_fields = ['name','desc'] ordering_fields = ['id'] ordering = 'id' @@ -185,7 +185,7 @@ class UserViewSet(ModelViewSet): serializer.save(password=password) return Response(serializer.data) - @action(methods=['put'], detail=True, permission_classes=[IsAuthenticated], + @action(methods=['put'], detail=True, permission_classes=[IsAuthenticated], # perms_map={'put':'change_password'} url_name='change_password') def password(self, request, pk=None): """ diff --git a/server/requirements.txt b/server/requirements.txt index 59640cf..5e1431f 100644 Binary files a/server/requirements.txt and b/server/requirements.txt differ diff --git a/server/s_celerybeat.bat b/server/s_celerybeat.bat deleted file mode 100644 index 45ca964..0000000 --- a/server/s_celerybeat.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -call venv\scripts\activate.bat -celery -A server beat -l info -pause \ No newline at end of file diff --git a/server/s_celeryworker.bat b/server/s_celeryworker.bat deleted file mode 100644 index b1fa78e..0000000 --- a/server/s_celeryworker.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -call venv\scripts\activate.bat -celery -A server worker -l info -P eventlet -pause \ No newline at end of file diff --git a/server/s_server.bat b/server/s_server.bat deleted file mode 100644 index 5f7e9df..0000000 --- a/server/s_server.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -call venv\scripts\activate.bat -python manage.py runserver \ No newline at end of file diff --git a/server/server/settings.py b/server/server/settings.py index a4357fe..2ce89a3 100644 --- a/server/server/settings.py +++ b/server/server/settings.py @@ -161,6 +161,7 @@ SIMPLE_JWT = { # 跨域配置 CORS_ORIGIN_ALLOW_ALL = True +CORS_ALLOW_CREDENTIALS = False # Auth配置 AUTH_USER_MODEL = 'system.User'