order tag not_done

hb_server/apps/sam/filters.py

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

hb_server/apps/sam/models.py

@@ -32,17 +32,10 @@ class Contract(CommonAModel):
     """
     合同信息
     """
-    state_choices = (
-         (0, '完好'),
-        (1, '限用'),
-        (2, '在修'),
-         (3, '禁用')
-    )
     name = models.CharField('合同名称', max_length=100)
     number = models.CharField('合同编号', max_length=100, unique=True)
     amount = 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')
     sign_date = models.DateField('签订日期')
     description = models.CharField('描述', max_length=200, blank=True, null=True)