Browse Source

update 优化代码

yue 2 months ago
parent
commit
017d4dfd2b

+ 13 - 13
SourceCode/IntelligentRailwayCosting/app/core/dtos/quota_input.py

@@ -11,17 +11,17 @@ class QuotaInputDto(BaseModel):
     budget_id: int
     item_id: int
     quota_code: str
-    # sequence_number: Optional[int] = None
+    sequence_number: Optional[int] = None
     project_name: Optional[str] = None
     unit: Optional[str] = None
     project_quantity: Optional[float] = None
-    # project_quantity_input: Optional[str] = None
+    project_quantity_input: Optional[str] = None
     quota_adjustment: Optional[str] = None
-    # unit_price: Optional[float] = None
+    unit_price: Optional[float] = None
     # compilation_unit_price: Optional[float] = None
     # total_price: Optional[float] = None
     # compilation_total_price: Optional[float] = None
-    # unit_weight: Optional[float] = None
+    unit_weight: Optional[float] = None
     # total_weight: Optional[float] = None
     # labor_cost: Optional[float] = None
     # compilation_labor_cost: Optional[float] = None
@@ -59,17 +59,17 @@ class QuotaInputDto(BaseModel):
             budget_id=model.budget_id,
             item_id=model.item_id,
             quota_code=model.quota_code,
-            # sequence_number=model.sequence_number,
+            sequence_number=model.sequence_number,
             project_name=model.project_name,
             unit=model.unit,
             project_quantity=model.project_quantity,
-            # project_quantity_input=model.project_quantity_input,
-            # quota_adjustment=model.quota_adjustment,
-            # unit_price=model.unit_price,
+            project_quantity_input=model.project_quantity_input,
+            quota_adjustment=model.quota_adjustment,
+            unit_price=model.unit_price,
             # compilation_unit_price=model.compilation_unit_price,
             # total_price=model.total_price,
             # compilation_total_price=model.compilation_total_price,
-            # unit_weight=model.unit_weight,
+            unit_weight=model.unit_weight,
             # total_weight=model.total_weight,
             # labor_cost=model.labor_cost,
             # compilation_labor_cost=model.compilation_labor_cost,
@@ -106,17 +106,17 @@ class QuotaInputDto(BaseModel):
             budget_id=quota_dto.budget_id,
             item_id=quota_dto.item_id,
             quota_code=quota_dto.quota_code,
-            # sequence_number=quota_dto.sequence_number,
+            sequence_number=1000,
             project_name=quota_dto.entry_name,
             unit=quota_dto.units,
             project_quantity=quota_dto.amount,
-            # project_quantity_input=quota_dto.project_quantity_input,
+            project_quantity_input=str(quota_dto.amount),
             quota_adjustment=quota_dto.quota_adjustment,
-            # unit_price=quota_dto.unit_price,
+            unit_price=0.1,
             # compilation_unit_price=quota_dto.compilation_unit_price,
             # total_price=quota_dto.total_price,
             # compilation_total_price=quota_dto.compilation_total_price,
-            # unit_weight=quota_dto.unit_weight,
+            unit_weight=0.1,
             # total_weight=quota_dto.total_weight,
             # labor_cost=quota_dto.labor_cost,
             # compilation_labor_cost=quota_dto.compilation_labor_cost,

+ 9 - 8
SourceCode/IntelligentRailwayCosting/app/stores/quota_input.py

@@ -103,15 +103,16 @@ class QuotaInputStore:
                 budget_id=dto.budget_id,
                 item_id=dto.item_id,
                 quota_code=dto.quota_code,
-                # sequence_number=dto.sequence_number,
+                sequence_number=dto.sequence_number,
                 project_name=dto.project_name,
                 unit=dto.unit,
-                # project_quantity=dto.project_quantity,
-                project_quantity_input=str(dto.project_quantity),
+                project_quantity=dto.project_quantity,
+                project_quantity_input=dto.project_quantity_input,
                 quota_adjustment=dto.quota_adjustment,
+                unit_price=dto.unit_price,
                 # compilation_unit_price=dto.compilation_unit_price,
                 # compilation_total_price=dto.compilation_total_price,
-                # unit_weight=dto.unit_weight,
+                unit_weight=dto.unit_weight,
                 # total_weight=dto.total_weight,
                 # labor_cost=dto.labor_cost,
                 # compilation_labor_cost=dto.compilation_labor_cost,
@@ -171,17 +172,17 @@ class QuotaInputStore:
             model.budget_id = dto.budget_id
             model.item_id = dto.item_id
             model.quota_code = dto.quota_code
-            # model.sequence_number = dto.sequence_number
+            model.sequence_number = dto.sequence_number
             model.project_name = dto.project_name
             model.unit = dto.unit
-            # model.project_quantity = dto.project_quantity
+            model.project_quantity = dto.project_quantity
             model.project_quantity_input = str(dto.project_quantity)
             model.quota_adjustment = dto.quota_adjustment
-            # model.unit_price = dto.unit_price
+            model.unit_price = dto.unit_price
             # model.compilation_unit_price = dto.compilation_unit_price
             # model.total_price = dto.total_price
             # model.compilation_total_price = dto.compilation_total_price
-            # model.unit_weight = dto.unit_weight
+            model.unit_weight = dto.unit_weight
             # model.total_weight = dto.total_weight
             # model.labor_cost = dto.labor_cost
             # model.compilation_labor_cost = dto.compilation_labor_cost

+ 2 - 2
SourceCode/IntelligentRailwayCosting/app/views/static/project/quota_info.js

@@ -454,7 +454,7 @@ function LoadQuotaTable(table) {
             {
                 title: '状态',
                 data: 'status',
-                width: '100px',
+                width: '90px',
                 render: (row) => {
                     let str = ''
                     // if(row.process_status === 0){
@@ -486,7 +486,7 @@ function LoadQuotaTable(table) {
             {
                 title: '操作',
                 data: 'id',
-                width: '160px',
+                width: '170px',
                 render: (row) => {
                     let str = ''
                     // if (row.process_status === 0) {