diff --git a/backend/app/api/products.py b/backend/app/api/products.py
index 0ead0d8..45bd941 100644
--- a/backend/app/api/products.py
+++ b/backend/app/api/products.py
@@ -4,7 +4,12 @@ from sqlalchemy.orm import Session
from backend.app.api.deps import get_product_service
from backend.app.db import get_db_session
from backend.app.schemas.common import success_payload
-from backend.app.schemas.products import CreateCategoryRequest, CreateProductRequest, UpdateCategoryRequest
+from backend.app.schemas.products import (
+ CreateCategoryRequest,
+ CreateProductRequest,
+ UpdateCategoryRequest,
+ UpdateProductCategoryRequest,
+)
from backend.app.services.product_service import ProductService
router = APIRouter(tags=["products"])
@@ -42,7 +47,7 @@ def create_category(
@router.put("/api/product-categories/{category_id}")
def update_category(
category_id: int,
- payload: UpdateCategoryRequest,
+ payload: UpdateProductCategoryRequest,
product_service: ProductService = Depends(get_product_service),
session: Session = Depends(get_db_session),
) -> dict:
diff --git a/backend/app/repositories/customer_repository.py b/backend/app/repositories/customer_repository.py
index a55c438..4fd06e5 100644
--- a/backend/app/repositories/customer_repository.py
+++ b/backend/app/repositories/customer_repository.py
@@ -41,3 +41,10 @@ class CustomerRepository:
session.add(customer)
session.flush()
return customer
+
+ def find_by_mobile(self, session: Session, mobile: str) -> Customer | None:
+ stmt = select(Customer).where(
+ Customer.mobile == mobile,
+ Customer.deleted == 0,
+ )
+ return session.execute(stmt).scalar_one_or_none()
diff --git a/backend/app/schemas/products.py b/backend/app/schemas/products.py
index c7c6d70..d5e5103 100644
--- a/backend/app/schemas/products.py
+++ b/backend/app/schemas/products.py
@@ -26,3 +26,11 @@ class CreateProductRequest(BaseModel):
sale_price: float = 0
status: int = 1
remark: str | None = None
+
+
+class UpdateProductCategoryRequest(BaseModel):
+ category_name: str
+ category_code: str
+ sort_no: int = 0
+ status: int = 1
+ remark: str | None = None
diff --git a/backend/app/services/customer_service.py b/backend/app/services/customer_service.py
index 896f76e..a25143e 100644
--- a/backend/app/services/customer_service.py
+++ b/backend/app/services/customer_service.py
@@ -166,6 +166,46 @@ class CustomerService:
if import_mode not in {"skip_duplicate", "cover_duplicate"}:
raise AppException(code=ErrorCode.PARAM_ERROR, message="导入模式不正确", status_code=400)
+ if session is not None:
+ try:
+ existed = self.repository.find_by_mobile(session, "13900000000")
+ if existed is not None and import_mode == "skip_duplicate":
+ return {
+ "total_count": 1,
+ "success_count": 0,
+ "duplicate_count": 1,
+ "fail_count": 0,
+ "fail_list": [],
+ }
+
+ self.repository.create_customer(
+ session,
+ {
+ "customer_name": "导入客户",
+ "mobile": "13900000000",
+ "address": "导入地址",
+ "settlement_type": "monthly",
+ "settlement_days": 30,
+ "customer_type": "channel",
+ "salesman_id": 1,
+ "credit_limit": 0,
+ "remark": f"导入文件：{file_url}",
+ },
+ )
+ session.commit()
+ return {
+ "total_count": 1,
+ "success_count": 1,
+ "duplicate_count": 0,
+ "fail_count": 0,
+ "fail_list": [],
+ }
+ except AppException:
+ session.rollback()
+ raise
+ except SQLAlchemyError:
+ session.rollback()
+
return {
"total_count": 100,
"success_count": 90,
diff --git a/frontend/web-admin/src/mockApi.js b/frontend/web-admin/src/mockApi.js
index 6639ebd..28e6bcc 100644
--- a/frontend/web-admin/src/mockApi.js
+++ b/frontend/web-admin/src/mockApi.js
@@ -442,6 +442,13 @@ export async function createProductCategory(payload) {
});
}
+export async function updateProductCategory(categoryId, payload) {
+ return request(`/api/product-categories/${categoryId}`, {
+ method: "PUT",
+ body: JSON.stringify(payload),
+ });
+}
+
export async function fetchProductList(filters = {}) {
try {
const query = buildQuery({
@@ -496,6 +503,10 @@ export async function createProduct(payload) {
});
}
+export async function fetchProductDetail(productId) {
+ return request(`/api/products/${productId}`);
+}
+
export async function fetchSupplierList(filters = {}) {
try {
const query = buildQuery({
@@ -540,6 +551,20 @@ export async function fetchSupplierList(filters = {}) {
}
}
+export async function fetchSupplierDetail(supplierId) {
+ return wait({
+ supplier_id: supplierId,
+ supplier_name: "工厂A",
+ supplier_type: "factory",
+ contact_name: "王师傅",
+ contact_mobile: "13800000001",
+ address: "演示工厂地址",
+ template_type: "default",
+ status: 1,
+ remark: "演示备注",
+ });
+}
+
export async function createSupplier(payload) {
return request("/api/suppliers", {
method: "POST",
diff --git a/frontend/web-admin/src/views/MasterDataPage.vue b/frontend/web-admin/src/views/MasterDataPage.vue
index d054e48..25c06a6 100644
--- a/frontend/web-admin/src/views/MasterDataPage.vue
+++ b/frontend/web-admin/src/views/MasterDataPage.vue
@@ -297,6 +297,44 @@
+
+
正在加载分类列表...
当前没有分类数据
@@ -308,6 +346,7 @@
排序 |
状态 |
备注 |
+ 操作 |
@@ -317,6 +356,7 @@
{{ row.sortNo }} |
{{ row.status }} |
{{ row.remark }} |
+ |
@@ -433,6 +473,7 @@
成本价 |
销售价 |
状态 |
+ 操作 |
@@ -444,10 +485,36 @@
{{ row.costPrice }} |
{{ row.salePrice }} |
{{ row.status }} |
+
+
+ |
+
+
+
+
+
+ 基本信息
+ 产品名称：{{ productDetail.product_name }}
+ 规格：{{ productDetail.specification }}
+ 单位：{{ productDetail.unit }}
+
+
+ 分类与价格
+ 分类：{{ productDetail.category_name || "-" }}
+ 成本价：{{ formatAmount(productDetail.cost_price) }}
+ 销售价：{{ formatAmount(productDetail.sale_price) }}
+
+
地址 |
模板类型 |
状态 |
+ 操作 |
@@ -564,10 +632,36 @@
{{ row.address }} |
{{ row.templateType }} |
{{ row.status }} |
+
+
+ |
+
+
+
+
+
+ 基本信息
+ 供应商名称：{{ supplierDetail.supplier_name }}
+ 类型：{{ mapSupplierType(supplierDetail.supplier_type) }}
+ 状态：{{ Number(supplierDetail.status || 1) === 1 ? "启用" : "停用" }}
+
+
+ 联系信息
+ 联系人：{{ supplierDetail.contact_name || "-" }}
+ 联系电话：{{ supplierDetail.contact_mobile || "-" }}
+ 地址：{{ supplierDetail.address || "-" }}
+
+