From 78098851f9ac5d28da7304e4718714a81b2b6be5 Mon Sep 17 00:00:00 2001 From: wushumin Date: Fri, 22 May 2026 21:13:52 +0800 Subject: [PATCH] chore: release updated anxinyan version --- admin-web/src/api/admin.ts | 52 ++ admin-web/src/layouts/AdminLayout.vue | 1 + admin-web/src/pages/appraisal-tasks/index.vue | 8 +- .../src/pages/express-companies/index.vue | 193 ++++++ admin-web/src/pages/orders/index.vue | 99 ++- admin-web/src/pages/reports/index.vue | 83 ++- .../src/pages/warehouse-workbench/index.vue | 65 +- admin-web/src/router/index.ts | 10 + admin-web/src/static/regions/pca.json | 1 + admin-web/src/utils/address-recognition.ts | 213 +++++++ .../admin/ExpressCompaniesController.php | 50 ++ .../controller/admin/ReportsController.php | 41 ++ .../app/controller/app/ReportsController.php | 19 +- .../app/middleware/AdminAuthMiddleware.php | 2 + .../app/support/ExpressCompanyService.php | 208 +++++++ server-api/config/route.php | 4 + server-api/database/schema.sql | 19 + server-api/tools/db_seed.php | 4 + .../schema_upgrade_express_companies.php | 68 ++ ...schema_upgrade_report_trace_visibility.php | 40 ++ user-app/src/api/app.ts | 2 + user-app/src/mocks/app.ts | 2 + user-app/src/pages/report/detail.vue | 585 +++++++++++++----- work-app/src/api/admin.ts | 16 + work-app/src/pages/order/manual-create.vue | 40 +- work-app/src/pages/report/detail.vue | 4 +- work-app/src/pages/return-shipping/index.vue | 75 ++- work-app/src/pages/task/detail.vue | 16 +- work-app/src/utils/address-recognition.ts | 213 +++++++ 29 files changed, 1949 insertions(+), 184 deletions(-) create mode 100644 admin-web/src/pages/express-companies/index.vue create mode 100644 admin-web/src/static/regions/pca.json create mode 100644 admin-web/src/utils/address-recognition.ts create mode 100644 server-api/app/controller/admin/ExpressCompaniesController.php create mode 100644 server-api/app/support/ExpressCompanyService.php create mode 100644 server-api/tools/schema_upgrade_express_companies.php create mode 100644 server-api/tools/schema_upgrade_report_trace_visibility.php create mode 100644 work-app/src/utils/address-recognition.ts diff --git a/admin-web/src/api/admin.ts b/admin-web/src/api/admin.ts index d520a00..3a12789 100644 --- a/admin-web/src/api/admin.ts +++ b/admin-web/src/api/admin.ts @@ -499,6 +499,7 @@ export interface AdminReportListItem { zhongjian_report_no: string; report_entry_admin_name: string; report_entered_at: string; + trace_info_visible: boolean; product_name: string; category_name: string; brand_name: string; @@ -525,6 +526,7 @@ export interface AdminReportDetail { report_entry_admin_id: number; report_entry_admin_name: string; report_entered_at: string; + trace_info_visible: boolean; }; product_info: Record; result_info: Record; @@ -1168,6 +1170,29 @@ export interface AdminWarehousePayload { remark: string; } +export interface AdminExpressCompanyItem { + id: number; + company_name: string; + company_code: string; + status: string; + status_text: string; + is_default: boolean; + sort_order: number; + remark: string; + created_at: string; + updated_at: string; +} + +export interface AdminExpressCompanyPayload { + id?: number; + company_name: string; + company_code: string; + status: string; + is_default: boolean; + sort_order: number; + remark: string; +} + export interface AdminMaterialTagCode { id: number; batch_id: number; @@ -1752,6 +1777,16 @@ export const adminApi = { data: AdminPublishReportResponse & { material_tag?: AdminMaterialTagCode | null }; }>; }, + updateReportTraceVisibility(id: number, visible: boolean) { + return request.post("/api/admin/report/trace-visibility", { + id, + trace_info_visible: visible, + }) as Promise<{ + code: number; + message: string; + data: { id: number; trace_info_visible: boolean }; + }>; + }, saveInspectionReport(data: AdminManualInspectionPayload) { return request.post("/api/admin/report/inspection/save", data) as Promise<{ code: number; @@ -2242,6 +2277,23 @@ export const adminApi = { data: { id: number }; }>; }, + getExpressCompanies(params?: { enabled_only?: 0 | 1 }) { + return request.get("/api/admin/express-companies", { params }) as Promise<{ + code: number; + message: string; + data: { + list: AdminExpressCompanyItem[]; + default_company: string; + }; + }>; + }, + saveExpressCompany(data: AdminExpressCompanyPayload) { + return request.post("/api/admin/express-company/save", data) as Promise<{ + code: number; + message: string; + data: { id: number }; + }>; + }, getMaterialBatches(params?: Record) { return request.get("/api/admin/material/batches", { params }) as Promise<{ code: number; diff --git a/admin-web/src/layouts/AdminLayout.vue b/admin-web/src/layouts/AdminLayout.vue index 620b38d..f968fcc 100644 --- a/admin-web/src/layouts/AdminLayout.vue +++ b/admin-web/src/layouts/AdminLayout.vue @@ -28,6 +28,7 @@ const menus = [ { index: "users", label: "用户管理", icon: User, permission: "users.manage" }, { index: "customers", label: "客户管理", icon: Connection, permission: "customers.manage" }, { index: "warehouses", label: "仓库中心", icon: OfficeBuilding, permission: "warehouses.manage" }, + { index: "express-companies", label: "快递公司", icon: Van, permission: "warehouses.manage" }, { index: "materials", label: "物料管理", icon: Box, permission: "materials.manage" }, { index: "access", label: "权限中心", icon: Lock, permission: "access.manage" }, { index: "content", label: "内容中心", icon: DocumentChecked, permission: "system.manage" }, diff --git a/admin-web/src/pages/appraisal-tasks/index.vue b/admin-web/src/pages/appraisal-tasks/index.vue index 98bf0d5..59e43e3 100644 --- a/admin-web/src/pages/appraisal-tasks/index.vue +++ b/admin-web/src/pages/appraisal-tasks/index.vue @@ -745,7 +745,7 @@ function normalizedKeyPoints() { point_code: item.point_code, point_name: item.point_name, point_value: item.point_value.trim(), - point_remark: item.point_remark.trim(), + point_remark: "", })); } @@ -1577,7 +1577,7 @@ onMounted(async () => {
鉴定模板填写
- 选择品类后自动加载对应模板，按关键项逐项填写检查结论和备注。 + 选择品类后自动加载对应模板，按关键项逐项填写检查结果。
@@ -1619,10 +1619,6 @@ onMounted(async () => { />
-
-
备注
- -
diff --git a/admin-web/src/pages/express-companies/index.vue b/admin-web/src/pages/express-companies/index.vue new file mode 100644 index 0000000..d359519 --- /dev/null +++ b/admin-web/src/pages/express-companies/index.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/admin-web/src/pages/orders/index.vue b/admin-web/src/pages/orders/index.vue index 43630f7..ee18bf3 100644 --- a/admin-web/src/pages/orders/index.vue +++ b/admin-web/src/pages/orders/index.vue @@ -1,8 +1,9 @@