[#17] 采购模块 (#268)

* 增加了材料执行中的物料字段为状态回溯写了对应的标单查询增加了几行代码注释 * 状态修改（创建状态转移表）时修改对应标单状态用filters去筛选标单状态列表 * bug * [#17] 采购物料 [#17] 采购物料为材料代用和材料执行添加了字段查询功能 * [#17] 采购模块为合同增添了几个字段 * bug * [#17] 修改供应商一个bug * bug
DLUT-SIE · Jan 12, 2018 · 91f8de3 · 91f8de3
1 parent bf1ae46
commit 91f8de3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/Procurement/serializers/__init__.py b/Procurement/serializers/__init__.py
@@ -21,9 +21,6 @@
     SupplierListSerializer, SupplierDetailSerializer,
     BaseSupplyRelationshipSerializer, BaseSupplierCheckSerializer)
 
-from .contact_detail import (
-    ContractDetailSerializer,)
-
 from .bidding import (
     BaseBiddingSheetSerializer, BiddingSheetListSerializer,
     BaseBiddingApplicationSerializer, BiddingApplicationListSerializer,
@@ -36,6 +33,7 @@
 
 from .comment import (BaseBiddingCommentSerializer,)
 
+from .contact_detail import (ContractDetailSerializer,)
 
 __all__ = [
     'MaterialSubApplySerializer', 'MaterialSubApplyListSerializer',

diff --git a/Procurement/serializers/contact_detail.py b/Procurement/serializers/contact_detail.py
@@ -4,6 +4,12 @@
 
 
 class ContractDetailSerializer(serializers.ModelSerializer):
+    contract_number = serializers.CharField(
+        source='bidding_sheet.contract_number', read_only=True)
+    contract_amount = serializers.FloatField(
+        source='bidding_sheet.contract_amount', read_only=True)
+    billing_amount = serializers.FloatField(
+        source='bidding_sheet.billing_amount', read_only=True)
 
     class Meta:
         model = ContractDetail

diff --git a/Procurement/serializers/supplier.py b/Procurement/serializers/supplier.py
@@ -28,18 +28,18 @@ class Meta:
 
 
 class SupplierListSerializer(SupplierSerializer):
-    doc = SupplierDocumentSerializer(read_only=True, many=True)
+    docs = SupplierDocumentSerializer(read_only=True, many=True)
 
     class Meta(SupplierSerializer.Meta):
-        fields = '__all__'
+        fields = ('id', 'uid', 'name', 'docs')
 
 
 class SupplierDetailSerializer(SupplierSerializer):
-    doc = SupplierDocumentSerializer(read_only=True, many=True)
-    quotation = QuotationSerializer(read_only=True, many=True)
+    docs = SupplierDocumentSerializer(read_only=True, many=True)
+    quotations = QuotationSerializer(read_only=True, many=True)
 
     class Meta(SupplierSerializer.Meta):
-        fields = '__all__'
+        fields = ('id', 'uid', 'name', 'docs', 'quotations')
 
 
 # 供应商关系