提交

backend/app.pid

@@ -0,0 +1 @@
+24265

backend/app/crud/crm/contract.py

@@ -1003,11 +1003,17 @@ def _validate_contract_type_and_products(data: dict) -> None:
 
 
 def _normalize_framework_contract_data(data: dict) -> None:
+    """框架合同：按需/随行就市行清零；有小计则累加写入合同金额（不再强制头金额为 0）。"""
     if not is_framework_contract_type(_get_field(data, "contract_type", "contractType")):
         return
-    data["amount"] = 0
-    data["amountWithTax"] = 0
-    products = _get_field(data, "products", "productList") or []
+    products = _get_field(data, "products", "productList")
+    if products is None:
+        # 未带产品明细时不改写金额（避免更新接口误清空）
+        return
+    if not isinstance(products, list):
+        products = []
+
+    total = Decimal("0")
     for product in products:
         if not isinstance(product, dict):
             continue
@@ -1022,6 +1028,20 @@ def _normalize_framework_contract_data(data: dict) -> None:
             product["subtotal"] = 0
             product["taxAmount"] = 0
 
+        subtotal_raw = _get_field(product, "subtotal")
+        if subtotal_raw is not None and str(subtotal_raw).strip() != "":
+            line = _decimal_value(subtotal_raw)
+        else:
+            qty = _decimal_value(_get_field(product, "quantity"))
+            price = _decimal_value(_get_field(product, "price"))
+            discount = _decimal_value(_get_field(product, "discount"))
+            line = qty * price * (Decimal("1") - discount / Decimal("100"))
+        total += line
+
+    tax_rate = _decimal_value(_get_field(data, "tax_rate", "taxRate"), Decimal("0"))
+    data["amount"] = float(total)
+    data["amountWithTax"] = float(_calc_amount_with_tax(total, tax_rate))
+
 
 def _validate_product_prices_by_contract_type(data: dict) -> None:
     contract_type = (_get_field(data, "contract_type", "contractType") or "").strip()
@@ -1400,6 +1420,13 @@ def update_contract(
     contract_type = (_get_field(data, "contract_type", "contractType") or old.contract_type or "sale").strip()
     old.contract_type = contract_type
 
+    # 框架合同金额在 work_data 上汇总后，需写回 data，供下方 apply 落库
+    if is_framework_contract_type(contract_type) and product_rows is not None:
+        if "amount" in work_data:
+            data["amount"] = work_data["amount"]
+        if "amountWithTax" in work_data:
+            data["amountWithTax"] = work_data["amountWithTax"]
+
     # 再编辑回草稿：作废全部历史审批（含已通过/已拒绝），避免再提审后 canApprove 命中旧记录
     invalidate_all_approvals(db, contract_id)
 

backend/tests/test_crm_framework_contract_amount.py

@@ -0,0 +1,87 @@
+"""框架合同金额：有小计则累加，不再强制为 0。"""
+from decimal import Decimal
+
+from app.crud.crm.contract import _normalize_framework_contract_data
+
+
+def test_framework_sale_sums_fixed_line_subtotals():
+    data = {
+        "contractType": "framework_sale",
+        "taxRate": 6,
+        "products": [
+            {
+                "quantityMode": "fixed",
+                "priceMode": "fixed",
+                "quantity": 10,
+                "price": 100,
+                "subtotal": 1000,
+            },
+            {
+                "quantityMode": "fixed",
+                "priceMode": "fixed",
+                "quantity": 2,
+                "price": 50,
+                "subtotal": 100,
+            },
+        ],
+    }
+    _normalize_framework_contract_data(data)
+    assert Decimal(str(data["amount"])) == Decimal("1100")
+    assert Decimal(str(data["amountWithTax"])) == Decimal("1166")
+
+
+def test_framework_purchase_mixed_market_rows_contribute_zero():
+    data = {
+        "contract_type": "framework_purchase",
+        "tax_rate": 6,
+        "productList": [
+            {
+                "quantity_mode": "fixed",
+                "price_mode": "fixed",
+                "quantity": 5,
+                "price": 200,
+                "subtotal": 1000,
+            },
+            {
+                "quantity_mode": "customer_demand",
+                "price_mode": "market",
+                "quantity": 99,
+                "price": 999,
+                "subtotal": 9999,
+            },
+        ],
+    }
+    _normalize_framework_contract_data(data)
+    market = data["productList"][1]
+    assert market["quantity"] == 0
+    assert market["price"] == 0
+    assert market["subtotal"] == 0
+    assert Decimal(str(data["amount"])) == Decimal("1000")
+
+
+def test_framework_all_market_amount_is_zero():
+    data = {
+        "contractType": "framework",
+        "products": [
+            {
+                "quantityMode": "customer_demand",
+                "priceMode": "market",
+                "quantity": 1,
+                "price": 10,
+                "subtotal": 10,
+            }
+        ],
+    }
+    _normalize_framework_contract_data(data)
+    assert Decimal(str(data["amount"])) == Decimal("0")
+    assert Decimal(str(data["amountWithTax"])) == Decimal("0")
+
+
+def test_non_framework_unchanged():
+    data = {
+        "contractType": "sale",
+        "amount": 500,
+        "products": [{"quantity": 1, "price": 500, "subtotal": 500}],
+    }
+    _normalize_framework_contract_data(data)
+    assert data["amount"] == 500

docs/superpowers/plans/2026-09-10-framework-contract-amount-sum.md

@@ -0,0 +1,33 @@
+# 框架合同金额按产品小计汇总 — Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** 框架销售/采购合同在新建或保存时，按产品行小计汇总合同金额（随行就市/按需行贡献 0）。
+
+**Architecture:** 后端 `_normalize_framework_contract_data` 去掉头金额强制 0，改为累加行小计；更新接口将规范化后的 amount 写回 apply 所用 payload。前端去掉 `amount = 0` 短路，统一 `calculateTotalAmount`。交付生产备份+回填 SQL。
+
+**Tech Stack:** FastAPI / pytest；Vue 3 web-admin
+
+---
+
+### Task 1: 后端单测 + 实现
+
+**Files:**
+- Create: `backend/tests/test_crm_framework_contract_amount.py`
+- Modify: `backend/app/crud/crm/contract.py`
+
+- [x] 写失败用例（固定价合计、混用、全 market）
+- [x] 改 `_normalize_framework_contract_data` 并同步 update 路径 amount
+- [x] 跑通 pytest
+
+### Task 2: 前端
+
+**Files:**
+- Modify: `web-admin/src/views/crm/contract/components/ContractFormDialog.vue`
+- Modify: `web-admin/src/views/crm/contract/form.vue`
+
+- [x] `calculateTotalAmount` / 切类型 / 载入产品：框架合同改为累加
+
+### Task 3: 生产 SQL
+
+- [x] 输出备份表 + 按 `crm_contract_product.subtotal` 回填框架合同金额的语句

docs/superpowers/specs/2026-09-10-framework-contract-amount-sum-design.md

@@ -0,0 +1,22 @@
+# 框架合同金额按产品小计汇总
+
+## 背景
+
+框架销售/采购合同（`framework_sale` / `framework_purchase` / 历史 `framework`）在前后端均强制将合同头 `amount` / `amountWithTax` 置为 0，导致产品行已有固定数量与单价时，列表与详情仍显示合同金额为 0。
+
+## 需求
+
+1. 有小计就累加：各行 `subtotal`（或 数量×单价×折扣）之和写入合同金额；`customer_demand` / `market` 行贡献 0。
+2. 运行时仅新建/再次保存生效；不做应用内批量迁移。
+3. 代码完成后提供生产库「先备份、再回填」SQL，由人工执行。
+
+## 设计
+
+- 后端 `_normalize_framework_contract_data`：保留行级 market/demand 清零；删除头金额强制 0；规范化后按行累加写回 `amount`（及 `amountWithTax` 与现有销售合同口径一致）。
+- 前端 `calculateTotalAmount` 及切类型/载入产品处：去掉框架合同 `amount = 0`，与销售合同相同累加。
+- 更新路径保证规范化后的 `amount` 写入实体（`update_contract` 当前对 `work_data` 规范化但对 `data` 做 apply，需同步金额字段）。
+- 测试覆盖：全固定价、混用、全随行就市。
+
+## 非目标
+
+不改审批流、调价区间、计划超量提醒；不在启动时跑迁移。

web-admin/graphify-out/cache/ast/4645ed9443c7f5ffd71dab5146f77308fb9c23af4c07a41a828d45b492abf029.json

@@ -0,0 +1 @@
+{"nodes": [{"id": "users_zlwu_work_00code_shanxia2_0_web_admin_src_components_business_crm_col_filter_header_index_vue", "label": "index.vue", "file_type": "code", "source_file": "/Users/zlwu/work/00code/shanxia2.0/web-admin/src/components/business/crm-col-filter-header/index.vue", "source_location": "L1"}, {"id": "crm_col_filter_header_index_options", "label": "options", "file_type": "code", "source_file": "/Users/zlwu/work/00code/shanxia2.0/web-admin/src/components/business/crm-col-filter-header/index.vue", "source_location": "L74"}], "edges": [{"source": "users_zlwu_work_00code_shanxia2_0_web_admin_src_components_business_crm_col_filter_header_index_vue", "target": "crm_col_filter_header_index_options", "relation": "contains", "confidence": "EXTRACTED", "source_file": "/Users/zlwu/work/00code/shanxia2.0/web-admin/src/components/business/crm-col-filter-header/index.vue", "source_location": "L74", "weight": 1.0}], "raw_calls": []}

web-admin/src/views/crm/contract/components/ContractFormDialog.vue

@@ -1518,11 +1518,7 @@ const applyContractProductsToForm = async (products: ExtendedContractProductForm
       calculateProductAmount(product)
     }
   })
-  if (isFw) {
-    form.value.amount = 0
-  } else {
-    calculateTotalAmount()
-  }
+  calculateTotalAmount()
 }
 
 /** 复制合同：仅带入产品明细，客户等信息由用户重新填写 */
@@ -2323,13 +2319,16 @@ const handleSwapParties = async () => {
 /** 合同类型变化处理 */
 const handleContractTypeChange = (value: string) => {
   if (isFrameworkContractType(value)) {
-    form.value.amount = 0
     form.value.products?.forEach((p) => {
       applyFrameworkDefaultsToProduct(p)
       if (!p.priceTiers) {
         p.priceTiers = []
       }
+      if (!isFrameworkPriceMarket(p)) {
+        calculateProductAmount(p)
+      }
     })
+    calculateTotalAmount()
   } else {
     form.value.products?.forEach((p) => {
       normalizeFrameworkProductPricing(p, false)
@@ -2618,12 +2617,8 @@ const calculateProductAmount = (product: ExtendedContractProductForm) => {
   product.taxAmount = taxAmount
 }
 
-/** 计算合计金额 */
+/** 计算合计金额（含框架合同：按需/随行就市行为 0，有小计则累加） */
 const calculateTotalAmount = () => {
-  if (isFrameworkContractType(form.value.contractType)) {
-    form.value.amount = 0
-    return
-  }
   let total = 0
   form.value.products.forEach((item) => {
     const quantity = item.quantity || 0

web-admin/src/views/crm/contract/form.vue

@@ -841,11 +841,7 @@ const loadContractDetail = async (id: number | string) => {
         calculateProductAmount(product);
       }
     });
-    if (isFw) {
-      form.value.amount = 0;
-    } else {
-      calculateTotalAmount();
-    }
+    calculateTotalAmount();
   }
 
   // 6. 设置合同期限日期范围
@@ -1389,13 +1385,16 @@ const handleSwapParties = async () => {
 /** 合同类型变化处理 */
 const handleContractTypeChange = (value: string) => {
   if (isFrameworkContractType(value)) {
-    form.value.amount = 0;
     form.value.products?.forEach((p) => {
       applyFrameworkDefaultsToProduct(p);
       if (!p.priceTiers) {
         p.priceTiers = [];
       }
+      if (!isFrameworkPriceMarket(p)) {
+        calculateProductAmount(p);
+      }
     });
+    calculateTotalAmount();
   } else {
     form.value.products?.forEach((p) => {
       normalizeFrameworkProductPricing(p, false);
@@ -1641,12 +1640,8 @@ const calculateProductAmount = (product: ExtendedContractProductForm) => {
   product.taxAmount = taxAmount;
 };
 
-/** 计算合计金额 */
+/** 计算合计金额（含框架合同：按需/随行就市行为 0，有小计则累加） */
 const calculateTotalAmount = () => {
-  if (isFrameworkContractType(form.value.contractType)) {
-    form.value.amount = 0;
-    return;
-  }
   let total = 0;
   form.value.products.forEach((item) => {
     const quantity = item.quantity || 0;