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

order tag not_done

This commit is contained in:
caoqianming 2022-01-26 15:25:41 +08:00
parent dfdc035089
commit 492b8d547f
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,8 @@ class OrderFilterSet(DynamicFieldsFilterMixin, filters.FilterSet):
elif value == 'out_delivery': elif value == 'out_delivery':
queryset = queryset.filter(delivered_count__lt=F('count'), queryset = queryset.filter(delivered_count__lt=F('count'),
delivery_date__gt = datetime.date(datetime.now())) delivery_date__gt = datetime.date(datetime.now()))
elif value == 'not_done':
queryset = queryset.filter(delivered_count__gte=F('count'))
return queryset return queryset
class ContractFilterSet(filters.FilterSet): class ContractFilterSet(filters.FilterSet):

7
hb_server/apps/sam/models.py
View File

@ -32,17 +32,10 @@ class Contract(CommonAModel):
""" """
合同信息 合同信息
""" """
state_choices = (
(0, '完好'),
(1, '限用'),
(2, '在修'),
(3, '禁用')
)
name = models.CharField('合同名称', max_length=100) name = models.CharField('合同名称', max_length=100)
number = models.CharField('合同编号', max_length=100, unique=True) number = models.CharField('合同编号', max_length=100, unique=True)
amount = models.IntegerField('合同金额', default=0) amount = models.IntegerField('合同金额', default=0)
invoice = models.IntegerField('开票金额', default=0) invoice = models.IntegerField('开票金额', default=0)
#state = models.CharField('合同状态', choices= state_choices, max_length=20, default=1)
customer = models.ForeignKey(Customer, verbose_name='关联客户', on_delete=models.CASCADE, related_name='contact_customer') customer = models.ForeignKey(Customer, verbose_name='关联客户', on_delete=models.CASCADE, related_name='contact_customer')
sign_date = models.DateField('签订日期') sign_date = models.DateField('签订日期')
description = models.CharField('描述', max_length=200, blank=True, null=True) description = models.CharField('描述', max_length=200, blank=True, null=True)