zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合同增加筛选条件

This commit is contained in:
caoqianming 2022-01-10 10:06:12 +08:00
parent bfa8b6857e
commit 73a88e2f86
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hb_server/apps/sam/filters.py
View File

@ -8,4 +8,11 @@ class OrderFilterSet(filters.FilterSet):
create_time_end = filters.NumberFilter(field_name="create_time", lookup_expr='lte') create_time_end = filters.NumberFilter(field_name="create_time", lookup_expr='lte')
class Meta: class Meta:
model = Order model = Order
fields = ['product', 'contract', 'customer', 'create_time_start', 'create_time_end'] fields = ['product', 'contract', 'customer', 'create_time_start', 'create_time_end']
class ContractFilterSet(filters.FilterSet):
create_time_start = filters.DateFilter(field_name="create_time", lookup_expr='gte')
create_time_end = filters.NumberFilter(field_name="create_time", lookup_expr='lte')
class Meta:
fields = ['customer', 'create_time_start', 'create_time_end']

4
hb_server/apps/sam/views.py
View File

@ -5,7 +5,7 @@ from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModel
from apps.mtm.models import Material from apps.mtm.models import Material
from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, WareHouse from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, WareHouse
from apps.inm.signals import update_inm from apps.inm.signals import update_inm
from apps.sam.filters import OrderFilterSet from apps.sam.filters import ContractFilterSet, OrderFilterSet
from apps.sam.serializers import ContractCreateUpdateSerializer, ContractSerializer, CustomerCreateUpdateSerializer, CustomerSerializer, OrderCreateUpdateSerializer, OrderSerializer, SaleCreateSerializer, SaleListSerializer, SaleProductCreateSerializer, SaleProductListSerializer from apps.sam.serializers import ContractCreateUpdateSerializer, ContractSerializer, CustomerCreateUpdateSerializer, CustomerSerializer, OrderCreateUpdateSerializer, OrderSerializer, SaleCreateSerializer, SaleListSerializer, SaleProductCreateSerializer, SaleProductListSerializer
from apps.sam.models import Contract, Customer, Order, Sale, SaleProduct from apps.sam.models import Contract, Customer, Order, Sale, SaleProduct
from rest_framework.viewsets import GenericViewSet, ModelViewSet from rest_framework.viewsets import GenericViewSet, ModelViewSet
@ -44,7 +44,7 @@ class ContractViewSet(CreateUpdateCustomMixin, ModelViewSet):
queryset = Contract.objects.select_related('customer').all() queryset = Contract.objects.select_related('customer').all()
serializer_class = ContractSerializer serializer_class = ContractSerializer
search_fields = ['name'] search_fields = ['name']
filterset_fields = [] filterset_class = ContractFilterSet
ordering_fields = ['create_time'] ordering_fields = ['create_time']
ordering = ['-create_time'] ordering = ['-create_time']